Use goog.i18n.DateTimeFormat (xapix-io#103)

Author: DeLaGuardo

.github/workflows/publish.yml

@@ -45,6 +45,10 @@ jobs:
         sed -i 's;<version/>;<version>${{ env.GIT_TAG }}</version>;' pom.xml
         sed -i 's;<tag/>;<tag>${{ github.sha }}</tag>;' pom.xml
 
+    - name: Compile java classes
+      run: |
+        javac $(find . -name '*.java' -type f)
+
     - name: Update pom.xml
       run: clojure -Srepro -Spom
 
@@ -94,11 +98,11 @@ jobs:
     - name: Install NodeJS
       uses: actions/setup-node@v1
       with:
-        node-version: 12.13.x
+        node-version: 13.9.x
 
     - name: Build JS
       run: |
-        clojure -A:1.10:cljs -m cljs.main -co axel_f.min.js.edn --compile
+        clojure -A:cljs:cljs-build
 
     - name: Prepare package
       run: |

.github/workflows/tests.yml

@@ -8,19 +8,14 @@ jobs:
   tests:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        clojure: [ 1.9, latest ]
-
     steps:
     - uses: actions/setup-java@v1
       with:
         java-version: '1.8'
 
     - uses: actions/setup-node@v1
-      if: matrix.clojure == 'latest'
       with:
-        node-version: '10.x'
+        node-version: '13.9.x'
 
     - uses: DeLaGuardo/[email protected]
       with:
@@ -29,7 +24,6 @@ jobs:
     - uses: actions/checkout@v1
 
     - name: Prepare npm modules for tests
-      if: matrix.clojure == 'latest'
       run: |
         npm install ws isomorphic-ws
 
@@ -47,15 +41,13 @@ jobs:
 
     - name: Run tests
       run: |
-        clojure -A:${{ matrix.clojure }}:kaocha:unit --plugin cloverage
+        ./bin/kaocha clj --plugin cloverage
 
     - name: Run JS tests
-      if: matrix.clojure == 'latest'
       run: |
-        clojure -A:${{ matrix.clojure }}:kaocha:unit-cljs
+        ./bin/kaocha cljs
 
     - name: Upload test coverage results
       uses: codecov/[email protected]
-      if: matrix.clojure == 'latest'
       with:
         token: ${{secrets.CODECOV_TOKEN}}

bin/kaocha

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+clojure -A:cljs:test -m kaocha.runner "$@"

deps.edn

@@ -8,31 +8,13 @@
  :paths ["src"]
 
  :aliases
- {:cljs {:extra-deps {org.clojure/clojurescript {:mvn/version "RELEASE"}}}
+ {:cljs {:extra-deps {org.clojure/clojurescript {:mvn/version "1.10.758"}}}
 
-  :cljs-repl {:extra-deps {com.bhauman/figwheel-main {:mvn/version "0.2.3"}
-                           com.bhauman/rebel-readline-cljs {:mvn/version "0.1.4"}}
-              :extra-paths ["dev" "target"]
-              :main-opts ["-m" "figwheel.main" "-b" "dev" "-r"]}
+  :cljs-repl {:main-opts ["-m" "cljs.main" "-co" "axel_f.dev.js.edn" "--repl"]}
 
-  :bench {:extra-deps {criterium          {:mvn/version "0.4.5"}
-                       com.taoensso/tufte {:mvn/version "2.1.0-RC4"}}}
+  :cljs-build {:main-opts ["-m" "cljs.main" "-co" "axel_f.min.js.edn" "--compile"]}
 
-  :1.9 {:override-deps {org.clojure/clojure {:mvn/version "1.9.0"}}}
-
-  :1.10 {:override-deps {org.clojure/clojure {:mvn/version "1.10.1"}}}
-
-  :latest {:override-deps {org.clojure/clojure {:mvn/version "1.10.1"}}}
-
-  :kaocha {:extra-paths ["test"]
-           :extra-deps {lambdaisland/kaocha {:mvn/version "0.0-554"}
-                        lambdaisland/kaocha-cloverage {:mvn/version "0.0-41"}
-                        lambdaisland/kaocha-cljs {:mvn/version "0.0-59"}}}
-
-  :unit {:main-opts ["-m" "kaocha.runner" "unit"]}
-
-  :unit-cljs {:main-opts ["-m" "kaocha.runner" "unit-cljs"]
-              :extra-deps {org.clojure/clojurescript {:mvn/version "RELEASE"}}
-              :override-deps {org.clojure/clojure {:mvn/version "1.10.1"}}}
-
-  :watch {:main-opts ["-m" "kaocha.runner" "unit" "--watch"]}}}
+  :test {:extra-paths ["test"]
+         :extra-deps {lambdaisland/kaocha {:mvn/version "1.0.629"}
+                      lambdaisland/kaocha-cloverage {:mvn/version "1.0-45"}
+                      lambdaisland/kaocha-cljs {:mvn/version "0.0-71"}}}}}

src/axel_f/buddy/codecs/base64.cljc

@@ -27,7 +27,10 @@
                (Base64/encodeBase64URLSafe ^bytes data)
                (Base64/encodeBase64 ^bytes data))
         :cljs (codecs/to-bytes
-               ((if urlsafe? trim-padding identity) (base64/encodeByteArray data urlsafe?)))))))
+               (base64/encodeByteArray data
+                                       (if urlsafe?
+                                         base64/Alphabet.WEBSAFE_NO_PADDING
+                                         base64/Alphabet.DEFAULT)))))))
 
 (defn decode
   "Decode base64 data into byte array.

src/axel_f/excel/coerce.cljc

@@ -1,7 +1,7 @@
 (ns axel-f.excel.coerce
   #?(:clj (:require [clojure.edn :as edn])))
 
-(defn excel-type [x]
+(defn excel-type [x & _]
   (cond
     #?@(:clj [(ratio? x) :ratio])
     (number? x) :number
@@ -40,25 +40,26 @@
 
 (defmethod excel-number :null [_] 0)
 
-(defmulti excel-str excel-type)
+(defmulti excel-string excel-type)
 
-(defmethod excel-str :default [x]
+(defmethod excel-string :default [x & _]
   (str x))
 
-(defmethod excel-str :boolean [b]
+(defmethod excel-string :boolean [b & _]
   (if b "TRUE" "FALSE"))
 
-(defmethod excel-str :null [_]
+(defmethod excel-string :null [_ & _]
   "NULL")
 
 #?(:clj
-   (defmethod excel-str :ratio [r]
+   (defmethod excel-string :ratio [r & _]
      (str (double r))))
 
 (defn to-string*
   "Tries to coerce given value to a string type. Returns null for empty value."
-  [^{:doc "Any object to coerce to a string."} obj]
-  (when obj (str obj)))
+  [^{:doc "Any object to coerce to a string."} obj
+   & ^{:doc "Optional arguments"} opts]
+  (when obj (apply (partial excel-string obj) opts)))
 
 (def to-string #'to-string*)
 

src/axel_f/excel/date.cljc

@@ -1,5 +1,6 @@
 (ns axel-f.excel.date
-  (:require #?(:clj [java-time :as jt])
+  (:require #?(:clj [java-time :as jt]
+               :cljs [goog.i18n.DateTimeFormat])
             [axel-f.excel.coerce :as coerce])
   #?(:clj (:import java.time.ZoneOffset
                    java.time.ZoneId)))
@@ -13,22 +14,51 @@
 #?(:cljs (defmethod coerce/excel-number js/Date [jsd]
            (Math/round (/ (.getTime jsd) 1000))))
 
+#?(:clj (defmethod coerce/excel-string java.time.LocalDate
+          ([ld] (str ld))
+          ([ld fmt] (jt/format fmt ld))))
+
+#?(:clj (defmethod coerce/excel-string java.time.LocalDateTime
+          ([ldt] (str ldt))
+          ([ldt fmt] (jt/format fmt ldt))))
+
+#?(:cljs (defmethod coerce/excel-string js/Date
+           ([jsd]
+            (coerce/excel-string jsd (case (.-AxelFType jsd)
+                                       :local-date "YYYY-MM-dd"
+                                       :local-date-time "YYYY-MM-dd'T'HH:mm:ss.SSS"
+                                       (throw (ex-info "Please specify format for date to string conversion" {})))))
+           ([jsd fmt]
+            (let [formatter (goog.i18n.DateTimeFormat. fmt)]
+              (.format formatter jsd)))))
+
 (defn NOW*
   "Returns the current date and time as a date value."
   []
   #?(:clj (jt/local-date-time)
-     :cljs (js/Date.)))
+     :cljs (let [n (js/Date.)
+                 ldt (js/Date. (js/Date.UTC (.getUTCFullYear n)
+                                            (.getUTCMonth n)
+                                            (.getUTCDate n)
+                                            (.getUTCHours n)
+                                            (.getUTCMinutes n)
+                                            (.getUTCSeconds n)
+                                            (.getUTCMilliseconds n)))]
+             (set! (.-AxelFType ldt) :local-date-time)
+             ldt)))
 
 (def NOW #'NOW*)
 
 (defn TODAY*
   "Returns the current date as a date value."
   []
   #?(:clj (jt/local-date)
-     :cljs (let [n (js/Date.)]
-             (js/Date. (js/Date.UTC (.getUTCFullYear n)
-                                    (.getUTCMonth n)
-                                    (.getUTCDate n))))))
+     :cljs (let [n (js/Date.)
+                 ld (js/Date. (js/Date.UTC (.getUTCFullYear n)
+                                           (.getUTCMonth n)
+                                           (.getUTCDate n)))]
+             (set! (.-AxelFType ld) :local-date)
+             ld)))
 
 (def TODAY #'TODAY*)
 
@@ -40,9 +70,11 @@
   #?(:clj (jt/local-date (coerce/excel-number year)
                          (coerce/excel-number month)
                          (coerce/excel-number day))
-     :cljs (js/Date. (js/Date.UTC (coerce/excel-number year)
-                                  (dec (coerce/excel-number month))
-                                  (coerce/excel-number day)))))
+     :cljs (let [d (js/Date. (js/Date.UTC (coerce/excel-number year)
+                                          (dec (coerce/excel-number month))
+                                          (coerce/excel-number day)))]
+             (set! (.-AxelFType d) :local-date)
+             d)))
 
 (def DATE #'DATE*)
 

src/axel_f/excel/operators.cljc

@@ -97,8 +97,8 @@
   "Concatenate two strings."
   [^{:doc "String or number that can be coerced to string."} x
    ^{:doc "String or number that can be coerced to string."} y]
-  (str (coerce/excel-str x)
-       (coerce/excel-str y)))
+  (str (coerce/excel-string x)
+       (coerce/excel-string y)))
 
 (def concatenate #'concatenate*)
 

src/axel_f/excel/text.cljc

@@ -62,7 +62,7 @@
 (defn CODE*
   "Returns the numeric Unicode map value of the first character in the string provided."
   [text]
-  (let [text (coerce/excel-str text)
+  (let [text (coerce/excel-string text)
         res #?(:clj (some-> text first int)
                :cljs (.charCodeAt text 0))]
     #?(:clj res
@@ -102,8 +102,8 @@
 (defn EXACT*
   "Tests whether two strings are identical."
   [str1 str2]
-  (= (coerce/excel-str str1)
-     (coerce/excel-str str2)))
+  (= (coerce/excel-string str1)
+     (coerce/excel-string str2)))
 
 (def EXACT #'EXACT*)
 
@@ -141,14 +141,14 @@
   (let [text (cond
                (string? text) text
                (seqable? text) (first text))]
-    (count (coerce/excel-str text))))
+    (count (coerce/excel-string text))))
 
 (def LEN #'LEN*)
 
 (defn LOWER*
   "Converts a specified string to lowercase."
   [text]
-  (string/lower-case (coerce/excel-str text)))
+  (string/lower-case (coerce/excel-string text)))
 
 (def LOWER #'LOWER*)
 
@@ -157,7 +157,7 @@
   [text start number]
   (let [start (coerce/excel-number start)
         number (coerce/excel-number number)
-        text (coerce/excel-str text)
+        text (coerce/excel-string text)
         text-end (count text)
         params-start (dec start)
         params-end (+ (dec start) number)
@@ -174,7 +174,7 @@
 (defn PROPER*
   "Capitalizes each word in a specified string."
   [text]
-  (string/replace (coerce/excel-str text) #"\w*" string/capitalize))
+  (string/replace (coerce/excel-string text) #"\w*" string/capitalize))
 
 (def PROPER #'PROPER*)
 
@@ -210,7 +210,7 @@
   (let [position (coerce/excel-number position)
         length (coerce/excel-number length)]
     (str (subs text 0 (dec position))
-         (coerce/excel-str new-text)
+         (coerce/excel-string new-text)
          (subs text (+ (dec position) length)))))
 
 (def REPLACE #'REPLACE*)
@@ -267,11 +267,11 @@
            remove-empty-text)
      not-empty
      identity)
-   (string/split (coerce/excel-str text)
+   (string/split (coerce/excel-string text)
                  (re-pattern (if split-by-each
                                (string/join "|" (map regex-escape
-                                                     (vec (coerce/excel-str delimeter))))
-                               (regex-escape (coerce/excel-str delimeter))))
+                                                     (vec (coerce/excel-string delimeter))))
+                               (regex-escape (coerce/excel-string delimeter))))
                  -1)))
 
 (def SPLIT #'SPLIT*)
@@ -298,9 +298,9 @@
   (let [occurrence (cond
                      (nil? occurrence) :all
                      :else (coerce/excel-number occurrence))]
-    (substitute-fn* (coerce/excel-str text)
-                    (coerce/excel-str old-text)
-                    (coerce/excel-str new-text)
+    (substitute-fn* (coerce/excel-string text)
+                    (coerce/excel-string old-text)
+                    (coerce/excel-string new-text)
                     occurrence)))
 
 (def SUBSTITUTE #'SUBSTITUTE*)
@@ -320,7 +320,7 @@
   "Removes leading, trailing, and repeated spaces in text."
   [& args]
   (string/trim
-   (string/replace (-> args first coerce/excel-str) #"\ +" " ")))
+   (string/replace (-> args first coerce/excel-string) #"\ +" " ")))
 
 (def TRIM #'TRIM*)
 
@@ -329,7 +329,7 @@
   [& args]
   (-> args
       first
-      coerce/excel-str
+      coerce/excel-string
       string/upper-case))
 
 (def UPPER #'UPPER*)
@@ -353,7 +353,7 @@
   (let [items (flatten items)
         items (if ignore-empty (keep identity items) items)]
     (->> items
-         (map coerce/excel-str)
+         (map coerce/excel-string)
          (string/join delimeter))))
 
 (def TEXTJOIN #'TEXTJOIN*)

test/axel_f/date_test.cljc

@@ -67,3 +67,7 @@
   (t/testing "local date time"
     (t/is ((af/compile "NOW() > 0")))
     (t/is ((af/compile "NOW() > DATE(1988, 8, 21)")))))
+
+(t/deftest format-test
+  (t/is (= "1988-08-21" ((af/compile "coerce.to-string(DATE(1988, 8, 21))"))))
+  (t/is (= "Aug-88-21" ((af/compile "coerce.to-string(DATE(1988, 8, 21), 'MMM-yy-dd')")))))