@pixelvibing/cli 0.54.0 → 0.56.0

package/dist/pixel-vibing-cli.js

@@ -3428,8 +3428,9 @@ function setPieces(asset) {
 function namesOf(name, count) {
   return count === 1 ? [name] : Array.from({ length: count }, (_, index) => `${name}/${index}`);
 }
-function nameFor(asset, record, given2) {
-  const name = given2 ?? record.assets[asset.id]?.name ?? asset.name ?? SET_NAMES[asset.kind] ?? `${asset.kind}-${asset.id.slice(0, 8)}`;
+function nameFor(asset, record, given2, key, hd) {
+  const platform = asset.name ?? SET_NAMES[asset.kind] ?? `${asset.kind}-${asset.id.slice(0, 8)}`;
+  const name = given2 ?? record.assets[key]?.name ?? (hd ? `${platform}-hd` : platform);
   const problem = nameProblem(name);
   if (problem !== null) throw new CliError(`${name} is not a name a picture can be landed under (${problem}): give one with --as`);
   return name;
@@ -3442,13 +3443,22 @@ async function pullAsset(platform, local, ref, given2, options = {}) {
   if (asset.kind === "terrain") {
     throw new CliError(`${asset.id} is a terrain set: land it from the editor's Library, which cuts a set into the cells its brush paints. Nothing was landed`);
   }
-  const record = await readRecord(local);
-  const name = nameFor(asset, record, given2);
   const pieces = setPieces(asset);
+  const hd = options.hd === true;
+  const drawnSmooth = asset.data.pixelArt === false;
+  if (hd && pieces === null) throw new CliError(`${asset.id} is a ${asset.kind}: only a UI's pieces and icons have an HD version. Nothing was landed`);
+  if (hd && !drawnSmooth && pieces?.some((piece) => piece.hd === void 0 || asset.attachments?.[piece.hd] === void 0)) {
+    throw new CliError(`${asset.id} was made before its pieces were kept as drawn, so it has no HD version. Nothing was landed`);
+  }
+  const lifted = hd && !drawnSmooth;
+  const key = lifted ? `${asset.id}/hd` : asset.id;
+  const record = await readRecord(local);
+  const name = nameFor(asset, record, given2, key, lifted);
   const reference = REFERENCE_KINDS.has(asset.kind);
   const names = pieces === null ? namesOf(name, asset.images.length) : pieceNames(name, pieces);
   const files = names.map((each) => `${reference ? "ref" : "out"}/${each}.png`);
-  const pulled = { id: asset.id, kind: asset.kind, name, hash: asset.hash, files, data: asset.data };
+  const version2 = pieces === null ? {} : { version: drawnSmooth || lifted ? "hd" : "pixel-art" };
+  const pulled = { id: asset.id, kind: asset.kind, name, hash: asset.hash, files, ...version2, data: asset.data };
   const base = `/projects/${encodeURIComponent(project)}`;
   const json2 = async (path, init2) => (await platform.call(path, init2)).json();
   const art = await json2(`${base}/art`);
@@ -3456,7 +3466,9 @@ async function pullAsset(platform, local, ref, given2, options = {}) {
   const held = (each) => reference ? references.get(each) : art.pictures[each];
   const landing = [];
   for (const [index, each] of names.entries()) {
-    const image = asset.images[index].id;
+    const own = asset.images[index];
+    const drawn = lifted ? asset.attachments?.[pieces?.[index]?.hd] : void 0;
+    const image = drawn?.id ?? own.id;
     const holds = held(each);
     if (holds === image) continue;
     if (holds !== void 0) {
@@ -3464,7 +3476,8 @@ async function pullAsset(platform, local, ref, given2, options = {}) {
         `the project's art already holds ${reference ? "a reference" : "a picture"} named ${each}, of something else: nothing was landed. Give this one another name with --as`
       );
     }
-    landing.push({ name: each, image, piece: pieces?.[index] ?? null });
+    const piece = pieces?.[index] ?? null;
+    landing.push({ name: each, image, piece: piece === null || drawn === void 0 ? piece : asDrawn(piece, drawn.width / own.width) });
   }
   if (landing.length > 0) {
     if (reference) {
@@ -3478,13 +3491,24 @@ async function pullAsset(platform, local, ref, given2, options = {}) {
       await json2(`${base}/art/land`, { method: "POST", body: { revision: art.revision, assets } });
     }
   }
-  await writeRecord(local, { ...record, assets: { ...record.assets, [asset.id]: { kind: asset.kind, name, hash: asset.hash, files } } });
+  await writeRecord(local, { ...record, assets: { ...record.assets, [key]: { kind: asset.kind, name, hash: asset.hash, files } } });
   await bringFolder(platform, local, { map: false, aside: options.aside === true });
   return { ...pulled, current: landing.length === 0 };
 }
+function asDrawn(piece, scale) {
+  if (piece.nineGrid === void 0 || !Number.isFinite(scale) || scale <= 1) return piece;
+  const grown = (inset) => Math.round(inset * scale);
+  const { top, right, bottom, left } = piece.nineGrid;
+  return { ...piece, nineGrid: { top: grown(top), right: grown(right), bottom: grown(bottom), left: grown(left) } };
+}
 function pulledWords(pulled) {
   const where = pulled.files.length === 1 ? `pixelvibing/${pulled.files[0]}` : `${pulled.files.length} pictures under pixelvibing/`;
-  return pulled.current ? `${pulled.name} is current: the project's art holds it, and ${where} is what the platform has.` : `Pulled ${pulled.name}, ${pulled.kind}, into the project's art, and wrote ${where}.`;
+  const said = pulled.current ? `${pulled.name} is current: the project's art holds it, and ${where} is what the platform has.` : `Pulled ${pulled.name}, ${pulled.kind}, into the project's art, and wrote ${where}.`;
+  if (pulled.version === "hd" && pulled.data.pixelArt === false)
+    return `${said} It was drawn without pixel art, so its pieces are HD and there is no pixel-art version.`;
+  if (pulled.version === "hd") return `${said} These are the pieces as drawn (HD).`;
+  if (pulled.version === "pixel-art") return `${said} These are the pixel-art pieces; --hd lands them as drawn.`;
+  return said;
 }
 const date = (at) => at.slice(0, 10);
 function listed(assets) {
@@ -3518,9 +3542,10 @@ More: pixel-vibing-cli list${kind === void 0 ? "" : ` ${kind}`}${tag2 === null ?
 const pull = {
   name: "pull",
   summary: "Land one asset, by its id or its name, in the project's art, and write it into the local project",
-  usage: "<id|name> [--as <name>] [--aside]",
+  usage: "<id|name> [--as <name>] [--aside] [--hd]",
   options: {
     as: { type: "string", value: "<name>", description: "land it under this name instead of the platform's" },
+    hd: { type: "boolean", description: "land a UI's pieces or icons as drawn (HD), beside the pixel-art ones, instead of read back on the pixel grid" },
     aside: { type: "boolean", description: "keep a folder's own map and art under pixelvibing/before-platform/, and write it from the platform" }
   },
   positionals: [1, 1],
@@ -3528,7 +3553,10 @@ const pull = {
     const local = await projectHere(context.io.cwd);
     linkedOf(local);
     const platform = await signedIn(context);
-    const pulled = await pullAsset(platform, local, args.positionals[0], stringOf(args, "as"), { aside: flagOf(args, "aside") });
+    const pulled = await pullAsset(platform, local, args.positionals[0], stringOf(args, "as"), {
+      aside: flagOf(args, "aside"),
+      hd: flagOf(args, "hd")
+    });
     answer(context, pulled, pulledWords(pulled));
   }
 };
@@ -4508,33 +4536,58 @@ function shapeProblem(shape, index, canvas) {
   return null;
 }
 function sketchProblem(sketch) {
-  if (typeof sketch.instruction !== "string" || sketch.instruction.trim() === "") return "the sketch has no description";
-  if (sketch.instruction.length > MAX_SKETCH_INSTRUCTION)
-    return `the description is ${sketch.instruction.length} characters; it is at most ${MAX_SKETCH_INSTRUCTION}`;
+  const problems = sketchProblems(sketch);
+  return problems.length === 0 ? null : problems.join("; ");
+}
+function sketchProblems(sketch) {
+  const problems = [];
+  if (typeof sketch.instruction !== "string" || sketch.instruction.trim() === "") problems.push("the sketch has no description");
+  else if (sketch.instruction.length > MAX_SKETCH_INSTRUCTION)
+    problems.push(`the description is ${sketch.instruction.length} characters; it is at most ${MAX_SKETCH_INSTRUCTION}`);
   const { canvas, shapes } = sketch;
   if (!SKETCH_CANVASES.some((size) => size.width === canvas.width && size.height === canvas.height)) {
-    return `the canvas is ${canvas.width} × ${canvas.height}; a sketch is ${SKETCH_CANVASES.map((size) => `${size.width} × ${size.height}`).join(", ")}`;
+    problems.push(
+      `the canvas is ${canvas.width} × ${canvas.height}; a sketch is ${SKETCH_CANVASES.map((size) => `${size.width} × ${size.height}`).join(", ")}`
+    );
+    return problems;
   }
-  if (shapes.length === 0) return "the sketch has no shape";
-  if (shapes.length > MAX_SKETCH_SHAPES) return `the sketch has ${shapes.length} shapes; it holds at most ${MAX_SKETCH_SHAPES}`;
-  const labels = /* @__PURE__ */ new Map();
+  if (shapes.length === 0) problems.push("the sketch has no shape");
+  if (shapes.length > MAX_SKETCH_SHAPES) problems.push(`the sketch has ${shapes.length} shapes; it holds at most ${MAX_SKETCH_SHAPES}`);
+  const labels = /* @__PURE__ */ new Set();
+  const twice = /* @__PURE__ */ new Set();
+  const sound = [];
   for (const [index, shape] of shapes.entries()) {
     const problem = shapeProblem(shape, index, canvas);
-    if (problem !== null) return problem;
+    if (problem !== null) {
+      problems.push(problem);
+      continue;
+    }
+    sound.push(index);
     const key = shape.label.trim().toLowerCase();
-    if (labels.has(key)) return `"${shape.label.trim()}" is the label of two shapes`;
-    labels.set(key, shape.label.trim());
+    if (labels.has(key) && !twice.has(key)) {
+      twice.add(key);
+      problems.push(`"${shape.label.trim()}" is the label of two shapes`);
+    }
+    labels.add(key);
   }
-  for (const [index, shape] of shapes.entries()) {
+  const overlapping = /* @__PURE__ */ new Set();
+  for (const index of sound) {
+    const shape = shapes[index];
     for (let y = shape.y; y < shape.y + shape.height; y += 1) {
       for (let x = shape.x; x < shape.x + shape.width; x += 1) {
         if (!inShape(shape, x + 0.5, y + 0.5)) continue;
-        const other = shapes.findIndex((them, at) => at < index && inShape(them, x + 0.5, y + 0.5));
-        if (other >= 0) return `"${shapes[other]?.label.trim()}" and "${shape.label.trim()}" overlap`;
+        for (const other of sound) {
+          if (other >= index || !inShape(shapes[other], x + 0.5, y + 0.5)) continue;
+          const pair = `"${shapes[other]?.label.trim()}" and "${shape.label.trim()}" overlap`;
+          if (!overlapping.has(pair)) {
+            overlapping.add(pair);
+            problems.push(pair);
+          }
+        }
       }
     }
   }
-  return null;
+  return problems;
 }
 function sentShape(shape) {
   const caption = shape.caption?.trim() ?? "";
@@ -6555,7 +6608,7 @@ const move = {
     );
   }
 };
-const version = "0.54.0";
+const version = "0.56.0";
 const manifest = {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pixelvibing/cli",
-  "version": "0.54.0",
+  "version": "0.56.0",
   "description": "PixelVibing: pixel art game assets from the command line, and the Skills that teach coding assistants to make them.",
   "license": "MIT",
   "homepage": "https://pixelvibing.com",

package/skills/pixelvibing-icons/SKILL.md

@@ -22,7 +22,9 @@ pixel-vibing-cli generate icons --names "<name>,<name>,..." --purpose <skill|ite
   "icon_size": 32, "instruction": "<theme>", "enrich": false, "max_percent": 40 }
 ```
 
-`get_job` follows the job; then `pixel-vibing-cli pull <job id>` lands each icon.
+`get_job` follows the job; then `pixel-vibing-cli pull <job id>` lands each icon as pixel art, and
+`pull <job id> --hd` lands them as drawn (HD), beside them; `get_asset` with `"version": "hd"` reads
+them so.
 
 ## Writing it
 

package/skills/pixelvibing-ui/SKILL.md

@@ -30,7 +30,10 @@ The layout goes in the call itself, as `canvas` and `shapes`, with the same fiel
   "reference_images": ["<image id>"], "max_percent": 40 }
 ```
 
-`get_job` follows the job; then `pixel-vibing-cli pull <job id>` lands each piece.
+`get_job` follows the job; then `pixel-vibing-cli pull <job id>` lands each piece as pixel art, and
+`pull <job id> --hd` lands them as drawn (HD), beside them; `get_asset` with `"version": "hd"` reads
+them so. A UI drawn with `--no-pixel-art` is HD alone. A shape nothing was drawn for is named in the
+result's `missing`: generate the UI again for it rather than retrying the whole set blind.
 
 ## Writing it