@datarails-ai/dr-appspace-cli 0.12.37 → 0.12.38

package/README.md

@@ -287,8 +287,11 @@ It compiles in memory, writes only the ejected file and `contract.json`,
 refuses a file already at that path unless it holds exactly what the
 compiler would write, and refuses an eject after which the folder would not
 compile (a page holding the only form a `by` handler is called from, a
-handler a picker needs as a list). `page:` keeps the page's nav gate as
-`pages[i].role`; an ejected handler's docstring says the file is yours.
+handler a picker needs as a list). `page:` keeps the page's `params` and
+`roles` (its nav gate as `pages[i].role` when it states no roles), and the
+sources the page reads keep their handlers and gates: the compiler reads them
+off the contract the owned page embeds. An ejected handler's docstring says
+the file is yours.
 The next `compile` carries the file as yours, and the one after writes
 nothing.
 

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.37",
+  version: "0.12.38",
   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-26T14:01:26.088Z";
+var BUILD_TIME = "2026-10-26T15:07:50.401Z";
 function formatBuildTime(iso) {
   if (iso === "") return "";
   const d = new Date(iso);
@@ -9618,7 +9618,7 @@ function rolesLandingNowhere(contract) {
   }
   return out;
 }
-function sourceRoles(contract, name) {
+function sourceRoles(contract, name, known = /* @__PURE__ */ new Set()) {
   const source = contract?.data?.sources?.[name];
   const stated2 = gateRoles(source?.requiresRole);
   const elements = isPlainObject3(contract?.elements) ? contract.elements : {};
@@ -9636,7 +9636,7 @@ function sourceRoles(contract, name) {
     for (const role of roles) if (!union.includes(role)) union.push(role);
   }
   for (const page of pagesOf(contract)) {
-    if (page.owned !== true || readers === 0) continue;
+    if (page.owned !== true || readers === 0 || known.has(page.path)) continue;
     const roles = pageRoles(page);
     if (roles.length === 0) open2 = true;
     for (const role of roles) if (!union.includes(role)) union.push(role);
@@ -12593,6 +12593,34 @@ function servedSources(elements, sources) {
   }
   return [...out].sort(natural3);
 }
+function ownedReaders(pages, extra) {
+  const readers = {};
+  const known = /* @__PURE__ */ new Set();
+  for (const page of Array.isArray(pages) ? pages : []) {
+    if (page?.owned !== true || !named5(page.path)) continue;
+    const text3 = extra?.[page.path];
+    if (typeof text3 !== "string" || !isOwnedPage(text3)) continue;
+    const embedded = embeddedContractOf({ text: text3 });
+    if (embedded === null) continue;
+    known.add(page.path);
+    const elements = isPlainObject8(embedded.elements) ? embedded.elements : {};
+    for (const uid of Object.keys(elements).sort(natural3)) {
+      const element = elements[uid];
+      if (!isPlainObject8(element) || element.page !== page.path) continue;
+      const props = isPlainObject8(element.props) ? element.props : {};
+      const kept = {};
+      if (named5(props.source)) kept.source = props.source;
+      if (Array.isArray(props.declares?.reads)) kept.declares = { reads: props.declares.reads.filter(named5) };
+      if (Object.keys(kept).length > 0) readers[`owned:${uid}`] = { page: page.path, props: kept };
+    }
+  }
+  return { readers, known };
+}
+function withOwnedReaders(contract, readers) {
+  if (Object.keys(readers).length === 0) return contract;
+  const elements = isPlainObject8(contract?.elements) ? contract.elements : {};
+  return { ...contract, elements: { ...elements, ...readers } };
+}
 function sourceProblems(sources, app, handlers, extra) {
   const problems = [];
   const names = Object.keys(sources).sort(natural3);
@@ -13624,7 +13652,8 @@ function compileApp(contract, { kit = null, runtime = RUNTIME, extra = {} } = {}
   problems.push(...exprProblems(stated2));
   const metricFindings = metricProblems(contract?.data?.metrics, stated2);
   problems.push(...metricFindings.filter((one) => !one.advisory));
-  problems.push(...paramProblems(contract, stated2));
+  const owned = ownedReaders(contract.pages, extra);
+  problems.push(...paramProblems(withOwnedReaders(contract, owned.readers), stated2));
   problems.push(...themeProblems(app));
   problems.push(...shellProblems(contract, typed, handlers, stated2));
   const sources = fillFilterable(stated2);
@@ -13743,10 +13772,10 @@ function compileApp(contract, { kit = null, runtime = RUNTIME, extra = {} } = {}
   problems.push(...placementProblems(elements, pages, tree, order2));
   if (problems.length > 0) return { files: {}, problems, contract, warnings };
   const whole = restate(contract, elements, pages, typed, order2);
-  const served = servedSources(elements, sources);
+  const served = servedSources({ ...elements, ...owned.readers }, sources);
   const transforms = transformTexts2(sources, extra);
   const files = {};
-  files["manifest.json"] = json(manifestOf(contract, manifestApp, handlers, names, model, served));
+  files["manifest.json"] = json(manifestOf(contract, manifestApp, handlers, names, model, served, withOwnedReaders(contract, owned.readers), owned.known));
   if (app.data_model) files["data_model.json"] = json(dataModelOf(app.data_model));
   for (const name of names) {
     const path3 = `handlers/${name}.py`;
@@ -16559,7 +16588,7 @@ function statusColumn(model, row) {
   const status = table.columns.status;
   return status !== void 0 && status.enum === null ? "status" : null;
 }
-function manifestOf(contract, app, handlers, names, model, served = []) {
+function manifestOf(contract, app, handlers, names, model, served = [], readers = contract, known = /* @__PURE__ */ new Set()) {
   const manifest = {
     apiVersion: app.api_version ?? DEFAULT_API_VERSION,
     id: app.id ?? null,
@@ -16585,7 +16614,7 @@ function manifestOf(contract, app, handlers, names, model, served = []) {
   }
   for (const name of served) {
     const entry = { http: "POST", entrypoint: `handlers/${name}.py` };
-    const { roles: gate } = sourceRoles(contract, name);
+    const { roles: gate } = sourceRoles(readers, name, known);
     if (gate.length > 0) entry.requiresRole = gate;
     manifest.handlers[name] = entry;
   }
@@ -29407,7 +29436,7 @@ function rolesLandingNowhere2(contract) {
   }
   return out;
 }
-function sourceRoles2(contract, name) {
+function sourceRoles2(contract, name, known = /* @__PURE__ */ new Set()) {
   const source = contract?.data?.sources?.[name];
   const stated2 = gateRoles2(source?.requiresRole);
   const elements = isPlainObject17(contract?.elements) ? contract.elements : {};
@@ -29425,7 +29454,7 @@ function sourceRoles2(contract, name) {
     for (const role of roles) if (!union.includes(role)) union.push(role);
   }
   for (const page of pagesOf2(contract)) {
-    if (page.owned !== true || readers === 0) continue;
+    if (page.owned !== true || readers === 0 || known.has(page.path)) continue;
     const roles = pageRoles2(page);
     if (roles.length === 0) open2 = true;
     for (const role of roles) if (!union.includes(role)) union.push(role);
@@ -31242,7 +31271,7 @@ 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.`;
+  return `after this eject the compiler would write no handler for source${one ? "" : "s"} ${names}, which ${path3} reads, so ${files} would go and the page would call ${one ? "a handler" : "handlers"} that ${one ? "is" : "are"} not there. The compiler counts an owned page as a reader of what the contract it embeds reads, and eject keeps that contract on the page, so this is a bug in the compiler or in eject, not in your contract. Meanwhile, 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;

package/package.json

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