@popcraft/cli 0.53.15 → 0.53.16

package/dist/popcraft.mjs

@@ -1198,7 +1198,7 @@ function operations(spec = openapi) {
 }
 async function call(target2, method, path, opts = {}) {
   const qs = new URLSearchParams(opts.query ?? {}).toString();
-  const headers = { "user-agent": `popcraft-cli/${"0.53.15"}`, ...opts.headers };
+  const headers = { "user-agent": `popcraft-cli/${"0.53.16"}`, ...opts.headers };
   if (target2.token) headers.authorization = `Bearer ${target2.token}`;
   if (opts.contentType) headers["content-type"] = opts.contentType;
   try {
@@ -8179,6 +8179,8 @@ function duplicateNode(document2, nodeId2, offset = { x: 10, y: 10 }) {
   }
   const newNode = cloneNode(node2);
   let doc2 = addNode(document2, newNode, node2.parentId);
+  const at4 = document2.nodes[node2.parentId]?.childIds.indexOf(nodeId2) ?? -1;
+  if (at4 >= 0) doc2 = reparentNode(doc2, newNode.id, node2.parentId, at4 + 1);
   function cloneChildren(originalId, newParentId) {
     const original = document2.nodes[originalId];
     if (!original) return;
@@ -8188,6 +8190,7 @@ function duplicateNode(document2, nodeId2, offset = { x: 10, y: 10 }) {
         const newChild = cloneNode(child);
         newChild.x = child.x;
         newChild.y = child.y;
+        newChild.name = child.name;
         doc2 = addNode(doc2, newChild, newParentId);
         cloneChildren(childId, newChild.id);
       }
@@ -29182,6 +29185,73 @@ var init_flags = __esm({
   }
 });
 
+// lib/document/z-order.ts
+function reorderSelection(doc2, ids2, dir) {
+  const selected = new Set(ids2);
+  const parents = /* @__PURE__ */ new Set();
+  for (const id3 of ids2) {
+    const p2 = doc2.nodes[id3]?.parentId;
+    if (p2 && doc2.nodes[p2]) parents.add(p2);
+  }
+  if (!parents.size) return doc2;
+  const nodes = { ...doc2.nodes };
+  let changed = false;
+  for (const pid of parents) {
+    const list2 = [...nodes[pid].childIds];
+    if (dir === "top" || dir === "bottom") {
+      const sel = list2.filter((id3) => selected.has(id3)), rest = list2.filter((id3) => !selected.has(id3));
+      const next2 = dir === "top" ? [...rest, ...sel] : [...sel, ...rest];
+      if (next2.some((id3, i2) => id3 !== list2[i2])) {
+        nodes[pid] = { ...nodes[pid], childIds: next2 };
+        changed = true;
+      }
+      continue;
+    }
+    let moved3 = false;
+    if (dir === "up") {
+      for (let i2 = list2.length - 2; i2 >= 0; i2--) {
+        if (selected.has(list2[i2]) && !selected.has(list2[i2 + 1])) {
+          [list2[i2], list2[i2 + 1]] = [list2[i2 + 1], list2[i2]];
+          moved3 = true;
+        }
+      }
+    } else {
+      for (let i2 = 1; i2 < list2.length; i2++) {
+        if (selected.has(list2[i2]) && !selected.has(list2[i2 - 1])) {
+          [list2[i2], list2[i2 - 1]] = [list2[i2 - 1], list2[i2]];
+          moved3 = true;
+        }
+      }
+    }
+    if (moved3) {
+      nodes[pid] = { ...nodes[pid], childIds: list2 };
+      changed = true;
+    }
+  }
+  return changed ? { ...doc2, nodes } : doc2;
+}
+var init_z_order = __esm({
+  "lib/document/z-order.ts"() {
+  }
+});
+
+// lib/editor/selection-drill.ts
+function selectAllTargets(doc2, pageId2, selection) {
+  const parentId = (selection.length ? resolveVirtualNode2(doc2.nodes, selection[0])?.parentId : null) ?? pageId2;
+  const parent = doc2.nodes[parentId] ?? doc2.nodes[pageId2];
+  return (parent?.childIds ?? []).filter((id3) => selectable(doc2, id3));
+}
+var selectable;
+var init_selection_drill = __esm({
+  "lib/editor/selection-drill.ts"() {
+    init_scene_graph();
+    selectable = (doc2, id3) => {
+      const n = doc2.nodes[id3];
+      return !!n && n.visible !== false && !n.locked;
+    };
+  }
+});
+
 // lib/document/history-group.ts
 function withHistoryGroup(group2, fn) {
   if (!group2) return fn();
@@ -96874,6 +96944,7 @@ function releaseMediaMemory(hash3) {
 var key2, peaksKey, objectUrls, sourceKey, remoteResolver, MEDIA_FETCH_TIMEOUT_MS, SHIPPED_MEDIA_PATH, notShipped, MEDIA_SCHEME, isImageDataUrl, memory, pendingLoads, sourceAliases, PAINT_KEYS, URL_KEYS;
 var init_media_store = __esm({
   "lib/storage/media-store.ts"() {
+    "use strict";
     init_media_types();
     init_idb();
     init_media_hash();
@@ -252666,7 +252737,6 @@ function resizeWindow(doc2, target2, rect) {
 }
 var init_crop = __esm({
   "lib/editor/crop.ts"() {
-    "use strict";
     init_dist_node();
     init_scene_graph();
     init_photo_frames();
@@ -257163,7 +257233,6 @@ function followPeers(peers) {
 var PALETTE, usePresence, awareness, CURSOR_SEND_MS, VIEWPORT_SEND_MS, cursorTimer, pendingCursor, sentCursor, EMOTE_MS, lastFollowCamera;
 var init_presence = __esm({
   "lib/collab/presence.ts"() {
-    "use strict";
     init_esm();
     init_editor_store();
     init_status_announcements();
@@ -262771,7 +262840,6 @@ function formatDate(date5, opts = { month: "short", day: "numeric", year: "numer
 var cache5, nf;
 var init_format = __esm({
   "lib/i18n/format.ts"() {
-    "use strict";
     init_runtime();
     cache5 = /* @__PURE__ */ new Map();
     nf = (opts) => cached2("n", opts, (l) => new Intl.NumberFormat(l, opts));
@@ -312398,7 +312466,6 @@ function creditLine(c2) {
 var MAX_PHOTO_PAGE, MAX_PHOTO_QUERY, UUID, isPhotoId, photoImagePath;
 var init_stock = __esm({
   "lib/photos/stock.ts"() {
-    "use strict";
     MAX_PHOTO_PAGE = 12;
     MAX_PHOTO_QUERY = 200;
     UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -313060,7 +313127,6 @@ function applyTextPath(layout2, path, tp, rebase = true) {
 var defaultCircleRadius, ownsPath, mapPoint;
 var init_text_path = __esm({
   "lib/engine/text/text-path.ts"() {
-    "use strict";
     init_scene_graph();
     init_transform();
     init_shape_to_path();
@@ -313178,7 +313244,6 @@ function areaBounds(rings) {
 }
 var init_text_area = __esm({
   "lib/engine/text/text-area.ts"() {
-    "use strict";
   }
 });
 
@@ -317615,7 +317680,6 @@ async function selectionReferenceImages(doc2, selection, opts = {}) {
 var FIT_QUALITIES, FIT_SCALES, blobToDataUrl;
 var init_reference_images = __esm({
   "lib/ai/reference-images.ts"() {
-    "use strict";
     init_export();
     init_selection_bounds();
     init_renderer_registry();
@@ -319394,6 +319458,7 @@ var nodeFind, nodeGet, nodeMeasure, docOutline, CREATABLE, nodeCreate, FORBIDDEN
 var init_node = __esm({
   "lib/commands/node.ts"() {
     "use strict";
+    init_z_order();
     init_zod();
     init_limits();
     init_search();
@@ -320051,7 +320116,7 @@ var init_node = __esm({
       run: (args2, ctx2) => {
         const { doc: doc2, ids: ids2 } = resolveTargets(ctx2, args2.ids, "order");
         let next2 = doc2;
-        for (const id3 of ids2) next2 = moveNodeInZOrder(next2, id3, args2.direction);
+        next2 = reorderSelection(next2, ids2, args2.direction);
         ctx2.commit(next2);
         return { summary: `Moved ${plural2(ids2.length, "layer")} ${args2.direction}`, data: { ids: ids2 } };
       }
@@ -328843,7 +328908,7 @@ var init_package = __esm({
   "packages/runtime/package.json"() {
     package_default = {
       name: "@popcraft/runtime",
-      version: "0.53.15",
+      version: "0.53.16",
       description: "What code exported from PopCraft shares: the meaning of expressions (operators and functions) and, as it grows, the parts of a design's behaviour that are common code rather than generated React.",
       license: "MIT",
       homepage: "https://popcraft.app/docs/exporting/nextjs",
@@ -408095,6 +408160,8 @@ function placeInstance(document2, mainComponentId, pageId2, x2, y) {
 var STICKY_PROP_KEYS, initialDocument, initialPageId, TABS_PREFS_KEY, isUnsavedPlaceholder, libraryDocs, markLibraryDocument, isPersistableDocument, resetLibraryDocuments, MAX_OPEN_NODES, sessionDocumentInLibrary, saveFailureNotified, saveTimeout, latestValue, isSaving, firstPendingAt, SAVE_IDLE_MS, SAVE_MAX_WAIT_MS, pendingSave, customIdbPersistStorage, readOnlyToldAt, useEditorStore, useSelection, useActiveTool, useCamera, useCurrentPageId, useDocument, glideToken, useMode;
 var init_editor_store = __esm({
   "lib/store/editor-store.ts"() {
+    init_z_order();
+    init_selection_drill();
     init_history_group();
     init_pixel_art();
     init_runtime();
@@ -409310,12 +409377,29 @@ var init_editor_store = __esm({
                   const topLevelNodes = nodes.filter((n) => !n.parentId || !clipboardIds.has(n.parentId));
                   const newNodes = { ...doc2.nodes };
                   const updatedParents = /* @__PURE__ */ new Map();
+                  const PASTE_INTO = /* @__PURE__ */ new Set(["FRAME", "COMPONENT", "SECTION"]);
+                  const sel = state.selection.length === 1 ? doc2.nodes[state.selection[0]] : void 0;
+                  const into = sel && PASTE_INTO.has(sel.type) && !clipboardIds.has(sel.id) ? sel : void 0;
+                  const pageOf4 = (d, id3) => {
+                    let n = d.nodes[id3];
+                    for (let guard2 = 0; n && n.type !== "PAGE" && guard2 < 64; guard2++) n = n.parentId ? d.nodes[n.parentId] : void 0;
+                    return n?.id;
+                  };
+                  const parentFor = (n) => {
+                    if (into) return into.id;
+                    if (n.parentId && doc2.nodes[n.parentId] && doc2.nodes[n.parentId].type !== "PAGE" && pageOf4(doc2, n.parentId) === state.currentPageId) return n.parentId;
+                    return state.currentPageId;
+                  };
                   nodes.forEach((n) => {
                     const newNode = { ...n, id: idMap.get(n.id) };
                     if (topLevelNodes.includes(n)) {
                       newNode.x += offset.x;
                       newNode.y += offset.y;
-                      newNode.parentId = state.currentPageId;
+                      newNode.parentId = parentFor(n);
+                      if (into && n.parentId !== into.id && (newNode.x < 0 || newNode.y < 0 || newNode.x > into.width || newNode.y > into.height)) {
+                        newNode.x = (into.width - newNode.width) / 2;
+                        newNode.y = (into.height - newNode.height) / 2;
+                      }
                       newSelection.push(newNode.id);
                     } else {
                       newNode.parentId = idMap.get(n.parentId);
@@ -409489,10 +409573,7 @@ var init_editor_store = __esm({
               })),
               selectAll: () => {
                 const state = get4();
-                const page = state.document.nodes[state.currentPageId];
-                if (page) {
-                  set4({ selection: [...page.childIds] });
-                }
+                set4({ selection: selectAllTargets(state.document, state.currentPageId, state.selection) });
               },
               deselectAll: () => set4({ selection: [] }),
               toggleSelectionVisibility: () => {
@@ -410257,57 +410338,59 @@ var init_editor_store = __esm({
                   }
                 };
               }),
-              // Z-order actions
-              bringToFront: () => {
+              // Z-order actions: the selection moves as a block, keeps its own order, and can be undone (lib/document/z-order.ts).
+              bringToFront: () => get4().reorderSelectionZ("top"),
+              sendToBack: () => get4().reorderSelectionZ("bottom"),
+              bringForward: () => get4().reorderSelectionZ("up"),
+              sendBackward: () => get4().reorderSelectionZ("down"),
+              reorderSelectionZ: (dir) => {
                 const state = get4();
-                state.selection.forEach((id3) => {
-                  set4({ document: moveNodeInZOrder(get4().document, id3, "top") });
-                });
-              },
-              sendToBack: () => {
-                const state = get4();
-                state.selection.forEach((id3) => {
-                  set4({ document: moveNodeInZOrder(get4().document, id3, "bottom") });
-                });
-              },
-              bringForward: () => {
-                const state = get4();
-                state.selection.forEach((id3) => {
-                  set4({ document: moveNodeInZOrder(get4().document, id3, "up") });
-                });
-              },
-              sendBackward: () => {
-                const state = get4();
-                state.selection.forEach((id3) => {
-                  set4({ document: moveNodeInZOrder(get4().document, id3, "down") });
-                });
+                const next2 = reorderSelection(state.document, state.selection, dir);
+                if (next2 === state.document) return;
+                const label3 = { top: "Bring to front", bottom: "Send to back", up: "Bring forward", down: "Send backward" }[dir];
+                set4({ document: next2, history: pushCommand(state.history, createCommand("REORDER", label3, state.document, next2)) });
               },
               // Group actions
               groupSelection: () => {
                 const state = get4();
                 if (state.selection.length < 2) return;
                 const documentBefore = state.document;
+                let base = state.document;
+                const order2 = /* @__PURE__ */ new Map();
+                const walk4 = (id3) => {
+                  order2.set(id3, order2.size);
+                  for (const c2 of base.nodes[id3]?.childIds ?? []) walk4(c2);
+                };
+                walk4(state.currentPageId);
+                const topmost = [...state.selection].sort((x2, y) => (order2.get(y) ?? 0) - (order2.get(x2) ?? 0))[0];
+                const target2 = base.nodes[topmost]?.parentId ?? state.currentPageId;
+                for (const id3 of state.selection) {
+                  const n = base.nodes[id3];
+                  if (!n || n.parentId === target2) continue;
+                  const placed2 = placementUnder(base, id3, target2);
+                  if (placed2) base = updateNode(base, id3, placed2);
+                  base = reparentNode(base, id3, target2);
+                }
                 let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
                 state.selection.forEach((id3) => {
-                  const n = state.document.nodes[id3];
+                  const n = base.nodes[id3];
                   if (!n) return;
                   minX = Math.min(minX, n.x);
                   minY = Math.min(minY, n.y);
                   maxX = Math.max(maxX, n.x + n.width);
                   maxY = Math.max(maxY, n.y + n.height);
                 });
-                const firstNode = state.document.nodes[state.selection[0]];
-                const parentId = firstNode?.parentId ?? state.currentPageId;
+                const parentId = target2;
                 const group2 = createGroup([]);
                 group2.x = minX;
                 group2.y = minY;
                 group2.width = maxX - minX;
                 group2.height = maxY - minY;
                 group2.name = "Group";
-                const siblings = state.document.nodes[parentId]?.childIds ?? [];
+                const siblings = base.nodes[parentId]?.childIds ?? [];
                 const ordered2 = [...state.selection].sort((a, b) => siblings.indexOf(a) - siblings.indexOf(b));
                 const top = Math.max(...ordered2.map((id3) => siblings.indexOf(id3)));
-                let doc2 = addNode(state.document, group2, parentId);
+                let doc2 = addNode(base, group2, parentId);
                 if (top >= 0) doc2 = reparentNode(doc2, group2.id, parentId, top + 1);
                 ordered2.forEach((id3) => {
                   doc2 = reparentNode(doc2, id3, group2.id);
@@ -410339,8 +410422,9 @@ var init_editor_store = __esm({
                     return;
                   }
                   const parentId = node2.parentId ?? state.currentPageId;
-                  node2.childIds.forEach((childId) => {
-                    doc2 = reparentNode(doc2, childId, parentId);
+                  const slot2 = doc2.nodes[parentId]?.childIds.indexOf(id3) ?? -1;
+                  node2.childIds.forEach((childId, i2) => {
+                    doc2 = reparentNode(doc2, childId, parentId, slot2 >= 0 ? slot2 + i2 : void 0);
                     const child = doc2.nodes[childId];
                     if (child) {
                       doc2.nodes[childId] = {
@@ -414448,7 +414532,7 @@ init_resources();
 init_desktop();
 init_hypery();
 import { createInterface } from "node:readline";
-var VERSION2 = "0.53.15";
+var VERSION2 = "0.53.16";
 var HELP = `popcraft ${VERSION2} \u2014 the PopCraft command line
 
 Files (headless, on .popcraft files):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@popcraft/cli",
-  "version": "0.53.15",
+  "version": "0.53.16",
   "description": "The PopCraft command line: edit .popcraft files headlessly, call the REST API, publish to the marketplace and manage the desktop app's local plugins, themes, fonts, skills and agents.",
   "license": "MIT",
   "homepage": "https://popcraft.app/docs/api/cli",
@@ -34,7 +34,7 @@
     "esbuild": "0.28.2"
   },
   "dependencies": {
-    "@popcraft/kit": "0.53.15"
+    "@popcraft/kit": "0.53.16"
   },
   "scripts": {
     "build": "node build.mjs",