pptx-glimpse 0.11.1 → 0.11.2

package/dist/index.cjs

@@ -1163,16 +1163,35 @@ var OpentypeTextMeasurer = class {
       return measureTextWidth(text, fontSizePt, bold, fontFamily, fontFamilyEa);
     }
     const fontSizePx = fontSizePt * PX_PER_PT2;
+    const latinFontResolved = latinFont ?? fallbackFont;
+    const eaFontResolved = eaFont ?? fallbackFont;
+    const boldLatinFont = bold ? this.resolveBoldFont(fontFamily) : null;
+    const latinGlyphCache = /* @__PURE__ */ new Map();
+    const eaGlyphCache = eaFontResolved !== latinFontResolved ? /* @__PURE__ */ new Map() : latinGlyphCache;
+    const boldGlyphCache = /* @__PURE__ */ new Map();
     let totalWidth = 0;
     for (const char of text) {
       const codePoint = char.codePointAt(0);
       const isEa = isCjkCodePoint(codePoint);
-      const font = isEa ? eaFont ?? fallbackFont : latinFont ?? fallbackFont;
+      const font = isEa ? eaFontResolved : latinFontResolved;
+      const cache = isEa ? eaGlyphCache : latinGlyphCache;
+      if (!cache.has(char)) {
+        cache.set(char, font.stringToGlyphs(char)[0]);
+      }
       const scale = fontSizePx / font.unitsPerEm;
-      const glyphs = font.stringToGlyphs(char);
-      let charWidth = (glyphs[0]?.advanceWidth ?? font.unitsPerEm * 0.6) * scale;
+      const glyph = cache.get(char);
+      let charWidth = (glyph?.advanceWidth ?? font.unitsPerEm * 0.6) * scale;
       if (bold && !isEa) {
-        charWidth *= BOLD_FACTOR2;
+        if (boldLatinFont) {
+          if (!boldGlyphCache.has(char)) {
+            boldGlyphCache.set(char, boldLatinFont.stringToGlyphs(char)[0]);
+          }
+          const boldGlyph = boldGlyphCache.get(char);
+          const boldScale = fontSizePx / boldLatinFont.unitsPerEm;
+          charWidth = (boldGlyph?.advanceWidth ?? boldLatinFont.unitsPerEm * 0.6) * boldScale;
+        } else {
+          charWidth *= BOLD_FACTOR2;
+        }
       }
       totalWidth += charWidth;
     }
@@ -1188,6 +1207,24 @@ var OpentypeTextMeasurer = class {
     if (!font) return 1;
     return font.ascender / font.unitsPerEm;
   }
+  resolveBoldFont(name) {
+    if (!name) return null;
+    const bases = [name];
+    const mappedBase = getCurrentMappedFont(name);
+    if (mappedBase && mappedBase !== name) bases.push(mappedBase);
+    for (const base of bases) {
+      for (const boldName of [`${base} Bold`, `${base}-Bold`]) {
+        const direct = this.fonts.get(boldName);
+        if (direct) return direct;
+        const mapped = getCurrentMappedFont(boldName);
+        if (mapped) {
+          const mappedFont = this.fonts.get(mapped);
+          if (mappedFont) return mappedFont;
+        }
+      }
+    }
+    return null;
+  }
   resolveFont(name) {
     if (!name) return null;
     const direct = this.fonts.get(name);
@@ -1883,6 +1920,8 @@ var ColorResolver = class {
     this.colorScheme = colorScheme;
     this.colorMap = colorMap;
   }
+  colorScheme;
+  colorMap;
   resolve(colorNode) {
     if (!colorNode) return null;
     if (colorNode.srgbClr) {
@@ -4183,7 +4222,7 @@ function extractMathText(node) {
     if (key === "t") {
       if (typeof value === "object" && value !== null) {
         text += value["#text"] ?? "";
-      } else if (value !== void 0 && value !== null) {
+      } else if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
         text += String(value);
       }
     } else if (typeof value === "object" && value !== null) {
@@ -4202,7 +4241,7 @@ function extractTextContent(node) {
   if (typeof text === "object") {
     return text["#text"] ?? "";
   }
-  return text !== void 0 && text !== null ? String(text) : "";
+  return typeof text === "string" || typeof text === "number" || typeof text === "boolean" ? String(text) : "";
 }
 function parseParagraph(p, colorResolver, rels, fontScheme, lstStyle, orderedPChildren) {
   const pPr = p.pPr;
@@ -6891,7 +6930,7 @@ var presetGeometries = {
     const shaftEnd = h - headLength;
     return `<polygon points="${bodyLeft},0 ${bodyRight},0 ${bodyRight},${shaftEnd} ${w},${shaftEnd} ${w / 2},${h} 0,${shaftEnd} ${bodyLeft},${shaftEnd}"/>`;
   },
-  line: () => "",
+  line: (w, h) => `<line x1="0" y1="0" x2="${w}" y2="${h}"/>`,
   // =====================
   // Connector shapes
   // =====================

package/dist/index.d.cts

@@ -136,6 +136,7 @@ declare class OpentypeTextMeasurer implements TextMeasurer {
     measureTextWidth(text: string, fontSizePt: number, bold: boolean, fontFamily?: string | null, fontFamilyEa?: string | null): number;
     getLineHeightRatio(fontFamily?: string | null, fontFamilyEa?: string | null): number;
     getAscenderRatio(fontFamily?: string | null, fontFamilyEa?: string | null): number;
+    private resolveBoldFont;
     private resolveFont;
 }
 

package/dist/index.d.ts

@@ -136,6 +136,7 @@ declare class OpentypeTextMeasurer implements TextMeasurer {
     measureTextWidth(text: string, fontSizePt: number, bold: boolean, fontFamily?: string | null, fontFamilyEa?: string | null): number;
     getLineHeightRatio(fontFamily?: string | null, fontFamilyEa?: string | null): number;
     getAscenderRatio(fontFamily?: string | null, fontFamilyEa?: string | null): number;
+    private resolveBoldFont;
     private resolveFont;
 }
 

package/dist/index.js

@@ -1126,16 +1126,35 @@ var OpentypeTextMeasurer = class {
       return measureTextWidth(text, fontSizePt, bold, fontFamily, fontFamilyEa);
     }
     const fontSizePx = fontSizePt * PX_PER_PT2;
+    const latinFontResolved = latinFont ?? fallbackFont;
+    const eaFontResolved = eaFont ?? fallbackFont;
+    const boldLatinFont = bold ? this.resolveBoldFont(fontFamily) : null;
+    const latinGlyphCache = /* @__PURE__ */ new Map();
+    const eaGlyphCache = eaFontResolved !== latinFontResolved ? /* @__PURE__ */ new Map() : latinGlyphCache;
+    const boldGlyphCache = /* @__PURE__ */ new Map();
     let totalWidth = 0;
     for (const char of text) {
       const codePoint = char.codePointAt(0);
       const isEa = isCjkCodePoint(codePoint);
-      const font = isEa ? eaFont ?? fallbackFont : latinFont ?? fallbackFont;
+      const font = isEa ? eaFontResolved : latinFontResolved;
+      const cache = isEa ? eaGlyphCache : latinGlyphCache;
+      if (!cache.has(char)) {
+        cache.set(char, font.stringToGlyphs(char)[0]);
+      }
       const scale = fontSizePx / font.unitsPerEm;
-      const glyphs = font.stringToGlyphs(char);
-      let charWidth = (glyphs[0]?.advanceWidth ?? font.unitsPerEm * 0.6) * scale;
+      const glyph = cache.get(char);
+      let charWidth = (glyph?.advanceWidth ?? font.unitsPerEm * 0.6) * scale;
       if (bold && !isEa) {
-        charWidth *= BOLD_FACTOR2;
+        if (boldLatinFont) {
+          if (!boldGlyphCache.has(char)) {
+            boldGlyphCache.set(char, boldLatinFont.stringToGlyphs(char)[0]);
+          }
+          const boldGlyph = boldGlyphCache.get(char);
+          const boldScale = fontSizePx / boldLatinFont.unitsPerEm;
+          charWidth = (boldGlyph?.advanceWidth ?? boldLatinFont.unitsPerEm * 0.6) * boldScale;
+        } else {
+          charWidth *= BOLD_FACTOR2;
+        }
       }
       totalWidth += charWidth;
     }
@@ -1151,6 +1170,24 @@ var OpentypeTextMeasurer = class {
     if (!font) return 1;
     return font.ascender / font.unitsPerEm;
   }
+  resolveBoldFont(name) {
+    if (!name) return null;
+    const bases = [name];
+    const mappedBase = getCurrentMappedFont(name);
+    if (mappedBase && mappedBase !== name) bases.push(mappedBase);
+    for (const base of bases) {
+      for (const boldName of [`${base} Bold`, `${base}-Bold`]) {
+        const direct = this.fonts.get(boldName);
+        if (direct) return direct;
+        const mapped = getCurrentMappedFont(boldName);
+        if (mapped) {
+          const mappedFont = this.fonts.get(mapped);
+          if (mappedFont) return mappedFont;
+        }
+      }
+    }
+    return null;
+  }
   resolveFont(name) {
     if (!name) return null;
     const direct = this.fonts.get(name);
@@ -1845,6 +1882,8 @@ var ColorResolver = class {
     this.colorScheme = colorScheme;
     this.colorMap = colorMap;
   }
+  colorScheme;
+  colorMap;
   resolve(colorNode) {
     if (!colorNode) return null;
     if (colorNode.srgbClr) {
@@ -4145,7 +4184,7 @@ function extractMathText(node) {
     if (key === "t") {
       if (typeof value === "object" && value !== null) {
         text += value["#text"] ?? "";
-      } else if (value !== void 0 && value !== null) {
+      } else if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
         text += String(value);
       }
     } else if (typeof value === "object" && value !== null) {
@@ -4164,7 +4203,7 @@ function extractTextContent(node) {
   if (typeof text === "object") {
     return text["#text"] ?? "";
   }
-  return text !== void 0 && text !== null ? String(text) : "";
+  return typeof text === "string" || typeof text === "number" || typeof text === "boolean" ? String(text) : "";
 }
 function parseParagraph(p, colorResolver, rels, fontScheme, lstStyle, orderedPChildren) {
   const pPr = p.pPr;
@@ -6853,7 +6892,7 @@ var presetGeometries = {
     const shaftEnd = h - headLength;
     return `<polygon points="${bodyLeft},0 ${bodyRight},0 ${bodyRight},${shaftEnd} ${w},${shaftEnd} ${w / 2},${h} 0,${shaftEnd} ${bodyLeft},${shaftEnd}"/>`;
   },
-  line: () => "",
+  line: (w, h) => `<line x1="0" y1="0" x2="${w}" y2="${h}"/>`,
   // =====================
   // Connector shapes
   // =====================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pptx-glimpse",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "A lightweight JavaScript library for rendering PowerPoint (.pptx) files as SVG or PNG in Node.js. No LibreOffice required.",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -13,36 +13,9 @@
       "require": "./dist/index.cjs"
     }
   },
-  "scripts": {
-    "build": "tsup src/index.ts --format cjs,esm --dts",
-    "bench": "vitest bench",
-    "lint": "eslint src/ vrt/ scripts/ bench/ e2e/",
-    "lint:fix": "eslint src/ vrt/ scripts/ bench/ e2e/ --fix",
-    "format": "prettier --write 'src/**/*.ts' 'vrt/**/*.ts' 'scripts/**/*.ts' 'bench/**/*.ts' 'e2e/**/*.ts'",
-    "format:check": "prettier --check 'src/**/*.ts' 'vrt/**/*.ts' 'scripts/**/*.ts' 'bench/**/*.ts' 'e2e/**/*.ts'",
-    "test": "vitest run",
-    "test:coverage": "vitest run --coverage",
-    "test:watch": "vitest",
-    "typecheck": "tsc --noEmit",
-    "knip": "knip",
-    "dev": "tsx scripts/dev-server.ts",
-    "render": "tsx scripts/test-render.ts",
-    "inspect": "tsx scripts/inspect-pptx.ts",
-    "vrt:snapshot:docker-build": "docker build -t pptx-glimpse-snapshot-vrt docker/snapshot-vrt",
-    "vrt:snapshot:fixtures": "tsx vrt/snapshot/create-fixtures.ts",
-    "vrt:snapshot:update": "docker run --rm -v \"$(pwd)\":/workspace -v pptx-glimpse-snapshot-vrt-nm:/workspace/node_modules pptx-glimpse-snapshot-vrt bash /workspace/vrt/snapshot/docker-run.sh bash -c \"npx tsx vrt/snapshot/create-fixtures.ts && npx tsx vrt/snapshot/update-snapshots.ts\"",
-    "vrt:lo:docker-build": "docker build -t pptx-glimpse-vrt docker/libreoffice-vrt",
-    "vrt:lo:fixtures": "docker run --rm -v \"$(pwd)\":/workspace pptx-glimpse-vrt python3 /workspace/vrt/libreoffice/create_fixtures.py",
-    "vrt:lo:update": "npm run vrt:lo:docker-build && npm run vrt:lo:fixtures && docker run --rm -v \"$(pwd)\":/workspace pptx-glimpse-vrt bash /workspace/vrt/libreoffice/update_snapshots.sh",
-    "test:package": "npm run build && bash scripts/test-package.sh",
-    "changeset": "changeset",
-    "demo:dev": "cd demo && npm run dev",
-    "demo:build": "npm run build && cd demo && npm install && npm run build"
-  },
   "files": [
     "dist"
   ],
-  "packageManager": "npm@10.9.6",
   "engines": {
     "node": ">=20"
   },
@@ -67,7 +40,7 @@
     "@resvg/resvg-wasm": "^2.6.2",
     "fast-xml-parser": "^5.7.3",
     "fflate": "^0.8.2",
-    "opentype.js": "^1.3.4"
+    "opentype.js": "1.3.4"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.8",
@@ -88,5 +61,31 @@
     "typescript-eslint": "^8.55.0",
     "vitest": "^3.0.0",
     "ws": "^8.19.0"
+  },
+  "scripts": {
+    "build": "tsup src/index.ts --format cjs,esm --dts",
+    "bench": "vitest bench",
+    "lint": "eslint src/ vrt/ scripts/ bench/ e2e/",
+    "lint:fix": "eslint src/ vrt/ scripts/ bench/ e2e/ --fix",
+    "format": "prettier --write 'src/**/*.ts' 'vrt/**/*.ts' 'scripts/**/*.ts' 'bench/**/*.ts' 'e2e/**/*.ts'",
+    "format:check": "prettier --check 'src/**/*.ts' 'vrt/**/*.ts' 'scripts/**/*.ts' 'bench/**/*.ts' 'e2e/**/*.ts'",
+    "test": "vitest run",
+    "test:coverage": "vitest run --coverage",
+    "test:watch": "vitest",
+    "typecheck": "tsc --noEmit",
+    "knip": "knip",
+    "dev": "tsx scripts/dev-server.ts",
+    "render": "tsx scripts/test-render.ts",
+    "inspect": "tsx scripts/inspect-pptx.ts",
+    "vrt:snapshot:docker-build": "docker build -t pptx-glimpse-snapshot-vrt docker/snapshot-vrt",
+    "vrt:snapshot:fixtures": "tsx vrt/snapshot/create-fixtures.ts",
+    "vrt:snapshot:update": "docker run --rm -v \"$(pwd)\":/workspace -v pptx-glimpse-snapshot-vrt-nm:/workspace/node_modules pptx-glimpse-snapshot-vrt bash /workspace/vrt/snapshot/docker-run.sh bash -c \"npx tsx vrt/snapshot/create-fixtures.ts && npx tsx vrt/snapshot/update-snapshots.ts\"",
+    "vrt:lo:docker-build": "docker build -t pptx-glimpse-vrt docker/libreoffice-vrt",
+    "vrt:lo:fixtures": "docker run --rm -v \"$(pwd)\":/workspace pptx-glimpse-vrt python3 /workspace/vrt/libreoffice/create_fixtures.py",
+    "vrt:lo:update": "pnpm run vrt:lo:docker-build && pnpm run vrt:lo:fixtures && docker run --rm -v \"$(pwd)\":/workspace pptx-glimpse-vrt bash /workspace/vrt/libreoffice/update_snapshots.sh",
+    "test:package": "pnpm run build && bash scripts/test-package.sh",
+    "changeset": "changeset",
+    "demo:dev": "cd demo && npm run dev",
+    "demo:build": "pnpm run build && cd demo && npm install && npm run build"
   }
-}
+}