Merge pull request #977 from fluree/fix/cljs-update

Fix/cljs update
fluree · Feb 24, 2025 · ec5667e · ec5667e
2 parents d55adde + 0dd85d4
commit ec5667e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/src/clj/fluree/db/datatype.cljc b/src/clj/fluree/db/datatype.cljc
@@ -16,7 +16,7 @@
 
 #?(:clj (set! *warn-on-reflection* true))
 
-(time-literals/print-time-literals-clj!)
+#?(:clj (time-literals/print-time-literals-clj!))
 
 (def default-data-types
   {const/iri-id                     const/$id

diff --git a/src/clj/fluree/db/flake/index/novelty.cljc b/src/clj/fluree/db/flake/index/novelty.cljc
@@ -421,7 +421,10 @@
                                             :garbage (:address garbage-res))]
                    (log/info "Index refresh complete:" end-stats)
                    ;; kick off automatic garbage collection
-                   (async/thread
-                    (garbage/clean-garbage indexed-db max-old-indexes))
+                   #?(:clj
+                      (async/thread
+                        (garbage/clean-garbage indexed-db max-old-indexes))
+                      :cljs
+                      (<? (garbage/clean-garbage indexed-db max-old-indexes)))
                    indexed-db)))))
         db))))
diff --git a/src/clj/fluree/db/query/exec/eval.cljc b/src/clj/fluree/db/query/exec/eval.cljc
@@ -419,7 +419,7 @@
        :cljs
        (.getHours (if (string? x)
                     (datatype/coerce (:value x) (:datatype-iri x))
-                    datetime)))))
+                    x)))))
 
 (defn minutes
   [x]
@@ -454,9 +454,9 @@
               (.toString (.getOffset ^OffsetDateTime (->offset-date-time (:value x))))
               #{const/iri-xsd-time}
               (.toString (.getOffset ^OffsetTime (->offset-time (:value x)))))
-       :cljs (.getTimeZoneOffset ^js/Date (if (string? datetime)
-                                            (datatype/coerce (:value datetime) (:datatype-iri datetime))
-                                            datetime)))))
+       :cljs (.getTimeZoneOffset ^js/Date (if (string? x)
+                                            (datatype/coerce (:value x) (:datatype-iri x))
+                                            x)))))
 
 (defn sha256
   [{x :value}]

diff --git a/src/clj/fluree/db/storage.cljc b/src/clj/fluree/db/storage.cljc
@@ -48,7 +48,8 @@
 (defn split-address
   "Splits `address` into the fully qualified storage method and local path."
   [address]
-  (str/split address #":(?!.*:)" 2))
+  (let [i (str/last-index-of address ":")]
+    [(subs address 0 i) (subs address (inc i))]))
 
 (defn valid-identifier?
   [x]

diff --git a/src/clj/fluree/db/virtual_graph/parse.cljc b/src/clj/fluree/db/virtual_graph/parse.cljc
@@ -5,7 +5,7 @@
             [fluree.db.query.exec.update :as exec.update]
             [fluree.db.query.exec.where :as where]
             [fluree.db.query.exec.where :as exec.where]
-            #?(:cljs fluree.db.query.exec.select :refer [SubgraphSelector])
+            #?(:cljs [fluree.db.query.exec.select :refer [SubgraphSelector]])
             [fluree.db.query.fql.parse :as q-parse])
   #?(:clj (:import (fluree.db.query.exec.select SubgraphSelector))))