pptx-glimpse 0.11.2 → 1.0.1

package/README.md

@@ -3,7 +3,7 @@
 [![npm](https://img.shields.io/npm/v/pptx-glimpse)](https://www.npmjs.com/package/pptx-glimpse)
 [![CI](https://github.com/hirokisakabe/pptx-glimpse/actions/workflows/ci.yml/badge.svg)](https://github.com/hirokisakabe/pptx-glimpse/actions/workflows/ci.yml)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Node.js](https://img.shields.io/badge/node-%3E%3D20-brightgreen)](https://nodejs.org/)
+[![Node.js](https://img.shields.io/badge/node-%3E%3D22-brightgreen)](https://nodejs.org/)
 
 No LibreOffice required — just `npm install`.
 
@@ -43,7 +43,7 @@ rather than pixel-perfect rendering of every PowerPoint feature.
 
 ## Requirements
 
-- **Node.js >= 20**
+- **Node.js >= 22**
 
 ## Installation
 

package/dist/index.cjs

@@ -35,6 +35,9 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
+// src/converter.ts
+var import_node_fs2 = require("fs");
+
 // src/font/font-mapping.ts
 var DEFAULT_FONT_MAPPING = {
   // ラテン文字フォント
@@ -1801,6 +1804,10 @@ async function svgToPng(svgString, options) {
   } else if (options?.height) {
     resvgOptions.fitTo = { mode: "height", value: options.height };
   }
+  const fontBuffers = options?.fontBuffers;
+  if (fontBuffers && fontBuffers.length > 0) {
+    resvgOptions.font = { fontBuffers };
+  }
   const resvg = new import_resvg_wasm.Resvg(svgString, resvgOptions);
   const rendered = resvg.render();
   return {
@@ -2760,7 +2767,7 @@ function parseChartTitle(titleNode) {
 function parseLegend(legendNode) {
   if (!legendNode) return null;
   const legendPos = legendNode.legendPos;
-  const pos = legendPos?.["@_val"] ?? "b";
+  const pos = legendPos?.["@_val"] ?? "r";
   return { position: pos };
 }
 
@@ -5417,6 +5424,7 @@ var DEFAULT_SERIES_COLORS = [
   { hex: "#5B9BD5", alpha: 1 },
   { hex: "#70AD47", alpha: 1 }
 ];
+var LEGEND_SIDE_WIDTH = 100;
 function renderChart(element) {
   const { transform, chart } = element;
   const w = emuToPixels(transform.extentWidth);
@@ -5435,6 +5443,8 @@ function renderChart(element) {
   if (chart.legend) {
     if (chart.legend.position === "b") margin.bottom = 50;
     else if (chart.legend.position === "t") margin.top += 20;
+    else if (chart.legend.position === "r") margin.right = LEGEND_SIDE_WIDTH;
+    else if (chart.legend.position === "l") margin.left += LEGEND_SIDE_WIDTH;
   }
   const plotX = margin.left;
   const plotY = margin.top;
@@ -6189,18 +6199,34 @@ function renderLegend(chart, chartW, chartH, position) {
     color: s.color
   }));
   if (entries2.length === 0) return "";
-  const entryWidth = 80;
-  const totalWidth = entries2.length * entryWidth;
-  const startX = Math.max((chartW - totalWidth) / 2, 5);
-  const legendY = position === "t" ? 25 : chartH - 15;
-  for (let i = 0; i < entries2.length; i++) {
-    const ex = startX + i * entryWidth;
-    parts.push(
-      `<rect x="${round(ex)}" y="${round(legendY - 6)}" width="12" height="12" ${fillAttr(entries2[i].color)}/>`
-    );
-    parts.push(
-      `<text x="${round(ex + 16)}" y="${round(legendY + 4)}" font-size="10" fill="#595959">${escapeXml(entries2[i].label)}</text>`
-    );
+  const ENTRY_HEIGHT = 20;
+  if (position === "r" || position === "l") {
+    const totalH = entries2.length * ENTRY_HEIGHT;
+    const startY = Math.max((chartH - totalH) / 2, 5);
+    const legendX = position === "r" ? chartW - LEGEND_SIDE_WIDTH + 5 : 5;
+    for (let i = 0; i < entries2.length; i++) {
+      const ey = startY + i * ENTRY_HEIGHT;
+      parts.push(
+        `<rect x="${round(legendX)}" y="${round(ey)}" width="12" height="12" ${fillAttr(entries2[i].color)}/>`
+      );
+      parts.push(
+        `<text x="${round(legendX + 16)}" y="${round(ey + 10)}" font-size="10" fill="#595959">${escapeXml(entries2[i].label)}</text>`
+      );
+    }
+  } else {
+    const entryWidth = 80;
+    const totalWidth = entries2.length * entryWidth;
+    const startX = Math.max((chartW - totalWidth) / 2, 5);
+    const legendY = position === "t" ? 25 : chartH - 15;
+    for (let i = 0; i < entries2.length; i++) {
+      const ex = startX + i * entryWidth;
+      parts.push(
+        `<rect x="${round(ex)}" y="${round(legendY - 6)}" width="12" height="12" ${fillAttr(entries2[i].color)}/>`
+      );
+      parts.push(
+        `<text x="${round(ex + 16)}" y="${round(legendY + 4)}" font-size="10" fill="#595959">${escapeXml(entries2[i].label)}</text>`
+      );
+    }
   }
   return parts.join("");
 }
@@ -9234,13 +9260,50 @@ async function convertPptxToSvg(input, options) {
     resetScriptFonts();
   }
 }
+var cachedFontBuffers = null;
+var cachedFontBuffersKey = null;
+var MAX_TOTAL_FONT_BUFFER_BYTES = 100 * 1024 * 1024;
+function loadFontBuffers(fontDirs, skipSystemFonts) {
+  const key = `${(fontDirs ?? []).join("\0")}
+${skipSystemFonts ?? false}`;
+  if (cachedFontBuffers !== null && cachedFontBuffersKey === key) {
+    return cachedFontBuffers;
+  }
+  const allPaths = collectFontFilePaths(fontDirs, skipSystemFonts);
+  const ttfOtfPaths = allPaths.filter((p) => {
+    const lower = p.toLowerCase();
+    return lower.endsWith(".ttf") || lower.endsWith(".otf");
+  });
+  const pathsWithSize = [];
+  for (const p of ttfOtfPaths) {
+    try {
+      pathsWithSize.push({ path: p, size: (0, import_node_fs2.statSync)(p).size });
+    } catch {
+    }
+  }
+  pathsWithSize.sort((a, b) => a.size - b.size);
+  const buffers = [];
+  let totalSize = 0;
+  for (const { path, size } of pathsWithSize) {
+    if (totalSize + size > MAX_TOTAL_FONT_BUFFER_BYTES) break;
+    try {
+      buffers.push(new Uint8Array((0, import_node_fs2.readFileSync)(path)));
+      totalSize += size;
+    } catch {
+    }
+  }
+  cachedFontBuffers = buffers;
+  cachedFontBuffersKey = key;
+  return buffers;
+}
 async function convertPptxToPng(input, options) {
   const svgResults = await convertPptxToSvg(input, options);
   const width = options?.width ?? DEFAULT_OUTPUT_WIDTH;
   const height = options?.height;
+  const fontBuffers = loadFontBuffers(options?.fontDirs, options?.skipSystemFonts);
   const results = [];
   for (const { slideNumber, svg } of svgResults) {
-    const pngResult = await svgToPng(svg, { width, height });
+    const pngResult = await svgToPng(svg, { width, height, fontBuffers });
     results.push({
       slideNumber,
       png: pngResult.png,

package/dist/index.js

@@ -1,3 +1,6 @@
+// src/converter.ts
+import { readFileSync, statSync } from "fs";
+
 // src/font/font-mapping.ts
 var DEFAULT_FONT_MAPPING = {
   // ラテン文字フォント
@@ -1763,6 +1766,10 @@ async function svgToPng(svgString, options) {
   } else if (options?.height) {
     resvgOptions.fitTo = { mode: "height", value: options.height };
   }
+  const fontBuffers = options?.fontBuffers;
+  if (fontBuffers && fontBuffers.length > 0) {
+    resvgOptions.font = { fontBuffers };
+  }
   const resvg = new Resvg(svgString, resvgOptions);
   const rendered = resvg.render();
   return {
@@ -2722,7 +2729,7 @@ function parseChartTitle(titleNode) {
 function parseLegend(legendNode) {
   if (!legendNode) return null;
   const legendPos = legendNode.legendPos;
-  const pos = legendPos?.["@_val"] ?? "b";
+  const pos = legendPos?.["@_val"] ?? "r";
   return { position: pos };
 }
 
@@ -5379,6 +5386,7 @@ var DEFAULT_SERIES_COLORS = [
   { hex: "#5B9BD5", alpha: 1 },
   { hex: "#70AD47", alpha: 1 }
 ];
+var LEGEND_SIDE_WIDTH = 100;
 function renderChart(element) {
   const { transform, chart } = element;
   const w = emuToPixels(transform.extentWidth);
@@ -5397,6 +5405,8 @@ function renderChart(element) {
   if (chart.legend) {
     if (chart.legend.position === "b") margin.bottom = 50;
     else if (chart.legend.position === "t") margin.top += 20;
+    else if (chart.legend.position === "r") margin.right = LEGEND_SIDE_WIDTH;
+    else if (chart.legend.position === "l") margin.left += LEGEND_SIDE_WIDTH;
   }
   const plotX = margin.left;
   const plotY = margin.top;
@@ -6151,18 +6161,34 @@ function renderLegend(chart, chartW, chartH, position) {
     color: s.color
   }));
   if (entries2.length === 0) return "";
-  const entryWidth = 80;
-  const totalWidth = entries2.length * entryWidth;
-  const startX = Math.max((chartW - totalWidth) / 2, 5);
-  const legendY = position === "t" ? 25 : chartH - 15;
-  for (let i = 0; i < entries2.length; i++) {
-    const ex = startX + i * entryWidth;
-    parts.push(
-      `<rect x="${round(ex)}" y="${round(legendY - 6)}" width="12" height="12" ${fillAttr(entries2[i].color)}/>`
-    );
-    parts.push(
-      `<text x="${round(ex + 16)}" y="${round(legendY + 4)}" font-size="10" fill="#595959">${escapeXml(entries2[i].label)}</text>`
-    );
+  const ENTRY_HEIGHT = 20;
+  if (position === "r" || position === "l") {
+    const totalH = entries2.length * ENTRY_HEIGHT;
+    const startY = Math.max((chartH - totalH) / 2, 5);
+    const legendX = position === "r" ? chartW - LEGEND_SIDE_WIDTH + 5 : 5;
+    for (let i = 0; i < entries2.length; i++) {
+      const ey = startY + i * ENTRY_HEIGHT;
+      parts.push(
+        `<rect x="${round(legendX)}" y="${round(ey)}" width="12" height="12" ${fillAttr(entries2[i].color)}/>`
+      );
+      parts.push(
+        `<text x="${round(legendX + 16)}" y="${round(ey + 10)}" font-size="10" fill="#595959">${escapeXml(entries2[i].label)}</text>`
+      );
+    }
+  } else {
+    const entryWidth = 80;
+    const totalWidth = entries2.length * entryWidth;
+    const startX = Math.max((chartW - totalWidth) / 2, 5);
+    const legendY = position === "t" ? 25 : chartH - 15;
+    for (let i = 0; i < entries2.length; i++) {
+      const ex = startX + i * entryWidth;
+      parts.push(
+        `<rect x="${round(ex)}" y="${round(legendY - 6)}" width="12" height="12" ${fillAttr(entries2[i].color)}/>`
+      );
+      parts.push(
+        `<text x="${round(ex + 16)}" y="${round(legendY + 4)}" font-size="10" fill="#595959">${escapeXml(entries2[i].label)}</text>`
+      );
+    }
   }
   return parts.join("");
 }
@@ -9196,13 +9222,50 @@ async function convertPptxToSvg(input, options) {
     resetScriptFonts();
   }
 }
+var cachedFontBuffers = null;
+var cachedFontBuffersKey = null;
+var MAX_TOTAL_FONT_BUFFER_BYTES = 100 * 1024 * 1024;
+function loadFontBuffers(fontDirs, skipSystemFonts) {
+  const key = `${(fontDirs ?? []).join("\0")}
+${skipSystemFonts ?? false}`;
+  if (cachedFontBuffers !== null && cachedFontBuffersKey === key) {
+    return cachedFontBuffers;
+  }
+  const allPaths = collectFontFilePaths(fontDirs, skipSystemFonts);
+  const ttfOtfPaths = allPaths.filter((p) => {
+    const lower = p.toLowerCase();
+    return lower.endsWith(".ttf") || lower.endsWith(".otf");
+  });
+  const pathsWithSize = [];
+  for (const p of ttfOtfPaths) {
+    try {
+      pathsWithSize.push({ path: p, size: statSync(p).size });
+    } catch {
+    }
+  }
+  pathsWithSize.sort((a, b) => a.size - b.size);
+  const buffers = [];
+  let totalSize = 0;
+  for (const { path, size } of pathsWithSize) {
+    if (totalSize + size > MAX_TOTAL_FONT_BUFFER_BYTES) break;
+    try {
+      buffers.push(new Uint8Array(readFileSync(path)));
+      totalSize += size;
+    } catch {
+    }
+  }
+  cachedFontBuffers = buffers;
+  cachedFontBuffersKey = key;
+  return buffers;
+}
 async function convertPptxToPng(input, options) {
   const svgResults = await convertPptxToSvg(input, options);
   const width = options?.width ?? DEFAULT_OUTPUT_WIDTH;
   const height = options?.height;
+  const fontBuffers = loadFontBuffers(options?.fontDirs, options?.skipSystemFonts);
   const results = [];
   for (const { slideNumber, svg } of svgResults) {
-    const pngResult = await svgToPng(svg, { width, height });
+    const pngResult = await svgToPng(svg, { width, height, fontBuffers });
     results.push({
       slideNumber,
       png: pngResult.png,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pptx-glimpse",
-  "version": "0.11.2",
+  "version": "1.0.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",
@@ -17,7 +17,7 @@
     "dist"
   ],
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "keywords": [
     "pptx",
@@ -46,7 +46,7 @@
     "@changesets/cli": "^2.29.8",
     "@types/node": "^25.2.2",
     "@types/ws": "^8.18.1",
-    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/coverage-v8": "4.1.0",
     "eslint": "^9.0.0",
     "eslint-config-prettier": "^10.0.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
@@ -59,7 +59,7 @@
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.55.0",
-    "vitest": "^3.0.0",
+    "vitest": "^4.1.0",
     "ws": "^8.19.0"
   },
   "scripts": {