@pixldocs/canvas-renderer 0.5.91 → 0.5.93

package/dist/index.cjs

@@ -12264,44 +12264,19 @@ function extractSectionStateCandidate(values, sections) {
   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];
+      const sourceEntry = sourceEntries[index];
       if (!isRecord(sourceEntry)) return entry;
       const id = sourceEntry[ENTRY_ID_KEY];
       const name = sourceEntry[ENTRY_NAME_KEY];
@@ -14700,6 +14675,13 @@ function containsDevanagari(text) {
   }
   return false;
 }
+function containsSymbol(text) {
+  if (!text) return false;
+  for (const char of text) {
+    if (classifyChar(char) === "symbol") return true;
+  }
+  return false;
+}
 function isBasicLatinOrLatin1(char) {
   const c = char.codePointAt(0) ?? 0;
   return c <= 591;
@@ -14732,7 +14714,7 @@ function rewriteSvgFontsForJsPDF(svgStr) {
   var _a, _b;
   const parser = new DOMParser();
   const doc = parser.parseFromString(svgStr, "image/svg+xml");
-  const textEls = doc.querySelectorAll("text, tspan, textPath");
+  const allTextEls = Array.from(doc.querySelectorAll("text, tspan, textPath"));
   const readStyleToken = (style, prop) => {
     var _a2;
     const match = style.match(new RegExp(`${prop}\\s*:\\s*([^;]+)`, "i"));
@@ -14761,7 +14743,17 @@ function rewriteSvgFontsForJsPDF(svgStr) {
     stylePairs.push(`font-style: normal`);
     return stylePairs.join("; ");
   };
-  for (const el of textEls) {
+  const getDepth = (el) => {
+    let depth = 0;
+    let current = el.parentElement;
+    while (current) {
+      depth++;
+      current = current.parentElement;
+    }
+    return depth;
+  };
+  const sourceMeta = /* @__PURE__ */ new Map();
+  for (const el of allTextEls) {
     const inlineStyle = el.getAttribute("style") || "";
     const rawFf = resolveInheritedValue(el, "font-family");
     if (!rawFf) continue;
@@ -14773,12 +14765,21 @@ function rewriteSvgFontsForJsPDF(svgStr) {
     const resolved = resolveFontWeight(weight);
     const isItalic = /italic|oblique/i.test(styleRaw);
     const jsPdfName = getEmbeddedJsPDFFontName(clean, resolved, isItalic);
+    sourceMeta.set(el, { clean, resolved, isItalic, jsPdfName, inlineStyle, weight });
+  }
+  const textEls = allTextEls.sort((a, b) => getDepth(b) - getDepth(a));
+  for (const el of textEls) {
+    if (!el.isConnected) continue;
+    const meta = sourceMeta.get(el);
+    if (!meta) continue;
+    const { clean, resolved, isItalic, jsPdfName, inlineStyle, weight } = meta;
     el.setAttribute("data-source-font-family", clean);
     el.setAttribute("data-source-font-weight", String(resolved));
     el.setAttribute("data-source-font-style", isItalic ? "italic" : "normal");
     const directText = Array.from(el.childNodes).filter((n) => n.nodeType === 3).map((n) => n.textContent || "").join("");
     const hasDevanagari = containsDevanagari(directText);
-    if (hasDevanagari && directText.length > 0) {
+    const hasSymbol = containsSymbol(directText);
+    if ((hasDevanagari || hasSymbol) && directText.length > 0) {
       const devanagariWeight = resolveFontWeight(weight);
       const devanagariJsPdfName = getEmbeddedJsPDFFontName(FONT_FALLBACK_DEVANAGARI, devanagariWeight);
       const symbolJsPdfName = isFontAvailable(FONT_FALLBACK_SYMBOLS) ? getEmbeddedJsPDFFontName(FONT_FALLBACK_SYMBOLS, 400) : jsPdfName;
@@ -14786,7 +14787,7 @@ function rewriteSvgFontsForJsPDF(svgStr) {
       for (const node of childNodes) {
         if (node.nodeType !== 3 || !node.textContent) continue;
         const runs = splitIntoRuns(node.textContent);
-        if (runs.length <= 1 && ((_b = runs[0]) == null ? void 0 : _b.runType) !== "devanagari") continue;
+        if (runs.length <= 1 && ((_b = runs[0]) == null ? void 0 : _b.runType) === "main") continue;
         const fragment = doc.createDocumentFragment();
         for (const run of runs) {
           const tspan = doc.createElementNS("http://www.w3.org/2000/svg", "tspan");
@@ -14837,6 +14838,8 @@ async function embedFontsInPdf(pdf, fontFamilies, fontBaseUrl) {
   const embedded = /* @__PURE__ */ new Set();
   const weights = [300, 400, 500, 600, 700];
   const tasks = [];
+  fontFamilies.add(FONT_FALLBACK_SYMBOLS);
+  fontFamilies.add(FONT_FALLBACK_DEVANAGARI);
   for (const family of fontFamilies) {
     if (!isFontAvailable(family)) {
       console.warn(`[pdf-fonts] No TTF mapping for "${family}" — will use Helvetica fallback`);
@@ -16302,7 +16305,7 @@ async function assemblePdfFromSvgs(svgResults, options = {}) {
     }
     if (shouldOutlineText) {
       try {
-        const { convertAllTextToPath } = await Promise.resolve().then(() => require("./svgTextToPath-CBcIgtk1.cjs"));
+        const { convertAllTextToPath } = await Promise.resolve().then(() => require("./svgTextToPath-B4SihUQv.cjs"));
         pageSvg = await convertAllTextToPath(pageSvg, fontBaseUrl, { mode: outlineSubMode });
         try {
           dumpSvgTextDiagnostics(pageSvg, i, PARITY_TAG, "STAGE-1b-after-text-to-path-raw");