pptx-glimpse 0.10.3 → 0.11.0

package/README.md

@@ -81,6 +81,7 @@ const results = await convertPptxToPng(pptx, {
   height: 1080, // Output height in pixels (width takes priority if both set)
   logLevel: "warn", // Warning log level: "off" | "warn" | "debug"
   fontDirs: ["/custom/fonts"], // Additional font directories to search
+  skipSystemFonts: true, // Skip OS system font directories; use fontDirs only
   fontMapping: {
     "Custom Corp Font": "Noto Sans", // Custom font name mapping
   },
@@ -154,7 +155,7 @@ Default system font directories:
 | macOS   | `/System/Library/Fonts`, `/Library/Fonts`, `~/Library/Fonts` |
 | Windows | `C:\Windows\Fonts`                                           |
 
-Use the `fontDirs` option to add custom font directories.
+Use the `fontDirs` option to add custom font directories. To skip system font scanning entirely and use only `fontDirs` (useful in containers, serverless environments, or when you want to bundle specific fonts to reduce startup time), set `skipSystemFonts: true`.
 
 ### Font Mapping
 

package/dist/index.cjs

@@ -1229,6 +1229,7 @@ var CJK_TTC_PATTERNS = [
 ];
 var cachedPaths = null;
 var cachedAdditionalDirs = null;
+var cachedSkipSystemFonts = null;
 function getSystemFontDirs() {
   const os = (0, import_node_os2.platform)();
   switch (os) {
@@ -1260,20 +1261,21 @@ function walk(dir, result) {
   } catch {
   }
 }
-function collectFontFilePaths(additionalDirs) {
+function collectFontFilePaths(additionalDirs, skipSystemFonts = false) {
   const dirs = additionalDirs ?? [];
   const dirsKey = dirs.join("\0");
   const cachedKey = cachedAdditionalDirs?.join("\0") ?? null;
-  if (cachedPaths !== null && dirsKey === cachedKey) {
+  if (cachedPaths !== null && dirsKey === cachedKey && cachedSkipSystemFonts === skipSystemFonts) {
     return cachedPaths;
   }
-  const allDirs = [...getSystemFontDirs(), ...dirs];
+  const allDirs = skipSystemFonts ? dirs : [...getSystemFontDirs(), ...dirs];
   const result = [];
   for (const dir of allDirs) {
     walk(dir, result);
   }
   cachedPaths = result;
   cachedAdditionalDirs = dirs;
+  cachedSkipSystemFonts = skipSystemFonts;
   return result;
 }
 
@@ -1545,11 +1547,12 @@ function collectFontNames(font) {
   }
   return names;
 }
-function buildCacheKey(additionalFontDirs, fontMapping) {
+function buildCacheKey(additionalFontDirs, fontMapping, skipSystemFonts = false) {
   const dirsKey = additionalFontDirs ? [...additionalFontDirs].sort().join("\0") : "";
   const mappingKey = fontMapping ? JSON.stringify(fontMapping, Object.keys(fontMapping).sort()) : "";
   return `${dirsKey}
-${mappingKey}`;
+${mappingKey}
+${skipSystemFonts}`;
 }
 var cachedSetup = null;
 var cachedSetupKey = null;
@@ -1557,14 +1560,14 @@ function clearFontCache() {
   cachedSetup = null;
   cachedSetupKey = null;
 }
-async function createOpentypeSetupFromSystem(additionalFontDirs, fontMapping) {
-  const key = buildCacheKey(additionalFontDirs, fontMapping);
+async function createOpentypeSetupFromSystem(additionalFontDirs, fontMapping, skipSystemFonts = false) {
+  const key = buildCacheKey(additionalFontDirs, fontMapping, skipSystemFonts);
   if (cachedSetup && cachedSetupKey === key) {
     return cachedSetup;
   }
   const opentype = await tryLoadOpentype();
   if (!opentype) return null;
-  const fontFilePaths = collectFontFilePaths(additionalFontDirs);
+  const fontFilePaths = collectFontFilePaths(additionalFontDirs, skipSystemFonts);
   if (fontFilePaths.length === 0) return null;
   const mapping = createFontMapping(fontMapping);
   const reverseMap = buildReverseMapping(mapping);
@@ -9113,7 +9116,11 @@ function escapeXmlAttr(str) {
 
 // src/converter.ts
 async function convertPptxToSvg(input, options) {
-  const setup = await createOpentypeSetupFromSystem(options?.fontDirs, options?.fontMapping);
+  const setup = await createOpentypeSetupFromSystem(
+    options?.fontDirs,
+    options?.fontMapping,
+    options?.skipSystemFonts
+  );
   if (setup) {
     setTextMeasurer(setup.measurer);
     setTextPathFontResolver(setup.fontResolver);
@@ -9165,13 +9172,21 @@ async function convertPptxToPng(input, options) {
   return results;
 }
 function mergeElements(masterElements, layoutElements, slideElements) {
-  const filterPlaceholders = (elements) => elements.filter((el) => {
+  const filterTemplatePlaceholders = (elements) => elements.filter((el) => {
     if (el.type !== "shape") return true;
     return !el.placeholderType;
   });
-  const filteredMaster = filterPlaceholders(masterElements);
-  const filteredLayout = filterPlaceholders(layoutElements);
-  return [...filteredMaster, ...filteredLayout, ...slideElements];
+  const filterEmptySlidePlaceholders = (elements) => elements.filter((el) => !(el.type === "shape" && isEmptyPlaceholder(el)));
+  const filteredMaster = filterTemplatePlaceholders(masterElements);
+  const filteredLayout = filterTemplatePlaceholders(layoutElements);
+  const filteredSlide = filterEmptySlidePlaceholders(slideElements);
+  return [...filteredMaster, ...filteredLayout, ...filteredSlide];
+}
+function isEmptyPlaceholder(shape) {
+  if (!shape.placeholderType) return false;
+  const paragraphs = shape.textBody?.paragraphs;
+  if (!paragraphs || paragraphs.length === 0) return true;
+  return !paragraphs.some((p) => p.runs.some((r) => r.text.length > 0));
 }
 
 // src/font/font-collector.ts

package/dist/index.d.cts

@@ -46,6 +46,8 @@ interface ConvertOptions {
     fontDirs?: string[];
     /** PPTX フォント名 → OSS 代替フォントのカスタムマッピング。デフォルトマッピングにマージされる */
     fontMapping?: FontMapping;
+    /** true のとき OS のシステムフォントをスキャンせず fontDirs のみを使用する */
+    skipSystemFonts?: boolean;
 }
 interface SlideSvg {
     slideNumber: number;

package/dist/index.d.ts

@@ -46,6 +46,8 @@ interface ConvertOptions {
     fontDirs?: string[];
     /** PPTX フォント名 → OSS 代替フォントのカスタムマッピング。デフォルトマッピングにマージされる */
     fontMapping?: FontMapping;
+    /** true のとき OS のシステムフォントをスキャンせず fontDirs のみを使用する */
+    skipSystemFonts?: boolean;
 }
 interface SlideSvg {
     slideNumber: number;

package/dist/index.js

@@ -1192,6 +1192,7 @@ var CJK_TTC_PATTERNS = [
 ];
 var cachedPaths = null;
 var cachedAdditionalDirs = null;
+var cachedSkipSystemFonts = null;
 function getSystemFontDirs() {
   const os = platform2();
   switch (os) {
@@ -1223,20 +1224,21 @@ function walk(dir, result) {
   } catch {
   }
 }
-function collectFontFilePaths(additionalDirs) {
+function collectFontFilePaths(additionalDirs, skipSystemFonts = false) {
   const dirs = additionalDirs ?? [];
   const dirsKey = dirs.join("\0");
   const cachedKey = cachedAdditionalDirs?.join("\0") ?? null;
-  if (cachedPaths !== null && dirsKey === cachedKey) {
+  if (cachedPaths !== null && dirsKey === cachedKey && cachedSkipSystemFonts === skipSystemFonts) {
     return cachedPaths;
   }
-  const allDirs = [...getSystemFontDirs(), ...dirs];
+  const allDirs = skipSystemFonts ? dirs : [...getSystemFontDirs(), ...dirs];
   const result = [];
   for (const dir of allDirs) {
     walk(dir, result);
   }
   cachedPaths = result;
   cachedAdditionalDirs = dirs;
+  cachedSkipSystemFonts = skipSystemFonts;
   return result;
 }
 
@@ -1508,11 +1510,12 @@ function collectFontNames(font) {
   }
   return names;
 }
-function buildCacheKey(additionalFontDirs, fontMapping) {
+function buildCacheKey(additionalFontDirs, fontMapping, skipSystemFonts = false) {
   const dirsKey = additionalFontDirs ? [...additionalFontDirs].sort().join("\0") : "";
   const mappingKey = fontMapping ? JSON.stringify(fontMapping, Object.keys(fontMapping).sort()) : "";
   return `${dirsKey}
-${mappingKey}`;
+${mappingKey}
+${skipSystemFonts}`;
 }
 var cachedSetup = null;
 var cachedSetupKey = null;
@@ -1520,14 +1523,14 @@ function clearFontCache() {
   cachedSetup = null;
   cachedSetupKey = null;
 }
-async function createOpentypeSetupFromSystem(additionalFontDirs, fontMapping) {
-  const key = buildCacheKey(additionalFontDirs, fontMapping);
+async function createOpentypeSetupFromSystem(additionalFontDirs, fontMapping, skipSystemFonts = false) {
+  const key = buildCacheKey(additionalFontDirs, fontMapping, skipSystemFonts);
   if (cachedSetup && cachedSetupKey === key) {
     return cachedSetup;
   }
   const opentype = await tryLoadOpentype();
   if (!opentype) return null;
-  const fontFilePaths = collectFontFilePaths(additionalFontDirs);
+  const fontFilePaths = collectFontFilePaths(additionalFontDirs, skipSystemFonts);
   if (fontFilePaths.length === 0) return null;
   const mapping = createFontMapping(fontMapping);
   const reverseMap = buildReverseMapping(mapping);
@@ -9075,7 +9078,11 @@ function escapeXmlAttr(str) {
 
 // src/converter.ts
 async function convertPptxToSvg(input, options) {
-  const setup = await createOpentypeSetupFromSystem(options?.fontDirs, options?.fontMapping);
+  const setup = await createOpentypeSetupFromSystem(
+    options?.fontDirs,
+    options?.fontMapping,
+    options?.skipSystemFonts
+  );
   if (setup) {
     setTextMeasurer(setup.measurer);
     setTextPathFontResolver(setup.fontResolver);
@@ -9127,13 +9134,21 @@ async function convertPptxToPng(input, options) {
   return results;
 }
 function mergeElements(masterElements, layoutElements, slideElements) {
-  const filterPlaceholders = (elements) => elements.filter((el) => {
+  const filterTemplatePlaceholders = (elements) => elements.filter((el) => {
     if (el.type !== "shape") return true;
     return !el.placeholderType;
   });
-  const filteredMaster = filterPlaceholders(masterElements);
-  const filteredLayout = filterPlaceholders(layoutElements);
-  return [...filteredMaster, ...filteredLayout, ...slideElements];
+  const filterEmptySlidePlaceholders = (elements) => elements.filter((el) => !(el.type === "shape" && isEmptyPlaceholder(el)));
+  const filteredMaster = filterTemplatePlaceholders(masterElements);
+  const filteredLayout = filterTemplatePlaceholders(layoutElements);
+  const filteredSlide = filterEmptySlidePlaceholders(slideElements);
+  return [...filteredMaster, ...filteredLayout, ...filteredSlide];
+}
+function isEmptyPlaceholder(shape) {
+  if (!shape.placeholderType) return false;
+  const paragraphs = shape.textBody?.paragraphs;
+  if (!paragraphs || paragraphs.length === 0) return true;
+  return !paragraphs.some((p) => p.runs.some((r) => r.text.length > 0));
 }
 
 // src/font/font-collector.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pptx-glimpse",
-  "version": "0.10.3",
+  "version": "0.11.0",
   "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",
@@ -65,7 +65,7 @@
   "license": "MIT",
   "dependencies": {
     "@resvg/resvg-wasm": "^2.6.2",
-    "fast-xml-parser": "^5.3.6",
+    "fast-xml-parser": "^5.7.3",
     "fflate": "^0.8.2",
     "opentype.js": "^1.3.4"
   },