@dra2020/baseclient 1.0.102 → 1.0.104

package/dist/baseclient.js

@@ -1071,6 +1071,7 @@ exports.DataFlowStamp = exports.DataFlowCallback = exports.DataFlow = void 0;
 class DataFlow {
     constructor() {
         this.usesList = [];
+        this.inCompute = false;
     }
     // override in subclass
     dfid() { return null; }
@@ -1097,9 +1098,14 @@ class DataFlow {
         this.usesList.forEach(ui => { ui.id = ui.df.dfid(); });
     }
     ifcompute() {
+        var _a;
         if (this.stale()) {
+            if (this.inCompute)
+                console.log(`DataFlow compute reentrancy: ${(_a = this.constructor) === null || _a === void 0 ? void 0 : _a.name}`);
+            this.inCompute = true;
             this.remember();
             this.compute();
+            this.inCompute = false;
         }
     }
 }
@@ -10094,18 +10100,16 @@ exports.topoMergeFeatures = topoMergeFeatures;
 let UniqueState = FSM.FSM_CUSTOM1;
 let FSM_COMPUTING = UniqueState++;
 class FsmIncrementalUnion extends FSM.Fsm {
-    constructor(env, options, key, map) {
+    constructor(env, options, multi, key, map) {
         super(env);
         this.options = options;
+        this.multi = multi;
         this.key = key;
         this.result = null;
         this.map = null;
         if (map)
             this.recompute(map);
     }
-    matches(key) {
-        return Util.shallowEqual(this.key, key);
-    }
     recompute(map) {
         if (this.map != null && map != null && Util.shallowEqual(map, this.map)) {
             this.work = { nUnion: 0, nDifference: 0, ms: 0 };
@@ -10119,7 +10123,7 @@ class FsmIncrementalUnion extends FSM.Fsm {
             let values = Object.values(map);
             this.work = { nUnion: values.length, nDifference: 0, ms: 0 };
             let elapsed = new Util.Elapsed();
-            this.result = topoMergeFeatures(this.key.multi.allTopo(), values);
+            this.result = topoMergeFeatures(this.multi.allTopo(), values);
             this.work.ms = elapsed.ms();
             this.map = map;
         }
@@ -10145,41 +10149,36 @@ class FsmTopoUnion extends FSM.Fsm {
     constructor(env, options) {
         super(env);
         this.options = Util.shallowAssignImmutable(P.DefaultTickOptions, options);
-        this.unions = [];
+        this.unions = {};
         this.work = { nUnion: 0, nDifference: 0, ms: 0 };
     }
     get result() {
-        if (this.unions.length > 0 && this.state === FSM.FSM_DONE)
-            return this.unions.map((i) => ({ key: i.key, poly: i.result, work: i.work }));
+        if (Util.countKeys(this.unions) > 0 && this.state === FSM.FSM_DONE)
+            return Object.values(this.unions).map((i) => ({ key: i.key, poly: i.result, work: i.work }));
         else
             return null;
     }
     cancel() {
-        this.unions.forEach((i) => {
+        Object.values(this.unions).forEach((i) => {
             i.cancel();
         });
-        this.unions = [];
+        this.unions = {};
         this.setState(FSM.FSM_DONE);
     }
     cancelOne(key) {
-        for (let i = 0; i < this.unions.length; i++) {
-            let u = this.unions[i];
-            if (u.matches(key)) {
-                u.cancel();
-                return;
-            }
-        }
+        let u = this.unions[key];
+        if (u)
+            u.cancel();
     }
-    recompute(key, map) {
-        let fsm = this.unions.find((i) => i.matches(key));
-        if (fsm == null) {
-            fsm = new FsmIncrementalUnion(this.env, this.options, key, map);
-            this.unions.push(fsm);
+    recompute(multi, key, map) {
+        let fsm = this.unions[key];
+        if (fsm == null || fsm.multi !== multi) {
+            fsm = new FsmIncrementalUnion(this.env, this.options, multi, key, map);
+            this.unions[key] = fsm;
         }
         else
             fsm.recompute(map);
         this.work = { nUnion: 0, nDifference: 0, ms: 0 };
-        this.unions.forEach((u) => { this.work.nUnion += u.work.nUnion; this.work.nDifference += u.work.nDifference; });
         this.waitOn(fsm);
         this.setState(FSM_COMPUTING);
     }
@@ -10188,8 +10187,13 @@ class FsmTopoUnion extends FSM.Fsm {
             switch (this.state) {
                 case FSM.FSM_STARTING:
                 case FSM_COMPUTING:
+                    this.work = { nUnion: 0, nDifference: 0, ms: 0 };
                     if (this.unions)
-                        this.unions.forEach((u) => { this.work.ms += u.work.ms; });
+                        Object.values(this.unions).forEach((i) => {
+                            this.work.ms += i.work.ms;
+                            this.work.nUnion += i.work.nUnion;
+                            this.work.nDifference += i.work.nDifference;
+                        });
                     this.setState(FSM.FSM_DONE);
                     break;
             }