@nodii/dev 0.6.8 → 0.6.9

package/dist/figma.js

@@ -1,4 +1,5 @@
-import { CliError } from "./core.js";
+import { readFile } from "node:fs/promises";
+import { CliError, devRequest, encode } from "./core.js";
 
 /** A Figma file key, or the key inside a figma.com file link (a branch link's branch key). */
 export function figmaFileKey(value) {
@@ -13,3 +14,93 @@ export function figmaFileKey(value) {
 /** What to run when Dev has no row for a Figma file (DESIGN_FILE_NOT_FOUND). */
 export const notRegisteredHint = (key) =>
   `${key} is NOT registered in Dev: run nodii-dev figma file add ${key} --name NAME --kind design-system|surfaces|prototype [--module M]`;
+
+// Dev's refusals of resubmitDesignChangeSet, said in terms of what to do next.
+const RESUBMIT_REFUSALS = {
+  CHANGE_SET_NOT_FOUND: (id) => `No change set ${id} in Dev.`,
+  CHANGE_SET_HOLDER_REQUIRED: (id) => `You don't hold ${id}; only its holder re-submits it.`,
+  INVALID_CHANGE_SET_STATE: (id) =>
+    `${id} is not applying; re-submit once every item is decided and some were rejected (see nodii-dev figma changeset show ${id}).`,
+  CHANGE_SET_HAS_NO_REJECTIONS: (id) => `Nothing in ${id} is rejected; run nodii-dev figma apply ${id} --figma-version VERSION instead.`,
+  REJECTED_ITEMS_MISSING: (id, details, message) =>
+    Array.isArray(details?.missing)
+      ? [`Re-submit every rejected item in ${id}; missing:`, ...details.missing.map((i) => `  ${i.figmaNodeId} (${i.id}): ${i.comment ?? "no comment"}`)].join("\n")
+      : message,
+  CHANGE_ITEM_NOT_REJECTED: (id, details, message) =>
+    Array.isArray(details?.rejected)
+      ? [`${message}`, `Rejected items in ${id}:`, ...details.rejected.map((i) => `  ${i.figmaNodeId} (${i.id})`)].join("\n")
+      : message,
+  CHANGE_SET_CHANGED: (id) => `${id} changed while re-submitting; read it with nodii-dev figma changeset show ${id} and try again.`,
+};
+
+/** A round-2 payload: { figmaVersion, items: [{ itemId | figmaNodeId, variants: [{ nodeId, beforePngBase64?, afterPngBase64? }] }] }. */
+export function resubmitPayload(text, file) {
+  let body;
+  try {
+    body = JSON.parse(text);
+  } catch (error) {
+    throw new CliError("USAGE", `${file} is not JSON: ${error.message}`, 2);
+  }
+  const bad = (why) => new CliError("USAGE", `${file}: ${why}`, 2);
+  if (!body || typeof body !== "object" || Array.isArray(body)) throw bad("expected a JSON object");
+  if (typeof body.figmaVersion !== "string" || !body.figmaVersion) throw bad("figmaVersion is required");
+  if (!Array.isArray(body.items) || body.items.length === 0) throw bad("items must list the rejected items");
+  body.items.forEach((item, n) => {
+    if (!item?.itemId && !item?.figmaNodeId) throw bad(`items[${n}] needs itemId or figmaNodeId`);
+    if (!Array.isArray(item.variants) || item.variants.length === 0) throw bad(`items[${n}] needs at least one variant`);
+    item.variants.forEach((v, m) => {
+      if (!v?.nodeId) throw bad(`items[${n}].variants[${m}] needs nodeId`);
+    });
+  });
+  return body;
+}
+
+export async function figmaResubmit(id, file, { request = devRequest, read = (f) => readFile(f, "utf8") } = {}) {
+  if (!id || !file) throw new CliError("USAGE", "figma resubmit CHANGE_SET PAYLOAD.json", 2);
+  let text;
+  try {
+    text = await read(file);
+  } catch (error) {
+    throw new CliError("USAGE", `cannot read ${file}: ${error.message}`, 2);
+  }
+  const body = resubmitPayload(text, file);
+  try {
+    return await request("POST", `/api/v1/design/change-sets/${encode(id)}/resubmit`, body);
+  } catch (error) {
+    const say = RESUBMIT_REFUSALS[error?.code];
+    if (!say) throw error;
+    throw new CliError(error.code, say(id, error.details, error.message), error.exitCode ?? 1, error.details);
+  }
+}
+
+export async function figmaChangeSetShow(id, { request = devRequest } = {}) {
+  if (!id) throw new CliError("USAGE", "figma changeset show CHANGE_SET", 2);
+  try {
+    return await request("GET", `/api/v1/design/change-sets/${encode(id)}`);
+  } catch (error) {
+    if (error?.code !== "CHANGE_SET_NOT_FOUND") throw error;
+    throw new CliError(error.code, `No Figma change set ${id} in Dev (guideline change sets: nodii-dev design changeset show).`, error.exitCode ?? 1, error.details);
+  }
+}
+
+const variantLine = (v) =>
+  `${v.figmaNodeId} (${[v.beforeImageId && "before", v.afterImageId && "after"].filter(Boolean).join(", ") || "no images"})`;
+
+/** One change set as lines: its items' round, decision, comment, the previous round's decision and comment, and variants. */
+export function figmaChangeSetText(cs) {
+  const c = cs.itemCounts ?? {};
+  const lines = [
+    `${cs.id}  ${cs.state}  ${cs.title}`,
+    `file ${cs.file?.name ?? cs.fileKey} (${cs.fileKey}); holder ${cs.holder?.agent?.displayName ?? cs.holder?.agent?.id ?? "none"}`,
+    `${c.total ?? cs.items.length} items: ${c.approved ?? 0} approved, ${c.rejected ?? 0} rejected, ${c.pending ?? 0} pending`,
+  ];
+  for (const item of cs.items ?? []) {
+    lines.push(`- ${item.decision}  round ${item.round}  ${item.figmaNodeId}  ${item.entryKey ?? "(new)"}  ${item.change}  item ${item.id}`);
+    if (item.comment) lines.push(`    comment: ${item.comment}`);
+    if (item.previousItemId)
+      lines.push(`    round ${item.round - 1}: ${item.previousDecision ?? "?"}${item.previousComment ? `: ${item.previousComment}` : ""}`);
+    if (item.variants?.length) lines.push(`    variants: ${item.variants.map(variantLine).join("; ")}`);
+  }
+  if (cs.previousRounds?.length) lines.push(`${cs.previousRounds.length} earlier-round item(s) replaced by a re-submit; --json lists them.`);
+  return lines.join("\n");
+}

package/dist/hooks.js

@@ -102,7 +102,9 @@ export async function preHook(payload, request = devRequest) {
   if (!response.data?.allowed)
     throw new CliError(
       "FIGMA_LOCK_DENIED",
-      response.data?.reason ?? "Blocked Figma write: lock not held.",
+      response.data?.reason === "change-set-not-editable"
+        ? `${response.data.changeSetId} is in review; writes wait for the reviewer's decisions (or nodii-dev figma withdraw ${response.data.changeSetId}).`
+        : (response.data?.reason ?? "Blocked Figma write: lock not held."),
       2,
       response.data,
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodii/dev",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "description": "Agent CLI for Nodii Dev, reached through the platform edge",
   "type": "module",
   "bin": {