@smallpen/cli 0.1.0-alpha.15 → 0.1.0-alpha.16

package/bin/inspection-output.mjs

@@ -153,21 +153,24 @@ export function inspectionReport(
     const copies = [...ancestry(node), raw].filter(
       (candidate) => (stored[candidate.id] ?? candidate).instance,
     );
-    const overrides = copies.flatMap((copy) =>
-      Object.entries((stored[copy.id] ?? copy).instance?.overrides ?? {})
-        .filter(
-          ([key]) =>
-            copy.id === node.id ||
-            key.slice(0, key.lastIndexOf(":")) === raw.sourceNodeId,
-        )
-        .map(([key, value]) => ({
-          element:
-            variant?.nodes?.[key.slice(0, key.lastIndexOf(":"))]?.name ??
-            "component element",
+    const overrides = [];
+    const fieldOverrides = [];
+    for (const copy of copies) {
+      for (const [key, value] of Object.entries((stored[copy.id] ?? copy).instance?.overrides ?? {})) {
+        const path = key.slice(0, key.lastIndexOf(":"));
+        const target = path === copy.sourceNodeId ? copy.id : `${copy.id}__${path}`;
+        const item = {
+          element: target === raw.id ? source?.name ?? "component element"
+            : variant?.nodes?.[path]?.name ?? projection.nodes[target]?.name ?? "component element",
           field: key.slice(key.lastIndexOf(":") + 1),
           value,
-        })),
-    );
+        };
+        // The instance summary includes edits inside it. A field's source
+        // depends only on overrides that target that exact projected node.
+        if (copy.id === raw.id || target === raw.id) overrides.push(item);
+        if (target === raw.id) fieldOverrides.push(item);
+      }
+    }
     const placed = stored[raw.id];
     if (placed?.instance && source) {
       for (const name of [
@@ -177,16 +180,25 @@ export function inspectionReport(
         "visible",
         "textStyle",
         "tokenBindings",
+        "layout-gap",
+        "layout-padding",
+        "layout-item-margin",
+        "cornerRadius",
+        "shadow",
       ])
         if (
           Object.hasOwn(placed, name) &&
+          (name !== "tokenBindings" || Object.keys(placed[name] ?? {}).length > 0) &&
           JSON.stringify(placed[name]) !== JSON.stringify(source[name])
-        )
-          overrides.push({
+        ) {
+          const item = {
             element: source.name,
             field: name,
             value: placed[name],
-          });
+          };
+          overrides.push(item);
+          fieldOverrides.push(item);
+        }
     }
     return {
       name: set?.name ?? "unknown component",
@@ -196,6 +208,7 @@ export function inspectionReport(
         .filter((axis) => selection[axis.id] !== undefined)
         .map((axis) => `${axis.name}=${selection[axis.id]}`),
       overrides,
+      fieldOverrides,
       // A located App copy may lack its full source chain. Absence of
       // metadata is not proof that no overrides exist.
       overridesKnown:
@@ -293,12 +306,16 @@ export function inspectionReport(
           };
       }
     }
-    const overridden = component?.overrides.some(
+    const overridden = (component?.fieldOverrides ?? component?.overrides)?.some(
       (item) =>
         item.element === component.element &&
         (keys.includes(item.field) ||
           (name === "fill" && item.field === "fills") ||
           (name === "stroke" && item.field === "strokes") ||
+          (name === "gap" && item.field === "layout-gap") ||
+          (name.startsWith("padding") && item.field === "layout-padding") ||
+          (name.startsWith("margin") && item.field === "layout-item-margin") ||
+          (name.startsWith("radius") && item.field === "cornerRadius") ||
           (item.field === "textStyle" &&
             Object.hasOwn(item.value ?? {}, name)) ||
           (item.field === "tokenBindings" &&
@@ -357,6 +374,7 @@ export function inspectionReport(
   const nodes = layers.map(({ node, depth, index }) => {
     const raw = projection.nodes[node.id];
     const component = componentInfo(node);
+    const { fieldOverrides: _fieldOverrides, ...componentSource } = component ?? {};
     const actual = snapshot.nodes[node.id];
     const parent = parents.get(node.id);
     const parentBounds =
@@ -406,7 +424,7 @@ export function inspectionReport(
       add(
         "gap",
         raw["layout-gap"]?.[column ? "row-gap" : "column-gap"],
-        ["itemSpacing", column ? "rowGap" : "columnGap"],
+        [column ? "rowGap" : "columnGap", "itemSpacing"],
         0,
       );
       for (const [side, key] of [
@@ -557,7 +575,7 @@ export function inspectionReport(
       ...(layout ? { layout } : {}),
       fields,
       source: component
-        ? { kind: "component", ...component }
+        ? { kind: "component", ...componentSource }
         : { kind: "page" },
       visibility: {
         value: node.visible,

package/bin/smallpen.mjs

@@ -3190,6 +3190,11 @@ async function rebuildBefore(snapshot, history, cut) {
   let complete = true;
   for (const entry of [...newer].reverse()) {
     if (!entry.inverseBatch) {
+      if (entry.history?.status === "partial")
+        throw new SmallPenError("batch_history_unavailable", "The design was saved, but this earlier revision cannot be reconstructed from the bounded history cache", {
+          batchId: entry.batchId, revision: snapshot.revision, history: entry.history,
+          nextOperations: [{ argv: ["view", snapshot.locator, "--as", "spec", "--json"], operation: "smallpen.view" }],
+        });
       complete = false;
       break;
     }
@@ -3243,6 +3248,7 @@ async function changesCommand(packagePath, args) {
       packageId: snapshot.manifest.packageId,
       ...BATCH_HISTORY_LIMITS,
       retainedBatches: histories[index].length,
+      incompleteBatches: histories[index].filter((entry) => entry.history?.status === "partial").length,
       oldestRevision: histories[index][0]?.baseRevision,
       newestRevision: histories[index].at(-1)?.revision,
     })),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smallpen/cli",
-  "version": "0.1.0-alpha.15",
+  "version": "0.1.0-alpha.16",
   "publishConfig": {
     "access": "public"
   },
@@ -15,8 +15,8 @@
     "bin"
   ],
   "dependencies": {
-    "@smallpen/core": "0.1.0-alpha.15",
-    "@smallpen/local-package": "0.1.0-alpha.15"
+    "@smallpen/core": "0.1.0-alpha.16",
+    "@smallpen/local-package": "0.1.0-alpha.16"
   },
   "repository": {
     "type": "git",