pptx-glimpse 0.6.1 → 0.7.1

package/dist/index.cjs

@@ -29,7 +29,8 @@ __export(index_exports, {
   createOpentypeTextMeasurerFromBuffers: () => createOpentypeTextMeasurerFromBuffers,
   getMappedFont: () => getMappedFont,
   getWarningEntries: () => getWarningEntries,
-  getWarningSummary: () => getWarningSummary
+  getWarningSummary: () => getWarningSummary,
+  initResvgWasm: () => initResvgWasm
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -42,15 +43,18 @@ var DEFAULT_FONT_MAPPING = {
   "Times New Roman": "Tinos",
   "Courier New": "Cousine",
   Cambria: "Caladea",
-  // 日本語ゴシック系 → Noto Sans CJK JP
-  \u30E1\u30A4\u30EA\u30AA: "Noto Sans CJK JP",
-  Meiryo: "Noto Sans CJK JP",
-  \u6E38\u30B4\u30B7\u30C3\u30AF: "Noto Sans CJK JP",
-  "Yu Gothic": "Noto Sans CJK JP",
-  "MS \u30B4\u30B7\u30C3\u30AF": "Noto Sans CJK JP",
-  "MS Gothic": "Noto Sans CJK JP",
-  "MS P\u30B4\u30B7\u30C3\u30AF": "Noto Sans CJK JP",
-  "MS PGothic": "Noto Sans CJK JP",
+  // 日本語ゴシック系 → Noto Sans JP
+  // "Noto Sans CJK JP" ではなく "Noto Sans JP" を使用する。
+  // NotoSansCJK TTC は最初の1フォントのみ抽出するため JP バリアントが取れるとは限らず、
+  // Docker 環境でダウンロードする standalone NotoSansJP.ttf のフォント名に合わせている。
+  \u30E1\u30A4\u30EA\u30AA: "Noto Sans JP",
+  Meiryo: "Noto Sans JP",
+  \u6E38\u30B4\u30B7\u30C3\u30AF: "Noto Sans JP",
+  "Yu Gothic": "Noto Sans JP",
+  "MS \u30B4\u30B7\u30C3\u30AF": "Noto Sans JP",
+  "MS Gothic": "Noto Sans JP",
+  "MS P\u30B4\u30B7\u30C3\u30AF": "Noto Sans JP",
+  "MS PGothic": "Noto Sans JP",
   // 日本語明朝系 → Noto Serif CJK JP
   "MS \u660E\u671D": "Noto Serif CJK JP",
   "MS Mincho": "Noto Serif CJK JP",
@@ -1054,19 +1058,22 @@ var OpentypeTextMeasurer = class {
     this.defaultFont = defaultFont ?? null;
   }
   measureTextWidth(text, fontSizePt, bold, fontFamily, fontFamilyEa) {
-    const font = this.resolveFont(fontFamily) ?? this.resolveFont(fontFamilyEa) ?? this.defaultFont;
-    if (!font) {
+    const latinFont = this.resolveFont(fontFamily);
+    const eaFont = this.resolveFont(fontFamilyEa);
+    const fallbackFont = latinFont ?? eaFont ?? this.defaultFont;
+    if (!fallbackFont) {
       return measureTextWidth(text, fontSizePt, bold, fontFamily, fontFamilyEa);
     }
     const fontSizePx = fontSizePt * PX_PER_PT2;
-    const scale = fontSizePx / font.unitsPerEm;
     let totalWidth = 0;
-    const chars = [...text];
-    const glyphs = font.stringToGlyphs(text);
-    for (let i = 0; i < glyphs.length; i++) {
-      let charWidth = (glyphs[i].advanceWidth ?? font.unitsPerEm * 0.6) * scale;
-      const codePoint = chars[i]?.codePointAt(0);
-      if (bold && (codePoint === void 0 || !isCjkCodePoint(codePoint))) {
+    for (const char of text) {
+      const codePoint = char.codePointAt(0);
+      const isEa = isCjkCodePoint(codePoint);
+      const font = isEa ? eaFont ?? fallbackFont : latinFont ?? fallbackFont;
+      const scale = fontSizePx / font.unitsPerEm;
+      const glyphs = font.stringToGlyphs(char);
+      let charWidth = (glyphs[0]?.advanceWidth ?? font.unitsPerEm * 0.6) * scale;
+      if (bold && !isEa) {
         charWidth *= BOLD_FACTOR2;
       }
       totalWidth += charWidth;
@@ -1085,7 +1092,14 @@ var OpentypeTextMeasurer = class {
   }
   resolveFont(name) {
     if (!name) return null;
-    return this.fonts.get(name) ?? null;
+    const direct = this.fonts.get(name);
+    if (direct) return direct;
+    const mapped = getCurrentMappedFont(name);
+    if (mapped) {
+      const mappedFont = this.fonts.get(mapped);
+      if (mappedFont) return mappedFont;
+    }
+    return null;
   }
 };
 
@@ -1570,15 +1584,36 @@ function parseXmlOrdered(xml) {
 }
 
 // src/png/png-converter.ts
-var import_resvg_js = require("@resvg/resvg-js");
+var import_resvg_wasm = require("@resvg/resvg-wasm");
+var import_promises2 = require("fs/promises");
+var import_module = require("module");
+var import_meta = {};
+var wasmInitPromise = null;
+function resolveWasmPath() {
+  const baseUrl = import_meta.url || `file://${__filename}`;
+  const require2 = (0, import_module.createRequire)(baseUrl);
+  return require2.resolve("@resvg/resvg-wasm/index_bg.wasm");
+}
+async function initResvgWasm() {
+  if (!wasmInitPromise) {
+    wasmInitPromise = (async () => {
+      const wasmPath = resolveWasmPath();
+      const wasmBuffer = await (0, import_promises2.readFile)(wasmPath);
+      await (0, import_resvg_wasm.initWasm)(wasmBuffer);
+    })();
+  }
+  await wasmInitPromise;
+}
 async function svgToPng(svgString, options) {
+  await initResvgWasm();
   const resvgOptions = {};
   if (options?.width) {
     resvgOptions.fitTo = { mode: "width", value: options.width };
   } else if (options?.height) {
     resvgOptions.fitTo = { mode: "height", value: options.height };
   }
-  const rendered = await (0, import_resvg_js.renderAsync)(svgString, resvgOptions);
+  const resvg = new import_resvg_wasm.Resvg(svgString, resvgOptions);
+  const rendered = resvg.render();
   return {
     png: Buffer.from(rendered.asPng()),
     width: rendered.width,
@@ -3895,7 +3930,7 @@ function parseParagraph(p, colorResolver, rels, fontScheme, lstStyle, orderedPCh
   const lnSpcSpcPct = lnSpc?.spcPct;
   const tabStops = parseTabStops(pPr);
   const properties = {
-    alignment: pPr?.["@_algn"] ?? lstLevelProps?.alignment ?? "l",
+    alignment: pPr?.["@_algn"] ?? lstLevelProps?.alignment ?? null,
     lineSpacing: lnSpcSpcPct ? Number(lnSpcSpcPct["@_val"]) : null,
     spaceBefore: parseSpacing(pPr?.spcBef),
     spaceAfter: parseSpacing(pPr?.spcAft),
@@ -4579,6 +4614,19 @@ function resolveShapeTextInheritance(shape, context) {
   const chainSources = [layoutLstStyle, masterLstStyle, txStyle, context.defaultTextStyle];
   for (const paragraph of shape.textBody.paragraphs) {
     const level = paragraph.properties.level;
+    if (paragraph.properties.alignment === null) {
+      for (const source of chainSources) {
+        if (!source) continue;
+        const alignment = source.levels[level]?.alignment ?? source.defaultParagraph?.alignment;
+        if (alignment) {
+          paragraph.properties.alignment = alignment;
+          break;
+        }
+      }
+      if (paragraph.properties.alignment === null) {
+        paragraph.properties.alignment = "l";
+      }
+    }
     for (const run of paragraph.runs) {
       const props = run.properties;
       for (const source of chainSources) {
@@ -8180,8 +8228,8 @@ function renderSegmentAsPath(text, props, x, y, fontScale, defaultFontSize, font
       segText,
       fontSize,
       props.bold,
-      fontFamily,
-      fontFamilyEa
+      props.fontFamily,
+      props.fontFamilyEa
     );
     if (font) {
       const path = font.getPath(segText, x + totalWidth, effectiveY, fontSizePx);
@@ -8205,8 +8253,8 @@ function renderSegmentAsPath(text, props, x, y, fontScale, defaultFontSize, font
         char,
         fontSize,
         props.bold,
-        fontFamily,
-        fontFamilyEa
+        props.fontFamily,
+        props.fontFamilyEa
       );
       if (font) {
         const charX = x + totalWidth;
@@ -8892,5 +8940,6 @@ function collectFontsFromTextBody(textBody, fonts) {
   createOpentypeTextMeasurerFromBuffers,
   getMappedFont,
   getWarningEntries,
-  getWarningSummary
+  getWarningSummary,
+  initResvgWasm
 });

package/dist/index.d.cts

@@ -177,4 +177,11 @@ interface OpentypeSetup {
  */
 declare function createOpentypeSetupFromBuffers(fontBuffers: FontBuffer[], fontMapping?: FontMapping): Promise<OpentypeSetup | null>;
 
-export { type ConvertOptions, DEFAULT_FONT_MAPPING, type FontBuffer, type FontMapping, type LogLevel, type OpentypeSetup, type SlideImage, type SlideSvg, type UsedFonts, type WarningEntry, type WarningSummary, collectUsedFonts, convertPptxToPng, convertPptxToSvg, createFontMapping, createOpentypeSetupFromBuffers, createOpentypeTextMeasurerFromBuffers, getMappedFont, getWarningEntries, getWarningSummary };
+/**
+ * resvg-wasm の WASM モジュールを初期化する。
+ * 明示的に呼び出さなくても、初回の PNG 変換時に自動的に初期化される。
+ * アプリケーション起動時に初期化しておきたい場合に使用する。
+ */
+declare function initResvgWasm(): Promise<void>;
+
+export { type ConvertOptions, DEFAULT_FONT_MAPPING, type FontBuffer, type FontMapping, type LogLevel, type OpentypeSetup, type SlideImage, type SlideSvg, type UsedFonts, type WarningEntry, type WarningSummary, collectUsedFonts, convertPptxToPng, convertPptxToSvg, createFontMapping, createOpentypeSetupFromBuffers, createOpentypeTextMeasurerFromBuffers, getMappedFont, getWarningEntries, getWarningSummary, initResvgWasm };

package/dist/index.d.ts

@@ -177,4 +177,11 @@ interface OpentypeSetup {
  */
 declare function createOpentypeSetupFromBuffers(fontBuffers: FontBuffer[], fontMapping?: FontMapping): Promise<OpentypeSetup | null>;
 
-export { type ConvertOptions, DEFAULT_FONT_MAPPING, type FontBuffer, type FontMapping, type LogLevel, type OpentypeSetup, type SlideImage, type SlideSvg, type UsedFonts, type WarningEntry, type WarningSummary, collectUsedFonts, convertPptxToPng, convertPptxToSvg, createFontMapping, createOpentypeSetupFromBuffers, createOpentypeTextMeasurerFromBuffers, getMappedFont, getWarningEntries, getWarningSummary };
+/**
+ * resvg-wasm の WASM モジュールを初期化する。
+ * 明示的に呼び出さなくても、初回の PNG 変換時に自動的に初期化される。
+ * アプリケーション起動時に初期化しておきたい場合に使用する。
+ */
+declare function initResvgWasm(): Promise<void>;
+
+export { type ConvertOptions, DEFAULT_FONT_MAPPING, type FontBuffer, type FontMapping, type LogLevel, type OpentypeSetup, type SlideImage, type SlideSvg, type UsedFonts, type WarningEntry, type WarningSummary, collectUsedFonts, convertPptxToPng, convertPptxToSvg, createFontMapping, createOpentypeSetupFromBuffers, createOpentypeTextMeasurerFromBuffers, getMappedFont, getWarningEntries, getWarningSummary, initResvgWasm };

package/dist/index.js

@@ -7,15 +7,18 @@ var DEFAULT_FONT_MAPPING = {
   "Times New Roman": "Tinos",
   "Courier New": "Cousine",
   Cambria: "Caladea",
-  // 日本語ゴシック系 → Noto Sans CJK JP
-  \u30E1\u30A4\u30EA\u30AA: "Noto Sans CJK JP",
-  Meiryo: "Noto Sans CJK JP",
-  \u6E38\u30B4\u30B7\u30C3\u30AF: "Noto Sans CJK JP",
-  "Yu Gothic": "Noto Sans CJK JP",
-  "MS \u30B4\u30B7\u30C3\u30AF": "Noto Sans CJK JP",
-  "MS Gothic": "Noto Sans CJK JP",
-  "MS P\u30B4\u30B7\u30C3\u30AF": "Noto Sans CJK JP",
-  "MS PGothic": "Noto Sans CJK JP",
+  // 日本語ゴシック系 → Noto Sans JP
+  // "Noto Sans CJK JP" ではなく "Noto Sans JP" を使用する。
+  // NotoSansCJK TTC は最初の1フォントのみ抽出するため JP バリアントが取れるとは限らず、
+  // Docker 環境でダウンロードする standalone NotoSansJP.ttf のフォント名に合わせている。
+  \u30E1\u30A4\u30EA\u30AA: "Noto Sans JP",
+  Meiryo: "Noto Sans JP",
+  \u6E38\u30B4\u30B7\u30C3\u30AF: "Noto Sans JP",
+  "Yu Gothic": "Noto Sans JP",
+  "MS \u30B4\u30B7\u30C3\u30AF": "Noto Sans JP",
+  "MS Gothic": "Noto Sans JP",
+  "MS P\u30B4\u30B7\u30C3\u30AF": "Noto Sans JP",
+  "MS PGothic": "Noto Sans JP",
   // 日本語明朝系 → Noto Serif CJK JP
   "MS \u660E\u671D": "Noto Serif CJK JP",
   "MS Mincho": "Noto Serif CJK JP",
@@ -1019,19 +1022,22 @@ var OpentypeTextMeasurer = class {
     this.defaultFont = defaultFont ?? null;
   }
   measureTextWidth(text, fontSizePt, bold, fontFamily, fontFamilyEa) {
-    const font = this.resolveFont(fontFamily) ?? this.resolveFont(fontFamilyEa) ?? this.defaultFont;
-    if (!font) {
+    const latinFont = this.resolveFont(fontFamily);
+    const eaFont = this.resolveFont(fontFamilyEa);
+    const fallbackFont = latinFont ?? eaFont ?? this.defaultFont;
+    if (!fallbackFont) {
       return measureTextWidth(text, fontSizePt, bold, fontFamily, fontFamilyEa);
     }
     const fontSizePx = fontSizePt * PX_PER_PT2;
-    const scale = fontSizePx / font.unitsPerEm;
     let totalWidth = 0;
-    const chars = [...text];
-    const glyphs = font.stringToGlyphs(text);
-    for (let i = 0; i < glyphs.length; i++) {
-      let charWidth = (glyphs[i].advanceWidth ?? font.unitsPerEm * 0.6) * scale;
-      const codePoint = chars[i]?.codePointAt(0);
-      if (bold && (codePoint === void 0 || !isCjkCodePoint(codePoint))) {
+    for (const char of text) {
+      const codePoint = char.codePointAt(0);
+      const isEa = isCjkCodePoint(codePoint);
+      const font = isEa ? eaFont ?? fallbackFont : latinFont ?? fallbackFont;
+      const scale = fontSizePx / font.unitsPerEm;
+      const glyphs = font.stringToGlyphs(char);
+      let charWidth = (glyphs[0]?.advanceWidth ?? font.unitsPerEm * 0.6) * scale;
+      if (bold && !isEa) {
         charWidth *= BOLD_FACTOR2;
       }
       totalWidth += charWidth;
@@ -1050,7 +1056,14 @@ var OpentypeTextMeasurer = class {
   }
   resolveFont(name) {
     if (!name) return null;
-    return this.fonts.get(name) ?? null;
+    const direct = this.fonts.get(name);
+    if (direct) return direct;
+    const mapped = getCurrentMappedFont(name);
+    if (mapped) {
+      const mappedFont = this.fonts.get(mapped);
+      if (mappedFont) return mappedFont;
+    }
+    return null;
   }
 };
 
@@ -1535,15 +1548,35 @@ function parseXmlOrdered(xml) {
 }
 
 // src/png/png-converter.ts
-import { renderAsync } from "@resvg/resvg-js";
+import { initWasm, Resvg } from "@resvg/resvg-wasm";
+import { readFile as readFile2 } from "fs/promises";
+import { createRequire } from "module";
+var wasmInitPromise = null;
+function resolveWasmPath() {
+  const baseUrl = import.meta.url || `file://${__filename}`;
+  const require2 = createRequire(baseUrl);
+  return require2.resolve("@resvg/resvg-wasm/index_bg.wasm");
+}
+async function initResvgWasm() {
+  if (!wasmInitPromise) {
+    wasmInitPromise = (async () => {
+      const wasmPath = resolveWasmPath();
+      const wasmBuffer = await readFile2(wasmPath);
+      await initWasm(wasmBuffer);
+    })();
+  }
+  await wasmInitPromise;
+}
 async function svgToPng(svgString, options) {
+  await initResvgWasm();
   const resvgOptions = {};
   if (options?.width) {
     resvgOptions.fitTo = { mode: "width", value: options.width };
   } else if (options?.height) {
     resvgOptions.fitTo = { mode: "height", value: options.height };
   }
-  const rendered = await renderAsync(svgString, resvgOptions);
+  const resvg = new Resvg(svgString, resvgOptions);
+  const rendered = resvg.render();
   return {
     png: Buffer.from(rendered.asPng()),
     width: rendered.width,
@@ -3860,7 +3893,7 @@ function parseParagraph(p, colorResolver, rels, fontScheme, lstStyle, orderedPCh
   const lnSpcSpcPct = lnSpc?.spcPct;
   const tabStops = parseTabStops(pPr);
   const properties = {
-    alignment: pPr?.["@_algn"] ?? lstLevelProps?.alignment ?? "l",
+    alignment: pPr?.["@_algn"] ?? lstLevelProps?.alignment ?? null,
     lineSpacing: lnSpcSpcPct ? Number(lnSpcSpcPct["@_val"]) : null,
     spaceBefore: parseSpacing(pPr?.spcBef),
     spaceAfter: parseSpacing(pPr?.spcAft),
@@ -4544,6 +4577,19 @@ function resolveShapeTextInheritance(shape, context) {
   const chainSources = [layoutLstStyle, masterLstStyle, txStyle, context.defaultTextStyle];
   for (const paragraph of shape.textBody.paragraphs) {
     const level = paragraph.properties.level;
+    if (paragraph.properties.alignment === null) {
+      for (const source of chainSources) {
+        if (!source) continue;
+        const alignment = source.levels[level]?.alignment ?? source.defaultParagraph?.alignment;
+        if (alignment) {
+          paragraph.properties.alignment = alignment;
+          break;
+        }
+      }
+      if (paragraph.properties.alignment === null) {
+        paragraph.properties.alignment = "l";
+      }
+    }
     for (const run of paragraph.runs) {
       const props = run.properties;
       for (const source of chainSources) {
@@ -8145,8 +8191,8 @@ function renderSegmentAsPath(text, props, x, y, fontScale, defaultFontSize, font
       segText,
       fontSize,
       props.bold,
-      fontFamily,
-      fontFamilyEa
+      props.fontFamily,
+      props.fontFamilyEa
     );
     if (font) {
       const path = font.getPath(segText, x + totalWidth, effectiveY, fontSizePx);
@@ -8170,8 +8216,8 @@ function renderSegmentAsPath(text, props, x, y, fontScale, defaultFontSize, font
         char,
         fontSize,
         props.bold,
-        fontFamily,
-        fontFamilyEa
+        props.fontFamily,
+        props.fontFamilyEa
       );
       if (font) {
         const charX = x + totalWidth;
@@ -8856,5 +8902,6 @@ export {
   createOpentypeTextMeasurerFromBuffers,
   getMappedFont,
   getWarningEntries,
-  getWarningSummary
+  getWarningSummary,
+  initResvgWasm
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pptx-glimpse",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "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",
@@ -30,7 +30,7 @@
     "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 npx tsx vrt/snapshot/create-fixtures.ts && 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 npx tsx vrt/snapshot/update-snapshots.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",
@@ -64,7 +64,7 @@
   "author": "hirokisakabe",
   "license": "MIT",
   "dependencies": {
-    "@resvg/resvg-js": "^2.6.2",
+    "@resvg/resvg-wasm": "^2.6.2",
     "fast-xml-parser": "^5.3.6",
     "fflate": "^0.8.2",
     "opentype.js": "^1.3.4"