@dra2020/baseclient 1.0.73 → 1.0.75

package/dist/dataflow/dataflow.d.ts

@@ -1,29 +1,22 @@
 interface UseItem {
-    name: string;
     df: DataFlow;
     id?: any;
 }
 export declare class DataFlow {
-    uniquename: number;
-    usesList: {
-        [name: string]: UseItem;
-    };
+    usesList: UseItem[];
     constructor();
-    ready(): boolean;
     id(): any;
     value(): any;
-    uses(df: DataFlow, name?: string): void;
-    find(name: string): DataFlow;
-    findValue(name: string): any;
-    usesReady(): boolean;
+    uses(df: DataFlow): void;
     usesStale(): boolean;
     usesRemember(): void;
+    ifcompute(): void;
+    compute(): void;
 }
-export declare class DataFlowNonNull extends DataFlow {
+export declare class DataFlowCallback extends DataFlow {
     _value: any;
     _cb: () => any;
     constructor(cb: () => any);
-    ready(): boolean;
     id(): any;
     value(): any;
 }

package/lib/dataflow/dataflow.ts

@@ -15,67 +15,57 @@
 
 interface UseItem
 {
-  name: string,
   df: DataFlow,
   id?: any,
 }
 
 export class DataFlow
 {
-  uniquename: number;
-  usesList: { [name: string]: UseItem };
+  usesList: UseItem[];
 
   constructor()
   {
-    this.usesList = {};
-    this.uniquename = 1;
+    this.usesList = [];
   }
 
   // override in subclass
-  ready(): boolean { return this.usesReady() }
   id(): any { return null }
   value(): any { return null }
 
-  uses(df: DataFlow, name?: string): void
+  uses(df: DataFlow): void
   {
-    if (!name) name = `_df_${this.uniquename++}`;
-    this.usesList[name] = { name: name, df: df };
+    this.usesList.push({ df: df });
   }
 
-  find(name: string): DataFlow
-  {
-    let ui = this.usesList[name];
-    return ui ? ui.df : undefined;
-  }
-
-  findValue(name: string): any
+  usesStale(): boolean
   {
-    let df = this.find(name);
-    return df ? df.value() : undefined;
+    let isstale = false;
+    this.usesList.forEach(ui => { if (ui.id !== ui.df.id()) isstale = true });
+    return isstale;
   }
 
-  usesReady(): boolean
+  usesRemember(): void
   {
-    let isready = true;
-    Object.values(this.usesList).forEach((ui: UseItem) => { if (!ui.df.ready()) isready = false });
-    return isready;
+    this.usesList.forEach(ui => { ui.id = ui.df.id() });
   }
 
-  usesStale(): boolean
+  ifcompute(): void
   {
-    let isstale = false;
-    Object.values(this.usesList).forEach((ui: UseItem) => { if (ui.df.id !== ui.df.id()) isstale = true });
-    return isstale;
+    if (this.usesStale())
+    {
+      this.usesRemember();
+      this.compute();
+    }
   }
 
-  usesRemember(): void
+  compute(): void
   {
-    Object.values(this.usesList).forEach((ui: UseItem) => { ui.df.id = ui.df.id() });
   }
 }
 
-// Takes callback that, when ready, returns non-null. The return value is both the value and the id.
-export 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.
+export class DataFlowCallback extends DataFlow
 {
   _value: any;
   _cb: () => any;
@@ -86,21 +76,6 @@ export class DataFlowNonNull extends DataFlow
     this._cb = cb;
   }
 
-  ready(): boolean
-  {
-    // 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;
-  }
-
-  id(): any { return this.ready(), this._value }
-  value(): any { return this.ready(), this._value }
+  id(): any { if (!this._value) this._value = this._cb(); return this._value }
+  value(): any { return this.id() }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dra2020/baseclient",
-  "version": "1.0.73",
+  "version": "1.0.75",
   "description": "Utility functions for Javascript projects.",
   "main": "dist/baseclient.js",
   "types": "./dist/all/all.d.ts",