pptx-glimpse 0.11.0 → 0.11.1

package/dist/index.cjs

@@ -1962,25 +1962,48 @@ var LazyMediaMap = class {
     return data;
   }
 };
+var LazyXmlMap = class {
+  rawInput;
+  cache = /* @__PURE__ */ new Map();
+  entryIndex;
+  constructor(rawInput, xmlEntryNames) {
+    this.rawInput = rawInput;
+    this.entryIndex = xmlEntryNames;
+  }
+  has(path) {
+    return this.entryIndex.has(path);
+  }
+  get(path) {
+    if (!this.entryIndex.has(path)) return void 0;
+    const cached = this.cache.get(path);
+    if (cached !== void 0) return cached;
+    const result = (0, import_fflate.unzipSync)(this.rawInput, {
+      filter: (file) => file.name === path
+    });
+    const data = result[path];
+    if (data) {
+      const str = (0, import_fflate.strFromU8)(data);
+      this.cache.set(path, str);
+      return str;
+    }
+    return void 0;
+  }
+};
 function readPptx(input) {
   const rawInput = new Uint8Array(input);
+  const xmlEntryNames = /* @__PURE__ */ new Set();
   const mediaEntryNames = /* @__PURE__ */ new Set();
-  const unzipped = (0, import_fflate.unzipSync)(rawInput, {
+  (0, import_fflate.unzipSync)(rawInput, {
     filter: (file) => {
       if (file.name.startsWith("ppt/media/")) {
         mediaEntryNames.add(file.name);
-        return false;
+      } else if (file.name.endsWith(".xml") || file.name.endsWith(".rels") || file.name === "[Content_Types].xml") {
+        xmlEntryNames.add(file.name);
       }
-      return true;
+      return false;
     }
   });
-  const files = /* @__PURE__ */ new Map();
-  for (const [relativePath, data] of Object.entries(unzipped)) {
-    if (relativePath.endsWith("/")) continue;
-    if (relativePath.endsWith(".xml") || relativePath.endsWith(".rels") || relativePath === "[Content_Types].xml") {
-      files.set(relativePath, (0, import_fflate.strFromU8)(data));
-    }
-  }
+  const files = new LazyXmlMap(rawInput, xmlEntryNames);
   const media = new LazyMediaMap(rawInput, mediaEntryNames);
   return { files, media };
 }
@@ -3176,6 +3199,10 @@ function createDefaultBorders() {
 
 // src/parser/slide-parser.ts
 var SHAPE_TAGS = /* @__PURE__ */ new Set(["sp", "pic", "cxnSp", "grpSp", "graphicFrame"]);
+var SMARTART_DIAGRAM_URIS = /* @__PURE__ */ new Set([
+  "http://schemas.openxmlformats.org/drawingml/2006/diagram",
+  "http://purl.oclc.org/ooxml/drawingml/diagram"
+]);
 function navigateOrdered(ordered, path) {
   let current = ordered;
   for (const key of path) {
@@ -3723,7 +3750,7 @@ function parseGraphicFrame(gf, rels, slidePath, archive, colorResolver, fontSche
     if (!tableData) return null;
     return { type: "table", transform, table: tableData };
   }
-  if (graphicData["@_uri"] === "http://schemas.openxmlformats.org/drawingml/2006/diagram") {
+  if (SMARTART_DIAGRAM_URIS.has(graphicData["@_uri"])) {
     return parseSmartArt(
       graphicData,
       transform,
@@ -8475,10 +8502,23 @@ function computePathLineX(alignment, textStartX, effectiveTextWidth, width, marg
       return textStartX;
   }
 }
-function measureLineWidth(segments, defaultFontSize, fontScale) {
+function measureLineWidth(segments, defaultFontSize, fontScale, fontResolver) {
   let totalWidth = 0;
+  const jpanFallback = fontResolver ? getJpanFallbackFont() : null;
   for (const seg of segments) {
     const fontSize = (seg.properties.fontSize ?? defaultFontSize) * fontScale;
+    if (fontResolver) {
+      const fontSizePx = fontSize * PX_PER_PT3;
+      const font = fontResolver.resolveFont(
+        seg.properties.fontFamily,
+        seg.properties.fontFamilyEa,
+        jpanFallback
+      );
+      if (font) {
+        totalWidth += font.getAdvanceWidth(seg.text, fontSizePx);
+        continue;
+      }
+    }
     totalWidth += getTextMeasurer().measureTextWidth(
       seg.text,
       fontSize,
@@ -8534,7 +8574,7 @@ function renderSegmentAsPath(text, props, x, y, fontScale, defaultFontSize, font
   const processSegment = (segText, fontFamily, fontFamilyEa) => {
     if (segText.length === 0) return;
     const font = fontResolver.resolveFont(fontFamily, fontFamilyEa, jpanFallback);
-    const segWidth = getTextMeasurer().measureTextWidth(
+    const segWidth = font ? font.getAdvanceWidth(segText, fontSizePx) : getTextMeasurer().measureTextWidth(
       segText,
       fontSize,
       props.bold,
@@ -8559,7 +8599,7 @@ function renderSegmentAsPath(text, props, x, y, fontScale, defaultFontSize, font
     const font = fontResolver.resolveFont(fontFamily, fontFamilyEa, jpanFallback);
     const fillAttrs = buildPathFillAttrs(props);
     for (const char of segText) {
-      const charWidth = getTextMeasurer().measureTextWidth(
+      const charWidth = font ? font.getAdvanceWidth(char, fontSizePx) : getTextMeasurer().measureTextWidth(
         char,
         fontSize,
         props.bold,
@@ -8731,7 +8771,7 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
         if (!isFirstLine) {
           currentY += lineNaturalHeightPt * PX_PER_PT3 * getLineSpacing(para, lnSpcReduction) + lineGapPx;
         }
-        const lineWidth = measureLineWidth(line.segments, defaultFontSize, fontScale);
+        const lineWidth = measureLineWidth(line.segments, defaultFontSize, fontScale, fontResolver);
         const lineStartX = computePathLineX(
           para.properties.alignment,
           textStartX,
@@ -8780,7 +8820,7 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
         currentY += naturalHeightPt * PX_PER_PT3 * getLineSpacing(para, lnSpcReduction) + paragraphGapPx;
       }
       const runsAsSegments = para.runs.filter((r) => r.text.length > 0).map((r) => ({ text: r.text, properties: r.properties }));
-      const lineWidth = measureLineWidth(runsAsSegments, defaultFontSize, fontScale);
+      const lineWidth = measureLineWidth(runsAsSegments, defaultFontSize, fontScale, fontResolver);
       const lineStartX = computePathLineX(
         para.properties.alignment,
         textStartX,

package/dist/index.d.cts

@@ -151,6 +151,7 @@ interface OpentypeFullFont {
     ascender: number;
     descender: number;
     getPath(text: string, x: number, y: number, fontSize: number): OpentypePath;
+    getAdvanceWidth(text: string, fontSize: number): number;
 }
 interface TextPathFontResolver {
     resolveFont(fontFamily: string | null | undefined, fontFamilyEa: string | null | undefined, jpanFallback?: string | null): OpentypeFullFont | null;

package/dist/index.d.ts

@@ -151,6 +151,7 @@ interface OpentypeFullFont {
     ascender: number;
     descender: number;
     getPath(text: string, x: number, y: number, fontSize: number): OpentypePath;
+    getAdvanceWidth(text: string, fontSize: number): number;
 }
 interface TextPathFontResolver {
     resolveFont(fontFamily: string | null | undefined, fontFamilyEa: string | null | undefined, jpanFallback?: string | null): OpentypeFullFont | null;

package/dist/index.js

@@ -1924,25 +1924,48 @@ var LazyMediaMap = class {
     return data;
   }
 };
+var LazyXmlMap = class {
+  rawInput;
+  cache = /* @__PURE__ */ new Map();
+  entryIndex;
+  constructor(rawInput, xmlEntryNames) {
+    this.rawInput = rawInput;
+    this.entryIndex = xmlEntryNames;
+  }
+  has(path) {
+    return this.entryIndex.has(path);
+  }
+  get(path) {
+    if (!this.entryIndex.has(path)) return void 0;
+    const cached = this.cache.get(path);
+    if (cached !== void 0) return cached;
+    const result = unzipSync(this.rawInput, {
+      filter: (file) => file.name === path
+    });
+    const data = result[path];
+    if (data) {
+      const str = strFromU8(data);
+      this.cache.set(path, str);
+      return str;
+    }
+    return void 0;
+  }
+};
 function readPptx(input) {
   const rawInput = new Uint8Array(input);
+  const xmlEntryNames = /* @__PURE__ */ new Set();
   const mediaEntryNames = /* @__PURE__ */ new Set();
-  const unzipped = unzipSync(rawInput, {
+  unzipSync(rawInput, {
     filter: (file) => {
       if (file.name.startsWith("ppt/media/")) {
         mediaEntryNames.add(file.name);
-        return false;
+      } else if (file.name.endsWith(".xml") || file.name.endsWith(".rels") || file.name === "[Content_Types].xml") {
+        xmlEntryNames.add(file.name);
       }
-      return true;
+      return false;
     }
   });
-  const files = /* @__PURE__ */ new Map();
-  for (const [relativePath, data] of Object.entries(unzipped)) {
-    if (relativePath.endsWith("/")) continue;
-    if (relativePath.endsWith(".xml") || relativePath.endsWith(".rels") || relativePath === "[Content_Types].xml") {
-      files.set(relativePath, strFromU8(data));
-    }
-  }
+  const files = new LazyXmlMap(rawInput, xmlEntryNames);
   const media = new LazyMediaMap(rawInput, mediaEntryNames);
   return { files, media };
 }
@@ -3138,6 +3161,10 @@ function createDefaultBorders() {
 
 // src/parser/slide-parser.ts
 var SHAPE_TAGS = /* @__PURE__ */ new Set(["sp", "pic", "cxnSp", "grpSp", "graphicFrame"]);
+var SMARTART_DIAGRAM_URIS = /* @__PURE__ */ new Set([
+  "http://schemas.openxmlformats.org/drawingml/2006/diagram",
+  "http://purl.oclc.org/ooxml/drawingml/diagram"
+]);
 function navigateOrdered(ordered, path) {
   let current = ordered;
   for (const key of path) {
@@ -3685,7 +3712,7 @@ function parseGraphicFrame(gf, rels, slidePath, archive, colorResolver, fontSche
     if (!tableData) return null;
     return { type: "table", transform, table: tableData };
   }
-  if (graphicData["@_uri"] === "http://schemas.openxmlformats.org/drawingml/2006/diagram") {
+  if (SMARTART_DIAGRAM_URIS.has(graphicData["@_uri"])) {
     return parseSmartArt(
       graphicData,
       transform,
@@ -8437,10 +8464,23 @@ function computePathLineX(alignment, textStartX, effectiveTextWidth, width, marg
       return textStartX;
   }
 }
-function measureLineWidth(segments, defaultFontSize, fontScale) {
+function measureLineWidth(segments, defaultFontSize, fontScale, fontResolver) {
   let totalWidth = 0;
+  const jpanFallback = fontResolver ? getJpanFallbackFont() : null;
   for (const seg of segments) {
     const fontSize = (seg.properties.fontSize ?? defaultFontSize) * fontScale;
+    if (fontResolver) {
+      const fontSizePx = fontSize * PX_PER_PT3;
+      const font = fontResolver.resolveFont(
+        seg.properties.fontFamily,
+        seg.properties.fontFamilyEa,
+        jpanFallback
+      );
+      if (font) {
+        totalWidth += font.getAdvanceWidth(seg.text, fontSizePx);
+        continue;
+      }
+    }
     totalWidth += getTextMeasurer().measureTextWidth(
       seg.text,
       fontSize,
@@ -8496,7 +8536,7 @@ function renderSegmentAsPath(text, props, x, y, fontScale, defaultFontSize, font
   const processSegment = (segText, fontFamily, fontFamilyEa) => {
     if (segText.length === 0) return;
     const font = fontResolver.resolveFont(fontFamily, fontFamilyEa, jpanFallback);
-    const segWidth = getTextMeasurer().measureTextWidth(
+    const segWidth = font ? font.getAdvanceWidth(segText, fontSizePx) : getTextMeasurer().measureTextWidth(
       segText,
       fontSize,
       props.bold,
@@ -8521,7 +8561,7 @@ function renderSegmentAsPath(text, props, x, y, fontScale, defaultFontSize, font
     const font = fontResolver.resolveFont(fontFamily, fontFamilyEa, jpanFallback);
     const fillAttrs = buildPathFillAttrs(props);
     for (const char of segText) {
-      const charWidth = getTextMeasurer().measureTextWidth(
+      const charWidth = font ? font.getAdvanceWidth(char, fontSizePx) : getTextMeasurer().measureTextWidth(
         char,
         fontSize,
         props.bold,
@@ -8693,7 +8733,7 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
         if (!isFirstLine) {
           currentY += lineNaturalHeightPt * PX_PER_PT3 * getLineSpacing(para, lnSpcReduction) + lineGapPx;
         }
-        const lineWidth = measureLineWidth(line.segments, defaultFontSize, fontScale);
+        const lineWidth = measureLineWidth(line.segments, defaultFontSize, fontScale, fontResolver);
         const lineStartX = computePathLineX(
           para.properties.alignment,
           textStartX,
@@ -8742,7 +8782,7 @@ function renderTextBodyAsPath(textBody, transform, fontResolver) {
         currentY += naturalHeightPt * PX_PER_PT3 * getLineSpacing(para, lnSpcReduction) + paragraphGapPx;
       }
       const runsAsSegments = para.runs.filter((r) => r.text.length > 0).map((r) => ({ text: r.text, properties: r.properties }));
-      const lineWidth = measureLineWidth(runsAsSegments, defaultFontSize, fontScale);
+      const lineWidth = measureLineWidth(runsAsSegments, defaultFontSize, fontScale, fontResolver);
       const lineStartX = computePathLineX(
         para.properties.alignment,
         textStartX,

package/package.json

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