yaml-flow 5.2.6 → 5.2.8

package/dist/continuous-event-graph/index.cjs

@@ -1119,6 +1119,7 @@ function createReactiveGraph(configOrLive, options, executionId) {
   const inputQueue = new MemoryJournal();
   let live = "state" in configOrLive && "config" in configOrLive ? configOrLive : createLiveGraph(configOrLive, executionId);
   let disposed = false;
+  const pendingHandlers = /* @__PURE__ */ new Set();
   const handlers = new Map(Object.entries(initialHandlers));
   const internalJournal = new MemoryJournal();
   let draining = false;
@@ -1161,7 +1162,7 @@ function createReactiveGraph(configOrLive, options, executionId) {
         const taskState = live.state.tasks[taskName];
         if (!taskState || taskState.status !== "running") continue;
         const callbackToken = encodeCallbackToken(taskName);
-        runPipeline(taskName, callbackToken, update).catch((error) => {
+        const p = runPipeline(taskName, callbackToken, update).catch((error) => {
           if (disposed) return;
           internalJournal.append({
             type: "task-failed",
@@ -1170,7 +1171,10 @@ function createReactiveGraph(configOrLive, options, executionId) {
             timestamp: (/* @__PURE__ */ new Date()).toISOString()
           });
           drain();
+        }).finally(() => {
+          pendingHandlers.delete(p);
         });
+        pendingHandlers.add(p);
       }
     }
   }
@@ -1230,7 +1234,7 @@ function createReactiveGraph(configOrLive, options, executionId) {
     });
     drain();
     const callbackToken = encodeCallbackToken(taskName);
-    runPipeline(taskName, callbackToken).catch((error) => {
+    const p = runPipeline(taskName, callbackToken).catch((error) => {
       if (disposed) return;
       internalJournal.append({
         type: "task-failed",
@@ -1239,7 +1243,10 @@ function createReactiveGraph(configOrLive, options, executionId) {
         timestamp: (/* @__PURE__ */ new Date()).toISOString()
       });
       drain();
+    }).finally(() => {
+      pendingHandlers.delete(p);
     });
+    pendingHandlers.add(p);
   }
   return {
     push(event) {
@@ -1353,7 +1360,10 @@ function createReactiveGraph(configOrLive, options, executionId) {
     getSchedule() {
       return schedule(live);
     },
-    dispose() {
+    async dispose(options2) {
+      if (options2?.wait && pendingHandlers.size > 0) {
+        await Promise.allSettled([...pendingHandlers]);
+      }
       disposed = true;
     }
   };
@@ -1783,7 +1793,7 @@ var VALID_ELEMENT_KINDS = /* @__PURE__ */ new Set([
   "markdown",
   "custom"
 ]);
-var ALLOWED_KEYS = /* @__PURE__ */ new Set(["id", "meta", "requires", "provides", "view", "card_data", "compute", "sources"]);
+var ALLOWED_KEYS = /* @__PURE__ */ new Set(["id", "meta", "requires", "provides", "view", "card_data", "compute", "source_defs"]);
 function validateNode(node) {
   const errors = [];
   if (!node || typeof node !== "object" || Array.isArray(node)) {
@@ -1809,15 +1819,15 @@ function validateNode(node) {
   if (n.requires != null && !Array.isArray(n.requires)) errors.push("requires: must be an array of strings");
   if (n.provides != null) {
     if (!Array.isArray(n.provides)) {
-      errors.push("provides: must be an array of { bindTo, src } bindings");
+      errors.push("provides: must be an array of { bindTo, ref } bindings");
     } else {
       n.provides.forEach((p, i) => {
         if (!p || typeof p !== "object" || Array.isArray(p)) {
-          errors.push(`provides[${i}]: must be an object with bindTo and src`);
+          errors.push(`provides[${i}]: must be an object with bindTo and ref`);
         } else {
           const b = p;
           if (typeof b.bindTo !== "string" || !b.bindTo) errors.push(`provides[${i}]: missing required "bindTo" string`);
-          if (typeof b.src !== "string" || !b.src) errors.push(`provides[${i}]: missing required "src" string`);
+          if (typeof b.ref !== "string" || !b.ref) errors.push(`provides[${i}]: missing required "ref" string`);
         }
       });
     }
@@ -1837,35 +1847,35 @@ function validateNode(node) {
       });
     }
   }
-  if (n.sources != null) {
-    if (!Array.isArray(n.sources)) {
-      errors.push("sources: must be an array");
+  if (n.source_defs != null) {
+    if (!Array.isArray(n.source_defs)) {
+      errors.push("source_defs: must be an array");
     } else {
       const bindTos = /* @__PURE__ */ new Set();
       const outputFiles = /* @__PURE__ */ new Set();
-      n.sources.forEach((src, i) => {
+      n.source_defs.forEach((src, i) => {
         if (!src || typeof src !== "object" || Array.isArray(src)) {
-          errors.push(`sources[${i}]: must be an object`);
+          errors.push(`source_defs[${i}]: must be an object`);
         } else {
           const s = src;
           if (typeof s.bindTo !== "string" || !s.bindTo) {
-            errors.push(`sources[${i}]: missing required "bindTo" property`);
+            errors.push(`source_defs[${i}]: missing required "bindTo" property`);
           } else {
             if (bindTos.has(s.bindTo)) {
-              errors.push(`sources[${i}]: bindTo "${s.bindTo}" is not unique across sources`);
+              errors.push(`source_defs[${i}]: bindTo "${s.bindTo}" is not unique across source_defs`);
             }
             bindTos.add(s.bindTo);
           }
           if (typeof s.outputFile !== "string" || !s.outputFile) {
-            errors.push(`sources[${i}]: missing required "outputFile" property`);
+            errors.push(`source_defs[${i}]: missing required "outputFile" property`);
           } else {
             if (outputFiles.has(s.outputFile)) {
-              errors.push(`sources[${i}]: outputFile "${s.outputFile}" is not unique across sources`);
+              errors.push(`source_defs[${i}]: outputFile "${s.outputFile}" is not unique across source_defs`);
             }
             outputFiles.add(s.outputFile);
           }
           if (s.optionalForCompletionGating != null && typeof s.optionalForCompletionGating !== "boolean") {
-            errors.push(`sources[${i}]: optionalForCompletionGating must be a boolean`);
+            errors.push(`source_defs[${i}]: optionalForCompletionGating must be a boolean`);
           }
         }
       });
@@ -1900,14 +1910,29 @@ function validateNode(node) {
   }
   return { ok: errors.length === 0, errors };
 }
-function enrichSources(sources, context) {
-  if (!sources || sources.length === 0) return [];
-  return sources.map((src) => ({
-    ...src,
-    _requires: context.requires ?? {},
-    _sourcesData: context.sourcesData ?? {},
-    _computed_values: context.computed_values ?? {}
-  }));
+async function enrichSources(source_defs, context) {
+  if (!source_defs || source_defs.length === 0) return [];
+  const evalCtx = {
+    card_data: context.card_data ?? {},
+    requires: context.requires ?? {}
+  };
+  return Promise.all(
+    source_defs.map(async (src) => {
+      const _projections = {};
+      if (src.projections && typeof src.projections === "object" && !Array.isArray(src.projections)) {
+        for (const [key, expr] of Object.entries(src.projections)) {
+          if (typeof expr === "string" && expr.trim().length > 0) {
+            try {
+              _projections[key] = await jsonata2__default.default(expr).evaluate(evalCtx);
+            } catch {
+              _projections[key] = void 0;
+            }
+          }
+        }
+      }
+      return { ...src, _projections };
+    })
+  );
 }
 var CardCompute = {
   run,
@@ -1950,7 +1975,7 @@ function liveCardsToReactiveGraph(input, options = {}) {
   const allTokens = /* @__PURE__ */ new Set();
   const tokenToCardId = /* @__PURE__ */ new Map();
   for (const card of cards) {
-    for (const binding of card.provides ?? [{ bindTo: card.id, src: "card_data" }]) {
+    for (const binding of card.provides ?? [{ bindTo: card.id, ref: "card_data" }]) {
       allTokens.add(binding.bindTo);
       tokenToCardId.set(binding.bindTo, card.id);
     }
@@ -1964,7 +1989,7 @@ function liveCardsToReactiveGraph(input, options = {}) {
     }
     tasks[card.id] = {
       requires: requires.length > 0 ? requires : void 0,
-      provides: (card.provides ?? [{ bindTo: card.id, src: "card_data" }]).map((p) => p.bindTo),
+      provides: (card.provides ?? [{ bindTo: card.id, ref: "card_data" }]).map((p) => p.bindTo),
       taskHandlers: [card.id],
       description: card.meta?.title ?? card.id
     };
@@ -1985,7 +2010,7 @@ function liveCardsToReactiveGraph(input, options = {}) {
     graphRef.resolveCallback(token, data, errors);
   };
   for (const card of cards) {
-    if (card.sources && card.sources.length > 0) {
+    if (card.source_defs && card.source_defs.length > 0) {
       handlers[card.id] = buildSourceHandler(card, sourceHandlers, defaultSourceHandler, sharedState, getResolve);
     } else {
       handlers[card.id] = buildCardHandler(card, cardHandlers, sharedState, cardMap, tokenToCardId, getResolve);
@@ -2049,8 +2074,8 @@ function buildCardHandler(card, cardHandlers, sharedState, _cardMap, tokenToCard
     let resultData;
     if (card.provides && card.provides.length > 0) {
       resultData = {};
-      for (const { bindTo, src } of card.provides) {
-        resultData[bindTo] = CardCompute.resolve(computeNode, src);
+      for (const { bindTo, ref } of card.provides) {
+        resultData[bindTo] = CardCompute.resolve(computeNode, ref);
       }
     } else {
       resultData = { ...computeNode.card_data, ...computeNode.computed_values };