@datarails-ai/dr-appspace-cli 0.10.6 → 0.10.7

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.10.6",
+  version: "0.10.7",
   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-09-30T16:43:46.444Z";
+var BUILD_TIME = "2026-09-30T19:32:36.822Z";
 function formatBuildTime(iso) {
   if (iso === "") return "";
   const d = new Date(iso);
@@ -2793,10 +2793,53 @@ function conflictTables(body) {
   const entries = Object.entries(raw).filter((e) => Array.isArray(e[1]) && e[1].length > 0).map(([table, owners]) => [table, owners.map(String)]);
   return entries.length === 0 ? void 0 : entries;
 }
+function conflictOwners(body, table) {
+  const owners = (body?.conflicts?.[table] ?? {}).owners;
+  if (!Array.isArray(owners)) return [];
+  return owners.flatMap((o) => {
+    if (typeof o !== "object" || o === null) return [];
+    const r = o;
+    if (typeof r["app_id"] !== "string") return [];
+    const cols = r["columns"];
+    return [
+      {
+        appId: r["app_id"],
+        columns: typeof cols === "object" && cols !== null && !Array.isArray(cols) ? Object.fromEntries(Object.entries(cols).map(([k, v]) => [k, String(v)])) : null,
+        connectProblems: Array.isArray(r["connect_problems"]) ? r["connect_problems"].map(String) : []
+      }
+    ];
+  });
+}
+function columnsLine(columns) {
+  return Object.entries(columns).map(([n, t]) => `${n} ${t}`).join(", ");
+}
+function conflictGuidance(body) {
+  const lines = [];
+  for (const [table, ids] of conflictTables(body) ?? []) {
+    const owners = conflictOwners(body, table);
+    for (const owner of owners.length > 0 ? owners : ids.map((appId) => ({ appId, columns: null, connectProblems: [] }))) {
+      lines.push(
+        `table "${table}" is owned by ${owner.appId}` + (owner.columns === null ? " (its structure could not be read)" : ` with columns: ${columnsLine(owner.columns)}`)
+      );
+      if (owner.connectProblems.length > 0) {
+        lines.push(
+          `  as declared, connecting would be refused: ${owner.connectProblems.join("; ")}`,
+          "  Match the owner's columns and types exactly (tables share ONE structure: the owner's), or rename yours."
+        );
+      } else if (owners.length > 0) {
+        lines.push(
+          `  to share it, add to manifest.json: "connect_tables": ${JSON.stringify({ [table]: owner.appId })}`
+        );
+      }
+    }
+  }
+  return lines;
+}
 function describeFailure(status, method, path3, body) {
   const conflicts = conflictTables(body);
   if (status === 409 && conflicts !== void 0) {
-    return `${method} ${path3} failed (409) \u2014 ${conflicts.map(([table, owners]) => `table "${table}" already belongs to ${owners.join(", ")}`).join("; ")}. Rename the table in data_model.json, or push with \`connect_tables\` to share the existing one.`;
+    return `${method} ${path3} failed (409) \u2014 ${conflicts.map(([table, owners]) => `table "${table}" already belongs to ${owners.join(", ")}`).join("; ")}. Rename the table in data_model.json, or share the existing one with \`connect_tables\` in manifest.json.` + conflictGuidance(body).map((l) => `
+${l}`).join("");
   }
   const code = body?.detail?.error;
   if (status === 403 && code === "studio_not_enabled") {
@@ -6941,6 +6984,10 @@ async function pushBody(dir, opts) {
   if (ui?.field === "frontend_bundle_gz") {
     body["frontend_bundle_gz"] = ui.files;
   }
+  const connectTables = manifest["connect_tables"];
+  if (typeof connectTables === "object" && connectTables !== null && !Array.isArray(connectTables)) {
+    if (Object.keys(connectTables).length > 0) body["connect_tables"] = connectTables;
+  }
   if (contract !== null) {
     body["contract"] = contract;
   }
@@ -7010,6 +7057,10 @@ async function pushFolder(dir, opts) {
     }
     if (result.stage !== "published") {
       process.stdout.write("Only you can see it until an admin publishes it.\n");
+    } else if (opts.publish !== true) {
+      process.stdout.write(
+        "The app was already published: this push changed its working version only; the published one is unchanged until it is published again.\n"
+      );
     }
     return outcome;
   } finally {
@@ -7146,9 +7197,11 @@ async function writePackage(dir, appId, pkg) {
     rm2(join10(dir, "handlers"), { recursive: true, force: true }),
     rm2(join10(dir, "ui"), { recursive: true, force: true })
   ]);
+  const connected = pkg.connect_tables ?? {};
+  const manifestOut = Object.keys(connected).length > 0 ? { ...pkg.manifest, connect_tables: connected } : pkg.manifest;
   await writeFile5(
     join10(dir, "manifest.json"),
-    JSON.stringify(pkg.manifest, null, 2) + "\n"
+    JSON.stringify(manifestOut, null, 2) + "\n"
   );
   if (pkg.data_model !== null && pkg.data_model !== void 0) {
     await writeFile5(
@@ -10763,12 +10816,19 @@ function fromRefusal(status, detail, contract) {
   const tables = tablesOf(contract);
   const conflicts = conflictTables(detail);
   if (conflicts !== void 0) {
-    return conflicts.map(([table, owners]) => ({
-      code: "server:table-conflict",
-      pointer: tables.has(table) ? pointer("app", "data_model", "tables", table) : "/",
-      message: `${refused}: table "${table}" already belongs to ${owners.join(", ")}.`,
-      fix: "Rename the table, or push with connect_tables to share the existing one."
-    }));
+    return conflicts.map(([table, owners]) => {
+      const owned = conflictOwners(detail, table);
+      const detailLines = conflictGuidance({
+        conflict_tables: { [table]: owners },
+        conflicts: detail.conflicts
+      });
+      return {
+        code: "server:table-conflict",
+        pointer: tables.has(table) ? pointer("app", "data_model", "tables", table) : "/",
+        message: `${refused}: table "${table}" already belongs to ${owners.join(", ")}.` + (owned.length > 0 ? ` ${detailLines.join(" ")}` : ""),
+        fix: `Rename the table, or share the existing one: add "connect_tables" to manifest.json (the entry is in the message) with your columns matching the owner's exactly.`
+      };
+    });
   }
   if (isObj3(detail) && detail["error"] === "stale_revision") {
     return [
@@ -29989,6 +30049,38 @@ ${METRIC_ADVICE}
   );
 }
 
+// src/commands/appspace/tables.ts
+function renderTables(rows2) {
+  if (rows2.length === 0) return "No app owns a table you can see.\n";
+  return rows2.map(
+    (r) => `${r.table}  (owner ${r.owner_app}${r.stage ? `, ${r.stage}` : ""})
+  columns: ${columnsLine(r.columns)}
+  to share: "connect_tables": ${JSON.stringify(r.connect_tables)}
+`
+  ).join("");
+}
+function registerTablesCommand(parent) {
+  withJsonOption(
+    withServerOptions(
+      parent.command("tables").description(
+        "List the tables this tenant's apps own, with their columns and owner app (to share one, connect to it)."
+      )
+    )
+  ).action(async (opts) => {
+    const client = await connect(opts);
+    try {
+      const rows2 = await client.request("/apps/tables");
+      if (opts.json === true) {
+        printJson(rows2);
+        return;
+      }
+      process.stdout.write(renderTables(rows2));
+    } finally {
+      client.cleanup();
+    }
+  });
+}
+
 // src/commands/appspace/whoami.ts
 function registerWhoamiCommand2(parent) {
   withJsonOption(
@@ -30027,6 +30119,7 @@ function registerAppSpaceCommand(root) {
   const cmd = root.command("app-space").description("Build and deploy App Space apps.");
   registerWhoamiCommand2(cmd);
   registerListCommand(cmd);
+  registerTablesCommand(cmd);
   registerScaffoldCommand(cmd);
   registerGetCommand(cmd);
   registerLogsCommand(cmd);

package/package.json

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