yaml-flow 3.1.1 → 5.0.0

package/dist/card-compute/index.js

@@ -1,3 +1,4 @@
+import jsonata2 from 'jsonata';
 import addFormats from 'ajv-formats';
 
 var __create = Object.create;
@@ -6415,13 +6416,11 @@ var require_ajv = __commonJS({
 var live_cards_schema_default = {
   $schema: "http://json-schema.org/draft-07/schema#",
   $id: "https://nsreehari.github.io/boards/live-cards.schema.json",
-  title: "LiveCards Node Schema",
-  description: "Schema for Card and ExternalSource nodes in the LiveCards Board/Canvas engine",
   definitions: {
     bind_ref: {
-      description: "A state path reference, e.g. 'state.raw_quotes' or 'state.compute_vars.total'",
+      description: "A card data path reference, e.g. 'card_data.raw_quotes' or 'requires.upstream'",
       type: "string",
-      pattern: "^state\\."
+      pattern: "^(card_data|requires|fetched_sources|computed_values)(\\.|$)"
     },
     bind_or_literal: {
       description: "A literal value or a bind reference object",
@@ -6490,7 +6489,7 @@ var live_cards_schema_default = {
           ]
         },
         input: {
-          description: "state.path, literal, array of inputs, or nested compute_expr",
+          description: "card_data.path, literal, array of inputs, or nested compute_expr",
           oneOf: [
             { type: "string" },
             { type: "number" },
@@ -6514,38 +6513,43 @@ var live_cards_schema_default = {
         tags: { type: "array", items: { type: "string" } }
       }
     },
-    data: {
+    requires: {
+      type: "array",
+      items: { type: "string" },
+      description: "IDs of upstream nodes this node depends on"
+    },
+    provides: {
+      type: "array",
+      items: {
+        type: "object",
+        required: ["bindTo", "src"],
+        properties: {
+          bindTo: { type: "string", description: "Token name published downstream" },
+          src: { type: "string", description: "Path to read value from (card_data.*, requires.*, fetched_sources.*, computed_values.*)" }
+        }
+      },
+      description: "Explicit bindings exposing computed or card_data values downstream as named tokens"
+    },
+    compute_step: {
+      description: "A single ordered compute step: reads card_data.*/requires.*/computed_values.*, writes to computed_values[bindTo]",
       type: "object",
+      required: ["bindTo", "expr"],
       properties: {
-        requires: {
-          type: "array",
-          items: { type: "string" },
-          description: "IDs of upstream nodes this node depends on"
-        },
-        provides: {
-          type: "object",
-          description: "Subset of state exposed downstream. Keys are published names, values are bind refs.",
-          additionalProperties: { $ref: "#/definitions/bind_or_literal" }
-        }
+        bindTo: { type: "string", description: "Key in computed_values to write result" },
+        expr: { type: "string", description: "JSONata expression evaluated against { card_data, requires, fetched_sources, computed_values }" }
       }
     },
     source_def: {
+      description: "One source entry. The engine only cares about 'bindTo' (compute namespace key) and 'outputFile' (delivery signal). Every other property is yours \u2014 add whatever your task-executor needs: kind, url, headers, mailbox, channel, model, query, etc. The full object is passed verbatim as the --in JSON to the executor.",
       type: "object",
-      required: ["kind", "bindTo"],
+      required: ["bindTo"],
+      additionalProperties: true,
       properties: {
-        kind: { enum: ["api", "websocket", "static", "llm"] },
-        bindTo: { $ref: "#/definitions/bind_ref", description: "state path to write fetched data into" },
-        method: { enum: ["GET", "POST", "PUT", "DELETE"], default: "GET" },
-        url_template: { type: "string", description: "URL with {{var}} placeholders" },
-        headers: { type: "object", additionalProperties: { $ref: "#/definitions/bind_or_literal" } },
-        body_template: { type: "object", description: "Request body with {{var}} placeholders or bind refs" },
-        template_vars: {
-          type: "object",
-          additionalProperties: { $ref: "#/definitions/bind_or_literal" },
-          description: "Variables for url/body templates \u2014 static values or bind refs"
-        },
-        poll_interval: { type: "integer", minimum: 0, description: "Auto-refresh in seconds (0 = manual)" },
-        transform: { type: "string", description: "Dot-path to extract from response, e.g. 'data.items'" }
+        bindTo: { type: "string", description: "Key under fetched_sources.* available in compute expressions" },
+        outputFile: { type: "string", description: "Board-relative path the executor writes its JSON result to. Presence of this file signals delivery." },
+        optionalForCompletionGating: { type: "boolean", default: false, description: "When true this source does not gate card completion. Default false when absent, so sources are completion-gating by default." },
+        timeout: { type: "integer", minimum: 0, default: 12e4, description: "Executor/script timeout in ms. Default: 120 000 (2 min)." },
+        script: { type: "string", description: "Legacy direct-run: shell command executed when no .task-executor is registered. stdout is captured as the result." }
       }
     },
     render_element: {
@@ -6569,19 +6573,17 @@ var live_cards_schema_default = {
             "text",
             "markdown",
             "custom",
-            "file-upload",
-            "chat",
             "actions"
           ]
         },
         label: { type: "string", description: "Heading above this element" },
         className: { type: "string", description: "Bootstrap grid class, e.g. 'col-12 col-md-6'" },
-        visible: { type: "string", description: "state path \u2014 element shown only if truthy" },
+        visible: { type: "string", description: "card_data/requires/fetched_sources/computed_values path \u2014 element shown only if truthy" },
         data: {
           type: "object",
           properties: {
-            bind: { $ref: "#/definitions/bind_ref", description: "state path to read data from" },
-            writeTo: { $ref: "#/definitions/bind_ref", description: "state path for user input (form, filter, todo, notes)" },
+            bind: { $ref: "#/definitions/bind_ref", description: "card_data/requires/fetched_sources/computed_values path to read data from" },
+            writeTo: { $ref: "#/definitions/bind_ref", description: "card_data path for user input (form, filter, todo, notes)" },
             columns: { type: "array", items: { type: "string" }, description: "table: visible columns" },
             maxRows: { type: "integer", description: "table/list: max rows to display" },
             sortable: { type: "boolean", default: true, description: "table: enable click-to-sort" },
@@ -6614,7 +6616,7 @@ var live_cards_schema_default = {
                   label: { type: "string" },
                   style: { type: "string", description: "Bootstrap button variant, e.g. 'success', 'outline-danger'" },
                   size: { type: "string", default: "sm" },
-                  disabled: { oneOf: [{ type: "boolean" }, { type: "string", description: "state path \u2014 truthy = disabled" }] }
+                  disabled: { oneOf: [{ type: "boolean" }, { type: "string", description: "card_data/requires/fetched_sources/computed_values path \u2014 truthy = disabled" }] }
                 }
               }
             }
@@ -6663,69 +6665,118 @@ var live_cards_schema_default = {
       }
     }
   },
-  oneOf: [
-    {
-      title: "Card",
-      description: "A renderable card node with view elements",
+  title: "LiveCard",
+  description: "A unified card node. Behavior depends on which sections are present (sources, compute, view, etc.)",
+  type: "object",
+  required: ["id"],
+  additionalProperties: false,
+  properties: {
+    id: { type: "string" },
+    requires: { $ref: "#/definitions/requires" },
+    provides: { $ref: "#/definitions/provides" },
+    meta: { $ref: "#/definitions/meta" },
+    view: { $ref: "#/definitions/view" },
+    card_data: {
       type: "object",
-      required: ["id", "type", "view", "state"],
-      additionalProperties: false,
+      description: "Authored card data supplied in the card definition",
       properties: {
-        id: { type: "string" },
-        type: { const: "card" },
-        meta: { $ref: "#/definitions/meta" },
-        data: { $ref: "#/definitions/data" },
-        view: { $ref: "#/definitions/view" },
-        state: {
-          type: "object",
-          additionalProperties: true,
-          properties: {
-            status: { enum: ["fresh", "stale", "loading", "error"] },
-            lastRun: { type: "string", format: "date-time" },
-            error: { type: "string" }
+        files: {
+          type: "array",
+          description: "Optional uploaded-file metadata maintained by host handlers. Stored name is normalized and serial-prefixed (for example 001-my_file.pdf).",
+          items: {
+            type: "object",
+            required: ["name", "stored_name"],
+            properties: {
+              name: { type: "string", minLength: 1 },
+              stored_name: {
+                type: "string",
+                minLength: 5,
+                maxLength: 32,
+                pattern: "^[0-9]{3,}-[a-z0-9._-]+$"
+              },
+              size: {
+                oneOf: [
+                  { type: "integer", minimum: 0 },
+                  { type: "null" }
+                ]
+              },
+              mime_type: { type: "string" },
+              path: { type: "string", pattern: "^[^\\s]+/files/[0-9]{3,}-[a-z0-9._-]+$" },
+              uploaded_at: { type: "string", format: "date-time" }
+            },
+            additionalProperties: false
           }
-        },
-        compute: {
-          type: "object",
-          description: "Derived state: key = state path to write, value = compute_expr",
-          additionalProperties: { $ref: "#/definitions/compute_expr" }
         }
-      }
+      },
+      additionalProperties: true
     },
-    {
-      title: "ExternalSource",
-      description: "A data-only node that fetches from external systems (no view)",
-      type: "object",
-      required: ["id", "type", "source", "state"],
-      additionalProperties: false,
-      properties: {
-        id: { type: "string" },
-        type: { const: "source" },
-        meta: { $ref: "#/definitions/meta" },
-        data: { $ref: "#/definitions/data" },
-        source: { $ref: "#/definitions/source_def" },
-        state: {
-          type: "object",
-          additionalProperties: true,
-          properties: {
-            status: { enum: ["fresh", "stale", "loading", "error"] },
-            lastRun: { type: "string", format: "date-time" },
-            error: { type: "string" }
-          }
-        },
-        compute: {
-          type: "object",
-          description: "Derived state: key = state path to write, value = compute_expr",
-          additionalProperties: { $ref: "#/definitions/compute_expr" }
-        }
-      }
+    sources: {
+      type: "array",
+      description: "Source entries. Each entry is passed verbatim to the board's .task-executor (registered via init --task-executor) as the --in JSON file. The executor fetches/generates the data and writes JSON to --out. If no executor is registered, the built-in executor runs the entry's 'cli' command directly. Sources gate completion by default. Set optionalForCompletionGating: true for enrichment-only sources that should not block task-completed.",
+      items: { $ref: "#/definitions/source_def" }
+    },
+    compute: {
+      type: "array",
+      description: "Ordered array of compute steps. Each reads card_data.*/requires.*/fetched_sources.*/computed_values.* and writes to ephemeral computed_values[bindTo].",
+      items: { $ref: "#/definitions/compute_step" }
     }
-  ]
+  }
 };
 
 // src/card-compute/schema-validator.ts
 var import_ajv = __toESM(require_ajv());
 var _compiled = null;
+var NAMESPACE_REFERENCE_RE = /\b(card_data|requires|fetched_sources|computed_values|sources)\b/g;
+var ROOT_PATH_NAMESPACE_RE = /^\s*(card_data|requires|fetched_sources|computed_values|sources)(\.|$)/;
+function referencedNamespaces(expression) {
+  const namespaces = /* @__PURE__ */ new Set();
+  let match;
+  NAMESPACE_REFERENCE_RE.lastIndex = 0;
+  while ((match = NAMESPACE_REFERENCE_RE.exec(expression)) !== null) {
+    namespaces.add(match[1]);
+  }
+  return namespaces;
+}
+function parseRootPathNamespace(pathValue) {
+  const match = ROOT_PATH_NAMESPACE_RE.exec(pathValue);
+  return match ? match[1] : null;
+}
+function validateJsonataExprWithNamespaces(expr, path, allowedNamespaces, errors) {
+  try {
+    jsonata2(expr);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    errors.push(`${path}: invalid JSONata expression (${message})`);
+    return;
+  }
+  const usedNamespaces = referencedNamespaces(expr);
+  for (const namespace of usedNamespaces) {
+    if (!allowedNamespaces.has(namespace)) {
+      errors.push(`${path}: disallowed namespace "${namespace}" in expression`);
+    }
+  }
+}
+function walkViewPathReferences(value, path, errors) {
+  if (Array.isArray(value)) {
+    value.forEach((entry, index) => {
+      walkViewPathReferences(entry, `${path}/${index}`, errors);
+    });
+    return;
+  }
+  if (typeof value === "string") {
+    const rootNamespace = parseRootPathNamespace(value);
+    if (!rootNamespace) return;
+    if (!(/* @__PURE__ */ new Set(["card_data", "requires", "fetched_sources", "computed_values"])).has(rootNamespace)) {
+      errors.push(`${path}: disallowed namespace "${rootNamespace}" in view reference`);
+    }
+    return;
+  }
+  if (!value || typeof value !== "object") return;
+  const record = value;
+  for (const [key, next] of Object.entries(record)) {
+    walkViewPathReferences(next, `${path}/${key}`, errors);
+  }
+}
 function getValidator() {
   if (_compiled) return _compiled;
   const ajv = new import_ajv.default({ allErrors: true });
@@ -6743,6 +6794,42 @@ function validateLiveCardSchema(node) {
   });
   return { ok: false, errors };
 }
+function validateLiveCardRuntimeExpressions(node) {
+  const errors = [];
+  if (!node || typeof node !== "object" || Array.isArray(node)) {
+    return { ok: true, errors: [] };
+  }
+  const asRecord = node;
+  const compute = asRecord.compute;
+  if (Array.isArray(compute)) {
+    compute.forEach((step, i) => {
+      if (!step || typeof step !== "object" || Array.isArray(step)) return;
+      const expr = step.expr;
+      if (typeof expr !== "string" || expr.trim().length === 0) return;
+      validateJsonataExprWithNamespaces(
+        expr,
+        `/compute/${i}/expr`,
+        /* @__PURE__ */ new Set(["card_data", "requires", "fetched_sources", "computed_values"]),
+        errors
+      );
+    });
+  }
+  const view = asRecord.view;
+  if (view && typeof view === "object" && !Array.isArray(view)) {
+    walkViewPathReferences(view, "/view", errors);
+  }
+  return { ok: errors.length === 0, errors };
+}
+function validateLiveCard(node) {
+  return validateLiveCardDefinition(node);
+}
+function validateLiveCardDefinition(node) {
+  const schema = validateLiveCardSchema(node);
+  if (!schema.ok) return schema;
+  const runtime = validateLiveCardRuntimeExpressions(node);
+  if (!runtime.ok) return { ok: false, errors: runtime.errors };
+  return { ok: true, errors: [] };
+}
 
 // src/card-compute/index.ts
 function deepGet(obj, path) {
@@ -6764,288 +6851,43 @@ function deepSet(obj, path, value) {
   }
   cur[parts[parts.length - 1]] = value;
 }
-var _fns = {};
-_fns.sum = (input, _e, opts) => {
-  const a = Array.isArray(input) ? input : [];
-  return opts.field ? a.reduce((s, r) => s + (Number(r[opts.field]) || 0), 0) : a.reduce((s, v) => s + (Number(v) || 0), 0);
-};
-_fns.avg = (input, _e, opts) => {
-  const s = _fns.sum(input, _e, opts);
-  const n = Array.isArray(input) ? input.length : 1;
-  return n ? s / n : 0;
-};
-_fns.min = (input, _e, opts) => {
-  const a = Array.isArray(input) ? input : [];
-  const vals = opts.field ? a.map((r) => Number(r[opts.field])) : a.map(Number);
-  return vals.length ? Math.min(...vals) : 0;
-};
-_fns.max = (input, _e, opts) => {
-  const a = Array.isArray(input) ? input : [];
-  const vals = opts.field ? a.map((r) => Number(r[opts.field])) : a.map(Number);
-  return vals.length ? Math.max(...vals) : 0;
-};
-_fns.count = (input) => Array.isArray(input) ? input.length : input != null ? 1 : 0;
-_fns.first = (input) => Array.isArray(input) ? input[0] : input;
-_fns.last = (input) => Array.isArray(input) ? input[input.length - 1] : input;
-_fns.add = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.reduce((s, v) => s + Number(v), 0);
-};
-_fns.sub = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.length >= 2 ? Number(a[0]) - Number(a[1]) : 0;
-};
-_fns.mul = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.reduce((s, v) => s * Number(v), 1);
-};
-_fns.div = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.length >= 2 && Number(a[1]) !== 0 ? Number(a[0]) / Number(a[1]) : 0;
-};
-_fns.round = (input, _e, opts) => {
-  const decimals = opts.decimals != null ? opts.decimals : 0;
-  const factor = Math.pow(10, decimals);
-  return Math.round(Number(input) * factor) / factor;
-};
-_fns.abs = (input) => Math.abs(Number(input));
-_fns.mod = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.length >= 2 ? Number(a[0]) % Number(a[1]) : 0;
-};
-_fns.gt = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.length >= 2 && Number(a[0]) > Number(a[1]);
-};
-_fns.gte = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.length >= 2 && Number(a[0]) >= Number(a[1]);
-};
-_fns.lt = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.length >= 2 && Number(a[0]) < Number(a[1]);
-};
-_fns.lte = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.length >= 2 && Number(a[0]) <= Number(a[1]);
-};
-_fns.eq = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.length >= 2 && a[0] === a[1];
-};
-_fns.neq = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.length >= 2 && a[0] !== a[1];
-};
-_fns.and = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.every(Boolean);
-};
-_fns.or = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.some(Boolean);
-};
-_fns.not = (input) => !input;
-_fns.concat = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.map((v) => v != null ? String(v) : "").join("");
-};
-_fns.upper = (input) => String(input || "").toUpperCase();
-_fns.lower = (input) => String(input || "").toLowerCase();
-_fns.template = (input, _e, opts) => {
-  let t = String(opts.format || "");
-  if (input && typeof input === "object" && !Array.isArray(input)) {
-    for (const k of Object.keys(input)) {
-      const v = input[k];
-      t = t.split("{{" + k + "}}").join(v != null ? String(v) : "");
-    }
-  }
-  return t;
-};
-_fns.join = (input, _e, opts) => {
-  const a = Array.isArray(input) ? input : [];
-  const sep = opts.separator != null ? String(opts.separator) : ", ";
-  return a.map((v) => v != null ? String(v) : "").join(sep);
-};
-_fns.split = (input, _e, opts) => {
-  const sep = opts.separator != null ? String(opts.separator) : ",";
-  return String(input || "").split(sep).map((s) => s.trim());
-};
-_fns.trim = (input) => String(input || "").trim();
-_fns.pluck = (input, _e, opts) => Array.isArray(input) ? input.map((r) => r[opts.field]) : [];
-_fns.filter = (input, _e, opts) => {
-  if (!Array.isArray(input)) return [];
-  if (opts.field) return input.filter((r) => !!r[opts.field]);
-  return input.filter(Boolean);
-};
-_fns.map = (input) => Array.isArray(input) ? input.slice() : [];
-_fns.sort = (input, _e, opts) => {
-  const a = Array.isArray(input) ? input.slice() : [];
-  const f = opts.field;
-  const dir = opts.direction === "desc" ? -1 : 1;
-  if (f) return a.sort((x, y) => x[f] > y[f] ? dir : x[f] < y[f] ? -dir : 0);
-  return a.sort((x, y) => x > y ? dir : x < y ? -dir : 0);
-};
-_fns.slice = (input, _e, opts) => Array.isArray(input) ? input.slice(opts.start || 0, opts.end) : input;
-_fns.flat = (input, _e, opts) => {
-  const depth = opts.depth != null ? opts.depth : 1;
-  return Array.isArray(input) ? input.flat(depth) : [input];
-};
-_fns.unique = (input) => {
-  if (!Array.isArray(input)) return [input];
-  const seen = /* @__PURE__ */ new Set();
-  return input.filter((v) => {
-    const key = typeof v === "object" ? JSON.stringify(v) : v;
-    if (seen.has(key)) return false;
-    seen.add(key);
-    return true;
-  });
-};
-_fns.group = (input, _e, opts) => {
-  const a = Array.isArray(input) ? input : [];
-  const g = {};
-  a.forEach((r) => {
-    const k = String(r[opts.field] || "");
-    if (!g[k]) g[k] = [];
-    g[k].push(r);
-  });
-  return g;
-};
-_fns.flatten_keys = (input) => {
-  if (!input || typeof input !== "object" || Array.isArray(input)) return [];
-  const result = [];
-  for (const k of Object.keys(input)) {
-    const vals = Array.isArray(input[k]) ? input[k] : [input[k]];
-    vals.forEach((v) => result.push({ key: k, value: v }));
-  }
-  return result;
-};
-_fns.entries = (input) => {
-  if (!input || typeof input !== "object" || Array.isArray(input)) return [];
-  return Object.keys(input).map((k) => ({ key: k, value: input[k] }));
-};
-_fns.from_entries = (input) => {
-  if (!Array.isArray(input)) return {};
-  const obj = {};
-  input.forEach((item) => {
-    if (item.key != null) obj[item.key] = item.value;
-  });
-  return obj;
-};
-_fns.length = (input) => {
-  if (Array.isArray(input)) return input.length;
-  if (typeof input === "string") return input.length;
-  if (input && typeof input === "object") return Object.keys(input).length;
-  return 0;
-};
-_fns.get = (input, _e, opts) => deepGet(input, opts.field || opts.path || "");
-_fns.default = (input, _e, opts) => input != null ? input : opts.value;
-_fns.coalesce = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  for (let i = 0; i < a.length; i++) {
-    if (a[i] != null) return a[i];
-  }
-  return null;
-};
-_fns.now = () => (/* @__PURE__ */ new Date()).toISOString();
-_fns.diff_days = (input) => {
-  const a = Array.isArray(input) ? input : [];
-  return a.length >= 2 ? Math.floor((new Date(a[0]).getTime() - new Date(a[1]).getTime()) / 864e5) : 0;
-};
-_fns.format_date = (input, _e, opts) => {
-  try {
-    const d = new Date(input);
-    if (opts.format === "iso") return d.toISOString();
-    if (opts.format === "date") return d.toLocaleDateString();
-    if (opts.format === "time") return d.toLocaleTimeString();
-    return d.toLocaleDateString();
-  } catch {
-    return String(input);
-  }
-};
-_fns.parse_date = (input) => {
-  try {
-    return new Date(input).toISOString();
-  } catch {
-    return null;
-  }
-};
-_fns.to_number = (input) => Number(input) || 0;
-_fns.to_string = (input) => input != null ? String(input) : "";
-_fns.to_bool = (input) => !!input;
-_fns.type_of = (input) => Array.isArray(input) ? "array" : typeof input;
-_fns.is_null = (input) => input == null;
-_fns.is_empty = (input) => {
-  if (input == null) return true;
-  if (Array.isArray(input)) return input.length === 0;
-  if (typeof input === "string") return input.length === 0;
-  if (typeof input === "object") return Object.keys(input).length === 0;
-  return false;
-};
-var _customFns = {};
-function evalExpr(expr, node) {
-  if (expr == null) return expr;
-  if (typeof expr !== "object" || Array.isArray(expr)) return expr;
-  const e = expr;
-  if (!e.fn) return expr;
-  let input = e.input;
-  if (typeof input === "string" && input.startsWith("state.")) {
-    input = deepGet(node, input);
-  } else if (Array.isArray(input)) {
-    input = input.map((v) => {
-      if (typeof v === "string" && v.startsWith("state.")) return deepGet(node, v);
-      if (v && typeof v === "object" && v.fn) return evalExpr(v, node);
-      return v;
-    });
-  } else if (input && typeof input === "object" && input.fn) {
-    input = evalExpr(input, node);
-  }
-  if (e.fn === "if") {
-    const cond = evalExpr(e.cond, node);
-    if (cond) {
-      return e.then && typeof e.then === "object" && e.then.fn ? evalExpr(e.then, node) : e.then;
-    } else {
-      return e.else && typeof e.else === "object" && e.else.fn ? evalExpr(e.else, node) : e.else;
-    }
-  }
-  if (e.fn === "filter" && Array.isArray(input) && e.where) {
-    return input.filter((item) => {
-      const tmp = { state: { ...node.state, $: item } };
-      return evalExpr(e.where, tmp);
-    });
-  }
-  if (e.fn === "map" && Array.isArray(input) && e.apply) {
-    return input.map((item) => {
-      const tmp = { state: { ...node.state, $: item } };
-      return evalExpr(e.apply, tmp);
-    });
-  }
-  const fn = _customFns[e.fn] || _fns[e.fn];
-  if (!fn) {
-    console.warn('CardCompute: unknown function "' + e.fn + '"');
-    return void 0;
-  }
-  return fn(input, evalExpr, e);
-}
-function run(node) {
-  if (!node || !node.compute) return node;
-  if (!node.state) node.state = {};
-  for (const key of Object.keys(node.compute)) {
+async function run(node, options) {
+  if (!node?.compute?.length) return node;
+  if (!node.card_data) node.card_data = {};
+  node.computed_values = {};
+  node._sourcesData = options?.sourcesData ?? {};
+  const ctx = {
+    card_data: node.card_data,
+    requires: node.requires ?? {},
+    fetched_sources: node._sourcesData,
+    computed_values: node.computed_values
+  };
+  for (const step of node.compute) {
     try {
-      const val = evalExpr(node.compute[key], node);
-      deepSet(node.state, key, val);
+      const val = await jsonata2(step.expr).evaluate(ctx);
+      deepSet(node.computed_values, step.bindTo, val);
+      ctx.computed_values = node.computed_values;
     } catch (err) {
-      console.error(`CardCompute.run error on "${node.id || "?"}.${key}":`, err);
+      console.error(`CardCompute.run error on "${node.id ?? "?"}.${step.bindTo}":`, err);
     }
   }
   return node;
 }
+async function evalExpr(expr, node) {
+  const ctx = {
+    card_data: node.card_data ?? {},
+    requires: node.requires ?? {},
+    fetched_sources: node._sourcesData ?? {},
+    computed_values: node.computed_values ?? {}
+  };
+  return jsonata2(expr).evaluate(ctx);
+}
 function resolve(node, path) {
+  if (path.startsWith("fetched_sources.")) {
+    return deepGet(node._sourcesData ?? {}, path.slice("fetched_sources.".length));
+  }
   return deepGet(node, path);
 }
-function registerFunction(name, fn) {
-  _customFns[name] = fn;
-}
 var VALID_ELEMENT_KINDS = /* @__PURE__ */ new Set([
   "metric",
   "table",
@@ -7062,34 +6904,19 @@ var VALID_ELEMENT_KINDS = /* @__PURE__ */ new Set([
   "markdown",
   "custom"
 ]);
-var VALID_SOURCE_KINDS = /* @__PURE__ */ new Set(["api", "websocket", "static", "llm"]);
-var VALID_STATUSES = /* @__PURE__ */ new Set(["fresh", "stale", "loading", "error"]);
-var CARD_ALLOWED_KEYS = /* @__PURE__ */ new Set(["id", "type", "meta", "data", "view", "state", "compute"]);
-var SOURCE_ALLOWED_KEYS = /* @__PURE__ */ new Set(["id", "type", "meta", "data", "source", "state", "compute"]);
+var ALLOWED_KEYS = /* @__PURE__ */ new Set(["id", "meta", "requires", "provides", "view", "card_data", "compute", "sources"]);
 function validateNode(node) {
   const errors = [];
   if (!node || typeof node !== "object" || Array.isArray(node)) {
     return { ok: false, errors: ["Node must be a non-null object"] };
   }
   const n = node;
-  if (typeof n.id !== "string" || !n.id) {
-    errors.push("id: required, must be a non-empty string");
-  }
-  if (n.type !== "card" && n.type !== "source") {
-    errors.push('type: must be "card" or "source"');
-    return { ok: false, errors };
-  }
-  const allowed = n.type === "card" ? CARD_ALLOWED_KEYS : SOURCE_ALLOWED_KEYS;
+  if (typeof n.id !== "string" || !n.id) errors.push("id: required, must be a non-empty string");
   for (const key of Object.keys(n)) {
-    if (!allowed.has(key)) errors.push(`Unknown top-level key: "${key}"`);
+    if (!ALLOWED_KEYS.has(key)) errors.push(`Unknown top-level key: "${key}"`);
   }
-  if (n.state == null || typeof n.state !== "object" || Array.isArray(n.state)) {
-    errors.push("state: required, must be an object");
-  } else {
-    const state = n.state;
-    if (state.status != null && !VALID_STATUSES.has(state.status)) {
-      errors.push(`state.status: must be one of: ${[...VALID_STATUSES].join(", ")}`);
-    }
+  if (n.card_data == null || typeof n.card_data !== "object" || Array.isArray(n.card_data)) {
+    errors.push("card_data: required, must be an object");
   }
   if (n.meta != null) {
     if (typeof n.meta !== "object" || Array.isArray(n.meta)) {
@@ -7100,37 +6927,58 @@ function validateNode(node) {
       if (meta.tags != null && !Array.isArray(meta.tags)) errors.push("meta.tags: must be an array");
     }
   }
-  if (n.data != null) {
-    if (typeof n.data !== "object" || Array.isArray(n.data)) {
-      errors.push("data: must be an object");
+  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");
     } else {
-      const data = n.data;
-      if (data.requires != null && !Array.isArray(data.requires)) errors.push("data.requires: must be an array of strings");
-      if (data.provides != null && (typeof data.provides !== "object" || Array.isArray(data.provides))) errors.push("data.provides: must be an object");
+      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`);
+        } 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 (n.compute != null) {
-    if (typeof n.compute !== "object" || Array.isArray(n.compute)) {
-      errors.push("compute: must be an object");
+    if (!Array.isArray(n.compute)) {
+      errors.push("compute: must be an array of compute steps");
     } else {
-      for (const [key, expr] of Object.entries(n.compute)) {
-        if (!expr || typeof expr !== "object" || Array.isArray(expr)) {
-          errors.push(`compute.${key}: must be a compute expression object`);
-        } else if (!expr.fn) {
-          errors.push(`compute.${key}: missing required "fn" property`);
+      n.compute.forEach((step, i) => {
+        if (!step || typeof step !== "object" || Array.isArray(step)) {
+          errors.push(`compute[${i}]: must be a compute step object`);
         } else {
-          const fn = expr.fn;
-          if (!_fns[fn] && !_customFns[fn]) {
-            errors.push(`compute.${key}: unknown function "${fn}"`);
+          const s = step;
+          if (typeof s.bindTo !== "string" || !s.bindTo) errors.push(`compute[${i}]: missing required "bindTo" property`);
+          if (typeof s.expr !== "string" || !s.expr) errors.push(`compute[${i}]: missing required "expr" string (JSONata expression)`);
+        }
+      });
+    }
+  }
+  if (n.sources != null) {
+    if (!Array.isArray(n.sources)) {
+      errors.push("sources: must be an array");
+    } else {
+      n.sources.forEach((src, i) => {
+        if (!src || typeof src !== "object" || Array.isArray(src)) {
+          errors.push(`sources[${i}]: must be an object`);
+        } else {
+          const s = src;
+          if (typeof s.bindTo !== "string" || !s.bindTo) errors.push(`sources[${i}]: missing required "bindTo" property`);
+          if (s.outputFile != null && typeof s.outputFile !== "string") errors.push(`sources[${i}]: outputFile must be a string`);
+          if (s.optionalForCompletionGating != null && typeof s.optionalForCompletionGating !== "boolean") {
+            errors.push(`sources[${i}]: optionalForCompletionGating must be a boolean`);
           }
         }
-      }
+      });
     }
   }
-  if (n.type === "card") {
-    if (n.source != null) errors.push('Card nodes must not have "source" \u2014 use type "source" instead');
-    if (n.view == null || typeof n.view !== "object" || Array.isArray(n.view)) {
-      errors.push("view: required for card nodes, must be an object");
+  if (n.view != null) {
+    if (typeof n.view !== "object" || Array.isArray(n.view)) {
+      errors.push("view: must be an object");
     } else {
       const view = n.view;
       if (!Array.isArray(view.elements) || view.elements.length === 0) {
@@ -7151,47 +6999,30 @@ function validateNode(node) {
           }
         });
       }
-      if (view.layout != null && (typeof view.layout !== "object" || Array.isArray(view.layout))) {
-        errors.push("view.layout: must be an object");
-      }
-      if (view.features != null && (typeof view.features !== "object" || Array.isArray(view.features))) {
-        errors.push("view.features: must be an object");
-      }
-    }
-  }
-  if (n.type === "source") {
-    if (n.view != null) errors.push('Source nodes must not have "view" \u2014 use type "card" instead');
-    if (n.source == null || typeof n.source !== "object" || Array.isArray(n.source)) {
-      errors.push("source: required for source nodes, must be an object");
-    } else {
-      const src = n.source;
-      if (!src.kind || !VALID_SOURCE_KINDS.has(src.kind)) {
-        errors.push(`source.kind: required, must be one of: ${[...VALID_SOURCE_KINDS].join(", ")}`);
-      }
-      if (typeof src.bindTo !== "string" || !src.bindTo) {
-        errors.push("source.bindTo: required, must be a state path string");
-      } else if (!src.bindTo.startsWith("state.")) {
-        errors.push('source.bindTo: must start with "state."');
-      }
+      if (view.layout != null && (typeof view.layout !== "object" || Array.isArray(view.layout))) errors.push("view.layout: must be an object");
+      if (view.features != null && (typeof view.features !== "object" || Array.isArray(view.features))) errors.push("view.features: must be an object");
     }
   }
   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 ?? {}
+  }));
+}
 var CardCompute = {
   run,
   eval: evalExpr,
   resolve,
   validate: validateNode,
-  registerFunction,
-  get functions() {
-    const all = {};
-    for (const k of Object.keys(_fns)) all[k] = _fns[k];
-    for (const k of Object.keys(_customFns)) all[k] = _customFns[k];
-    return all;
-  }
+  enrichSources
 };
 var card_compute_default = CardCompute;
 
-export { CardCompute, card_compute_default as default, validateLiveCardSchema };
+export { CardCompute, card_compute_default as default, validateLiveCard, validateLiveCardDefinition, validateLiveCardRuntimeExpressions, validateLiveCardSchema };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map