@pixldocs/canvas-renderer 0.5.89 → 0.5.91

package/dist/index.js

@@ -11646,6 +11646,8 @@ function applyFormDataToConfig(config, mappings, formValues, repeatableSectionsF
   }
   return cloned;
 }
+const ENTRY_ID_KEY = "__entryId";
+const ENTRY_NAME_KEY = "__entryName";
 function hasBaseNodeId(node) {
   return node.__baseNodeId != null;
 }
@@ -12225,6 +12227,76 @@ function getRenderableFormSections(schema) {
   if (!pages.length) return base;
   return [...base, ...pages.map(repeatablePageToSection)];
 }
+function isRecord(value) {
+  return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function getRepeatableEntryMeta(entry, section) {
+  const entryNameKey = section.entryNameFieldKey;
+  const nameCandidate = entry[ENTRY_NAME_KEY] ?? (entryNameKey ? entry[entryNameKey] : void 0) ?? entry.section_title ?? entry.label ?? entry.name;
+  return {
+    id: typeof entry[ENTRY_ID_KEY] === "string" ? entry[ENTRY_ID_KEY] : void 0,
+    name: typeof nameCandidate === "string" ? nameCandidate : void 0
+  };
+}
+function extractSectionStateCandidate(values, sections) {
+  if (!isRecord(values)) return null;
+  const raw = isDefaultDataV2(values) && isRecord(values.sectionState) ? values.sectionState : values;
+  const sectionIds = new Set(sections.map((section) => section.id));
+  const looksLikeSectionState = Object.keys(raw).some((key) => sectionIds.has(key) || key.startsWith("section_"));
+  return looksLikeSectionState ? raw : null;
+}
+function entryIdentityTokens(entry, section) {
+  const entryNameKey = section == null ? void 0 : section.entryNameFieldKey;
+  const candidates = [
+    entry[ENTRY_NAME_KEY],
+    entryNameKey ? entry[entryNameKey] : void 0,
+    entry.section_title,
+    entry.label,
+    entry.name
+  ];
+  return Array.from(new Set(
+    candidates.filter((value) => typeof value === "string" && !!value.trim()).map((value) => value.trim().toLowerCase())
+  ));
+}
+function mergeRepeatableEntryMeta(target, metaSource, sections) {
+  if (!metaSource) return target;
+  let changed = false;
+  const next = { ...target };
+  const repeatableIds = new Set(sections.filter((section) => section.type === "repeatable").map((section) => section.id));
+  const isRepeatableStateKey = (key) => repeatableIds.has(key) || Array.from(repeatableIds).some((id) => key.endsWith(`_${id}`));
+  const sectionForStateKey = (key) => sections.find((section) => section.type === "repeatable" && (section.id === key || key.endsWith(`_${section.id}`)));
+  for (const [key, targetEntries] of Object.entries(target)) {
+    if (!isRepeatableStateKey(key) || !Array.isArray(targetEntries)) continue;
+    const sourceEntries = metaSource[key];
+    if (!Array.isArray(sourceEntries)) continue;
+    const section = sectionForStateKey(key);
+    const sourceByToken = /* @__PURE__ */ new Map();
+    const duplicateTokens = /* @__PURE__ */ new Set();
+    for (const sourceEntry of sourceEntries) {
+      if (!isRecord(sourceEntry)) continue;
+      for (const token of entryIdentityTokens(sourceEntry, section)) {
+        if (sourceByToken.has(token)) duplicateTokens.add(token);
+        else sourceByToken.set(token, sourceEntry);
+      }
+    }
+    for (const token of duplicateTokens) sourceByToken.delete(token);
+    const mergedEntries = targetEntries.map((entry, index) => {
+      if (!isRecord(entry)) return entry;
+      const sourceEntry = entryIdentityTokens(entry, section).map((token) => sourceByToken.get(token)).find((match) => !!match) ?? sourceEntries[index];
+      if (!isRecord(sourceEntry)) return entry;
+      const id = sourceEntry[ENTRY_ID_KEY];
+      const name = sourceEntry[ENTRY_NAME_KEY];
+      const additions = {};
+      if (typeof id === "string" && id.trim() && typeof entry[ENTRY_ID_KEY] !== "string") additions[ENTRY_ID_KEY] = id;
+      if (typeof name === "string" && name.trim() && typeof entry[ENTRY_NAME_KEY] !== "string") additions[ENTRY_NAME_KEY] = name;
+      if (!Object.keys(additions).length) return entry;
+      changed = true;
+      return { ...entry, ...additions };
+    });
+    next[key] = mergedEntries;
+  }
+  return changed ? next : target;
+}
 function buildRepeatablePagesInputForApply(schema, sectionState) {
   var _a;
   if (!((_a = schema == null ? void 0 : schema.repeatablePages) == null ? void 0 : _a.length)) return [];
@@ -12453,8 +12525,9 @@ async function resolveFromForm(options) {
   const repeatableNodeMap = /* @__PURE__ */ new Map();
   if (repeatableFromSchema) {
     for (const r of repeatableFromSchema) {
-      repeatableNodeMap.set(r.label, r.nodeId);
-      repeatableNodeMap.set(r.label.trim().toLowerCase(), r.nodeId);
+      if (!repeatableNodeMap.has(r.label)) repeatableNodeMap.set(r.label, r.nodeId);
+      const labelKey = r.label.trim().toLowerCase();
+      if (!repeatableNodeMap.has(labelKey)) repeatableNodeMap.set(labelKey, r.nodeId);
     }
   }
   let inferredSections;
@@ -12470,6 +12543,7 @@ async function resolveFromForm(options) {
   } else {
     inferredSections = [];
   }
+  const defaultFormMetaSectionState = extractSectionStateCandidate(defaultForm == null ? void 0 : defaultForm.values, inferredSections) ?? extractSectionStateCandidate(defaultForm == null ? void 0 : defaultForm.saved_data, inferredSections);
   let mergedSectionState = { ...sectionState };
   const templateDefaultData = templateRow.default_data;
   if (templateDefaultData && isDefaultDataV2(templateDefaultData)) {
@@ -12480,6 +12554,7 @@ async function resolveFromForm(options) {
       }
     }
   }
+  mergedSectionState = mergeRepeatableEntryMeta(mergedSectionState, defaultFormMetaSectionState, inferredSections);
   const flatFormData = flattenSectionStateToFormData(mergedSectionState, inferredSections);
   const dynamicFields = templateConfig.dynamicFields || [];
   const mappings = [];
@@ -12501,10 +12576,7 @@ async function resolveFromForm(options) {
     const entries = mergedSectionState[s.id] ?? [];
     const nodeId = s.treeNodeId ?? s.id;
     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
-    }));
+    const entryMeta = entries.map((e) => getRepeatableEntryMeta(e, s));
     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) => {
@@ -12518,10 +12590,7 @@ async function resolveFromForm(options) {
     const merged = [];
     for (let pi = 0; pi < parentEntries.length; pi++) {
       const childEntries = mergedSectionState[`${parentId}_${pi}_${s.id}`] ?? [];
-      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
-      }));
+      const meta = childEntries.map((e) => getRepeatableEntryMeta(e, s));
       nestedEntryMeta[`${baseId(parentNodeId)}_${pi + 1}_${baseId(nodeId)}`] = meta;
       merged.push(...meta);
     }