@datarails-ai/dr-appspace-cli 0.12.34 → 0.12.36

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.34",
+  version: "0.12.36",
   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-26T12:43:18.858Z";
+var BUILD_TIME = "2026-10-26T13:45:46.965Z";
 function formatBuildTime(iso) {
   if (iso === "") return "";
   const d = new Date(iso);
@@ -5961,6 +5961,11 @@ function readPage(app, page, spec, elements, problems) {
         well_formed: tree.well_formed,
         tree: [],
         owned: true,
+        // A page `app-space eject page:` made owned still embeds the contract
+        // it was compiled from, and the runtime's param store reads the
+        // page's params from there, as it does on a compiled page. A page
+        // written by hand with no embedded contract says nothing, as before.
+        ...paramsOf(page),
         ...pageRolesOf(app.manifest, page.path)
       },
       pins: pinsOf(page, tree)
@@ -10517,7 +10522,7 @@ function compile(contract, { kit, extra = {} } = {}) {
   for (const page of pages) {
     files[page.path] = pageFile(page, { contract: composed, pages, kit, problems });
   }
-  return { files, problems: problems.sort(byProblem2) };
+  return { files, problems: problems.sort(byProblem2), warnings: narrativeOrderWarnings(composed, applied) };
 }
 var RUNTIME_RENDERER2 = "runtime";
 function dashboardHandler(composed, handlerName, extra = {}) {
@@ -10593,6 +10598,43 @@ function missingExpressions(widgets) {
   }
   return problems;
 }
+function narrativeOrderWarnings(composed, applied) {
+  const picked = new Set(applied.filter((fill) => fill.what === "layout.order").map((fill) => fill.where));
+  const elements = isPlainObject6(composed?.elements) ? composed.elements : {};
+  const widgets = isPlainObject6(composed?.data?.widgets) ? composed.data.widgets : {};
+  const pages = [...Array.isArray(composed?.pages) ? composed.pages : []].sort((a, b) => natural3(a.path ?? "", b.path ?? ""));
+  const named13 = (value) => typeof value === "string" && value !== "";
+  const quoted3 = (ids) => ids.map((id) => JSON.stringify(id)).join(", ");
+  const warnings = [];
+  for (const page of pages) {
+    if (picked.has(page.path)) continue;
+    const sections = Array.isArray(page.sections) ? page.sections : [];
+    const sectionOf4 = (uid) => sections.findIndex((entry) => isPlainObject6(entry) && entry.id === elements[uid].section);
+    const cards = Object.keys(elements).filter((uid) => elements[uid]?.page === page.path && elements[uid]?.type === "widget").sort((a, b) => sectionOf4(a) - sectionOf4(b) || order(elements[a]) - order(elements[b]) || natural3(a, b));
+    const specOf2 = (uid) => {
+      const element = elements[uid];
+      const props = isPlainObject6(element.props) ? element.props : {};
+      return named13(element.id) ? element.id : named13(props.card) ? props.card : named13(props.id) ? props.id : uid;
+    };
+    cards.forEach((uid, at) => {
+      const own2 = specOf2(uid);
+      const row = widgets[own2];
+      const about = isPlainObject6(row) && row.kind === "narrative" && Array.isArray(row.about) ? row.about.filter((id) => named13(id) && id !== own2) : [];
+      if (about.length === 0) return;
+      const after = cards.slice(at + 1).filter((other) => sectionOf4(other) === sectionOf4(uid) && about.includes(specOf2(other)));
+      if (after.length === 0) return;
+      const later = [...new Set(after.map(specOf2))];
+      const last = specOf2(after[after.length - 1]);
+      const where2 = sectionOf4(uid) === -1 ? page.path : `section "${sections[sectionOf4(uid)].id}" of ${page.path}`;
+      warnings.push({
+        code: "narrative_before_about",
+        pointer: `/elements/${escapePointer3(uid)}/order`,
+        message: `narrative "${own2}" comes before ${quoted3(later)}, ${later.length === 1 ? "a card" : "cards"} it is about, on ${where2}: it reads the cards it is about as it loads, so its context gives ${quoted3(later)} as "(not loaded yet)". The page keeps the order you stated; move "${own2}" after "${last}"`
+      });
+    });
+  }
+  return warnings;
+}
 var DEFAULT_CAPABILITIES = { financeos: ["metrics:read", "raw:read"] };
 function manifestFile(contract, handlerName) {
   const app = contract.app ?? {};
@@ -11073,7 +11115,7 @@ function compileDashboard(contract, { kit = null, extra = {}, uiKit, charts, fmt
   files[handlerPath(composed, handlerName)] = handler.text;
   const shelf2 = { runtime: DASHBOARD_RUNTIME, widgets: DASHBOARD_WIDGETS, bar: DASHBOARD_BAR, assistant, markdown, uiKit, charts, fmt, appComponents, appControls };
   for (const page of whole.pages) files[page.path] = pageHtml(whole, page, elements, tree, shelf2);
-  return { files, problems, contract: whole, order: order2, warnings: [] };
+  return { files, problems, contract: whole, order: order2, warnings: narrativeOrderWarnings(composed, applied) };
 }
 function isRefusal(problem5) {
   return problem5.lossy !== false;
@@ -24755,6 +24797,11 @@ function readPage2(app, page, spec, elements, problems) {
         well_formed: tree.well_formed,
         tree: [],
         owned: true,
+        // A page `app-space eject page:` made owned still embeds the contract
+        // it was compiled from, and the runtime's param store reads the
+        // page's params from there, as it does on a compiled page. A page
+        // written by hand with no embedded contract says nothing, as before.
+        ...paramsOf2(page),
         ...pageRolesOf2(app.manifest, page.path)
       },
       pins: pinsOf2(page, tree)
@@ -30581,21 +30628,32 @@ async function ejectPage(dir, contract, path3) {
     element["children"] = element["children"].filter((uid) => !gone.has(String(uid)));
   }
   const kept = {};
-  for (const key of ["path", "route", "title"]) if (page[key] !== void 0) kept[key] = page[key];
+  for (const key of ["path", "route", "title", "params", "roles"]) if (page[key] !== void 0) kept[key] = page[key];
   kept["owned"] = true;
-  if (gate !== null) kept["role"] = gate;
+  if (gate !== null && kept["roles"] === void 0) kept["role"] = gate;
   pages[index] = kept;
   const app = obj3(obj3(contract["data"])["app"]);
   if (Array.isArray(app["screens"])) {
     app["screens"] = app["screens"].filter((screen) => !(isPlain2(screen) && screen["page"] === path3));
   }
-  const wrote = await commit(dir, contract, path3, marked2);
+  const sources = Object.keys(obj3(obj3(contract["data"])["sources"]));
+  const served = sources.filter((name) => files[`handlers/${name}.py`] !== void 0);
+  const wrote = await commit(dir, contract, path3, marked2, (after) => {
+    const lost = served.filter((name) => after[`handlers/${name}.py`] === void 0).sort();
+    if (lost.length > 0) throw new Refused(unservedAfter(path3, lost));
+  });
   return {
     target: `page:${path3}`,
     wrote,
     said: `page ${path3} is yours now: owned, and its ${String(gone.size)} element${gone.size === 1 ? "" : "s"} left the contract.`
   };
 }
+function unservedAfter(path3, lost) {
+  const one = lost.length === 1;
+  const names = lost.map((name) => JSON.stringify(name)).join(", ");
+  const files = lost.map((name) => `handlers/${name}.py`).join(", ");
+  return `${path3} is the only page whose cards read source${one ? "" : "s"} ${names}. Owned, the page has no elements in the contract, and the compiler writes a handler only for a source some element reads, so ${files} would go and the page would call ${one ? "a handler" : "handlers"} that ${one ? "is" : "are"} not there. Keep a card that reads ${one ? "it" : "each"} on a compiled page, or eject ${one ? "the source" : "each source"} first (app-space eject ${lost.map((name) => `source:${name}`).join(", ")}), which makes it a custom handler the compiler always carries, where that eject is allowed: eject source: says when it is not.`;
+}
 function navGateOf(files, path3) {
   const gates = navGates;
   for (const [file, text3] of Object.entries(files)) {
@@ -30727,7 +30785,7 @@ async function mayPlace(dir, path3, text3, same5) {
     `${path3} already holds something other than what eject would write there. It is yours: move it aside first, or keep it and edit contract.json by hand.`
   );
 }
-async function commit(dir, contract, path3, text3) {
+async function commit(dir, contract, path3, text3, check5) {
   const invalid = validateContract(contract, NO_CATALOG).problems;
   if (invalid.length > 0) {
     throw new Refused(`after this eject contract.json would not validate, so eject leaves the folder as it was:
@@ -30745,6 +30803,7 @@ ${formatProblems(invalid)}`);
 ${lines}
 `);
   }
+  check5?.(built.files);
   const full = join16(dir, path3);
   const wrote = await readIfPresent(full) === text3 ? [] : [path3];
   if (wrote.length > 0) {

package/package.json

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