@pixldocs/canvas-renderer 0.5.87 → 0.5.89

package/dist/index.cjs

@@ -10745,36 +10745,53 @@ const NESTED_REPEATABLE_KEY_REGEX = /^field_(.+)_(\d+)_field_(.+)_(\d+)_(.+)$/;
 const FORMDEF_CANONICAL_KEY_REGEX = /^field_.+_N_.+$/;
 function parseEntryRange(range, max, entryMeta) {
   if (!range || !range.trim()) return null;
-  const out = /* @__PURE__ */ new Set();
+  const normalizeToken = (value) => {
+    const raw = String(value ?? "").trim().toLowerCase();
+    if (!raw) return [];
+    const slug = raw.replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
+    const withoutTrailingS = slug.endsWith("s") ? slug.slice(0, -1) : "";
+    return Array.from(new Set([raw, slug, withoutTrailingS].filter(Boolean)));
+  };
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  const addIndex = (idx) => {
+    if (idx < 1 || idx > max || seen.has(idx)) return;
+    seen.add(idx);
+    out.push(idx);
+  };
+  let sawSelector = false;
   for (const partRaw of range.split(",")) {
     const part = partRaw.trim();
     if (!part) continue;
     if (part.startsWith("#")) {
-      const token = part.slice(1).trim().toLowerCase();
-      if (!token || !(entryMeta == null ? void 0 : entryMeta.length)) continue;
+      sawSelector = true;
+      const tokens = normalizeToken(part.slice(1));
+      if (!tokens.length || !(entryMeta == null ? void 0 : entryMeta.length)) continue;
       for (let i = 0; i < entryMeta.length; i++) {
         const m2 = entryMeta[i];
         if (!m2) continue;
-        if (m2.id && m2.id.toLowerCase() === token || m2.name && m2.name.toLowerCase() === token) {
-          const idx = i + 1;
-          if (idx >= 1 && idx <= max) out.add(idx);
+        const candidates = [...normalizeToken(m2.id), ...normalizeToken(m2.name)];
+        if (candidates.some((candidate) => tokens.includes(candidate))) {
+          addIndex(i + 1);
         }
       }
       continue;
     }
     if (/^\d+$/.test(part)) {
+      sawSelector = true;
       const n = parseInt(part, 10);
-      if (n >= 1 && n <= max) out.add(n);
+      addIndex(n);
       continue;
     }
     const m = /^(\d*)\s*-\s*(\d*)$/.exec(part);
     if (!m) continue;
+    sawSelector = true;
     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);
+    for (let i = start; i <= end; i++) addIndex(i);
   }
-  if (out.size === 0) return null;
-  return Array.from(out).sort((a, b) => a - b);
+  if (out.length === 0) return sawSelector ? [] : null;
+  return out;
 }
 function applyTextCase(text, textCase) {
   if (!textCase || textCase === "none") return text;
@@ -11180,6 +11197,15 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
     const item = repeatableList.find((r) => baseId(r.nodeId) === baseNodeId || r.nodeId === baseNodeId);
     return item == null ? void 0 : item.entryMeta;
   };
+  const nestedEntryMetaFromList = (parentBaseNodeId, parentIndex1Based, childBaseNodeId) => {
+    var _a2;
+    for (const { parentBaseId, childBaseId } of getNestedBasePairs(parentBaseNodeId, childBaseNodeId)) {
+      const item = repeatableList.find((r) => baseId(r.nodeId) === childBaseId || r.nodeId === childBaseId);
+      const meta = (_a2 = item == null ? void 0 : item.nestedEntryMeta) == null ? void 0 : _a2[`${parentBaseId}_${parentIndex1Based}_${childBaseId}`];
+      if (meta == null ? void 0 : meta.length) return meta;
+    }
+    return entryMetaFromList(childBaseNodeId);
+  };
   const resolvedIdMap = /* @__PURE__ */ new Map();
   const addResolved = (key, id) => {
     const arr = resolvedIdMap.get(key);
@@ -11267,7 +11293,7 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
       let entryIndices;
       if (entryFilter && entryFilter.mode === "range" && entryFilter.range) {
         const parsed = parseEntryRange(entryFilter.range, N, entryMetaFromList(baseNodeId));
-        entryIndices = parsed && parsed.length ? parsed : Array.from({ length: N }, (_, k) => k + 1);
+        entryIndices = parsed ?? Array.from({ length: N }, (_, k) => k + 1);
       } else {
         entryIndices = Array.from({ length: N }, (_, k) => k + 1);
       }
@@ -11311,8 +11337,8 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
         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, entryMetaFromList(baseNodeId));
-          nestedEntryIndices = parsed && parsed.length ? parsed : Array.from({ length: N }, (_, k) => k + 1);
+          const parsed = parseEntryRange(nestedEntryFilter.range, N, nestedEntryMetaFromList(parentBaseNodeId, parentIndex1Based, baseNodeId));
+          nestedEntryIndices = parsed ?? Array.from({ length: N }, (_, k) => k + 1);
         } else {
           nestedEntryIndices = Array.from({ length: N }, (_, k) => k + 1);
         }
@@ -12504,18 +12530,21 @@ async function resolveFromForm(options) {
     const nodeId = s.treeNodeId ?? s.id;
     const schemaRepeatable = repeatableFromSchemaByBase.get(baseId(nodeId));
     const parentId = s.parentId;
+    const parentSection = inferredSections.find((ps) => ps.id === parentId);
+    const parentNodeId = parentSection ? parentSection.treeNodeId ?? parentSection.id : parentId;
     const parentEntries = mergedSectionState[parentId] ?? [];
+    const nestedEntryMeta = {};
     const merged = [];
     for (let pi = 0; pi < parentEntries.length; pi++) {
       const childEntries = mergedSectionState[`${parentId}_${pi}_${s.id}`] ?? [];
-      for (const e of childEntries) {
-        merged.push({
-          id: typeof (e == null ? void 0 : e.__entryId) === "string" ? e.__entryId : void 0,
-          name: typeof (e == null ? void 0 : e.__entryName) === "string" ? e.__entryName : void 0
-        });
-      }
+      const meta = childEntries.map((e) => ({
+        id: typeof (e == null ? void 0 : e.__entryId) === "string" ? e.__entryId : void 0,
+        name: typeof (e == null ? void 0 : e.__entryName) === "string" ? e.__entryName : void 0
+      }));
+      nestedEntryMeta[`${baseId(parentNodeId)}_${pi + 1}_${baseId(nodeId)}`] = meta;
+      merged.push(...meta);
     }
-    return { nodeId, label: s.label, entryFilter: schemaRepeatable == null ? void 0 : schemaRepeatable.entryFilter, entryMeta: merged };
+    return { nodeId, label: s.label, entryFilter: schemaRepeatable == null ? void 0 : schemaRepeatable.entryFilter, entryMeta: merged, nestedEntryMeta };
   });
   const inferredRepeatableList = [...topLevelRepeatables, ...nestedRepeatables];
   const entryCountForLabel = (label) => {