@pixldocs/canvas-renderer 0.5.85 → 0.5.87

package/dist/index.cjs

@@ -10694,6 +10694,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)) {
@@ -10742,12 +10743,25 @@ 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();
   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;
+      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);
+        }
+      }
+      continue;
+    }
     if (/^\d+$/.test(part)) {
       const n = parseInt(part, 10);
       if (n >= 1 && n <= max) out.add(n);
@@ -11162,6 +11176,10 @@ 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 resolvedIdMap = /* @__PURE__ */ new Map();
   const addResolved = (key, id) => {
     const arr = resolvedIdMap.get(key);
@@ -11248,7 +11266,7 @@ 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);
+        const parsed = parseEntryRange(entryFilter.range, N, entryMetaFromList(baseNodeId));
         entryIndices = parsed && parsed.length ? parsed : Array.from({ length: N }, (_, k) => k + 1);
       } else {
         entryIndices = Array.from({ length: N }, (_, k) => k + 1);
@@ -11293,7 +11311,7 @@ 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);
+          const parsed = parseEntryRange(nestedEntryFilter.range, N, entryMetaFromList(baseNodeId));
           nestedEntryIndices = parsed && parsed.length ? parsed : Array.from({ length: N }, (_, k) => k + 1);
         } else {
           nestedEntryIndices = Array.from({ length: N }, (_, k) => k + 1);
@@ -12345,7 +12363,8 @@ async function resolveTemplateData(options) {
           nodeId: r.nodeId,
           label: r.label,
           minEntries: r.minEntries,
-          maxEntries: r.maxEntries
+          maxEntries: r.maxEntries,
+          entryFilter: r.entryFilter
         });
       }
     }
@@ -12468,13 +12487,58 @@ async function resolveFromForm(options) {
       }
     }
   }
+  const repeatableFromSchemaByBase = new Map(
+    (repeatableFromSchema ?? []).map((r) => [baseId(r.nodeId), r])
+  );
   const topLevelRepeatables = inferredSections.filter((s) => s.type === "repeatable" && !s.parentId).map((s) => {
     const entries = mergedSectionState[s.id] ?? [];
     const nodeId = s.treeNodeId ?? s.id;
-    return { nodeId, label: s.label, entryCount: Math.max(1, entries.length) };
+    const schemaRepeatable = repeatableFromSchemaByBase.get(baseId(nodeId));
+    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));
+    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 nestedRepeatables = inferredSections.filter((s) => s.type === "repeatable" && s.parentId != null).map((s) => ({ nodeId: s.treeNodeId ?? s.id, label: s.label }));
-  const repeatableList = [...topLevelRepeatables, ...nestedRepeatables];
+  const inferredRepeatableList = [...topLevelRepeatables, ...nestedRepeatables];
+  const entryCountForLabel = (label) => {
+    const normalized = label.trim().toLowerCase();
+    for (const item of inferredRepeatableList) {
+      if (item.label.trim().toLowerCase() !== normalized) continue;
+      const count = item.entryCount;
+      if (typeof count === "number") return count;
+    }
+    return void 0;
+  };
+  const fallbackRepeatableList = (repeatableFromSchema ?? []).map((r) => ({
+    nodeId: r.nodeId,
+    label: r.label,
+    entryFilter: r.entryFilter,
+    entryCount: entryCountForLabel(r.label)
+  }));
+  const repeatableList = inferredRepeatableList.length > 0 ? [
+    ...inferredRepeatableList,
+    ...fallbackRepeatableList.filter(
+      (fallback) => !inferredRepeatableList.some((r) => baseId(r.nodeId) === baseId(fallback.nodeId))
+    )
+  ] : fallbackRepeatableList;
   const repeatableNestedEntryCounts = {};
   for (const s of inferredSections) {
     if (s.type !== "repeatable") continue;
@@ -12692,6 +12756,7 @@ function paintRepeatableSections(config, repeatableSections) {
     const payload = { label: section.label };
     if (section.minEntries !== void 0) payload.minEntries = section.minEntries;
     if (section.maxEntries !== void 0) payload.maxEntries = section.maxEntries;
+    if (section.entryFilter !== void 0) payload.entryFilter = section.entryFilter;
     for (const page of pages) {
       if (setRepeatable(page.children ?? [], section.nodeId, payload)) break;
     }
@@ -12887,7 +12952,7 @@ function PixldocsPreview(props) {
     !canvasSettled && /* @__PURE__ */ jsxRuntime.jsx("div", { style: { position: "absolute", inset: 0, display: "flex", alignItems: "center", justifyContent: "center", minHeight: 200 }, children: /* @__PURE__ */ jsxRuntime.jsx("div", { style: { color: "#888", fontSize: 14 }, children: "Loading preview..." }) })
   ] });
 }
-const PACKAGE_VERSION = "0.5.81";
+const PACKAGE_VERSION = "0.5.86";
 const roundParityValue = (value) => {
   if (typeof value !== "number") return value;
   return Number.isFinite(value) ? Number(value.toFixed(3)) : value;