@datarails-ai/dr-appspace-cli 0.12.29 → 0.12.30

package/dist/cli.js

@@ -13,7 +13,7 @@ import { fileURLToPath as fileURLToPath6 } from "url";
 // package.json
 var package_default = {
   name: "@datarails-ai/dr-appspace-cli",
-  version: "0.12.29",
+  version: "0.12.30",
   description: "Datarails App Space CLI \u2014 build, try, push and publish App Space apps",
   type: "module",
   engines: {
@@ -57,7 +57,7 @@ var package_default = {
 };
 
 // src/buildInfo.ts
-var BUILD_TIME = "2026-10-25T11:42:55.355Z";
+var BUILD_TIME = "2026-10-25T11:56:43.845Z";
 function formatBuildTime(iso) {
   if (iso === "") return "";
   const d = new Date(iso);
@@ -6327,15 +6327,15 @@ function inputTypeOf(node) {
 }
 function optionsOf(node, text3, tree) {
   const options = [];
-  const walk4 = (index) => {
+  const walk5 = (index) => {
     for (const child of tree.nodes[index].children) {
       const candidate = tree.nodes[child];
       if (candidate.tag === "option") {
         if (!("disabled" in candidate.attrs)) options.push(candidate.attrs.value ?? textOf(text3, candidate));
-      } else walk4(child);
+      } else walk5(child);
     }
   };
-  walk4(node.index);
+  walk5(node.index);
   return options;
 }
 function splitList(value) {
@@ -6354,14 +6354,14 @@ function textOf(text3, node) {
 function slotsOf(node, tree) {
   if (!(WIDGET_ATTR in node.attrs)) return {};
   const slots = {};
-  const walk4 = (index) => {
+  const walk5 = (index) => {
     for (const child of tree.nodes[index].children) {
       const kind = classify(tree.nodes[child]);
       if (kind?.type === "slot") slots[kind.role] = kind.role === "body" ? classesOf(tree.nodes[child])[0] ?? true : true;
-      else walk4(child);
+      else walk5(child);
     }
   };
-  walk4(node.index);
+  walk5(node.index);
   return slots;
 }
 function bindingOf(entry, node, spec) {
@@ -7082,15 +7082,15 @@ function hasCycle(tables) {
     }
   }
   const state = /* @__PURE__ */ new Map();
-  const walk4 = (name) => {
+  const walk5 = (name) => {
     if (state.get(name) === "done") return false;
     if (state.get(name) === "open") return true;
     state.set(name, "open");
-    for (const next of graph.get(name) ?? []) if (walk4(next)) return true;
+    for (const next of graph.get(name) ?? []) if (walk5(next)) return true;
     state.set(name, "done");
     return false;
   };
-  return [...graph.keys()].some((name) => walk4(name));
+  return [...graph.keys()].some((name) => walk5(name));
 }
 function byProblem(a, b) {
   return natural3(a.code, b.code) || natural3(a.where ?? "", b.where ?? "") || natural3(a.message, b.message);
@@ -7769,15 +7769,16 @@ var contract_schema_default = {
         sources: {
           $comment: "Present only for kind: app, and only when the contract declares any. A source some component names compiles to handlers/<name>.py; one only depended on is served in-process by the module that depends on it.",
           type: "object",
-          description: "one row per source: where its rows come from (from), the shape it answers in, the transforms/<name>.py that reshapes them, and the keys its read is narrowed by.",
+          description: "one row per source: where its rows come from (from), the shape it answers in, the transforms/<name>.py that reshapes them or the expr the platform evaluates over them, and the keys its read is narrowed by.",
           additionalProperties: {
             type: "object",
             required: ["from"],
             properties: {
               from: {
-                description: 'one of four spellings: {"financeos": {...}} (the dashboard SPEC source vocabulary), {"table": "<app table>"}, {"call": "<dotted method>", "args": {...}}, or ["<source>", ...] to compose others',
+                description: 'one of four spellings: {"financeos": {...}} (the dashboard SPEC source vocabulary), {"table": "<app table>"}, {"call": "<dotted method>", "args": {...}}, or ["<source>", ...] to compose others (with a transform, or with an expr the platform evaluates)',
                 oneOf: [{ type: "object" }, { type: "array", items: { type: "string" } }]
               },
+              expr: { type: "string", description: "OPTIONAL, beside from as a list and no transform (lineage tier 3, docs/appspace/design-computed-card-lineage.md): the source's figure as a formula over its from sources' figures, which the PLATFORM evaluates, so the figure is made of Datarails reads and never computed by the app. It may use numbers, the operands' names, + - * / and parentheses (/ is a safe divide: a zero or missing divisor is no figure, and any missing figure makes the result none), and abs(x), min(a, b, ...), max(a, b, ...), round(x) or round(x, decimals 0-6, half away from zero), and if(comparison, then, else), the one place a comparison (< <= > >= == !=) may stand. Shape kpi (the value, and the compare where every operand carries one), series (point by point: each series operand draws one line, and a kpi operand is one figure at every point) or breakdown (member by member: every breakdown operand states top: null, and a kpi operand is one figure for every member). Its figure comes from an operand on every path: each branch of if() and each argument of min()/max() reads an operand, so a number alone (870000, or a fallback 0) is never the figure; write actual / budget, not if(budget > 0, actual / budget, 0). Every operand is a FinanceOS table read or metric (from.financeos) or another expr source over them - never a transform's output, a composed source, a call or an app table (a KPI belongs in the Datarails semantic layer, not in app data) - and every operand is used; compare is not stated here (it is the formula over the operands' compares). The compiler refuses the rest (source_expr)." },
               shape: { enum: ["rows", "series", "kpi", "breakdown", "table", "ohlc", "scatter", "narrative"] },
               transform: { type: "string", pattern: "^transforms/[a-z][a-z0-9_]*\\.py$" },
               period: { type: ["string", "object", "null"], description: `OPTIONAL. The window the source reads. "all": every period, whatever the page sends, honoured or not (not a metric). "ytd", "last12" or "quarter" (a FinanceOS source, table or metric): a rolling window resolved at each request as the page's period presets are, so it ends today; a source that honours period reads the page's window when the page sends one, and this one when it sends none. An object {start, end, grain}: a fixed window, read where the source does not honour period. Absent: year to date, or the page's window where the source honours period.` },
@@ -8500,16 +8501,16 @@ function payloadProducers(contract, { moduleSource = () => void 0, pageSource =
   };
   const fieldsUnder = (uid) => {
     const fields = [];
-    const walk4 = (at) => {
+    const walk5 = (at) => {
       for (const child of children.get(at) ?? []) {
         const element = elements[child];
         const field = fieldOf(element);
         if (field !== null && !fields.includes(field)) fields.push(field);
         if (element?.type === "form" || element?.type === "dialog") continue;
-        walk4(child);
+        walk5(child);
       }
     };
-    walk4(uid);
+    walk5(uid);
     return fields;
   };
   for (const uid of Object.keys(elements).sort()) {
@@ -9736,20 +9737,20 @@ function untitledCards(contract) {
     if (page?.owned === true) continue;
     const seen = /* @__PURE__ */ new Set();
     const drawn2 = [];
-    const walk4 = (uids) => {
+    const walk5 = (uids) => {
       for (const uid of uids) {
         const element = elements[uid];
         if (element === void 0 || seen.has(uid)) continue;
         seen.add(uid);
         if (LAYOUT.has(element.type ?? "")) {
           const children = element.children?.length ? element.children : Object.keys(elements).filter((other) => elements[other]?.parent === uid);
-          walk4(children);
+          walk5(children);
         } else {
           drawn2.push(uid);
         }
       }
     };
-    walk4(rootsOf(contract, page));
+    walk5(rootsOf(contract, page));
     for (const uid of drawn2) {
       const element = elements[uid];
       const type = element.type ?? "";
@@ -11627,6 +11628,225 @@ function badgesCss() {
 `;
 }
 
+// ../flows/insights-builder/kit/contract/formula.mjs
+var FORMULA_FUNCTIONS = Object.freeze({
+  abs: [1, 1],
+  if: [3, 3],
+  max: [2, null],
+  min: [2, null],
+  round: [1, 2]
+});
+var ROUND_DIGITS_MAX = 6;
+var FORMULA_NUMBERS_ALONE = "its figure can be a number it states rather than an operand's, and a number the app typed is no Datarails figure; build it from its operands (from) on every path: each branch of if() and each argument of min() and max() must come from an operand (if()'s condition only picks a branch), and / already gives no figure for a zero divisor, so no fallback number is needed";
+var COMPARISONS = ["<=", ">=", "==", "!=", "<", ">"];
+var FormulaSyntax = class extends Error {
+};
+function tokenize2(text3) {
+  const tokens = [];
+  let at = 0;
+  const isDigit = (c) => c >= "0" && c <= "9";
+  const isStart = (c) => /[\p{L}_]/u.test(c);
+  const isPart5 = (c) => /[\p{L}\p{N}_]/u.test(c);
+  while (at < text3.length) {
+    const c = text3[at];
+    if (/\s/.test(c)) {
+      at += 1;
+    } else if (COMPARISONS.slice(0, 4).includes(text3.slice(at, at + 2))) {
+      tokens.push(["op", text3.slice(at, at + 2)]);
+      at += 2;
+    } else if ("+-*/(),<>".includes(c)) {
+      tokens.push(["op", c]);
+      at += 1;
+    } else if (isDigit(c) || c === ".") {
+      const start = at;
+      while (at < text3.length && (isDigit(text3[at]) || text3[at] === ".")) at += 1;
+      const spelled = text3.slice(start, at);
+      if ((spelled.match(/\./g) ?? []).length > 1 || spelled === ".") throw new FormulaSyntax();
+      tokens.push(["num", Number(spelled)]);
+    } else if (isStart(c)) {
+      const start = at;
+      while (at < text3.length && isPart5(text3[at])) at += 1;
+      tokens.push(["name", text3.slice(start, at)]);
+    } else {
+      throw new FormulaSyntax();
+    }
+  }
+  return tokens;
+}
+function parseFormula(text3) {
+  const tokens = tokenize2(String(text3));
+  if (tokens.length === 0) throw new FormulaSyntax();
+  const is = (at, op) => at < tokens.length && tokens[at][0] === "op" && tokens[at][1] === op;
+  const isComparison = (at) => at < tokens.length && tokens[at][0] === "op" && COMPARISONS.includes(tokens[at][1]);
+  function expr(at) {
+    let [node2, next2] = term(at);
+    while (is(next2, "+") || is(next2, "-")) {
+      const op = tokens[next2][1];
+      const [right, after] = term(next2 + 1);
+      node2 = ["bin", op, node2, right];
+      next2 = after;
+    }
+    return [node2, next2];
+  }
+  function term(at) {
+    let [node2, next2] = factor(at);
+    while (is(next2, "*") || is(next2, "/")) {
+      const op = tokens[next2][1];
+      const [right, after] = factor(next2 + 1);
+      node2 = ["bin", op, node2, right];
+      next2 = after;
+    }
+    return [node2, next2];
+  }
+  function factor(at) {
+    if (is(at, "-")) {
+      const [node2, next2] = factor(at + 1);
+      return [["neg", node2], next2];
+    }
+    return atom(at);
+  }
+  function atom(at) {
+    if (at >= tokens.length) throw new FormulaSyntax();
+    const [kind, value] = tokens[at];
+    if (kind === "num") return [["num", value], at + 1];
+    if (kind === "name") {
+      if (is(at + 1, "(")) return call(at + 2, value);
+      return [["name", value], at + 1];
+    }
+    if (value === "(") {
+      const [node2, next2] = expr(at + 1);
+      if (!is(next2, ")")) throw new FormulaSyntax();
+      return [node2, next2 + 1];
+    }
+    throw new FormulaSyntax();
+  }
+  function call(at, name) {
+    const args = [];
+    let next2 = at;
+    for (; ; ) {
+      let [node2, after] = expr(next2);
+      if (isComparison(after)) {
+        const op = tokens[after][1];
+        const [right, past] = expr(after + 1);
+        node2 = ["cmp", op, node2, right];
+        after = past;
+      }
+      args.push(node2);
+      if (is(after, ",")) {
+        next2 = after + 1;
+        continue;
+      }
+      if (is(after, ")")) return [["fn", name, args], after + 1];
+      throw new FormulaSyntax();
+    }
+  }
+  let [node, next] = expr(0);
+  if (isComparison(next)) {
+    const op = tokens[next][1];
+    const [right, after] = expr(next + 1);
+    node = ["cmp", op, node, right];
+    next = after;
+  }
+  if (next !== tokens.length) throw new FormulaSyntax();
+  return node;
+}
+function formulaNames(node) {
+  const out = /* @__PURE__ */ new Set();
+  const walk5 = (one) => {
+    if (one[0] === "name") out.add(one[1]);
+    else if (one[0] === "neg") walk5(one[1]);
+    else if (one[0] === "bin" || one[0] === "cmp") {
+      walk5(one[2]);
+      walk5(one[3]);
+    } else if (one[0] === "fn") one[2].forEach(walk5);
+  };
+  walk5(node);
+  return out;
+}
+function takesAnOperand(node) {
+  const kind = node[0];
+  if (kind === "name") return true;
+  if (kind === "neg") return takesAnOperand(node[1]);
+  if (kind === "bin") return takesAnOperand(node[2]) || takesAnOperand(node[3]);
+  if (kind === "fn") {
+    const [, name, args] = node;
+    let figures = args;
+    if (name === "if") figures = args.slice(1);
+    else if (name === "abs" || name === "round") figures = args.slice(0, 1);
+    return figures.length > 0 && figures.every(takesAnOperand);
+  }
+  return false;
+}
+var ALLOWED = Object.keys(FORMULA_FUNCTIONS).sort().map((name) => `${name}()`).join(", ");
+function walk2(node, problems, condition) {
+  const note = (sentence2) => {
+    if (!problems.includes(sentence2)) problems.push(sentence2);
+  };
+  const kind = node[0];
+  if (kind === "cmp") {
+    if (!condition) note("a comparison (< <= > >= == !=) stands only as if()'s first argument, such as if(actual > budget, actual, budget)");
+    walk2(node[2], problems, false);
+    walk2(node[3], problems, false);
+    return;
+  }
+  if (condition) note("if() takes a comparison first, such as if(actual > budget, actual, budget)");
+  if (kind === "neg") walk2(node[1], problems, false);
+  else if (kind === "bin") {
+    walk2(node[2], problems, false);
+    walk2(node[3], problems, false);
+  } else if (kind === "fn") {
+    const [, name, args] = node;
+    callProblems(name, args, note);
+    args.forEach((arg, index) => walk2(arg, problems, name === "if" && index === 0));
+  }
+}
+function callProblems(name, args, note) {
+  if (!Object.prototype.hasOwnProperty.call(FORMULA_FUNCTIONS, name)) {
+    note(`${name}() is not a function a formula may call; it may call ${ALLOWED}`);
+    return;
+  }
+  const [fewest, most] = FORMULA_FUNCTIONS[name];
+  if (args.length < fewest || most !== null && args.length > most) {
+    let said2;
+    if (name === "if") said2 = "3 arguments: a comparison, the figure when it holds, and the figure when it does not";
+    else if (most === null) said2 = `at least ${fewest} arguments`;
+    else if (fewest === most) said2 = `${fewest} argument${fewest === 1 ? "" : "s"}`;
+    else said2 = `${fewest} or ${most} arguments`;
+    note(`${name}() takes ${said2}, and it is given ${args.length}`);
+    return;
+  }
+  if (name === "round" && args.length === 2) {
+    const digits = args[1];
+    if (!(digits[0] === "num" && Number.isInteger(digits[1]) && digits[1] >= 0 && digits[1] <= ROUND_DIGITS_MAX)) {
+      note(`round()'s second argument is how many decimals to keep: a whole number from 0 to ${ROUND_DIGITS_MAX}, written as a number`);
+    }
+  }
+}
+function formulaProblems(text3, operands) {
+  if (typeof text3 !== "string") return { tree: null, problems: ["the formula is not text"] };
+  let tree;
+  try {
+    tree = parseFormula(text3);
+  } catch (error) {
+    if (!(error instanceof FormulaSyntax)) throw error;
+    return {
+      tree: null,
+      problems: [`it is not a formula the platform can read: it may use numbers, its operands' names, + - * /, parentheses, and the functions ${ALLOWED}`]
+    };
+  }
+  const problems = [];
+  walk2(tree, problems, false);
+  const known = (Array.isArray(operands) ? operands : []).filter((one) => typeof one === "string");
+  for (const name of [...formulaNames(tree)].sort()) {
+    if (!known.includes(name)) {
+      const sentence2 = `it reads ${name}, which is not one of its operands (from); its operands are: ${known.join(", ") || "none"}`;
+      if (!problems.includes(sentence2)) problems.push(sentence2);
+    }
+  }
+  if (!takesAnOperand(tree) && !problems.includes(FORMULA_NUMBERS_ALONE)) problems.push(FORMULA_NUMBERS_ALONE);
+  return problems.length > 0 ? { tree: null, problems } : { tree, problems: [] };
+}
+
 // ../flows/insights-builder/kit/contract/compileApp.mjs
 var RUNTIME = "dr-app-runtime@1.11.0";
 var UI_KIT2 = "ui-kit/v4";
@@ -12084,7 +12304,7 @@ function sourceProblems(sources, app, handlers, extra) {
           });
         }
       }
-      if (row.transform === void 0 || row.transform === null) {
+      if ((row.transform === void 0 || row.transform === null) && row.expr === void 0) {
         problems.push({
           code: "transform_missing",
           pointer: at(name, "transform"),
@@ -12119,6 +12339,109 @@ function sourceProblems(sources, app, handlers, extra) {
   }
   return problems;
 }
+var FORMULA_SHAPES = ["kpi", "series", "breakdown"];
+function exprProblems(sources) {
+  const problems = [];
+  const at = (name, key) => `/data/sources/${escapePointer3(name)}${key ? `/${key}` : ""}`;
+  const isFormula = (row) => isPlainObject8(row) && row.expr !== void 0;
+  const say = (pointer2, message) => problems.push({ code: "source_expr", pointer: pointer2, message });
+  const cutOperands = /* @__PURE__ */ new Set();
+  for (const name of Object.keys(sources).sort(natural3)) {
+    const row = sources[name];
+    if (!isFormula(row)) continue;
+    const pointer2 = at(name, "expr");
+    if (!Array.isArray(row.from)) {
+      say(pointer2, `source "${name}" states expr, and a formula is evaluated over other sources' figures: write from as the list of sources it reads (["budget", "actual"])`);
+      continue;
+    }
+    if (row.transform !== void 0 && row.transform !== null) {
+      say(pointer2, `source "${name}" states expr and a transform; its figure is one or the other \u2014 drop the transform, and the platform evaluates expr`);
+      continue;
+    }
+    const shape = row.shape ?? "rows";
+    if (!FORMULA_SHAPES.includes(shape)) {
+      say(at(name, "shape"), `source "${name}" states a formula and answers ${JSON.stringify(shape)}; a formula answers ${either3(FORMULA_SHAPES.map((one) => JSON.stringify(one)))} \u2014 state its shape`);
+    }
+    if (row.compare !== void 0) {
+      say(at(name, "compare"), `source "${name}" is a formula and states compare; its compare is its formula over its operands' compares \u2014 state compare on the operands (compare_label still names it here)`);
+    }
+    const operands = row.from.filter(named5);
+    const { tree, problems: wrong } = formulaProblems(row.expr, operands);
+    for (const one of wrong) say(pointer2, `source "${name}"'s formula cannot be evaluated: ${one}`);
+    if (tree === null) continue;
+    const read = formulaNames(tree);
+    row.from.forEach((dep, index) => {
+      if (named5(dep) && !read.has(dep)) {
+        say(
+          at(name, `from/${index}`),
+          `source "${name}"'s formula never reads "${dep}"; an operand it does not use would be listed as an input its figure was not built from \u2014 drop it from from, or use it in expr`
+        );
+      }
+    });
+    const allowed = shape === "kpi" ? ["kpi"] : [shape, "kpi"];
+    let shaped = shape === "kpi";
+    for (const dep of [...new Set(operands)]) {
+      const operand = sources[dep];
+      if (!isPlainObject8(operand)) continue;
+      const origin = originOf(operand);
+      if (operand.transform !== void 0 && operand.transform !== null || origin === "depends" && !isFormula(operand)) {
+        say(
+          pointer2,
+          `source "${name}"'s formula reads "${dep}", which the app computes in its own code${named5(operand.transform) ? ` (${operand.transform})` : ""}; a formula's operands are FinanceOS table reads or metrics (from.financeos), or other formulas over them, so its figure never comes from app arithmetic`
+        );
+        continue;
+      }
+      if (origin === "call") {
+        say(pointer2, `source "${name}"'s formula reads "${dep}", a call whose answer has no rows behind it to open; read the table or metric with from.financeos instead`);
+        continue;
+      }
+      if (origin === "table") {
+        say(
+          pointer2,
+          `source "${name}"'s formula reads "${dep}", one of the app's own tables; a formula's operands are FinanceOS table reads or metrics (from.financeos), or other formulas over them \u2014 a figure the page needs from app data is no formula`
+        );
+        continue;
+      }
+      const theirs = operand.shape ?? "rows";
+      if (!allowed.includes(theirs)) {
+        say(
+          pointer2,
+          `source "${name}" is a ${shape} formula, and its operand "${dep}" answers ${JSON.stringify(theirs)}; a ${shape} formula's operands answer ${allowed.map((one) => JSON.stringify(one)).join(" or ")} \u2014 give "${dep}" that shape`
+        );
+        continue;
+      }
+      if (theirs === shape) shaped = true;
+      if (theirs === "breakdown" && operand.top !== null && !cutOperands.has(dep)) {
+        cutOperands.add(dep);
+        say(
+          at(dep, "top"),
+          `source "${dep}" is an operand of the breakdown formula "${name}", which needs every member of it; state "top": null on "${dep}" (a breakdown draws its top 5 by default, and the members past it would drop out of the formula)`
+        );
+      }
+    }
+    if (!shaped && FORMULA_SHAPES.includes(shape)) {
+      say(pointer2, `source "${name}" is a ${shape} formula with no ${shape} operand; it takes its ${shape === "series" ? "periods" : "members"} from one \u2014 add a ${shape} source to from`);
+    }
+  }
+  for (const name of Object.keys(sources).sort(natural3)) {
+    if (!isFormula(sources[name]) || !Array.isArray(sources[name].from)) continue;
+    for (const dep of sources[name].from.filter(named5)) {
+      if (reaches2(sources, dep, name, /* @__PURE__ */ new Set(), isFormula)) {
+        say(at(name, "expr"), `source "${name}"'s formula reads itself, through "${dep}"; a formula's operands are read before it, so none may read it back`);
+        break;
+      }
+    }
+  }
+  return problems;
+}
+function reaches2(sources, start, target, seen, isFormula) {
+  if (start === target) return true;
+  if (seen.has(start)) return false;
+  seen.add(start);
+  const row = sources[start];
+  if (!isFormula(row) || !Array.isArray(row.from)) return false;
+  return row.from.filter(named5).some((one) => reaches2(sources, one, target, seen, isFormula));
+}
 var SOURCE_ORDERS = ["source", "declared"];
 function orderProblems(name, row, at) {
   const problems = [];
@@ -12698,6 +13021,7 @@ function compileApp(contract, { kit = null, runtime = RUNTIME, extra = {} } = {}
   const sourceFindings = sourceProblems(stated2, app, handlers, extra);
   problems.push(...sourceFindings.filter((one) => !one.advisory));
   problems.push(...compareProblems(stated2, model));
+  problems.push(...exprProblems(stated2));
   problems.push(...paramProblems(contract, stated2));
   problems.push(...themeProblems(app));
   problems.push(...shellProblems(contract, typed, handlers, stated2));
@@ -13723,8 +14047,8 @@ function numberPinProblems(elements, pins) {
     const pin = pins[module];
     if (typeof pin !== "string" || drawsPlatformNumbers(pin)) continue;
     const need = typeof PLATFORM_NUMBERS2[module] === "string" ? `${module}@${PLATFORM_NUMBERS2[module]}` : `a ${module} release that draws it`;
-    const walk4 = (node, at) => {
-      if (Array.isArray(node)) return node.forEach((child, i) => walk4(child, `${at}/${i}`));
+    const walk5 = (node, at) => {
+      if (Array.isArray(node)) return node.forEach((child, i) => walk5(child, `${at}/${i}`));
       if (!isPlainObject8(node)) return;
       for (const [key, value] of Object.entries(node)) {
         const pointer2 = `${at}/${escapePointer3(key)}`;
@@ -13735,10 +14059,10 @@ function numberPinProblems(elements, pins) {
         });
         if (key === "format" && isPlatformFormat(value)) say(`format ${JSON.stringify(value)}`);
         else if (key === "negative" && value !== void 0 && value !== null) say(`negative ${JSON.stringify(value)}`);
-        else walk4(value, pointer2);
+        else walk5(value, pointer2);
       }
     };
-    walk4(element.props ?? {}, `/elements/${escapePointer3(uid)}/props`);
+    walk5(element.props ?? {}, `/elements/${escapePointer3(uid)}/props`);
   }
   return problems;
 }
@@ -16835,7 +17159,7 @@ function checkAppSources(doc, problems) {
           fix: "Name a declared source, or declare it."
         });
       }
-      if (row["transform"] === void 0 || row["transform"] === null) {
+      if ((row["transform"] === void 0 || row["transform"] === null) && row["expr"] === void 0) {
         problems.push({
           code: "transform-missing",
           pointer: pointer("data", "sources", name, "transform"),
@@ -17878,7 +18202,7 @@ function checkKitRules(doc, kind, problems, renderer = "widgets") {
         fix: "Give it a source with the brief\u2019s metric_id or table_alias, or a compute."
       });
     }
-    walk2(row, ["data", "widgets", id], (value, path3, key) => {
+    walk3(row, ["data", "widgets", id], (value, path3, key) => {
       if (isObject4(value) && typeof value["$callable"] === "string") {
         if (known.size > 0 && !known.has(value["$callable"])) {
           problems.push({
@@ -18293,17 +18617,17 @@ function inheritedEntity2(doc, uid, entityOf2) {
   }
   return null;
 }
-function walk2(node, path3, visit) {
+function walk3(node, path3, visit) {
   const key = typeof path3[path3.length - 1] === "string" ? path3[path3.length - 1] : null;
   if (!visit(node, path3, key)) return;
   if (Array.isArray(node)) {
     node.forEach((item, index) => {
-      walk2(item, [...path3, index], visit);
+      walk3(item, [...path3, index], visit);
     });
     return;
   }
   if (isObject4(node)) {
-    for (const [name, value] of Object.entries(node)) walk2(value, [...path3, name], visit);
+    for (const [name, value] of Object.entries(node)) walk3(value, [...path3, name], visit);
   }
 }
 function dedupe(problems) {
@@ -19600,7 +19924,7 @@ async function readDirIfPresent(path3) {
 }
 async function readUiTree(uiDir) {
   const out = [];
-  const walk4 = async (dir, prefix) => {
+  const walk5 = async (dir, prefix) => {
     for (const name of (await readDirIfPresent(dir)).sort()) {
       const full = join5(dir, name);
       let entry;
@@ -19610,14 +19934,14 @@ async function readUiTree(uiDir) {
         continue;
       }
       if (entry.isDirectory()) {
-        await walk4(full, `${prefix}${name}/`);
+        await walk5(full, `${prefix}${name}/`);
         continue;
       }
       if (!entry.isFile()) continue;
       out.push({ path: `${prefix}${name}`, bytes: await readFile3(full) });
     }
   };
-  await walk4(uiDir, "");
+  await walk5(uiDir, "");
   return out.sort((a, b) => a.path < b.path ? -1 : 1);
 }
 async function readManifest(dir) {
@@ -23114,7 +23438,7 @@ function loadApp2(dir) {
       source: readHandlerSource2(dir, file)
     };
   });
-  const ui = walk3(join13(dir, UI_PREFIX3)).map((path3) => ({ path: UI_PREFIX3 + relative2(join13(dir, UI_PREFIX3), path3).split("\\").join("/"), text: readText2(path3) })).sort((a, b) => a.path < b.path ? -1 : 1);
+  const ui = walk4(join13(dir, UI_PREFIX3)).map((path3) => ({ path: UI_PREFIX3 + relative2(join13(dir, UI_PREFIX3), path3).split("\\").join("/"), text: readText2(path3) })).sort((a, b) => a.path < b.path ? -1 : 1);
   const pages = ui.filter((file) => PAGE_PATH4.test(file.path));
   const index = pages.find((file) => file.path === "ui/index.html") ?? null;
   return { manifest, dataModel, handlers, handlersSource, ui, pages, index };
@@ -23143,12 +23467,12 @@ function readText2(path3) {
   const bytes = readFileSync4(path3);
   return bytes.includes(0) ? "" : bytes.toString("utf8");
 }
-function walk3(dir) {
+function walk4(dir) {
   if (!existsSync2(dir)) return [];
   const out = [];
   for (const entry of readdirSync2(dir).sort()) {
     const full = join13(dir, entry);
-    if (statSync2(full).isDirectory()) out.push(...walk3(full));
+    if (statSync2(full).isDirectory()) out.push(...walk4(full));
     else out.push(full);
   }
   return out;
@@ -23379,9 +23703,9 @@ var semver2 = (version) => String(version ?? "").split(".").map((part) => Number
 var APP_WIDGET_KINDS5 = APP_WIDGET_KINDS4;
 var PLATFORM_FINANCE4 = PLATFORM_FINANCE3;
 function drawsFinanceKinds2(pin) {
-  return reaches2(pin, PLATFORM_FINANCE4);
+  return reaches3(pin, PLATFORM_FINANCE4);
 }
-function reaches2(pin, table) {
+function reaches3(pin, table) {
   const at = String(pin ?? "").lastIndexOf("@");
   const module = at > 0 ? pin.slice(0, at) : String(pin ?? "");
   const first = table[module];
@@ -23562,7 +23886,7 @@ var TERMINATORS2 = /* @__PURE__ */ new Set([",", "]", "}", ")", ":", ";"]);
 var OPENERS3 = "([{";
 var CLOSERS3 = ")]}";
 var STRING_PREFIX2 = /^[rRbBuUfF]{0,3}$/;
-function tokenize2(src, d) {
+function tokenize3(src, d) {
   const tokens = [];
   let i = 0;
   let line2 = 1;
@@ -23720,7 +24044,7 @@ var Literals2 = class {
   constructor(src, dialect = "py") {
     this.src = src;
     this.d = DIALECTS2[dialect] ?? PY2;
-    this.tokens = tokenize2(src, this.d);
+    this.tokens = tokenize3(src, this.d);
     this.consts = /* @__PURE__ */ new Map();
     this.defs = /* @__PURE__ */ new Set();
     this.cache = /* @__PURE__ */ new Map();
@@ -24794,15 +25118,15 @@ function inputTypeOf2(node) {
 }
 function optionsOf2(node, text3, tree) {
   const options = [];
-  const walk4 = (index) => {
+  const walk5 = (index) => {
     for (const child of tree.nodes[index].children) {
       const candidate = tree.nodes[child];
       if (candidate.tag === "option") {
         if (!("disabled" in candidate.attrs)) options.push(candidate.attrs.value ?? textOf2(text3, candidate));
-      } else walk4(child);
+      } else walk5(child);
     }
   };
-  walk4(node.index);
+  walk5(node.index);
   return options;
 }
 function splitList2(value) {
@@ -24821,14 +25145,14 @@ function textOf2(text3, node) {
 function slotsOf2(node, tree) {
   if (!(WIDGET_ATTR2 in node.attrs)) return {};
   const slots = {};
-  const walk4 = (index) => {
+  const walk5 = (index) => {
     for (const child of tree.nodes[index].children) {
       const kind = classify2(tree.nodes[child]);
       if (kind?.type === "slot") slots[kind.role] = kind.role === "body" ? classesOf3(tree.nodes[child])[0] ?? true : true;
-      else walk4(child);
+      else walk5(child);
     }
   };
-  walk4(node.index);
+  walk5(node.index);
   return slots;
 }
 function bindingOf2(entry, node, spec) {
@@ -25549,15 +25873,15 @@ function hasCycle2(tables) {
     }
   }
   const state = /* @__PURE__ */ new Map();
-  const walk4 = (name) => {
+  const walk5 = (name) => {
     if (state.get(name) === "done") return false;
     if (state.get(name) === "open") return true;
     state.set(name, "open");
-    for (const next of graph.get(name) ?? []) if (walk4(next)) return true;
+    for (const next of graph.get(name) ?? []) if (walk5(next)) return true;
     state.set(name, "done");
     return false;
   };
-  return [...graph.keys()].some((name) => walk4(name));
+  return [...graph.keys()].some((name) => walk5(name));
 }
 function byProblem3(a, b) {
   return natural5(a.code, b.code) || natural5(a.where ?? "", b.where ?? "") || natural5(a.message, b.message);
@@ -26117,16 +26441,16 @@ function payloadProducers2(contract, { moduleSource = () => void 0, pageSource =
   };
   const fieldsUnder = (uid) => {
     const fields = [];
-    const walk4 = (at) => {
+    const walk5 = (at) => {
       for (const child of children.get(at) ?? []) {
         const element = elements[child];
         const field = fieldOf2(element);
         if (field !== null && !fields.includes(field)) fields.push(field);
         if (element?.type === "form" || element?.type === "dialog") continue;
-        walk4(child);
+        walk5(child);
       }
     };
-    walk4(uid);
+    walk5(uid);
     return fields;
   };
   for (const uid of Object.keys(elements).sort()) {
@@ -27001,20 +27325,20 @@ function untitledCards2(contract) {
     if (page?.owned === true) continue;
     const seen = /* @__PURE__ */ new Set();
     const drawn2 = [];
-    const walk4 = (uids) => {
+    const walk5 = (uids) => {
       for (const uid of uids) {
         const element = elements[uid];
         if (element === void 0 || seen.has(uid)) continue;
         seen.add(uid);
         if (LAYOUT2.has(element.type ?? "")) {
           const children = element.children?.length ? element.children : Object.keys(elements).filter((other) => elements[other]?.parent === uid);
-          walk4(children);
+          walk5(children);
         } else {
           drawn2.push(uid);
         }
       }
     };
-    walk4(rootsOf3(contract, page));
+    walk5(rootsOf3(contract, page));
     for (const uid of drawn2) {
       const element = elements[uid];
       const type = element.type ?? "";
@@ -28719,6 +29043,8 @@ var REFUSALS = /* @__PURE__ */ new Set([
   "transform_forbidden",
   // a KPI source's compare (E6)
   "source_compare_field",
+  // a source's formula, which the platform evaluates (lineage tier 3)
+  "source_expr",
   // dr-components parts (DC-4)
   "part_props",
   "part_source_shape",
@@ -28802,6 +29128,9 @@ var SOURCE_REFUSALS = {
 var KPI_REFUSALS = {
   source_compare_field: "a source's compare names a field its rows do not carry (where that is knowable: a FinanceOS aggregate's dimensions, measures and period column; an app table's columns), or is set on a source not shaped kpi \u2014 declare the measure beside the figure, or name one it carries"
 };
+var EXPR_REFUSALS = {
+  source_expr: "a source's formula (its expr) has a from that is no list, or sits beside a transform; answers a shape other than kpi, series or breakdown; states compare (its compare is its formula over its operands' compares); cannot be evaluated (it is not text, a syntax error, a function other than abs, min, max, round and if, a wrong number of arguments, round decimals other than a whole number from 0 to 6, an if whose first argument is no comparison, a comparison anywhere but if's condition, a name not in from); can be, on some path, a number it states rather than an operand's (numbers alone such as 870000, a typed if() branch such as if(actual > 0, 870000, actual), or a typed min() or max() bound such as max(actual, 0): each branch of if() and each argument of min() and max() must come from an operand, and / already gives no figure for a zero divisor, so no fallback number is needed); names an operand it never reads; reads an operand that is not a FinanceOS read or metric or a formula over them (a transform, a composed source, a call, one of the app's own tables); reads an operand of a shape it cannot take (a kpi formula takes kpis; a series or breakdown formula its own shape and kpis), or, as a series or breakdown formula, has no operand of its own shape; reads a breakdown operand that does not state top: null; or reads itself \u2014 the message names which"
+};
 var TRANSFORM_REFUSALS = {
   transform_row: 'a row names a transform and is not a dataset series row ("kind": "series", "data": "<dataset>", and no source, compute, depends, drill, window or by), or its dataset reads with the period pushed down (a period other than "all")',
   transform_missing: "a row or source names a transform not spelled transforms/<name>.py, or that file is not beside contract.json",
@@ -29908,6 +30237,8 @@ function registerCompileCommand(parent) {
           ...Object.entries(SOURCE_REFUSALS).map(([code, what]) => `  ${code.padEnd(22)}${what}`),
           "A KPI source (shape kpi: its period comes from the rows; compare sets the figure against another measure of the same row) is refused with:",
           ...Object.entries(KPI_REFUSALS).map(([code, what]) => `  ${code.padEnd(22)}${what}`),
+          "A source that states its figure as a formula (expr over from, evaluated by the platform) is refused with:",
+          ...Object.entries(EXPR_REFUSALS).map(([code, what]) => `  ${code.padEnd(22)}${what}`),
           "",
           "A transform (a dashboard dataset series row's transforms/<name>.py, or an app source's) is refused with:",
           ...Object.entries(TRANSFORM_REFUSALS).map(([code, what]) => `  ${code.padEnd(22)}${what}`)
@@ -31612,19 +31943,19 @@ function figuresIn(text3) {
 }
 function seriesNumbers(data) {
   const out = [];
-  const walk4 = (one) => {
+  const walk5 = (one) => {
     if (Array.isArray(one)) {
-      for (const item of one) walk4(item);
+      for (const item of one) walk5(item);
       return;
     }
     if (typeof one === "object" && one !== null) {
-      walk4(one.value);
+      walk5(one.value);
       return;
     }
     const n = numberOf(one);
     if (n !== null) out.push(n);
   };
-  walk4(data);
+  walk5(data);
   return out;
 }
 var INPUT_TAGS = /* @__PURE__ */ new Set(["input", "select", "textarea"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarails-ai/dr-appspace-cli",
-  "version": "0.12.29",
+  "version": "0.12.30",
   "description": "Datarails App Space CLI — build, try, push and publish App Space apps",
   "type": "module",
   "engines": {