Merge branch 'release/1.11.2'

VERSION

@@ -1 +1 @@
-1.11.1
+1.11.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@totalperspective/pondermatic",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "Functional effect system driven rules engine",
   "engines": {
     "node": ">=16"

src/example/clone.cljs

@@ -1,16 +1,17 @@
 (ns example.clone
   (:require [pondermatic.index :as p]
-            [pondermatic.flow :as flow]
             [asami.core :as d]))
 
 (reset! d/connections {})
 
-(binding [flow/*tap-print* true]
+(def engine-1 (p/create-engine (str (gensym "example.clone")) true))
 
-  (def engine-1 (p/create-engine (str (gensym "example.clone")) true))
+(p/sh engine-1 {:->db (p/ruleset '[{:id :test
+                                    :rule/when {:id 1 :key ?value}
+                                    :rule/then {:id 2 :key ?value}}])})
 
-  (p/sh engine-1 {:->db (p/dataset [{:id 1 :key :value}])})
+(p/sh engine-1 {:->db (p/dataset [{:id 1 :key :value}])})
 
-  (def engine-2 (p/copy engine-1))
+(def engine-2 (p/copy engine-1))
 
-  (p/sh engine-2 {:->db (p/dataset [{:id 1 :key' :value2}])}))
+(p/sh engine-2 {:->db (p/dataset [{:id 1 :key' :value2}])})

src/pondermatic/core.cljc

@@ -161,7 +161,6 @@
         ruleset))
 
 (defn ruleset [rules]
-  (log/debug rules)
   (-> (map #(assoc % type-name rule-type) rules)
       id->ident
       kw->qkw

src/pondermatic/engine.cljc

@@ -19,6 +19,8 @@
 (def type-name ::type)
 (def rule-type ::rule)
 
+(def !conns (atom {}))
+
 (defn datum->eav [[e a v]]
   [e a v])
 
@@ -73,9 +75,11 @@
             (when (seq assertions)
               (sh/|> rule-session (rules/insert* assertions)))))))))
 
-(defn ->then-finally [?id entity-lvars then conn rules]
+(defn ->then-finally [?id entity-lvars then rules]
   (fn then-finally [session]
-    (let [matches (o/query-all session ?id)
+    (let [[{:keys [db-uri]}] (o/query-all session ::db-uri)
+          conn (get @!conns db-uri)
+          matches (o/query-all session ?id)
           bindings (map (partial reduce-kv (fn [m k v]
                                              (assoc m (symbol k) v))
                                  {})
@@ -131,15 +135,18 @@
         rule-spec {:what what
                    :when when-fn
                    :then-finally
-                   (->then-finally ?id entity-lvars then conn rules)}
+                   (->then-finally ?id entity-lvars then rules)}
         rule (o/->rule ?id rule-spec)]
     rule))
 
 #_{:clj-kondo/ignore [:unused-binding]}
 (defn add-base-rules [conn rules env]
   (let [ruleset
         (o/ruleset
-         {::collection-head
+         {::db-uri
+          [:what
+           [::db ::db-uri db-uri]]
+          ::collection-head
           [:what
            [?first-node :a/first ?first-id]
            [?entity-id ?attr ?first-node]
@@ -190,8 +197,15 @@
                (log/error e)))]})]
     (sh/|> rules (rules/add-rules ruleset))))
 
+(defn register-conn! [conn rules]
+  (let [{:keys [db-uri]} conn]
+    (log/trace {::register-conn! db-uri})
+    (sh/|> rules (rules/insert ::db {::db-uri db-uri}))
+    (swap! !conns assoc db-uri conn)))
+
 (defn ->engine [conn rules]
   (add-base-rules conn rules '{!= not=})
+  (register-conn! conn rules)
   (let [dispose:db=>rules (db=>rules conn rules)
         session {::conn conn
                  ::rules rules
@@ -216,6 +230,7 @@
          session {::conn conn'
                   ::rules rules'
                   ::dispose:db=>rules dispose:db=>rules}]
+     (register-conn! conn' rules')
      (log/trace session)
      (->> session
           (sh/engine engine-process)

src/pondermatic/portal/client.cljc

@@ -14,7 +14,7 @@
 (def !opts (atom {:port port :host host}))
 
 (def submit-impl
-  #?(:cljs (if js/window
+  #?(:cljs (if (.-window js/globalThis)
              pw/submit
              p/submit)
      :default p/submit))