@pixldocs/canvas-renderer 0.5.86 → 0.5.88

package/dist/index.js

@@ -10675,6 +10675,7 @@ function flattenSectionStateToFormData(sectionState, sections) {
       flat[`${sectionPrefix}_${oneBased}_sectionLabel`] = sectionLabel;
       flat[`${sectionPrefix}_${oneBased}_label`] = sectionLabel;
       for (const f of section.entryFields) {
+        if (f.key === "__entryId" || f.key === "__entryName") continue;
         const v = entry[f.key];
         if (f.templateKey) {
           if (f.type === "list" && Array.isArray(v)) {
@@ -10723,25 +10724,55 @@ 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) {
+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("#")) {
+      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;
+        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;
@@ -11143,6 +11174,19 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
     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 entryMetaFromList = (baseNodeId) => {
+    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);
@@ -11229,8 +11273,8 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
       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);
+        const parsed = parseEntryRange(entryFilter.range, N, entryMetaFromList(baseNodeId));
+        entryIndices = parsed ?? Array.from({ length: N }, (_, k) => k + 1);
       } else {
         entryIndices = Array.from({ length: N }, (_, k) => k + 1);
       }
@@ -11274,8 +11318,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);
-          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);
         }
@@ -12457,12 +12501,28 @@ async function resolveFromForm(options) {
     const entries = mergedSectionState[s.id] ?? [];
     const nodeId = s.treeNodeId ?? s.id;
     const schemaRepeatable = repeatableFromSchemaByBase.get(baseId(nodeId));
-    return { nodeId, label: s.label, entryCount: Math.max(1, entries.length), entryFilter: schemaRepeatable == null ? void 0 : schemaRepeatable.entryFilter };
+    const entryMeta = entries.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
+    }));
+    return { nodeId, label: s.label, entryCount: Math.max(1, entries.length), entryFilter: schemaRepeatable == null ? void 0 : schemaRepeatable.entryFilter, entryMeta };
   });
   const nestedRepeatables = inferredSections.filter((s) => s.type === "repeatable" && s.parentId != null).map((s) => {
     const nodeId = s.treeNodeId ?? s.id;
     const schemaRepeatable = repeatableFromSchemaByBase.get(baseId(nodeId));
-    return { nodeId, label: s.label, entryFilter: schemaRepeatable == null ? void 0 : schemaRepeatable.entryFilter };
+    const parentId = s.parentId;
+    const parentEntries = mergedSectionState[parentId] ?? [];
+    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
+        });
+      }
+    }
+    return { nodeId, label: s.label, entryFilter: schemaRepeatable == null ? void 0 : schemaRepeatable.entryFilter, entryMeta: merged };
   });
   const inferredRepeatableList = [...topLevelRepeatables, ...nestedRepeatables];
   const entryCountForLabel = (label) => {