@datarails-ai/dr-appspace-cli 0.9.3 → 0.9.5

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.9.3",
+  version: "0.9.5",
   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-30T10:53:27.024Z";
+var BUILD_TIME = "2026-09-30T11:19:50.440Z";
 function formatBuildTime(iso) {
   if (iso === "") return "";
   const d = new Date(iso);
@@ -4009,6 +4009,7 @@ var FILTER_ATTR = "data-dr-filter";
 var ARGS_ATTR = "data-dr-args";
 var PROPS_ATTR = "data-dr-props";
 var DECLARES_ATTR = "data-dr-declares";
+var WHEN_ATTR = "data-dr-when";
 var COMPONENT_TYPES2 = COMPONENT_TYPES;
 var COMPONENT_TYPE_SET = new Set(COMPONENT_TYPES2);
 var MODULE_RE = /^components\/[a-z][a-z0-9_-]*\.js$/;
@@ -5236,6 +5237,7 @@ function propsOf(node, text3, tree) {
     if (ARGS_ATTR in node.attrs) props.args = parseArgs(node.attrs[ARGS_ATTR]);
     if (PROPS_ATTR in node.attrs) props.props = parseProps(node.attrs[PROPS_ATTR]);
     if (DECLARES_ATTR in node.attrs) props.declares = parseDeclares(node.attrs[DECLARES_ATTR]);
+    if (WHEN_ATTR in node.attrs) props.when = parseArgs(node.attrs[WHEN_ATTR]);
     const inputType = inputTypeOf(node);
     if (inputType !== null) props.input_type = inputType;
     if ("required" in node.attrs) props.required = true;
@@ -7702,6 +7704,8 @@ var COMPONENT_PROPS3 = /* @__PURE__ */ new Set([
   "props",
   // What a custom's module declares it does (`data-dr-declares`, DC-5), one JSON object.
   "declares",
+  // A row action's states (`data-dr-when`, dr-app-runtime 1.6.3), one JSON object.
+  "when",
   "input_type",
   "required",
   "options"
@@ -12761,7 +12765,7 @@ var HANDLER_KEYS = [
   "measures",
   "requiresRole"
 ];
-var ATTR_ORDER = ["component", "id", "entity", "action", "source", "field", "filter", "param", "measure", "kind", "x", "y", "series", "format", "module", "args", "props", "declares", "role", "label", "tone"];
+var ATTR_ORDER = ["component", "id", "entity", "action", "source", "field", "filter", "param", "measure", "kind", "x", "y", "series", "format", "module", "args", "props", "declares", "when", "role", "label", "tone"];
 var ENTITY_WRITERS2 = /* @__PURE__ */ new Set(["form", "list", "queue", "detail", "filter"]);
 var DECIMAL_TYPES = /* @__PURE__ */ new Set(["decimal", "numeric", "money"]);
 var NUMBER_TYPES = /* @__PURE__ */ new Set(["decimal", "numeric", "money", "int", "integer", "bigint", "float"]);
@@ -12798,28 +12802,35 @@ function roleListOf(element) {
   const role = isPlainObject7(element?.props) ? element.props.role : void 0;
   return Array.isArray(role) ? role : null;
 }
-function foldRoleLists(elements) {
+function roleListCoversHandler(element, handlers) {
+  const listed = roleListOf(element);
+  if (listed === null || element?.type !== "action" || !listed.every(named4)) return false;
+  const gate = handlers?.[element.props?.action]?.requiresRole;
+  return Array.isArray(gate) && gate.length > 0 && gate.every((role) => listed.includes(role));
+}
+function foldRoleLists(elements, handlers = {}) {
   const folding = Object.keys(elements).filter((uid) => {
     const listed = roleListOf(elements[uid]);
-    return listed !== null && listed.length === 1 && named4(listed[0]);
+    return listed !== null && (listed.length === 1 && named4(listed[0]) || roleListCoversHandler(elements[uid], handlers));
   });
   if (folding.length === 0) return elements;
   const out = { ...elements };
   for (const uid of folding) {
     const element = out[uid];
-    out[uid] = { ...element, props: { ...element.props, role: element.props.role[0] } };
+    const { role, ...rest } = element.props;
+    out[uid] = { ...element, props: role.length === 1 && named4(role[0]) ? { ...element.props, role: role[0] } : rest };
   }
   return out;
 }
-function roleListProblems(elements) {
+function roleListProblems(elements, handlers = {}) {
   const problems = [];
   for (const uid of Object.keys(elements).sort(natural)) {
     const listed = roleListOf(elements[uid]);
-    if (listed === null || listed.length === 1 && named4(listed[0])) continue;
+    if (listed === null || listed.length === 1 && named4(listed[0]) || roleListCoversHandler(elements[uid], handlers)) continue;
     problems.push({
       code: "app_model_mismatch",
       pointer: `/elements/${escapePointer3(uid)}/props/role`,
-      message: `"${uid}" states props.role ${JSON.stringify(listed)}, and a role gate names one role: it is written as data-dr-role and the page shows the element only to the caller who holds that role \u2014 write the one role as a string, or leave props.role off and let the handler's requiresRole name every role that may call it`
+      message: `"${uid}" states props.role ${JSON.stringify(listed)}, and a role gate names one role: it is written as data-dr-role and the page shows the element only to the caller who holds that role \u2014 write the one role as a string, or leave props.role off and let the handler's requiresRole name every role that may call it (a button is drawn only for a caller the handler lets through)`
     });
   }
   return problems;
@@ -13458,8 +13469,9 @@ function compileApp(contract, { kit = null, runtime = RUNTIME, extra = {} } = {}
   }
   problems.push(...appIdProblems(app));
   const typed = isPlainObject7(contract.elements) ? contract.elements : {};
-  problems.push(...statedIdProblems(typed), ...roleListProblems(typed));
-  const declared = foldDialogTriggers(foldNavRegions(foldHeaderRoles(foldRoleLists(foldStatedIds(typed)))));
+  const gates = isPlainObject7(contract.data?.app?.handlers) ? contract.data.app.handlers : {};
+  problems.push(...statedIdProblems(typed), ...roleListProblems(typed, gates));
+  const declared = foldDialogTriggers(foldNavRegions(foldHeaderRoles(foldRoleLists(foldStatedIds(typed), gates))));
   problems.push(...headerPropsProblems(declared));
   const fromBundle = Object.keys(declared).filter((uid) => declared[uid]?.source === "bundle").sort(natural);
   if (fromBundle.length > 0) {
@@ -13549,7 +13561,7 @@ function compileApp(contract, { kit = null, runtime = RUNTIME, extra = {} } = {}
   }
   const tree = treeOf(declared);
   problems.push(...tree.problems);
-  if (tree.problems.length === 0) problems.push(...byProblems(declared, tree, handlers, model), ...pickerProblems(declared, tree, handlers, model));
+  if (tree.problems.length === 0) problems.push(...byProblems(declared, tree, handlers, model), ...pickerProblems(declared, tree, handlers, model), ...whenProblems(declared, tree, model));
   problems.push(...computedProblems(declared, tree, handlers, model));
   if (tree.problems.length === 0) problems.push(...modelProblems(declared, tree, handlers, model, rolesOf2(contract.backend?.roles, model), sources));
   if (tree.problems.length === 0) problems.push(...historyProblems(declared, tree, handlers, model));
@@ -14808,6 +14820,45 @@ function computedProblems(elements, tree, handlers, model) {
   }
   return problems;
 }
+function whenProblems(elements, tree, model) {
+  const problems = [];
+  for (const uid of Object.keys(elements).sort(natural)) {
+    const element = elements[uid] ?? {};
+    const when = element.props?.when;
+    if (when === void 0 || when === null) continue;
+    const at = `/elements/${escapePointer3(uid)}/props/when`;
+    const push = (message, pointer2 = at) => problems.push({ code: "app_model_mismatch", pointer: pointer2, message });
+    const holder = elements[parentOf(tree, uid)] ?? null;
+    if (element.type !== "action" || !["list", "queue"].includes(holder?.type)) {
+      push(`"${uid}" states when, and when says which rows a row action shows on: only an action inside a list or a queue has a row \u2014 drop when`);
+      continue;
+    }
+    if (!isPlainObject7(when) || Object.keys(when).length === 0) {
+      push(`"${uid}" states when as ${JSON.stringify(when)}; when is an object of column to the list of values the row may hold \u2014 {"status": ["open", "in_progress"]}`);
+      continue;
+    }
+    const entity = entityOf(uid, elements, tree);
+    for (const column of Object.keys(when).sort()) {
+      const states = when[column];
+      const pointer2 = `${at}/${escapePointer3(column)}`;
+      if (!Array.isArray(states) || states.length === 0 || !states.every(named4)) {
+        push(`"${uid}" states when.${column} as ${JSON.stringify(states)}; each column takes a non-empty list of the values it may hold, as strings \u2014 even one: ["open"]`, pointer2);
+        continue;
+      }
+      if (entity === null || !Object.prototype.hasOwnProperty.call(model.tables, entity)) continue;
+      if (!hasColumn(model, entity, column)) {
+        push(`"${uid}" shows only where "${column}" holds ${JSON.stringify(states)}, and "${entity}" has no column "${column}"`, pointer2);
+        continue;
+      }
+      const values = model.tables[entity].columns[column]?.enum ?? null;
+      const stray = values === null ? [] : states.filter((state) => !values.includes(state));
+      if (stray.length > 0) {
+        push(`"${uid}" shows only where "${column}" holds ${JSON.stringify(stray)}, which "${entity}.${column}" cannot hold (${values.join(", ")})`, pointer2);
+      }
+    }
+  }
+  return problems;
+}
 function pickerProblems(elements, tree, handlers, model) {
   const problems = [];
   const push = (pointer2, message) => problems.push({ code: "app_model_mismatch", pointer: pointer2, message });
@@ -16365,6 +16416,11 @@ function attrsOf(element) {
       if (written !== "") out.push(["declares", written]);
       continue;
     }
+    if (key === "when") {
+      const written = writeArgs(value);
+      if (written !== "") out.push(["when", written]);
+      continue;
+    }
     if (typeof value !== "string") continue;
     out.push([key, value]);
   }
@@ -17643,6 +17699,7 @@ var FILTER_ATTR2 = "data-dr-filter";
 var ARGS_ATTR2 = "data-dr-args";
 var PROPS_ATTR2 = "data-dr-props";
 var DECLARES_ATTR2 = "data-dr-declares";
+var WHEN_ATTR2 = "data-dr-when";
 var COMPONENT_TYPES5 = COMPONENT_TYPES4;
 var COMPONENT_TYPE_SET2 = new Set(COMPONENT_TYPES5);
 var MODULE_RE2 = /^components\/[a-z][a-z0-9_-]*\.js$/;
@@ -18822,6 +18879,7 @@ function propsOf2(node, text3, tree) {
     if (ARGS_ATTR2 in node.attrs) props.args = parseArgs2(node.attrs[ARGS_ATTR2]);
     if (PROPS_ATTR2 in node.attrs) props.props = parseProps2(node.attrs[PROPS_ATTR2]);
     if (DECLARES_ATTR2 in node.attrs) props.declares = parseDeclares2(node.attrs[DECLARES_ATTR2]);
+    if (WHEN_ATTR2 in node.attrs) props.when = parseArgs2(node.attrs[WHEN_ATTR2]);
     const inputType = inputTypeOf2(node);
     if (inputType !== null) props.input_type = inputType;
     if ("required" in node.attrs) props.required = true;
@@ -20423,11 +20481,15 @@ function checkComponents(app, contract, contractError) {
     if (typeof role !== "string" || role === "" || roles.includes(role)) continue;
     violations.push({ rule: "A3.8", where: uid, message: `data-dr-role="${role}" names no role manifest.json declares (${roles.join(", ")})` });
   }
+  const mounted = new Set(
+    app.ui.filter((file) => [...file.text.matchAll(SCRIPT_SRC)].some((match) => RUNTIME_JS.test(match[1]))).map((file) => file.path)
+  );
   let flat = false;
   for (const uid of uids) {
     const element = elements[uid];
     const required = actions[element.props?.action]?.requires_role ?? [];
     if (required.length === 0) continue;
+    if (element.type === "action" && mounted.has(element.page)) continue;
     if (marked(elements, uid, required, pageRoles3)) continue;
     if (element.source === "bundle") {
       flat = true;
@@ -21162,7 +21224,8 @@ function rolesOf5(manifest) {
 }
 
 // ../flows/appspace-builder/kit/checks/rules/ux.mjs
-var RULES4 = ["A3.23", "A3.24", "A3.25"];
+var RULES4 = ["A3.23", "A3.24", "A3.25", "A3.26", "A3.27"];
+var STATE_COLUMNS = ["status", "state"];
 var isPlainObject13 = (v) => Boolean(v) && typeof v === "object" && !Array.isArray(v);
 var said = (v) => typeof v === "string" && v.trim() !== "" ? v : null;
 var OPENERS3 = /* @__PURE__ */ new Set(["dialog", "list", "queue", "detail"]);
@@ -21249,6 +21312,39 @@ function checkUx(app, contract, contractError) {
       message: `dialog "${nameOf5(uid)}" on ${el.page} states no props.trigger, no label and no title, so its button has no words (dialog-no-trigger); state props.trigger \u2014 what the button says ("New ticket")`
     });
   }
+  for (const uid of uids) {
+    const el = elements[uid];
+    if (!ROWS.has(el?.type) || el.type === "data_grid") continue;
+    const table = tableOf2(el);
+    const columns = isPlainObject13(tables[table]?.columns) ? tables[table].columns : {};
+    const state = STATE_COLUMNS.find((c) => isPlainObject13(columns[c]) && Array.isArray(columns[c].enum));
+    const seen = /* @__PURE__ */ new Map();
+    for (const kid of kidsOf(uid)) {
+      const action = elements[kid];
+      if (action?.type !== "action" || !said(action.props?.action)) continue;
+      const name = action.props.action;
+      const role = handlers[name]?.role ?? "custom";
+      const label = said(action.props?.label) ?? name;
+      const twin = seen.get(`${name}
+${label}`);
+      if (twin !== void 0) {
+        violations.push({
+          rule: "A3.27",
+          where: kid,
+          message: `${el.type} "${nameOf5(uid)}" on ${el.page} draws "${label}" (${name}) twice \u2014 ${twin} and ${kid} (row-action-twins); keep one action element and drop its props.role: the button shows for every caller the handler's requiresRole lets through`
+        });
+        continue;
+      }
+      seen.set(`${name}
+${label}`, kid);
+      if (role !== "custom" || state === void 0 || action.props?.when != null) continue;
+      violations.push({
+        rule: "A3.26",
+        where: kid,
+        message: `row action "${label}" (${name}, a custom handler) on ${el.type} "${nameOf5(uid)}" states no when, so it shows on every row whatever its ${state} (row-action-stateless). State the values of ${state} it runs from \u2014 "when": {"${state}": ["${columns[state].enum.slice(0, 2).join('", "')}"]} \u2014 and have the handler refuse any other; a handler that only moves the row from one state to another is a decide with a guard, which hides its button the same way`
+      });
+    }
+  }
   return { violations, skipped: [] };
 }
 function byPageThenRank(a, b) {
@@ -21828,7 +21924,7 @@ function kitFromDisk2() {
   }
   return kitOnDisk2;
 }
-var ADVISORY = /* @__PURE__ */ new Set(["A1.5", "A1.6", "A2.5", "A2.6", "A3.15", "A3.17", "A3.19", "A3.20", "A3.21", "A3.22", "A3.23", "A3.24", "A3.25"]);
+var ADVISORY = /* @__PURE__ */ new Set(["A1.5", "A1.6", "A2.5", "A2.6", "A3.15", "A3.17", "A3.19", "A3.20", "A3.21", "A3.22", "A3.23", "A3.24", "A3.25", "A3.26", "A3.27"]);
 function verify2({ app: appRef }, { extractContract: extractContract2 = extract2, kit } = {}) {
   const KIT = kit ?? kitFromDisk2();
   const app = loadApp2(resolve12(appRef.dir));

package/package.json

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