Merge branch 'release/1.11.1'

totalperspective · Mar 10, 2024 · 0a6b1aa · 0a6b1aa
2 parents 2daa663 + 02169a2
commit 0a6b1aa
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/.esm.source-map.edn b/.esm.source-map.edn
diff --git a/.npm.source-map.edn b/.npm.source-map.edn
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.11.0
+1.11.1
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@totalperspective/pondermatic",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "Functional effect system driven rules engine",
   "engines": {
     "node": ">=16"

diff --git a/src/pondermatic/index.cljs b/src/pondermatic/index.cljs
@@ -292,7 +292,7 @@
 (defn console-tap
   ([x]
    (if (and (map? x) (:level x))
-     (let [{:keys [level]} x
+     (let [{:keys [level result]} x
            level (condp = level
                    :trace :debug
                    :fatal :error
@@ -303,7 +303,7 @@
                       (name level)))]
        (if (fn? log)
          (log x)
-         (js/console.log x)))
+         (js/console.log (dissoc x :result) result)))
      (js/console.log x))))
 
 (defn eval-string
@@ -359,12 +359,12 @@
 #_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
 (defn exports []
   (cond
-    (and js/globalThis.pondermatic js/globalThis.pondermatic.api)
+    (and (.-pondermatic js/globalThis) (.-api js/globalThis.pondermatic))
     (do
       (js/console.log "Pondematic - Browser version detected")
       js/globalThis.pondermatic.api)
 
-    js/globalThis.pondermatic
+    (.-pondermatic js/globalThis)
     (do
       (js/console.log "Pondematic - Initialising Browser version")
       (set! js/globalThis.pondermatic.api api)