Merge tag 'v1.11.3' into develop

Release v1.11.3
totalperspective · Mar 12, 2024 · e134798 · e134798
2 parents e24e764 + 5638e42
commit e134798
Show file tree

Hide file tree

Showing 12 changed files with 177 additions and 29 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.2
+1.11.3
diff --git a/build-shadow.sh b/build-shadow.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 rm -rf dist
-npx shadow-cljs $@ release portal browser esm npm worker  || exit $?
+npx shadow-cljs $@ release portal browser esm npm  || exit $?
 cat >dist/cjs/package.json <<!EOF
 {
     "type": "commonjs"

diff --git a/build.sh b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 TP_PONDERMATIC_VERSION=`cat VERSION`
-clojure -T:build clean
-clojure -T:build jar :version '"'$TP_PONDERMATIC_VERSION'"'
-clojure -T:build install :version '"'$TP_PONDERMATIC_VERSION'"'
-./build-shadow.sh
+clojure -T:build clean || exit $?
+clojure -T:build jar :version '"'$TP_PONDERMATIC_VERSION'"' || exit $?
+clojure -T:build install :version '"'$TP_PONDERMATIC_VERSION'"' || exit $?
+./build-shadow.sh || exit $?
diff --git a/deploy.sh b/deploy.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 TP_PONDERMATIC_VERSION=`cat VERSION`
 
-clojure -T:build deploy :version '"'$TP_PONDERMATIC_VERSION'"'
-npm publish --access public
+clojure -T:build deploy :version '"'$TP_PONDERMATIC_VERSION'"'  || exit $?
+npm publish --access public || exit $?
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.2",
+  "version": "1.11.3",
   "description": "Functional effect system driven rules engine",
   "engines": {
     "node": ">=16"

diff --git a/pondermatic-1.11.2.pom b/pondermatic-1.11.2.pom
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <groupId>tech.totalperspective</groupId>
+  <artifactId>pondermatic</artifactId>
+  <version>1.11.2</version>
+  <name>pondermatic</name>
+  <description>A functional effect system driven rules engine for Clojure/ClojureScript</description>
+  <scm>
+    <url>https://github.com/totalperspective/pondermatic</url>
+    <connection>scm:git:git://github.com/totalperspective/pondermatic.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/totalperspective/pondermatic.git</developerConnection>
+    <tag>v1.11.2</tag>
+  </scm>
+  <licenses>
+    <license>
+      <name>EPL-2.0</name>
+      <url>https://spdx.org/licenses/EPL-2.0.html</url>
+    </license>
+  </licenses>
+  <dependencies>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>clojure</artifactId>
+      <version>1.11.1</version>
+    </dependency>
+    <dependency>
+      <groupId>meander</groupId>
+      <artifactId>epsilon</artifactId>
+      <version>0.0.650</version>
+    </dependency>
+    <dependency>
+      <groupId>edn-query-language</groupId>
+      <artifactId>eql</artifactId>
+      <version>2021.07.18</version>
+    </dependency>
+    <dependency>
+      <groupId>expound</groupId>
+      <artifactId>expound</artifactId>
+      <version>0.9.0</version>
+    </dependency>
+    <dependency>
+      <groupId>io.replikativ</groupId>
+      <artifactId>hasch</artifactId>
+      <version>0.3.94</version>
+    </dependency>
+    <dependency>
+      <groupId>tick</groupId>
+      <artifactId>tick</artifactId>
+      <version>0.7.5</version>
+    </dependency>
+    <dependency>
+      <groupId>com.taoensso</groupId>
+      <artifactId>tufte</artifactId>
+      <version>2.6.3</version>
+    </dependency>
+    <dependency>
+      <groupId>djblue</groupId>
+      <artifactId>portal</artifactId>
+      <version>0.52.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.clojars.quoll</groupId>
+      <artifactId>asami</artifactId>
+      <version>2.3.4</version>
+    </dependency>
+    <dependency>
+      <groupId>inflections</groupId>
+      <artifactId>inflections</artifactId>
+      <version>0.14.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.clojars.quoll</groupId>
+      <artifactId>zuko</artifactId>
+      <version>0.6.7</version>
+    </dependency>
+    <dependency>
+      <groupId>net.cgrand</groupId>
+      <artifactId>macrovich</artifactId>
+      <version>0.2.2</version>
+    </dependency>
+    <dependency>
+      <groupId>com.cognitect</groupId>
+      <artifactId>transit-clj</artifactId>
+      <version>1.0.333</version>
+    </dependency>
+    <dependency>
+      <groupId>net.sekao</groupId>
+      <artifactId>odoyle-rules</artifactId>
+      <version>1.3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>town.lilac</groupId>
+      <artifactId>pyramid</artifactId>
+      <version>3.4.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.hyperfiddle</groupId>
+      <artifactId>rcf</artifactId>
+      <version>20220926-202227</version>
+    </dependency>
+    <dependency>
+      <groupId>missionary</groupId>
+      <artifactId>missionary</artifactId>
+      <version>b.34</version>
+    </dependency>
+    <dependency>
+      <groupId>funcool</groupId>
+      <artifactId>promesa</artifactId>
+      <version>11.0.678</version>
+    </dependency>
+    <dependency>
+      <groupId>cheshire</groupId>
+      <artifactId>cheshire</artifactId>
+      <version>5.12.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.babashka</groupId>
+      <artifactId>sci</artifactId>
+      <version>0.8.41</version>
+    </dependency>
+    <dependency>
+      <groupId>camel-snake-kebab</groupId>
+      <artifactId>camel-snake-kebab</artifactId>
+      <version>0.4.3</version>
+    </dependency>
+    <dependency>
+      <groupId>cljstache</groupId>
+      <artifactId>cljstache</artifactId>
+      <version>2.0.6</version>
+    </dependency>
+    <dependency>
+      <groupId>juji</groupId>
+      <artifactId>editscript</artifactId>
+      <version>0.6.3</version>
+    </dependency>
+    <dependency>
+      <groupId>http-kit</groupId>
+      <artifactId>http-kit</artifactId>
+      <version>2.7.0</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+  </build>
+  <repositories>
+    <repository>
+      <id>clojars</id>
+      <url>https://repo.clojars.org/</url>
+    </repository>
+  </repositories>
+</project>
diff --git a/release.sh b/release.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 git flow release start $1
-./build.sh
-./deploy.sh
+./build.sh || exit $?
+./deploy.sh || exit $?
 git commit -am "Build artefacts"
 git flow release finish
 git push --all
diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -12,7 +12,7 @@
    :compiler-options {:source-map true
                       :pretty-print true
                       :pseudo-names true
-                      :reader-features #{:dev}}
+                      :reader-features #{:cljs/dev}}
    :devtools {:repl-init-ns user
               :repl-pprint true}}
 
@@ -31,14 +31,14 @@
    :build-hooks [(build/hook)]
    :compiler-options {:pretty-print true
                       :pseudo-names true
-                      :reader-features #{:browser :browser-test}}
+                      :reader-features #{:cljs/browser :cljs/browser-test}}
    :ns-regexp "^(example.*|pondermatic.*)$"}
 
   :node
   {:target :npm-module
    :output-dir "dist/module"
    :build-hooks [(build/hook)]
-   :compiler-options {:reader-features #{:node}}
+   :compiler-options {:reader-features #{:cljs/node}}
    :entries [pondermatic.index]}
 
   :portal
@@ -51,7 +51,7 @@
    :output-to "dist/cjs/index.js"
    :build-hooks [(build/hook)]
    :compiler-options {:output-feature-set :es5
-                      :reader-features #{:npm}}
+                      :reader-features #{:cljs/npm}}
    :exports-fn pondermatic.index/exports}
 
   :esm
@@ -69,14 +69,6 @@
              {:exports {default pondermatic.index/exports}
               :depends-on #{}}}
    :release {}}
-  :worker
-  {:target :browser
-   :output-dir "dist/worker"
-   :asset-path "/"
-   :compiler-options {:reader-features #{:cljs/browser}}
-   :modules {:index
-             {:init-fn pondermatic.browser.worker/init
-              :web-worker true}}}
   :browser
   {:target :browser
    :output-dir "dist/browser"

diff --git a/src/pondermatic/index.cljs b/src/pondermatic/index.cljs
@@ -301,9 +301,12 @@
                     (if (string? level)
                       level
                       (name level)))]
+       (js/console.groupCollapsed)
        (if (fn? log)
-         (log x)
-         (js/console.log (dissoc x :result) result)))
+         (log (dissoc x :result))
+         (js/console.log (dissoc x :result)))
+       (js/console.trace result)
+       (js/console.groupEnd))
      (js/console.log x))))
 
 (defn eval-string