@smallpen/cli 0.1.0-alpha.18 → 0.1.0-alpha.19

package/bin/command-contract.mjs

@@ -165,7 +165,7 @@ const PARAMETERS = {
   setField: parameter(
     "--set",
     "assignment",
-    'FIELD=VALUE as in page draw: width=320, fill={color.surface}, padding=[8,16], text="Save", props={"Style":"ghost"}; a JSON value or plain text',
+    'FIELD=VALUE as in page draw: width=320, fill={color.surface}, padding=[8,16], text="Save", props={"Style":"ghost"}; a JSON value or plain text. Conflicting values for one field, including --intent values, are rejected',
     { repeatable: true },
   ),
   variant: parameter("--variant", "string", 'One variant, as "Style=secondary" (or just "secondary")'),

package/bin/schema.mjs

@@ -762,8 +762,8 @@ function setTopic(command) {
   return {
     command,
     fields: {
-      set: "FIELD=VALUE, repeatable; VALUE is JSON (320, [8,16], {\"Style\":\"ghost\"}, true) or plain text; {token.path} binds a Token",
-      element: "fields: width, height (number, px, Token, fill, hug), fill, stroke, radius, opacity, shadow, visible, rotation, margin, min/max sizes; texts: text, color, font, fontFamily, fontSize, fontWeight, lineHeight, letterSpacing, textTransform, textDecoration, textAlign; containers: layout (row|column|none), gap, padding, align, justify",
+      set: "FIELD=VALUE, repeatable; VALUE is JSON (320, [8,16], {\"Style\":\"ghost\"}, true) or plain text; {token.path} binds a Token. Conflicting values for one field, including --intent values, are rejected",
+      element: "fields: width, height (number, px, Token, fill, hug), fill, stroke, radius, opacity, shadow, visible, rotation, margin, min/max sizes; texts: text, color, font, fontFamily, fontSize, fontWeight, lineHeight, letterSpacing, textTransform, textDecoration, textAlign; containers: layout (row|column|none), gap, padding, align (start|center|end|stretch), justify (start|center|end|space-between). gap, padding, align and justify need a row or column on the target",
       copy: "a copy of a component: props, text {\"Element\": \"text\"}, set {\"Element.field\": value}, width/height (numbers, px, Tokens, hug, or fill in a row/column parent), visible, opacity. Sizes inside set (Element.width/height) take numbers or Tokens",
       itself: "without --element: the page version (or the variant) itself, for example its width and height",
     },

package/bin/smallpen.mjs

@@ -1258,11 +1258,11 @@ async function writeReply(result, args) {
   const files =
     (result.changedFiles?.length ?? 0) + (result.deletedFiles?.length ?? 0);
   const warnings = result.warningSummary?.total ?? result.warnings?.length ?? 0;
-  const verb = result.dryRun
-    ? "Previewed"
-    : result.alreadyApplied
-      ? "Already applied"
-      : "Applied";
+  const verb = result.alreadyApplied
+    ? "Already applied"
+    : result.changed === false
+      ? result.dryRun ? "No changes (preview)" : "No changes"
+      : result.dryRun ? "Previewed" : "Applied";
   // Empty advice says nothing: leave it out of the short reply.
   if (!rest.reuseReminders?.length) delete rest.reuseReminders;
   if (!rest.reuseSummary?.total) delete rest.reuseSummary;
@@ -3734,12 +3734,12 @@ async function namedContextArgs(packagePath, args) {
 }
 
 // page set / component set: the target by name, the fields from --set
-// FIELD=VALUE (a JSON value, else text) on top of an --intent {"set": {...}}.
+// FIELD=VALUE (a JSON value, else text) alongside --intent {"set": {...}}.
 async function setIntent(command, args) {
   const file = option(args, "--intent");
   const base = file ? parseJson(await readInputFile(file, "--intent", "utf8"), `invalid_${command.replace("-", "_")}_json`) : {};
   if (!isRecord(base)) throw new SmallPenError("invalid_set", "--intent holds {\"set\": {...}}");
-  const set = { ...(isRecord(base.set) ? base.set : {}) };
+  const set = Object.assign(Object.create(null), isRecord(base.set) ? base.set : {});
   for (const assignment of options(args, "--set")) {
     const at = assignment.indexOf("=");
     if (at <= 0) throw new SmallPenError("invalid_set", `--set takes FIELD=VALUE, not ${assignment}`);
@@ -3752,7 +3752,12 @@ async function setIntent(command, args) {
       } catch {
         value = raw;
       }
-    set[assignment.slice(0, at).trim()] = value;
+    const field = assignment.slice(0, at).trim();
+    if (Object.hasOwn(set, field) && canonicalJSON(set[field]) !== canonicalJSON(value))
+      throw new SmallPenError("conflicting_set_field", `Conflicting values for ${field}; give this field one value`, {
+        field, previous: set[field], received: value,
+      });
+    set[field] = value;
   }
   const target = command === "page-set"
     ? { page: option(args, "--page") ?? base.page, platform: option(args, "--platform") ?? base.platform }

package/package.json

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