@dra2020/baseclient 1.0.73 → 1.0.77

package/dist/baseclient.js

@@ -1016,79 +1016,72 @@ __exportStar(__webpack_require__(/*! ./dataflow */ "./lib/dataflow/dataflow.ts")
 // DataFlow: mechanism for setting up a data-flow dependency graph that gets computed on demand.
 //
 //  Semantics are these:
-//    1. The simplest "atomic" DataFlow object just has an id() and a value(). The id() is used to check for exact
-//       equivalence when determining if any dependents need to be recomputed. id() and value() might be the same
-//       for something that just creates a new whole object when recomputed. In other cases, id() might represent a
-//       hash or changestamp/timestamp that is distinct from the value(). The value may or may not be "ready" as well.
-//       If the value is not "ready", no dependents can be computed.
+//    1. The simplest "atomic" DataFlow object just has an id(). The id() is used to check for exact
+//       equivalence when determining if any dependents need to be recomputed.
 //    2. A DataFlow object can record that it "uses" another DataFlow object. If it does, it can use a set of helper
-//       routines to track the state of its dependents. When its dependents are all ready(), it remembers their ids
-//       and can later test if they are stale.
+//       routines to track the state of its dependents. When its dependents are "stale" (have changed) the computation
+//       needs to be run.
 //
 //
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DataFlowNonNull = exports.DataFlow = void 0;
+exports.DataFlowStamp = exports.DataFlowCallback = exports.DataFlow = void 0;
 class DataFlow {
     constructor() {
-        this.usesList = {};
-        this.uniquename = 1;
+        this.usesList = [];
     }
     // override in subclass
-    ready() { return this.usesReady(); }
-    id() { return null; }
-    value() { return null; }
-    uses(df, name) {
-        if (!name)
-            name = `_df_${this.uniquename++}`;
-        this.usesList[name] = { name: name, df: df };
-    }
-    find(name) {
-        let ui = this.usesList[name];
-        return ui ? ui.df : undefined;
-    }
-    findValue(name) {
-        let df = this.find(name);
-        return df ? df.value() : undefined;
+    dfid() { return null; }
+    // override in subclass
+    compute() {
     }
-    usesReady() {
-        let isready = true;
-        Object.values(this.usesList).forEach((ui) => { if (!ui.df.ready())
-            isready = false; });
-        return isready;
+    uses(df, name) {
+        this.usesList.push({ name: name, df: df });
     }
     usesStale() {
         let isstale = false;
-        Object.values(this.usesList).forEach((ui) => { if (ui.df.id !== ui.df.id())
-            isstale = true; });
+        this.usesList.forEach(ui => {
+            ui.wasstale = ui.id !== ui.df.dfid();
+            if (ui.wasstale)
+                isstale = true;
+        });
         return isstale;
     }
+    wasStale(name) {
+        let ui = this.usesList.find((ui) => ui.name === name);
+        return ui != null && ui.wasstale;
+    }
     usesRemember() {
-        Object.values(this.usesList).forEach((ui) => { ui.df.id = ui.df.id(); });
+        this.usesList.forEach(ui => { ui.id = ui.df.dfid(); });
+    }
+    ifcompute() {
+        if (this.usesStale()) {
+            this.usesRemember();
+            this.compute();
+        }
     }
 }
 exports.DataFlow = DataFlow;
-// Takes callback that, when ready, returns non-null. The return value is both the value and the id.
-class DataFlowNonNull extends DataFlow {
+// Takes callback that, eventually, returns non-null. The return value is both the value and the id.
+// Once the value returns non-null, the callback is never called again.
+class DataFlowCallback extends DataFlow {
     constructor(cb) {
         super();
         this._cb = cb;
     }
-    ready() {
-        // Allow chaining
-        if (!this.usesReady())
-            return false;
-        // Real core semantics, with chaining on stale
-        if (!this._value || this.usesStale()) {
-            this._value = this._cb();
-            if (this._value)
-                this.usesRemember();
-        }
-        return !!this._value;
+    dfid() { if (!this._value)
+        this._value = this._cb(); return this._value; }
+}
+exports.DataFlowCallback = DataFlowCallback;
+// Simple helper that maintains a simple monotonically increasing stamp
+class DataFlowStamp extends DataFlow {
+    constructor() {
+        super();
+        this._stamp = 0;
     }
-    id() { return this.ready(), this._value; }
-    value() { return this.ready(), this._value; }
+    dfid() { return this._stamp; }
+    stamp() { this._stamp++; }
 }
-exports.DataFlowNonNull = DataFlowNonNull;
+exports.DataFlowStamp = DataFlowStamp;
 
 
 /***/ }),