@pixldocs/canvas-renderer 0.5.112 → 0.5.114

package/dist/index.d.ts

@@ -259,7 +259,7 @@ export declare function normalizeFontFamily(fontStack: string): string;
  * Package version banner. Bump alongside package.json so we can confirm
  * (via browser:log) that the deployed bundle matches the expected build.
  */
-export declare const PACKAGE_VERSION = "0.5.110";
+export declare const PACKAGE_VERSION = "0.5.114";
 
 export declare interface PageSettings {
     backgroundColor?: string;
@@ -305,7 +305,7 @@ export declare interface PdfFromFormOptions {
     title?: string;
     /** Base URL for TTF font files for PDF font embedding */
     fontBaseUrl?: string;
-    /** PDF text rendering mode. Default: pixel-perfect path text for canvas parity. */
+    /** PDF text rendering mode. Default: selectable text for client vector-PDF parity. */
     textMode?: 'auto' | 'selectable' | 'pixel-perfect';
 }
 

package/dist/index.js

@@ -13998,7 +13998,7 @@ function PixldocsPreview(props) {
     !canvasSettled && /* @__PURE__ */ jsx("div", { style: { position: "absolute", inset: 0, display: "flex", alignItems: "center", justifyContent: "center", minHeight: 200 }, children: /* @__PURE__ */ jsx("div", { style: { color: "#888", fontSize: 14 }, children: "Loading preview..." }) })
   ] });
 }
-const PACKAGE_VERSION = "0.5.110";
+const PACKAGE_VERSION = "0.5.114";
 const roundParityValue = (value) => {
   if (typeof value !== "number") return value;
   return Number.isFinite(value) ? Number(value.toFixed(3)) : value;
@@ -14285,7 +14285,7 @@ class PixldocsRenderer {
   async renderPdf(templateConfig, options) {
     const svgs = await this.renderAllPageSvgs(templateConfig);
     const { assemblePdfFromSvgs: assemblePdfFromSvgs2 } = await Promise.resolve().then(() => pdfExport);
-    return assemblePdfFromSvgs2(svgs, { title: options == null ? void 0 : options.title, fontBaseUrl: options == null ? void 0 : options.fontBaseUrl, textMode: (options == null ? void 0 : options.textMode) ?? "pixel-perfect" });
+    return assemblePdfFromSvgs2(svgs, { title: options == null ? void 0 : options.title, fontBaseUrl: options == null ? void 0 : options.fontBaseUrl, textMode: (options == null ? void 0 : options.textMode) ?? "selectable" });
   }
   /**
    * Resolve from V2 sectionState and render a vector PDF.
@@ -14310,7 +14310,7 @@ class PixldocsRenderer {
     }
     const svgs = await this.renderAllPageSvgs(configToRender);
     const { assemblePdfFromSvgs: assemblePdfFromSvgs2 } = await Promise.resolve().then(() => pdfExport);
-    return assemblePdfFromSvgs2(svgs, { title: title ?? resolved.config.name, fontBaseUrl, textMode: options.textMode ?? "pixel-perfect" });
+    return assemblePdfFromSvgs2(svgs, { title: title ?? resolved.config.name, fontBaseUrl, textMode: options.textMode ?? "selectable" });
   }
   async renderById(templateId, formData, options) {
     const resolved = await resolveTemplateData({
@@ -15716,6 +15716,9 @@ const remoteVariantKey = (family, weight, isItalic) => `${family}|${resolveFontW
 const registeredVariants = /* @__PURE__ */ new Set();
 const registeredVariantCoverage = /* @__PURE__ */ new Map();
 const variantKey = (family, weight, italic) => `${family}|${resolveFontWeight(weight)}|${italic ? "i" : "n"}`;
+function isVariantEmbedded(family, weight, italic) {
+  return registeredVariants.has(variantKey(family, weight, italic));
+}
 const resolveBestRegisteredVariant = (family, weight, italic) => {
   const want = resolveFontWeight(weight);
   const weights = [300, 400, 500, 600, 700];
@@ -16203,6 +16206,88 @@ function extractFontFamiliesFromSvgs(svgs) {
   }
   return families;
 }
+async function embedFontVariantsFromSvg(pdf, svgStr, fontBaseUrl) {
+  var _a;
+  const parser = new DOMParser();
+  const doc = parser.parseFromString(svgStr, "image/svg+xml");
+  const textEls = Array.from(doc.querySelectorAll("text, tspan, textPath"));
+  const readStyleToken = (style, prop) => {
+    var _a2;
+    const m = style.match(new RegExp(`${prop}\\s*:\\s*([^;]+)`, "i"));
+    return ((_a2 = m == null ? void 0 : m[1]) == null ? void 0 : _a2.trim()) || null;
+  };
+  const resolveInherited = (el, attr, styleProp = attr) => {
+    var _a2;
+    let cur = el;
+    while (cur) {
+      const a = (_a2 = cur.getAttribute(attr)) == null ? void 0 : _a2.trim();
+      if (a) return a;
+      const s = readStyleToken(cur.getAttribute("style") || "", styleProp);
+      if (s) return s;
+      cur = cur.parentElement;
+    }
+    return null;
+  };
+  const parseWeight = (raw) => {
+    const n = Number.parseInt(raw, 10);
+    if (Number.isFinite(n)) return n;
+    const s = raw.toLowerCase();
+    if (/bold/.test(s)) return 700;
+    if (/semi|demi/.test(s)) return 600;
+    if (/medium/.test(s)) return 500;
+    if (/light|thin/.test(s)) return 300;
+    return 400;
+  };
+  const needed = /* @__PURE__ */ new Map();
+  for (const el of textEls) {
+    const rawFf = resolveInherited(el, "font-family");
+    if (!rawFf) continue;
+    const family = (_a = rawFf.split(",")[0]) == null ? void 0 : _a.replace(/['"]/g, "").trim();
+    if (!family) continue;
+    const weight = resolveFontWeight(parseWeight(resolveInherited(el, "font-weight") || "400"));
+    const italic = /italic|oblique/i.test(resolveInherited(el, "font-style") || "normal");
+    const key = `${family}${weight}${italic ? "i" : "n"}`;
+    if (!needed.has(key)) needed.set(key, { family, weight, italic });
+  }
+  let embedded = 0;
+  for (const { family, weight, italic } of needed.values()) {
+    if (isVariantEmbedded(family, weight, italic)) continue;
+    await embedFontWithGoogleFallback(pdf, family, weight, fontBaseUrl, italic);
+    if (isVariantEmbedded(family, weight, italic)) embedded++;
+  }
+  const fallbacks = [
+    { family: FONT_FALLBACK_SYMBOLS, weight: 400 },
+    { family: FONT_FALLBACK_MATH, weight: 400 }
+  ];
+  for (const w of [300, 400, 500, 600, 700]) {
+    fallbacks.push({ family: FONT_FALLBACK_DEVANAGARI, weight: w });
+  }
+  for (const { family, weight } of fallbacks) {
+    if (isVariantEmbedded(family, weight, false)) continue;
+    await embedFontWithGoogleFallback(pdf, family, weight, fontBaseUrl, false);
+    if (isVariantEmbedded(family, weight, false)) embedded++;
+  }
+  for (const { family, weight, italic } of needed.values()) {
+    if (!italic) continue;
+    if (!isVariantEmbedded(family, weight, false)) {
+      await embedFontWithGoogleFallback(pdf, family, weight, fontBaseUrl, false);
+      if (isVariantEmbedded(family, weight, false)) embedded++;
+    }
+    if (!isVariantEmbedded(family, 400, false)) {
+      await embedFontWithGoogleFallback(pdf, family, 400, fontBaseUrl, false);
+      if (isVariantEmbedded(family, 400, false)) embedded++;
+    }
+    if (weight <= 400) continue;
+    if (isVariantEmbedded(family, 400, true)) continue;
+    await embedFontWithGoogleFallback(pdf, family, 400, fontBaseUrl, true);
+    if (isVariantEmbedded(family, 400, true)) embedded++;
+  }
+  console.log("[pdf-fonts] embedFontVariantsFromSvg", {
+    requested: needed.size,
+    newlyEmbedded: embedded
+  });
+  return embedded;
+}
 async function embedFontsInPdf(pdf, fontFamilies, fontBaseUrl) {
   const embedded = /* @__PURE__ */ new Set();
   const weights = [300, 400, 500, 600, 700];
@@ -16254,6 +16339,7 @@ const pdfFonts = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProp
   FONT_FILES,
   FONT_WEIGHT_LABELS,
   embedFont,
+  embedFontVariantsFromSvg,
   embedFontWithGoogleFallback,
   embedFontsForConfig,
   embedFontsInPdf,
@@ -16261,6 +16347,7 @@ const pdfFonts = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProp
   getEmbeddedJsPDFFontName,
   getFontPathForWeight,
   isFontAvailable,
+  isVariantEmbedded,
   resolveBestRegisteredVariant,
   resolveFontWeight,
   rewriteSvgFontsForJsPDF
@@ -17767,7 +17854,17 @@ async function assemblePdfFromSvgs(svgResults, options = {}) {
       } catch {
       }
       await convertTextDecorationsToLines(processedSvg);
-      const rewrittenSvg = rewriteSvgFontsForJsPDF(new XMLSerializer().serializeToString(processedSvg));
+      const liveSvgStr = new XMLSerializer().serializeToString(processedSvg);
+      try {
+        const { embedFontVariantsFromSvg: embedFontVariantsFromSvg2 } = await Promise.resolve().then(() => pdfFonts);
+        await embedFontVariantsFromSvg2(pdf, liveSvgStr, fontBaseUrl);
+      } catch (embedErr) {
+        console.warn(
+          "[canvas-renderer][pdf] embedFontVariantsFromSvg failed (page " + (i + 1) + "):",
+          embedErr
+        );
+      }
+      const rewrittenSvg = rewriteSvgFontsForJsPDF(liveSvgStr);
       const reParser = new DOMParser();
       const reDoc = reParser.parseFromString(rewrittenSvg, "image/svg+xml");
       processedSvg = reDoc.documentElement;