@darkhorseprojects/circuitry 0.2.26 → 0.2.28

package/dist/graph.d.ts

@@ -181,9 +181,9 @@ export type CircuitryGraph = {
     nodes?: CircuitryNode[];
     /** Internal normalized execution edges. Authored graph files must not set this. */
     edges?: CircuitryEdge[];
-    /** Rejected legacy field. */
+    /** Forbidden in authored v0.2 graph files. */
     agents?: never;
-    /** Rejected legacy field. */
+    /** Forbidden in authored v0.2 graph files. */
     inputs?: never;
     runtime?: CircuitryRuntime;
     validation?: CircuitryGraphValidation;

package/dist/index.js

@@ -163,16 +163,16 @@ var validateCircuitryGraphInternal = (graph, standard = {}, options) => {
       addError("missing_resources", "Circuitry v0.2 graphs must use a resources: section", ["resources"]);
     }
     if (graphObject.agents && Object.keys(graphObject.agents).length > 0) {
-      addError("legacy_agents", "Circuitry v0.2 graphs must not use legacy agents: section", ["agents"]);
+      addError("forbidden_agents", "Circuitry v0.2 graph files must not use top-level agents:; use resources:", ["agents"]);
     }
     if (graphObject.inputs && Object.keys(graphObject.inputs).length > 0) {
-      addError("legacy_inputs", "Circuitry v0.2 graphs must not use legacy inputs: section", ["inputs"]);
+      addError("forbidden_inputs", "Circuitry v0.2 graph files must not use top-level inputs:; use resources:", ["inputs"]);
     }
     if (graphObject.nodes && graphObject.nodes.length > 0) {
-      addError("legacy_nodes", "Circuitry v0.2 graph files must not use nodes:; use resources:", ["nodes"]);
+      addError("forbidden_nodes", "Circuitry v0.2 graph files must not use top-level nodes:; use resources:", ["nodes"]);
     }
     if (graphObject.edges && graphObject.edges.length > 0) {
-      addError("legacy_edges", "Circuitry v0.2 graph files must not use edges:; use resource inputs:", ["edges"]);
+      addError("forbidden_edges", "Circuitry v0.2 graph files must not use top-level edges:; use resource inputs:", ["edges"]);
     }
   }
   const normalized = normalizeCircuitryGraph(graphObject);
@@ -627,15 +627,15 @@ var runCircuitryGraphExecution = async ({
   const ready = [];
   for (const nodeId of nodeIds) {
     const node = executionGraph.nodes.get(nodeId);
-    if (node.completed) {
-      completed.add(nodeId);
-      if (node.output) {
-        outputs.set(nodeId, node.output);
-      }
-      continue;
-    }
+    if (!node.completed) continue;
+    completed.add(nodeId);
+    outputs.set(nodeId, node.output || "");
+  }
+  for (const nodeId of nodeIds) {
+    if (completed.has(nodeId)) continue;
+    const node = executionGraph.nodes.get(nodeId);
     const count = node.inputNodeIds.filter(
-      (sourceId) => executionGraph.nodes.has(sourceId)
+      (sourceId) => executionGraph.nodes.has(sourceId) && !completed.has(sourceId)
     ).length;
     remainingDependencies.set(nodeId, count);
     if (count === 0) {

package/dist/node.js

@@ -144,16 +144,16 @@ var validateCircuitryGraphInternal = (graph, standard = {}, options) => {
       addError("missing_resources", "Circuitry v0.2 graphs must use a resources: section", ["resources"]);
     }
     if (graphObject.agents && Object.keys(graphObject.agents).length > 0) {
-      addError("legacy_agents", "Circuitry v0.2 graphs must not use legacy agents: section", ["agents"]);
+      addError("forbidden_agents", "Circuitry v0.2 graph files must not use top-level agents:; use resources:", ["agents"]);
     }
     if (graphObject.inputs && Object.keys(graphObject.inputs).length > 0) {
-      addError("legacy_inputs", "Circuitry v0.2 graphs must not use legacy inputs: section", ["inputs"]);
+      addError("forbidden_inputs", "Circuitry v0.2 graph files must not use top-level inputs:; use resources:", ["inputs"]);
     }
     if (graphObject.nodes && graphObject.nodes.length > 0) {
-      addError("legacy_nodes", "Circuitry v0.2 graph files must not use nodes:; use resources:", ["nodes"]);
+      addError("forbidden_nodes", "Circuitry v0.2 graph files must not use top-level nodes:; use resources:", ["nodes"]);
     }
     if (graphObject.edges && graphObject.edges.length > 0) {
-      addError("legacy_edges", "Circuitry v0.2 graph files must not use edges:; use resource inputs:", ["edges"]);
+      addError("forbidden_edges", "Circuitry v0.2 graph files must not use top-level edges:; use resource inputs:", ["edges"]);
     }
   }
   const normalized = normalizeCircuitryGraph(graphObject);
@@ -549,15 +549,15 @@ var runCircuitryGraphExecution = async ({
   const ready = [];
   for (const nodeId of nodeIds) {
     const node = executionGraph.nodes.get(nodeId);
-    if (node.completed) {
-      completed.add(nodeId);
-      if (node.output) {
-        outputs.set(nodeId, node.output);
-      }
-      continue;
-    }
+    if (!node.completed) continue;
+    completed.add(nodeId);
+    outputs.set(nodeId, node.output || "");
+  }
+  for (const nodeId of nodeIds) {
+    if (completed.has(nodeId)) continue;
+    const node = executionGraph.nodes.get(nodeId);
     const count = node.inputNodeIds.filter(
-      (sourceId) => executionGraph.nodes.has(sourceId)
+      (sourceId) => executionGraph.nodes.has(sourceId) && !completed.has(sourceId)
     ).length;
     remainingDependencies.set(nodeId, count);
     if (count === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkhorseprojects/circuitry",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",