Merge pull request #302 from receptron/parse_update_early

parse update early
receptron · May 10, 2024 · 66f17c6 · 66f17c6
2 parents 0833ea9 + 4ff3a28
commit 66f17c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/graphai.ts b/src/graphai.ts
@@ -62,8 +62,7 @@ export class GraphAI {
     return nodes;
   }
 
-  private getValueFromResults(key: string, results: ResultDataDictonary<DefaultResultData>) {
-    const source = parseNodeName(key, this.version);
+  private getValueFromResults(source: DataSource, results: ResultDataDictonary<DefaultResultData>) {
     return getDataFromSource(source.nodeId ? results[source.nodeId] : undefined, source);
   }
 
@@ -82,7 +81,7 @@ export class GraphAI {
         const update = node?.update;
         if (update && previousResults) {
           const result = this.getValueFromResults(update, previousResults);
-          this.injectValue(nodeId, result, update);
+          this.injectValue(nodeId, result, update.nodeId);
         }
       }
     });
@@ -243,7 +242,8 @@ export class GraphAI {
 
       // Notice that we need to check the while condition *after* calling initializeNodes.
       if (loop.while) {
-        const value = this.getValueFromResults(loop.while, this.results(true));
+        const source = parseNodeName(loop.while, this.version);
+        const value = this.getValueFromResults(source, this.results(true));
         // NOTE: We treat an empty array as false.
         if (Array.isArray(value) ? value.length === 0 : !value) {
           return false; // while condition is not met

diff --git a/src/node.ts b/src/node.ts
@@ -340,15 +340,15 @@ export class ComputedNode extends Node {
 
 export class StaticNode extends Node {
   public value?: ResultData;
-  public readonly update?: string;
+  public readonly update?: DataSource;
   public readonly isResult: boolean;
   public readonly isStaticNode = true;
   public readonly isComputedNode = false;
 
   constructor(nodeId: string, data: StaticNodeData, graph: GraphAI) {
     super(nodeId, graph);
     this.value = data.value;
-    this.update = data.update;
+    this.update = data.update ? parseNodeName(data.update, graph.version) : undefined;
     this.isResult = data.isResult ?? false;
   }