@pixldocs/canvas-renderer 0.5.83 → 0.5.85

package/dist/index.js

@@ -1677,7 +1677,7 @@ const useEditorStore = create((set, get) => ({
     const themeConfig = state.canvas.themeConfig ?? createEmptyThemeConfig();
     if (themeConfig.properties.some((p) => p.id === property.id)) return {};
     const updatedProperties = [...themeConfig.properties, property];
-    const updatedVariants = themeConfig.variants.map(
+    const updatedVariants = property.linkedTo ? themeConfig.variants : themeConfig.variants.map(
       (v) => v.isDefault ? { ...v, values: { ...v.values, [property.id]: currentValue } } : v
     );
     const nextCanvas = {
@@ -1703,9 +1703,17 @@ const useEditorStore = create((set, get) => ({
   removeThemeProperty: (propertyId) => set((state) => {
     const themeConfig = state.canvas.themeConfig;
     if (!themeConfig) return {};
-    const updatedProperties = themeConfig.properties.filter((p) => p.id !== propertyId);
+    const linkedChildren = themeConfig.properties.filter((p) => p.linkedTo === propertyId);
+    const updatedProperties = themeConfig.properties.filter((p) => p.id !== propertyId).map((p) => p.linkedTo === propertyId ? { ...p, linkedTo: void 0 } : p);
     const updatedVariants = themeConfig.variants.map((v) => {
-      const { [propertyId]: _, ...rest } = v.values;
+      const { [propertyId]: removedValue, ...rest } = v.values;
+      if (linkedChildren.length && removedValue !== void 0) {
+        const seeded = { ...rest };
+        for (const child of linkedChildren) {
+          if (seeded[child.id] === void 0) seeded[child.id] = removedValue;
+        }
+        return { ...v, values: seeded };
+      }
       return { ...v, values: rest };
     });
     const nextCanvas = {
@@ -1779,7 +1787,7 @@ const useEditorStore = create((set, get) => ({
     const PAGE_BG_ID = "__pageBackground__";
     let updatedPages = [...state.canvas.pages];
     for (const prop of themeConfig.properties) {
-      const value = variant.values[prop.id];
+      const value = variant.values[prop.linkedTo ?? prop.id];
       if (value === void 0) continue;
       if (prop.elementId === PAGE_BG_ID) {
         if (prop.targetProperty === "backgroundColor") {
@@ -2002,19 +2010,7 @@ const useEditorStore = create((set, get) => ({
     } else {
       newCollapsedSet.add(groupId);
     }
-    const currentPage = getCurrentPageFromCanvas(state.canvas);
-    let nextCanvas = state.canvas;
-    const group = findNodeById(currentPage.children, groupId);
-    if (group && isGroup(group)) {
-      nextCanvas = updateCurrentPageChildren(
-        nextCanvas,
-        (children) => updateNodeInTree(children, groupId, { collapsed: !isCollapsed })
-      );
-    }
-    return {
-      collapsedGroups: newCollapsedSet,
-      canvas: nextCanvas
-    };
+    return { collapsedGroups: newCollapsedSet };
   }),
   // Convenience aliases
   groupElements: (ids, name) => get().groupNodes(ids, name),
@@ -10281,7 +10277,8 @@ function formDefSectionsToInferred(schemaSections, repeatableNodeMap) {
           })),
           // Honor minEntries: 0 — start with no entries, user adds via "+ Add" button.
           initialEntryCount: minEntries,
-          parentId
+          parentId,
+          entryNameFieldKey: def.entryNameFieldKey
         };
         if (treeNodeId) section.treeNodeId = treeNodeId;
         sections.push(section);
@@ -10726,6 +10723,26 @@ function baseId(id) {
 const REPEATABLE_KEY_REGEX = /^field_(.+)_(\d+)_(.+)$/;
 const NESTED_REPEATABLE_KEY_REGEX = /^field_(.+)_(\d+)_field_(.+)_(\d+)_(.+)$/;
 const FORMDEF_CANONICAL_KEY_REGEX = /^field_.+_N_.+$/;
+function parseEntryRange(range, max) {
+  if (!range || !range.trim()) return null;
+  const out = /* @__PURE__ */ new Set();
+  for (const partRaw of range.split(",")) {
+    const part = partRaw.trim();
+    if (!part) continue;
+    if (/^\d+$/.test(part)) {
+      const n = parseInt(part, 10);
+      if (n >= 1 && n <= max) out.add(n);
+      continue;
+    }
+    const m = /^(\d*)\s*-\s*(\d*)$/.exec(part);
+    if (!m) continue;
+    const start = m[1] === "" ? 1 : Math.max(1, parseInt(m[1], 10));
+    const end = m[2] === "" ? max : Math.min(max, parseInt(m[2], 10));
+    for (let i = start; i <= end; i++) out.add(i);
+  }
+  if (out.size === 0) return null;
+  return Array.from(out).sort((a, b) => a - b);
+}
 function applyTextCase(text, textCase) {
   if (!textCase || textCase === "none") return text;
   switch (textCase) {
@@ -10804,13 +10821,19 @@ function findElementBySourceIdInSubtree(nodes, sourceId) {
   }
   return void 0;
 }
-function findRepeatableElementBySourceId(pages, baseNodeId, oneBasedIndex, sourceElementId) {
+function findAllRepeatableElementsBySourceId(pages, baseNodeId, oneBasedIndex, sourceElementId, expectedEntriesPerOccurrence) {
   var _a;
   const groups = collectGroupsByBaseId(pages, baseNodeId);
-  const group = groups[oneBasedIndex - 1];
-  if (!group) return void 0;
-  if (!isGroup(group) || !((_a = group.children) == null ? void 0 : _a.length)) return void 0;
-  return findElementBySourceIdInSubtree(group.children, sourceElementId) ?? (group.__sourceId === sourceElementId ? group.id : void 0);
+  if (!groups.length) return [];
+  const N = Math.max(1, expectedEntriesPerOccurrence ?? groups.length);
+  const out = [];
+  for (let occStart = 0; occStart < groups.length; occStart += N) {
+    const group = groups[occStart + (oneBasedIndex - 1)];
+    if (!group || !isGroup(group) || !((_a = group.children) == null ? void 0 : _a.length)) continue;
+    const found = findElementBySourceIdInSubtree(group.children, sourceElementId) ?? (group.__sourceId === sourceElementId ? group.id : void 0);
+    if (found) out.push(found);
+  }
+  return out;
 }
 function findNestedRepeatableElementBySourceId(pages, parentBaseNodeId, parentPi, childBaseNodeId, childCi, sourceElementId) {
   var _a, _b;
@@ -10831,6 +10854,24 @@ function findNestedRepeatableElementBySourceId(pages, parentBaseNodeId, parentPi
   if (!childGroup || !isGroup(childGroup) || !((_b = childGroup.children) == null ? void 0 : _b.length)) return void 0;
   return findElementBySourceIdInSubtree(childGroup.children, sourceElementId) ?? (childGroup.__sourceId === sourceElementId ? childGroup.id : void 0);
 }
+function repeatableLabelKey(label) {
+  return String(label ?? "").trim().toLowerCase();
+}
+function repeatableLabelSlug(label) {
+  return repeatableLabelKey(label).replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
+}
+function addToSetMap(map, key, value) {
+  if (!key || !value) return;
+  const set = map.get(key);
+  if (set) set.add(value);
+  else map.set(key, /* @__PURE__ */ new Set([value]));
+}
+function getFieldKeyAliases(fieldId) {
+  const aliases = /* @__PURE__ */ new Set([fieldId]);
+  const canonicalParts = fieldId.split("_N_");
+  if (canonicalParts.length > 1) aliases.add(canonicalParts[canonicalParts.length - 1]);
+  return Array.from(aliases).filter(Boolean);
+}
 function idPrefix(node) {
   if (isGroup(node)) return "group";
   const t = node.type;
@@ -10884,7 +10925,7 @@ function findRepeatableByNodeIds(pages, nodeIds) {
     var _a2;
     return !!((_a2 = n.repeatableSection) == null ? void 0 : _a2.label);
   };
-  function walk(children, parentRepeatableBaseId, parentInfo) {
+  function walk(children, parentRepeatableBaseId, parentInfo, parentRepeatableEntryIndex) {
     var _a2, _b;
     if (!Array.isArray(children)) return;
     for (let i = 0; i < children.length; i++) {
@@ -10898,7 +10939,7 @@ function findRepeatableByNodeIds(pages, nodeIds) {
           const childBaseFromMeta = child.__baseNodeId;
           const isMatch = schemaBaseIds.has(child.id) || schemaBaseIds.has(childBase) || childBaseFromMeta != null && schemaBaseIds.has(childBaseFromMeta);
           if (!isMatch) {
-            if (isGroup(child) && Array.isArray(child.children)) walk(child.children, parentRepeatableBaseId);
+            if (isGroup(child) && Array.isArray(child.children)) walk(child.children, parentRepeatableBaseId, void 0, parentRepeatableEntryIndex);
             j++;
             continue;
           }
@@ -10921,17 +10962,22 @@ function findRepeatableByNodeIds(pages, nodeIds) {
             count,
             node: child,
             baseNodeId: childBaseFromMeta ?? childBase,
-            parentBaseNodeId: parentRepeatableBaseId
+            parentBaseNodeId: parentRepeatableBaseId,
+            parentEntryIndex: parentRepeatableEntryIndex
           });
-          if (isGroup(child) && Array.isArray(child.children)) walk(child.children, childBase);
+          const childEntryIndex = child.__repeatableEntryIndex;
+          if (isGroup(child) && Array.isArray(child.children)) walk(child.children, effectiveChildBase, void 0, childEntryIndex);
           j += count;
         }
       } else if (isGroup(node) && ((_b = node.children) == null ? void 0 : _b.length)) {
         const nodeBase = baseId(node.id);
         const selfMatch = schemaBaseIds.has(node.id) || schemaBaseIds.has(nodeBase) || node.__baseNodeId != null && schemaBaseIds.has(node.__baseNodeId);
-        if (selfMatch && hasRepeatableSection(node)) {
+        const isSelfRepeatable = selfMatch && hasRepeatableSection(node);
+        let matchedSelfBase;
+        if (selfMatch) matchedSelfBase = node.__baseNodeId ?? nodeBase;
+        if (isSelfRepeatable) {
           let count = 1;
-          const effectiveBase = node.__baseNodeId ?? nodeBase;
+          const effectiveBase = matchedSelfBase ?? nodeBase;
           if (node.id !== nodeBase && node.id !== effectiveBase) {
             while (i + count < children.length) {
               const next = children[i + count];
@@ -10948,10 +10994,12 @@ function findRepeatableByNodeIds(pages, nodeIds) {
             count,
             node,
             baseNodeId: effectiveBase,
-            parentBaseNodeId: parentRepeatableBaseId
+            parentBaseNodeId: parentRepeatableBaseId,
+            parentEntryIndex: parentRepeatableEntryIndex
           });
         }
-        walk(node.children, parentRepeatableBaseId);
+        const nodeEntryIndex = node.__repeatableEntryIndex;
+        walk(node.children, matchedSelfBase ?? parentRepeatableBaseId, void 0, nodeEntryIndex ?? parentRepeatableEntryIndex);
       }
     }
   }
@@ -11010,7 +11058,7 @@ function getNestedRepeatableEntryCount(parentId, parentIndex, childId, formValue
   return Math.max(1, maxIndex);
 }
 function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsFromSchema, repeatableEntryCounts, repeatableNestedEntryCounts, displayFormatMap, repeatablePagesFromSchema) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c;
   const cloned = JSON.parse(JSON.stringify(config));
   if (!cloned.pages) return cloned;
   const dynamicFields = cloned.dynamicFields;
@@ -11060,17 +11108,56 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
   }
   const repeatableList = (repeatableSectionsFromSchema == null ? void 0 : repeatableSectionsFromSchema.length) ? repeatableSectionsFromSchema : getRepeatableFromConfig(pages);
   const nodeIds = repeatableList.map((r) => r.nodeId);
+  const repeatableBasesByLabel = /* @__PURE__ */ new Map();
+  for (const r of repeatableList) {
+    const base = baseId(r.nodeId);
+    addToSetMap(repeatableBasesByLabel, repeatableLabelKey(r.label), base);
+    addToSetMap(repeatableBasesByLabel, repeatableLabelSlug(r.label), base);
+  }
+  const repeatableTokenToBaseIds = /* @__PURE__ */ new Map();
+  for (const r of repeatableList) {
+    const base = baseId(r.nodeId);
+    const labelBases = /* @__PURE__ */ new Set([
+      base,
+      ...repeatableBasesByLabel.get(repeatableLabelKey(r.label)) ?? [],
+      ...repeatableBasesByLabel.get(repeatableLabelSlug(r.label)) ?? []
+    ]);
+    for (const targetBase of labelBases) {
+      addToSetMap(repeatableTokenToBaseIds, base, targetBase);
+      addToSetMap(repeatableTokenToBaseIds, r.nodeId, targetBase);
+      addToSetMap(repeatableTokenToBaseIds, repeatableLabelKey(r.label), targetBase);
+      addToSetMap(repeatableTokenToBaseIds, repeatableLabelSlug(r.label), targetBase);
+    }
+  }
+  const getRepeatableBaseIdsForToken = (token) => {
+    const direct = repeatableTokenToBaseIds.get(token) ?? repeatableTokenToBaseIds.get(baseId(token));
+    return direct ? Array.from(direct) : [baseId(token)];
+  };
   const entryCountFromList = (baseNodeId) => {
     const item = repeatableList.find((r) => baseId(r.nodeId) === baseNodeId || r.nodeId === baseNodeId);
     return item == null ? void 0 : item.entryCount;
   };
+  const entryFilterFromList = (baseNodeId) => {
+    var _a2;
+    const item = repeatableList.find((r) => baseId(r.nodeId) === baseNodeId || r.nodeId === baseNodeId);
+    const filter = item == null ? void 0 : item.entryFilter;
+    return (filter == null ? void 0 : filter.mode) === "range" && ((_a2 = filter.range) == null ? void 0 : _a2.trim()) ? filter : void 0;
+  };
   const resolvedIdMap = /* @__PURE__ */ new Map();
+  const addResolved = (key, id) => {
+    const arr = resolvedIdMap.get(key);
+    if (arr) {
+      if (!arr.includes(id)) arr.push(id);
+    } else resolvedIdMap.set(key, [id]);
+  };
   const mappedNewIds = /* @__PURE__ */ new Set();
   const elementIdToFieldId = /* @__PURE__ */ new Map();
   if (dynamicFields == null ? void 0 : dynamicFields.length) {
     for (const f of dynamicFields) {
-      const elId = (_c = (_b = f.mappings) == null ? void 0 : _b[0]) == null ? void 0 : _c.elementId;
-      if (elId) elementIdToFieldId.set(elId, f.id);
+      for (const m of f.mappings ?? []) {
+        const elId = m == null ? void 0 : m.elementId;
+        if (elId) elementIdToFieldId.set(elId, f.id);
+      }
     }
   }
   const repeatableInfosFirst = findRepeatableByNodeIds(pages, nodeIds);
@@ -11083,37 +11170,90 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
   for (const r of nestedFirst) {
     if (r.parentBaseNodeId) nestedChildToParent.set(r.baseNodeId, r.parentBaseNodeId);
   }
+  const getNestedBasePairs = (parentToken, childToken) => {
+    const pairs = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (const parentBaseId of getRepeatableBaseIdsForToken(parentToken)) {
+      for (const childBaseId of getRepeatableBaseIdsForToken(childToken)) {
+        const key = `${parentBaseId}::${childBaseId}`;
+        if (seen.has(key)) continue;
+        seen.add(key);
+        pairs.push({ parentBaseId, childBaseId });
+      }
+    }
+    return pairs.length ? pairs : [{ parentBaseId: baseId(parentToken), childBaseId: baseId(childToken) }];
+  };
+  const getNestedCountForBasePair = (parentBaseNodeId, parentIndex1Based, childBaseNodeId) => {
+    let maxCount = 0;
+    for (const { parentBaseId, childBaseId } of getNestedBasePairs(parentBaseNodeId, childBaseNodeId)) {
+      const aliasKey = `${parentBaseId}_${parentIndex1Based}_${childBaseId}`;
+      maxCount = Math.max(
+        maxCount,
+        (repeatableNestedEntryCounts == null ? void 0 : repeatableNestedEntryCounts[aliasKey]) ?? 0,
+        getNestedRepeatableEntryCount(parentBaseId, parentIndex1Based, childBaseId, formValues)
+      );
+    }
+    return Math.max(1, maxCount);
+  };
   const phase1NewToOriginal = /* @__PURE__ */ new Map();
-  const topLevelByBase = /* @__PURE__ */ new Map();
+  const entryCountByBase = /* @__PURE__ */ new Map();
+  [...topLevel].sort((a, b) => {
+    if (a.parentChildren !== b.parentChildren) return 0;
+    return b.startIndex - a.startIndex;
+  });
+  const occByParent = /* @__PURE__ */ new Map();
   for (const r of topLevel) {
-    if (!topLevelByBase.has(r.baseNodeId)) topLevelByBase.set(r.baseNodeId, []);
-    topLevelByBase.get(r.baseNodeId).push(r);
-  }
-  for (const [, blocks] of topLevelByBase) {
-    const first = blocks[0];
-    const startIndex = Math.min(...blocks.map((b) => b.startIndex));
-    const endIndex = Math.max(...blocks.map((b) => b.startIndex + b.count));
-    const count = endIndex - startIndex;
-    const { parentChildren, node, baseNodeId } = first;
+    if (!occByParent.has(r.parentChildren)) occByParent.set(r.parentChildren, []);
+    occByParent.get(r.parentChildren).push(r);
+  }
+  const computeN = (baseNodeId, sampleNodeId) => {
+    if (entryCountByBase.has(baseNodeId)) return entryCountByBase.get(baseNodeId);
     const countFromList = entryCountFromList(baseNodeId);
-    const countFromState = countFromList ?? (repeatableEntryCounts == null ? void 0 : repeatableEntryCounts[baseNodeId]) ?? (repeatableEntryCounts == null ? void 0 : repeatableEntryCounts[node.id]) ?? repeatableEntryCounts;
+    const countFromState = countFromList ?? (repeatableEntryCounts == null ? void 0 : repeatableEntryCounts[baseNodeId]) ?? (repeatableEntryCounts == null ? void 0 : repeatableEntryCounts[sampleNodeId]) ?? repeatableEntryCounts;
     const N = Math.max(1, countFromState ?? getRepeatableEntryCount(baseNodeId, formValues));
-    const clones = [];
-    for (let i = 1; i <= N; i++) {
-      const [clone, oldToNew] = cloneNodeWithNewIds$1(node, `${baseNodeId}_e${i}`);
-      delete clone.repeatableSection;
-      clones.push(clone);
-      const newToOriginal = /* @__PURE__ */ new Map();
-      for (const [oldId, newId] of oldToNew) {
-        resolvedIdMap.set(`${baseNodeId}_${i}_${oldId}`, newId);
-        newToOriginal.set(newId, oldId);
-        const fieldId = elementIdToFieldId.get(oldId);
-        if (fieldId) resolvedIdMap.set(`${baseNodeId}_${i}_${fieldId}`, newId);
-        mappedNewIds.add(newId);
-      }
-      phase1NewToOriginal.set(`${baseNodeId}_${i}`, newToOriginal);
-    }
-    parentChildren.splice(startIndex, count, ...clones);
+    entryCountByBase.set(baseNodeId, N);
+    return N;
+  };
+  const occurrenceIndexByBase = /* @__PURE__ */ new Map();
+  for (const r of topLevel) {
+    const idx = (occurrenceIndexByBase.get(r.baseNodeId) ?? 0) + 1;
+    occurrenceIndexByBase.set(r.baseNodeId, idx);
+    r.__occurrenceIndex = idx;
+  }
+  for (const [parentChildren, blocks] of occByParent) {
+    const sorted = [...blocks].sort((a, b) => b.startIndex - a.startIndex);
+    for (const block of sorted) {
+      const { node, baseNodeId, startIndex, count } = block;
+      const occIdx = block.__occurrenceIndex ?? 1;
+      const N = computeN(baseNodeId, node.id);
+      const entryFilter = ((_b = node.repeatableSection) == null ? void 0 : _b.entryFilter) ?? entryFilterFromList(baseNodeId);
+      let entryIndices;
+      if (entryFilter && entryFilter.mode === "range" && entryFilter.range) {
+        const parsed = parseEntryRange(entryFilter.range, N);
+        entryIndices = parsed && parsed.length ? parsed : Array.from({ length: N }, (_, k) => k + 1);
+      } else {
+        entryIndices = Array.from({ length: N }, (_, k) => k + 1);
+      }
+      const clones = [];
+      for (const i of entryIndices) {
+        const [clone, oldToNew] = cloneNodeWithNewIds$1(node, `${baseNodeId}_o${occIdx}_e${i}`);
+        clone.__repeatableEntryIndex = i;
+        delete clone.repeatableSection;
+        clones.push(clone);
+        const newToOriginal = /* @__PURE__ */ new Map();
+        for (const [oldId, newId] of oldToNew) {
+          addResolved(`${baseNodeId}_${i}_${oldId}`, newId);
+          newToOriginal.set(newId, oldId);
+          const fieldId = elementIdToFieldId.get(oldId);
+          if (fieldId) {
+            for (const alias of getFieldKeyAliases(fieldId)) addResolved(`${baseNodeId}_${i}_${alias}`, newId);
+          }
+          mappedNewIds.add(newId);
+        }
+        phase1NewToOriginal.set(`${baseNodeId}_${i}`, newToOriginal);
+      }
+      parentChildren.splice(startIndex, count, ...clones);
+    }
   }
   if (nestedChildToParent.size > 0) {
     const repeatableInfosSecond = findRepeatableByNodeIds(pages, nodeIds);
@@ -11126,25 +11266,41 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
     for (const [childBaseNodeId, blocks] of byChildBase) {
       const parentBaseNodeId = nestedChildToParent.get(childBaseNodeId);
       blocks.forEach((block, parentIndex0) => {
-        const parentIndex1Based = parentIndex0 + 1;
+        var _a2;
+        const parentIndex1Based = block.parentEntryIndex ?? parentIndex0 + 1;
         const { parentChildren, startIndex, count, node, baseNodeId } = block;
-        const nestedKey = `${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}`;
-        const N = Math.max(
-          1,
-          (repeatableNestedEntryCounts == null ? void 0 : repeatableNestedEntryCounts[nestedKey]) ?? getNestedRepeatableEntryCount(parentBaseNodeId, parentIndex1Based, baseNodeId, formValues)
-        );
+        const N = getNestedCountForBasePair(parentBaseNodeId, parentIndex1Based, baseNodeId);
         const phase1Map = phase1NewToOriginal.get(`${parentBaseNodeId}_${parentIndex1Based}`);
+        const nestedEntryFilter = ((_a2 = node.repeatableSection) == null ? void 0 : _a2.entryFilter) ?? entryFilterFromList(baseNodeId);
+        let nestedEntryIndices;
+        if (nestedEntryFilter && nestedEntryFilter.mode === "range" && nestedEntryFilter.range) {
+          const parsed = parseEntryRange(nestedEntryFilter.range, N);
+          nestedEntryIndices = parsed && parsed.length ? parsed : Array.from({ length: N }, (_, k) => k + 1);
+        } else {
+          nestedEntryIndices = Array.from({ length: N }, (_, k) => k + 1);
+        }
         const clones = [];
-        for (let i = 1; i <= N; i++) {
+        for (const i of nestedEntryIndices) {
           const [clone, oldToNew] = cloneNodeWithNewIds$1(node, `${parentBaseNodeId}_p${parentIndex1Based}_${baseNodeId}_e${i}`);
           delete clone.repeatableSection;
           clones.push(clone);
           for (const [oldId, newId] of oldToNew) {
             const originalId = (phase1Map == null ? void 0 : phase1Map.get(oldId)) ?? oldId;
-            resolvedIdMap.set(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${originalId}`, newId);
-            resolvedIdMap.set(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${oldId}`, newId);
+            addResolved(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${originalId}`, newId);
+            addResolved(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${oldId}`, newId);
+            for (const { parentBaseId, childBaseId } of getNestedBasePairs(parentBaseNodeId, baseNodeId)) {
+              addResolved(`${parentBaseId}_${parentIndex1Based}_${childBaseId}_${i}_${originalId}`, newId);
+              addResolved(`${parentBaseId}_${parentIndex1Based}_${childBaseId}_${i}_${oldId}`, newId);
+            }
             const fieldId = elementIdToFieldId.get(originalId) ?? elementIdToFieldId.get(oldId);
-            if (fieldId) resolvedIdMap.set(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${fieldId}`, newId);
+            if (fieldId) {
+              for (const alias of getFieldKeyAliases(fieldId)) {
+                addResolved(`${parentBaseNodeId}_${parentIndex1Based}_${baseNodeId}_${i}_${alias}`, newId);
+                for (const { parentBaseId, childBaseId } of getNestedBasePairs(parentBaseNodeId, baseNodeId)) {
+                  addResolved(`${parentBaseId}_${parentIndex1Based}_${childBaseId}_${i}_${alias}`, newId);
+                }
+              }
+            }
             mappedNewIds.add(newId);
           }
         }
@@ -11152,7 +11308,9 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
       });
     }
   }
-  cloned.__cloneIdMap = Object.fromEntries(resolvedIdMap);
+  cloned.__cloneIdMap = Object.fromEntries(
+    Array.from(resolvedIdMap.entries()).map(([k, v]) => [k, v.length === 1 ? v[0] : v])
+  );
   cloned.__mappedElementIds = Array.from(mappedNewIds);
   const fieldLabelByKey = /* @__PURE__ */ new Map();
   const fieldTypeByKey = /* @__PURE__ */ new Map();
@@ -11295,10 +11453,7 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
     }
     const byId = dynamicFields.find((f) => f.id === fieldId);
     if (byId) return byId;
-    const byElementId = dynamicFields.find((f) => {
-      var _a2, _b2;
-      return ((_b2 = (_a2 = f.mappings) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.elementId) === fieldId;
-    });
+    const byElementId = dynamicFields.find((f) => (f.mappings ?? []).some((m) => (m == null ? void 0 : m.elementId) === fieldId));
     if (byElementId) return byElementId;
     const suffixMatch = dynamicFields.find((f) => {
       if (f.id.endsWith(`_N_${fieldId}`)) return true;
@@ -11314,39 +11469,36 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
         const [, parentId, parentIndexStr, childId, childIndexStr, fieldId] = nestedMatch;
         const value = formValues[key];
         const field = getFieldForRepeatableKey(fieldId, key);
-        const mapping = (_d = field == null ? void 0 : field.mappings) == null ? void 0 : _d[0];
-        if (!mapping) continue;
-        const oldElementId = mapping.elementId;
-        const mapKeyByElement = `${baseId(parentId)}_${parentIndexStr}_${baseId(childId)}_${childIndexStr}_${oldElementId}`;
-        const mapKeyByField = `${baseId(parentId)}_${parentIndexStr}_${baseId(childId)}_${childIndexStr}_${fieldId}`;
-        let elementId = resolvedIdMap.get(mapKeyByElement) ?? resolvedIdMap.get(mapKeyByField);
-        if (!elementId) {
-          const mapKeyByElementBase = `${baseId(parentId)}_${parentIndexStr}_${baseId(childId)}_${childIndexStr}_${baseId(oldElementId)}`;
-          elementId = resolvedIdMap.get(mapKeyByElementBase);
-        }
-        if (!elementId) {
-          elementId = findNestedRepeatableElementBySourceId(
-            pages,
-            baseId(parentId),
-            parseInt(parentIndexStr, 10),
-            baseId(childId),
-            parseInt(childIndexStr, 10),
-            oldElementId
-          );
-        }
-        if (!elementId) {
-          elementId = findNestedRepeatableElementBySourceId(
-            pages,
-            baseId(parentId),
-            parseInt(parentIndexStr, 10),
-            baseId(childId),
-            parseInt(childIndexStr, 10),
-            baseId(oldElementId)
-          );
+        for (const mapping of (field == null ? void 0 : field.mappings) ?? []) {
+          const oldElementId = mapping.elementId;
+          const mapKeyByElement = `${baseId(parentId)}_${parentIndexStr}_${baseId(childId)}_${childIndexStr}_${oldElementId}`;
+          let elementIds = resolvedIdMap.get(mapKeyByElement);
+          if (!elementIds || elementIds.length === 0) {
+            const mapKeyByElementBase = `${baseId(parentId)}_${parentIndexStr}_${baseId(childId)}_${childIndexStr}_${baseId(oldElementId)}`;
+            elementIds = resolvedIdMap.get(mapKeyByElementBase);
+          }
+          if (!elementIds || elementIds.length === 0) {
+            const fallback = findNestedRepeatableElementBySourceId(
+              pages,
+              baseId(parentId),
+              parseInt(parentIndexStr, 10),
+              baseId(childId),
+              parseInt(childIndexStr, 10),
+              oldElementId
+            ) ?? findNestedRepeatableElementBySourceId(
+              pages,
+              baseId(parentId),
+              parseInt(parentIndexStr, 10),
+              baseId(childId),
+              parseInt(childIndexStr, 10),
+              baseId(oldElementId)
+            );
+            if (fallback) elementIds = [fallback];
+          }
+          if (!elementIds || elementIds.length === 0) continue;
+          const targetProperty = mapping.targetProperty || "text";
+          for (const elementId of elementIds) applyValue(elementId, targetProperty, value, key);
         }
-        if (!elementId) continue;
-        const targetProperty = mapping.targetProperty || "text";
-        applyValue(elementId, targetProperty, value, key);
       }
     }
   }
@@ -11369,18 +11521,29 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
       const [, nodeId, indexStr, fieldId] = match;
       const value = formValues[key];
       const field = getFieldForRepeatableKey(fieldId);
-      const mapping = (_e = field == null ? void 0 : field.mappings) == null ? void 0 : _e[0];
-      if (!mapping) continue;
-      const oldElementId = mapping.elementId;
-      const mapKeyByElement = `${baseId(nodeId)}_${indexStr}_${oldElementId}`;
-      const mapKeyByField = `${baseId(nodeId)}_${indexStr}_${fieldId}`;
-      let elementId = resolvedIdMap.get(mapKeyByElement) ?? resolvedIdMap.get(mapKeyByField);
-      if (!elementId) {
-        elementId = findRepeatableElementBySourceId(pages, baseId(nodeId), parseInt(indexStr, 10), oldElementId);
+      for (const mapping of (field == null ? void 0 : field.mappings) ?? []) {
+        const oldElementId = mapping.elementId;
+        const elementIds = /* @__PURE__ */ new Set();
+        for (const candidateBaseId of getRepeatableBaseIdsForToken(nodeId)) {
+          const mapKeyByElement = `${candidateBaseId}_${indexStr}_${oldElementId}`;
+          const foundByMap = resolvedIdMap.get(mapKeyByElement);
+          for (const id of foundByMap ?? []) elementIds.add(id);
+          if (!(foundByMap == null ? void 0 : foundByMap.length)) {
+            const N = entryCountByBase.get(candidateBaseId);
+            const found = findAllRepeatableElementsBySourceId(
+              pages,
+              candidateBaseId,
+              parseInt(indexStr, 10),
+              oldElementId,
+              N
+            );
+            for (const id of found) elementIds.add(id);
+          }
+        }
+        if (elementIds.size === 0) continue;
+        const targetProperty = mapping.targetProperty || "text";
+        for (const elementId of elementIds) applyValue(elementId, targetProperty, value, key);
       }
-      if (!elementId) continue;
-      const targetProperty = mapping.targetProperty || "text";
-      applyValue(elementId, targetProperty, value, key);
     }
   }
   const repeatableKeySet = new Set(
@@ -11433,7 +11596,7 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
     }
   }
   for (const page of pages) {
-    if ((_f = page.children) == null ? void 0 : _f.length) {
+    if ((_c = page.children) == null ? void 0 : _c.length) {
       page.children = applyStackReflowToPageTree(page.children);
     }
   }
@@ -12391,7 +12554,8 @@ function applyThemeVariantToConfig(config, themeConfig, themeId) {
   const cloneIdMap = config.__cloneIdMap || {};
   const pageElements = result.pages.map((page) => flattenAll(page.children || []));
   for (const prop of themeConfig.properties) {
-    const value = variant ? (_d = variant.values) == null ? void 0 : _d[prop.id] : prop.defaultValue;
+    const lookupId = prop.linkedTo || prop.id;
+    const value = variant ? (_d = variant.values) == null ? void 0 : _d[lookupId] : prop.defaultValue;
     if (value === void 0) continue;
     if (prop.targetProperty === "backgroundColor" && prop.elementId === "__pageBackground__") {
       result.pages.forEach((p) => {