pptx-glimpse 0.6.0 → 0.7.0

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);
 
@@ -1570,15 +1571,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,
@@ -3017,7 +3039,7 @@ function navigateOrdered(ordered, path) {
   }
   return current;
 }
-function parseSlide(slideXml, slidePath, slideNumber, archive, colorResolver, fontScheme, fmtScheme) {
+function parseSlide(slideXml, slidePath, slideNumber, archive, colorResolver, fontScheme, fmtScheme, placeholderStyles) {
   const parsed = parseXml(slideXml);
   const sld = parsed.sld;
   if (!sld) {
@@ -3041,7 +3063,8 @@ function parseSlide(slideXml, slidePath, slideNumber, archive, colorResolver, fo
     fillContext,
     fontScheme,
     orderedSpTree,
-    fmtScheme
+    fmtScheme,
+    placeholderStyles
   );
   const showMasterSpAttr = sld?.["@_showMasterSp"];
   const showMasterSp = showMasterSpAttr !== "0" && showMasterSpAttr !== "false";
@@ -3068,7 +3091,7 @@ function mergeChildElements(spTree, source) {
     }
   }
 }
-function parseShapeTree(spTree, rels, slidePath, archive, colorResolver, context, fillContext, fontScheme, orderedChildren, fmtScheme) {
+function parseShapeTree(spTree, rels, slidePath, archive, colorResolver, context, fillContext, fontScheme, orderedChildren, fmtScheme, placeholderStyles) {
   if (!spTree) return [];
   if (orderedChildren) {
     return parseShapeTreeOrdered(
@@ -3081,7 +3104,8 @@ function parseShapeTree(spTree, rels, slidePath, archive, colorResolver, context
       context,
       fillContext,
       fontScheme,
-      fmtScheme
+      fmtScheme,
+      placeholderStyles
     );
   }
   const alternateContents = spTree.AlternateContent ?? [];
@@ -3102,7 +3126,8 @@ function parseShapeTree(spTree, rels, slidePath, archive, colorResolver, context
       fillContext,
       fontScheme,
       void 0,
-      fmtScheme
+      fmtScheme,
+      placeholderStyles
     );
     if (shape) {
       elements.push(shape);
@@ -3158,7 +3183,7 @@ function parseShapeTree(spTree, rels, slidePath, archive, colorResolver, context
   }
   return elements;
 }
-function parseShapeTreeOrdered(spTree, orderedChildren, rels, slidePath, archive, colorResolver, context, fillContext, fontScheme, fmtScheme) {
+function parseShapeTreeOrdered(spTree, orderedChildren, rels, slidePath, archive, colorResolver, context, fillContext, fontScheme, fmtScheme, placeholderStyles) {
   const ctx = context ?? slidePath;
   const elements = [];
   const tagCounters = {};
@@ -3200,7 +3225,8 @@ function parseShapeTreeOrdered(spTree, orderedChildren, rels, slidePath, archive
             ctx,
             fillContext,
             fontScheme,
-            fmtScheme
+            fmtScheme,
+            placeholderStyles
           );
         }
       }
@@ -3224,12 +3250,13 @@ function parseShapeTreeOrdered(spTree, orderedChildren, rels, slidePath, archive
       ctx,
       fillContext,
       fontScheme,
-      fmtScheme
+      fmtScheme,
+      placeholderStyles
     );
   }
   return elements;
 }
-function parseAndPushElement(tag, element, orderedNode, elements, rels, slidePath, archive, colorResolver, ctx, fillContext, fontScheme, fmtScheme) {
+function parseAndPushElement(tag, element, orderedNode, elements, rels, slidePath, archive, colorResolver, ctx, fillContext, fontScheme, fmtScheme, placeholderStyles) {
   switch (tag) {
     case "sp": {
       const shape = parseShape(
@@ -3239,7 +3266,8 @@ function parseAndPushElement(tag, element, orderedNode, elements, rels, slidePat
         fillContext,
         fontScheme,
         orderedNode,
-        fmtScheme
+        fmtScheme,
+        placeholderStyles
       );
       if (shape) {
         elements.push(shape);
@@ -3304,22 +3332,42 @@ function parseAndPushElement(tag, element, orderedNode, elements, rels, slidePat
     }
   }
 }
-function parseShape(sp, colorResolver, rels, fillContext, fontScheme, orderedNode, fmtScheme) {
+function parseShape(sp, colorResolver, rels, fillContext, fontScheme, orderedNode, fmtScheme, placeholderStyles) {
   const spPr = sp.spPr;
-  if (!spPr) return null;
-  const transform = parseTransform(spPr.xfrm);
+  const spPrIsObject = spPr != null && typeof spPr === "object";
+  const nvSpPr = sp.nvSpPr;
+  const nvPr = nvSpPr?.nvPr;
+  const ph = nvPr?.ph;
+  const placeholderType = ph ? ph["@_type"] ?? "body" : void 0;
+  const placeholderIdx = ph?.["@_idx"] !== void 0 ? Number(ph["@_idx"]) : void 0;
+  let transform = null;
+  let geometry;
+  if (spPrIsObject) {
+    transform = parseTransform(spPr.xfrm);
+    geometry = parseGeometry(spPr);
+  } else {
+    geometry = { type: "preset", preset: "rect", adjustValues: {} };
+  }
+  if (!transform && placeholderType && placeholderStyles) {
+    const inherited = findMatchingPlaceholder(placeholderType, placeholderIdx, placeholderStyles);
+    if (inherited?.transform) {
+      transform = inherited.transform;
+    }
+    if (!spPrIsObject && inherited?.geometry) {
+      geometry = inherited.geometry;
+    }
+  }
   if (!transform) return null;
-  if (spPr.scene3d) {
+  if (spPrIsObject && spPr.scene3d) {
     warn("spPr.scene3d", "3D scene/camera not implemented");
   }
-  if (spPr.sp3d) {
+  if (spPrIsObject && spPr.sp3d) {
     warn("spPr.sp3d", "3D extrusion/bevel not implemented");
   }
-  const geometry = parseGeometry(spPr);
   const styleRef = resolveShapeStyle(sp.style, fmtScheme, colorResolver);
-  const directFill = parseFillFromNode(spPr, colorResolver, fillContext);
+  const directFill = spPrIsObject ? parseFillFromNode(spPr, colorResolver, fillContext) : null;
   const fill = directFill ?? styleRef?.fill ?? null;
-  const directOutline = parseOutline(spPr.ln, colorResolver);
+  const directOutline = spPrIsObject ? parseOutline(spPr.ln, colorResolver) : null;
   const outline = directOutline ?? styleRef?.outline ?? null;
   let orderedTxBody;
   if (orderedNode) {
@@ -3337,16 +3385,11 @@ function parseShape(sp, colorResolver, rels, fillContext, fontScheme, orderedNod
     void 0,
     orderedTxBody
   );
-  const directEffects = parseEffectList(spPr.effectLst, colorResolver);
+  const directEffects = spPrIsObject ? parseEffectList(spPr.effectLst, colorResolver) : null;
   const effects = directEffects ?? styleRef?.effects ?? null;
-  const nvSpPr = sp.nvSpPr;
   const cNvPr = nvSpPr?.cNvPr;
   const altText = cNvPr?.["@_descr"];
   const hyperlink = parseHyperlink(cNvPr?.hlinkClick, rels);
-  const nvPr = nvSpPr?.nvPr;
-  const ph = nvPr?.ph;
-  const placeholderType = ph ? ph["@_type"] ?? "body" : void 0;
-  const placeholderIdx = ph?.["@_idx"] !== void 0 ? Number(ph["@_idx"]) : void 0;
   return {
     type: "shape",
     transform,
@@ -3700,6 +3743,31 @@ function parseGeometry(spPr) {
   }
   return { type: "preset", preset: "rect", adjustValues: {} };
 }
+function findMatchingPlaceholder(placeholderType, placeholderIdx, styles) {
+  if (placeholderIdx !== void 0) {
+    const byIdx = styles.find((s) => s.placeholderIdx === placeholderIdx && s.transform);
+    if (byIdx) return byIdx;
+    const byIdxAny = styles.find((s) => s.placeholderIdx === placeholderIdx);
+    if (byIdxAny) return byIdxAny;
+  }
+  const byTypeWithTransform = styles.find(
+    (s) => s.placeholderType === placeholderType && s.transform
+  );
+  if (byTypeWithTransform) return byTypeWithTransform;
+  const fallbackType = placeholderType === "ctrTitle" ? "title" : placeholderType === "subTitle" ? "body" : void 0;
+  if (fallbackType) {
+    const byFallbackWithTransform = styles.find(
+      (s) => s.placeholderType === fallbackType && s.transform
+    );
+    if (byFallbackWithTransform) return byFallbackWithTransform;
+  }
+  const byType = styles.find((s) => s.placeholderType === placeholderType);
+  if (byType) return byType;
+  if (fallbackType) {
+    return styles.find((s) => s.placeholderType === fallbackType);
+  }
+  return void 0;
+}
 function parseTextBody(txBody, colorResolver, rels, fontScheme, lstStyleOverride, orderedTxBody) {
   if (!txBody) return null;
   const bodyPr = txBody.bodyPr;
@@ -4129,10 +4197,15 @@ function parseSlideLayoutPlaceholderStyles(xml, colorResolver) {
     const txBody = sp.txBody;
     const lstStyleNode = txBody?.lstStyle;
     const lstStyle = lstStyleNode ? parseListStyle(lstStyleNode, colorResolver) : void 0;
+    const spPr = sp.spPr;
+    const transform = spPr && typeof spPr === "object" ? parseTransform(spPr.xfrm) : null;
+    const geometry = spPr && typeof spPr === "object" ? parseGeometry(spPr) : void 0;
     results.push({
       placeholderType,
       ...placeholderIdx !== void 0 && { placeholderIdx },
-      ...lstStyle && { lstStyle }
+      ...lstStyle && { lstStyle },
+      ...transform && { transform },
+      ...geometry && { geometry }
     });
   }
   return results;
@@ -4249,10 +4322,15 @@ function parseSlideMasterPlaceholderStyles(xml, colorResolver) {
     const txBody = sp.txBody;
     const lstStyleNode = txBody?.lstStyle;
     const lstStyle = lstStyleNode ? parseListStyle(lstStyleNode, colorResolver) : void 0;
+    const spPr = sp.spPr;
+    const transform = spPr && typeof spPr === "object" ? parseTransform(spPr.xfrm) : null;
+    const geometry = spPr && typeof spPr === "object" ? parseGeometry(spPr) : void 0;
     results.push({
       placeholderType,
       ...placeholderIdx !== void 0 && { placeholderIdx },
-      ...lstStyle && { lstStyle }
+      ...lstStyle && { lstStyle },
+      ...transform && { transform },
+      ...geometry && { geometry }
     });
   }
   return results;
@@ -4703,6 +4781,17 @@ function parseSlideWithLayout(slideNumber, path, data) {
     slideMasterData,
     data.theme
   );
+  let layoutPlaceholderStyles = [];
+  let layoutShowMasterSp = true;
+  if (layoutXml) {
+    layoutPlaceholderStyles = parseSlideLayoutPlaceholderStyles(layoutXml, slideColorResolver);
+    layoutShowMasterSp = parseSlideLayoutShowMasterSp(layoutXml);
+  }
+  const masterPlaceholderStyles = slideMasterData?.placeholderStyles ?? data.masterPlaceholderStyles;
+  const mergedPlaceholderStyles = mergePlaceholderGeometry(
+    layoutPlaceholderStyles,
+    masterPlaceholderStyles
+  );
   const slide = parseSlide(
     slideXml,
     path,
@@ -4710,11 +4799,10 @@ function parseSlideWithLayout(slideNumber, path, data) {
     data.archive,
     slideColorResolver,
     data.theme.fontScheme,
-    data.theme.fmtScheme
+    data.theme.fmtScheme,
+    mergedPlaceholderStyles
   );
   let layoutElements = [];
-  let layoutPlaceholderStyles = [];
-  let layoutShowMasterSp = true;
   if (layoutXml && layoutPath) {
     if (!slide.background) {
       const layoutFillContext = {
@@ -4736,13 +4824,10 @@ function parseSlideWithLayout(slideNumber, path, data) {
       data.theme.fontScheme,
       data.theme.fmtScheme
     );
-    layoutPlaceholderStyles = parseSlideLayoutPlaceholderStyles(layoutXml, slideColorResolver);
-    layoutShowMasterSp = parseSlideLayoutShowMasterSp(layoutXml);
   }
   if (!slide.background) {
     slide.background = slideMasterData?.background ?? data.masterBackground;
   }
-  const masterPlaceholderStyles = slideMasterData?.placeholderStyles ?? data.masterPlaceholderStyles;
   const masterTxStyles = slideMasterData?.txStyles ?? data.masterTxStyles;
   applyTextStyleInheritance(slide.elements, {
     layoutPlaceholderStyles,
@@ -4754,6 +4839,38 @@ function parseSlideWithLayout(slideNumber, path, data) {
   const masterElements = slideMasterData?.elements ?? data.masterElements;
   return { slide, layoutElements, layoutShowMasterSp, masterElements };
 }
+function mergePlaceholderGeometry(layoutStyles, masterStyles) {
+  const merged = layoutStyles.map((ls) => {
+    if (ls.transform) return ls;
+    const masterMatch = findPlaceholderByTypeAndIdx(
+      ls.placeholderType,
+      ls.placeholderIdx,
+      masterStyles
+    );
+    if (!masterMatch) return ls;
+    return {
+      ...ls,
+      ...!ls.transform && masterMatch.transform && { transform: masterMatch.transform },
+      ...!ls.geometry && masterMatch.geometry && { geometry: masterMatch.geometry }
+    };
+  });
+  for (const ms of masterStyles) {
+    const exists = merged.some(
+      (m) => m.placeholderType === ms.placeholderType && m.placeholderIdx === ms.placeholderIdx
+    );
+    if (!exists) {
+      merged.push(ms);
+    }
+  }
+  return merged;
+}
+function findPlaceholderByTypeAndIdx(type, idx, styles) {
+  if (idx !== void 0) {
+    const byIdx = styles.find((s) => s.placeholderIdx === idx);
+    if (byIdx) return byIdx;
+  }
+  return styles.find((s) => s.placeholderType === type);
+}
 function defaultColorScheme2() {
   return {
     dk1: "#000000",
@@ -8797,5 +8914,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

@@ -1535,15 +1535,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,
@@ -2982,7 +3002,7 @@ function navigateOrdered(ordered, path) {
   }
   return current;
 }
-function parseSlide(slideXml, slidePath, slideNumber, archive, colorResolver, fontScheme, fmtScheme) {
+function parseSlide(slideXml, slidePath, slideNumber, archive, colorResolver, fontScheme, fmtScheme, placeholderStyles) {
   const parsed = parseXml(slideXml);
   const sld = parsed.sld;
   if (!sld) {
@@ -3006,7 +3026,8 @@ function parseSlide(slideXml, slidePath, slideNumber, archive, colorResolver, fo
     fillContext,
     fontScheme,
     orderedSpTree,
-    fmtScheme
+    fmtScheme,
+    placeholderStyles
   );
   const showMasterSpAttr = sld?.["@_showMasterSp"];
   const showMasterSp = showMasterSpAttr !== "0" && showMasterSpAttr !== "false";
@@ -3033,7 +3054,7 @@ function mergeChildElements(spTree, source) {
     }
   }
 }
-function parseShapeTree(spTree, rels, slidePath, archive, colorResolver, context, fillContext, fontScheme, orderedChildren, fmtScheme) {
+function parseShapeTree(spTree, rels, slidePath, archive, colorResolver, context, fillContext, fontScheme, orderedChildren, fmtScheme, placeholderStyles) {
   if (!spTree) return [];
   if (orderedChildren) {
     return parseShapeTreeOrdered(
@@ -3046,7 +3067,8 @@ function parseShapeTree(spTree, rels, slidePath, archive, colorResolver, context
       context,
       fillContext,
       fontScheme,
-      fmtScheme
+      fmtScheme,
+      placeholderStyles
     );
   }
   const alternateContents = spTree.AlternateContent ?? [];
@@ -3067,7 +3089,8 @@ function parseShapeTree(spTree, rels, slidePath, archive, colorResolver, context
       fillContext,
       fontScheme,
       void 0,
-      fmtScheme
+      fmtScheme,
+      placeholderStyles
     );
     if (shape) {
       elements.push(shape);
@@ -3123,7 +3146,7 @@ function parseShapeTree(spTree, rels, slidePath, archive, colorResolver, context
   }
   return elements;
 }
-function parseShapeTreeOrdered(spTree, orderedChildren, rels, slidePath, archive, colorResolver, context, fillContext, fontScheme, fmtScheme) {
+function parseShapeTreeOrdered(spTree, orderedChildren, rels, slidePath, archive, colorResolver, context, fillContext, fontScheme, fmtScheme, placeholderStyles) {
   const ctx = context ?? slidePath;
   const elements = [];
   const tagCounters = {};
@@ -3165,7 +3188,8 @@ function parseShapeTreeOrdered(spTree, orderedChildren, rels, slidePath, archive
             ctx,
             fillContext,
             fontScheme,
-            fmtScheme
+            fmtScheme,
+            placeholderStyles
           );
         }
       }
@@ -3189,12 +3213,13 @@ function parseShapeTreeOrdered(spTree, orderedChildren, rels, slidePath, archive
       ctx,
       fillContext,
       fontScheme,
-      fmtScheme
+      fmtScheme,
+      placeholderStyles
     );
   }
   return elements;
 }
-function parseAndPushElement(tag, element, orderedNode, elements, rels, slidePath, archive, colorResolver, ctx, fillContext, fontScheme, fmtScheme) {
+function parseAndPushElement(tag, element, orderedNode, elements, rels, slidePath, archive, colorResolver, ctx, fillContext, fontScheme, fmtScheme, placeholderStyles) {
   switch (tag) {
     case "sp": {
       const shape = parseShape(
@@ -3204,7 +3229,8 @@ function parseAndPushElement(tag, element, orderedNode, elements, rels, slidePat
         fillContext,
         fontScheme,
         orderedNode,
-        fmtScheme
+        fmtScheme,
+        placeholderStyles
       );
       if (shape) {
         elements.push(shape);
@@ -3269,22 +3295,42 @@ function parseAndPushElement(tag, element, orderedNode, elements, rels, slidePat
     }
   }
 }
-function parseShape(sp, colorResolver, rels, fillContext, fontScheme, orderedNode, fmtScheme) {
+function parseShape(sp, colorResolver, rels, fillContext, fontScheme, orderedNode, fmtScheme, placeholderStyles) {
   const spPr = sp.spPr;
-  if (!spPr) return null;
-  const transform = parseTransform(spPr.xfrm);
+  const spPrIsObject = spPr != null && typeof spPr === "object";
+  const nvSpPr = sp.nvSpPr;
+  const nvPr = nvSpPr?.nvPr;
+  const ph = nvPr?.ph;
+  const placeholderType = ph ? ph["@_type"] ?? "body" : void 0;
+  const placeholderIdx = ph?.["@_idx"] !== void 0 ? Number(ph["@_idx"]) : void 0;
+  let transform = null;
+  let geometry;
+  if (spPrIsObject) {
+    transform = parseTransform(spPr.xfrm);
+    geometry = parseGeometry(spPr);
+  } else {
+    geometry = { type: "preset", preset: "rect", adjustValues: {} };
+  }
+  if (!transform && placeholderType && placeholderStyles) {
+    const inherited = findMatchingPlaceholder(placeholderType, placeholderIdx, placeholderStyles);
+    if (inherited?.transform) {
+      transform = inherited.transform;
+    }
+    if (!spPrIsObject && inherited?.geometry) {
+      geometry = inherited.geometry;
+    }
+  }
   if (!transform) return null;
-  if (spPr.scene3d) {
+  if (spPrIsObject && spPr.scene3d) {
     warn("spPr.scene3d", "3D scene/camera not implemented");
   }
-  if (spPr.sp3d) {
+  if (spPrIsObject && spPr.sp3d) {
     warn("spPr.sp3d", "3D extrusion/bevel not implemented");
   }
-  const geometry = parseGeometry(spPr);
   const styleRef = resolveShapeStyle(sp.style, fmtScheme, colorResolver);
-  const directFill = parseFillFromNode(spPr, colorResolver, fillContext);
+  const directFill = spPrIsObject ? parseFillFromNode(spPr, colorResolver, fillContext) : null;
   const fill = directFill ?? styleRef?.fill ?? null;
-  const directOutline = parseOutline(spPr.ln, colorResolver);
+  const directOutline = spPrIsObject ? parseOutline(spPr.ln, colorResolver) : null;
   const outline = directOutline ?? styleRef?.outline ?? null;
   let orderedTxBody;
   if (orderedNode) {
@@ -3302,16 +3348,11 @@ function parseShape(sp, colorResolver, rels, fillContext, fontScheme, orderedNod
     void 0,
     orderedTxBody
   );
-  const directEffects = parseEffectList(spPr.effectLst, colorResolver);
+  const directEffects = spPrIsObject ? parseEffectList(spPr.effectLst, colorResolver) : null;
   const effects = directEffects ?? styleRef?.effects ?? null;
-  const nvSpPr = sp.nvSpPr;
   const cNvPr = nvSpPr?.cNvPr;
   const altText = cNvPr?.["@_descr"];
   const hyperlink = parseHyperlink(cNvPr?.hlinkClick, rels);
-  const nvPr = nvSpPr?.nvPr;
-  const ph = nvPr?.ph;
-  const placeholderType = ph ? ph["@_type"] ?? "body" : void 0;
-  const placeholderIdx = ph?.["@_idx"] !== void 0 ? Number(ph["@_idx"]) : void 0;
   return {
     type: "shape",
     transform,
@@ -3665,6 +3706,31 @@ function parseGeometry(spPr) {
   }
   return { type: "preset", preset: "rect", adjustValues: {} };
 }
+function findMatchingPlaceholder(placeholderType, placeholderIdx, styles) {
+  if (placeholderIdx !== void 0) {
+    const byIdx = styles.find((s) => s.placeholderIdx === placeholderIdx && s.transform);
+    if (byIdx) return byIdx;
+    const byIdxAny = styles.find((s) => s.placeholderIdx === placeholderIdx);
+    if (byIdxAny) return byIdxAny;
+  }
+  const byTypeWithTransform = styles.find(
+    (s) => s.placeholderType === placeholderType && s.transform
+  );
+  if (byTypeWithTransform) return byTypeWithTransform;
+  const fallbackType = placeholderType === "ctrTitle" ? "title" : placeholderType === "subTitle" ? "body" : void 0;
+  if (fallbackType) {
+    const byFallbackWithTransform = styles.find(
+      (s) => s.placeholderType === fallbackType && s.transform
+    );
+    if (byFallbackWithTransform) return byFallbackWithTransform;
+  }
+  const byType = styles.find((s) => s.placeholderType === placeholderType);
+  if (byType) return byType;
+  if (fallbackType) {
+    return styles.find((s) => s.placeholderType === fallbackType);
+  }
+  return void 0;
+}
 function parseTextBody(txBody, colorResolver, rels, fontScheme, lstStyleOverride, orderedTxBody) {
   if (!txBody) return null;
   const bodyPr = txBody.bodyPr;
@@ -4094,10 +4160,15 @@ function parseSlideLayoutPlaceholderStyles(xml, colorResolver) {
     const txBody = sp.txBody;
     const lstStyleNode = txBody?.lstStyle;
     const lstStyle = lstStyleNode ? parseListStyle(lstStyleNode, colorResolver) : void 0;
+    const spPr = sp.spPr;
+    const transform = spPr && typeof spPr === "object" ? parseTransform(spPr.xfrm) : null;
+    const geometry = spPr && typeof spPr === "object" ? parseGeometry(spPr) : void 0;
     results.push({
       placeholderType,
       ...placeholderIdx !== void 0 && { placeholderIdx },
-      ...lstStyle && { lstStyle }
+      ...lstStyle && { lstStyle },
+      ...transform && { transform },
+      ...geometry && { geometry }
     });
   }
   return results;
@@ -4214,10 +4285,15 @@ function parseSlideMasterPlaceholderStyles(xml, colorResolver) {
     const txBody = sp.txBody;
     const lstStyleNode = txBody?.lstStyle;
     const lstStyle = lstStyleNode ? parseListStyle(lstStyleNode, colorResolver) : void 0;
+    const spPr = sp.spPr;
+    const transform = spPr && typeof spPr === "object" ? parseTransform(spPr.xfrm) : null;
+    const geometry = spPr && typeof spPr === "object" ? parseGeometry(spPr) : void 0;
     results.push({
       placeholderType,
       ...placeholderIdx !== void 0 && { placeholderIdx },
-      ...lstStyle && { lstStyle }
+      ...lstStyle && { lstStyle },
+      ...transform && { transform },
+      ...geometry && { geometry }
     });
   }
   return results;
@@ -4668,6 +4744,17 @@ function parseSlideWithLayout(slideNumber, path, data) {
     slideMasterData,
     data.theme
   );
+  let layoutPlaceholderStyles = [];
+  let layoutShowMasterSp = true;
+  if (layoutXml) {
+    layoutPlaceholderStyles = parseSlideLayoutPlaceholderStyles(layoutXml, slideColorResolver);
+    layoutShowMasterSp = parseSlideLayoutShowMasterSp(layoutXml);
+  }
+  const masterPlaceholderStyles = slideMasterData?.placeholderStyles ?? data.masterPlaceholderStyles;
+  const mergedPlaceholderStyles = mergePlaceholderGeometry(
+    layoutPlaceholderStyles,
+    masterPlaceholderStyles
+  );
   const slide = parseSlide(
     slideXml,
     path,
@@ -4675,11 +4762,10 @@ function parseSlideWithLayout(slideNumber, path, data) {
     data.archive,
     slideColorResolver,
     data.theme.fontScheme,
-    data.theme.fmtScheme
+    data.theme.fmtScheme,
+    mergedPlaceholderStyles
   );
   let layoutElements = [];
-  let layoutPlaceholderStyles = [];
-  let layoutShowMasterSp = true;
   if (layoutXml && layoutPath) {
     if (!slide.background) {
       const layoutFillContext = {
@@ -4701,13 +4787,10 @@ function parseSlideWithLayout(slideNumber, path, data) {
       data.theme.fontScheme,
       data.theme.fmtScheme
     );
-    layoutPlaceholderStyles = parseSlideLayoutPlaceholderStyles(layoutXml, slideColorResolver);
-    layoutShowMasterSp = parseSlideLayoutShowMasterSp(layoutXml);
   }
   if (!slide.background) {
     slide.background = slideMasterData?.background ?? data.masterBackground;
   }
-  const masterPlaceholderStyles = slideMasterData?.placeholderStyles ?? data.masterPlaceholderStyles;
   const masterTxStyles = slideMasterData?.txStyles ?? data.masterTxStyles;
   applyTextStyleInheritance(slide.elements, {
     layoutPlaceholderStyles,
@@ -4719,6 +4802,38 @@ function parseSlideWithLayout(slideNumber, path, data) {
   const masterElements = slideMasterData?.elements ?? data.masterElements;
   return { slide, layoutElements, layoutShowMasterSp, masterElements };
 }
+function mergePlaceholderGeometry(layoutStyles, masterStyles) {
+  const merged = layoutStyles.map((ls) => {
+    if (ls.transform) return ls;
+    const masterMatch = findPlaceholderByTypeAndIdx(
+      ls.placeholderType,
+      ls.placeholderIdx,
+      masterStyles
+    );
+    if (!masterMatch) return ls;
+    return {
+      ...ls,
+      ...!ls.transform && masterMatch.transform && { transform: masterMatch.transform },
+      ...!ls.geometry && masterMatch.geometry && { geometry: masterMatch.geometry }
+    };
+  });
+  for (const ms of masterStyles) {
+    const exists = merged.some(
+      (m) => m.placeholderType === ms.placeholderType && m.placeholderIdx === ms.placeholderIdx
+    );
+    if (!exists) {
+      merged.push(ms);
+    }
+  }
+  return merged;
+}
+function findPlaceholderByTypeAndIdx(type, idx, styles) {
+  if (idx !== void 0) {
+    const byIdx = styles.find((s) => s.placeholderIdx === idx);
+    if (byIdx) return byIdx;
+  }
+  return styles.find((s) => s.placeholderType === type);
+}
 function defaultColorScheme2() {
   return {
     dk1: "#000000",
@@ -8761,5 +8876,6 @@ export {
   createOpentypeTextMeasurerFromBuffers,
   getMappedFont,
   getWarningEntries,
-  getWarningSummary
+  getWarningSummary,
+  initResvgWasm
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pptx-glimpse",
-  "version": "0.6.0",
+  "version": "0.7.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",
@@ -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"