@aixa-transformation/pptx-viewer 2.0.30 → 2.0.33

package/dist/{chunk-JJ5MVLCK.mjs → chunk-QKRGKIBL.mjs}

@@ -8624,7 +8624,7 @@ var PptxPresentationSlidesReconciler = class {
       if (typeof relationshipId2 === "string" && relationshipId2.length > 0) {
         usedRIds.add(relationshipId2);
       }
-      if (relationshipType === input.slideRelationshipType && typeof relationshipId2 === "string" && typeof relationshipTarget2 === "string") {
+      if (this.isSlideRelationshipType(relationshipType, input.slideRelationshipType) && typeof relationshipId2 === "string" && typeof relationshipTarget2 === "string") {
         slideTargetByRid.set(relationshipId2, relationshipTarget2);
         continue;
       }
@@ -8839,6 +8839,13 @@ var PptxPresentationSlidesReconciler = class {
     }
     return [value];
   }
+  /** Match equivalent Strict and Transitional slide relationship URIs. */
+  isSlideRelationshipType(value, expected) {
+    if (typeof value !== "string") {
+      return false;
+    }
+    return value === expected || value.endsWith("/relationships/slide");
+  }
 };
 function isExternalTarget(target) {
   const normalized = target.trim();
@@ -9506,11 +9513,12 @@ function colorWithOpacity(color2, opacity2) {
   return `rgba(${rgb.r}, ${rgb.g}, ${rgb.b}, ${clampUnitInterval(opacity2)})`;
 }
 function parseDrawingPercent(value) {
-  const parsed = Number.parseFloat(String(value ?? "").trim());
+  const raw = String(value ?? "").trim();
+  const parsed = Number.parseFloat(raw);
   if (!Number.isFinite(parsed)) {
     return void 0;
   }
-  return clampUnitInterval(parsed / 1e5);
+  return clampUnitInterval(raw.endsWith("%") ? parsed / 100 : parsed / 1e5);
 }
 function scrgbLinearToSrgb8(linear) {
   const l = Math.min(1, Math.max(0, linear));
@@ -9589,11 +9597,12 @@ function hslToRgb(h, s, l) {
   };
 }
 function parseDrawingFraction(value) {
-  const parsed = Number.parseFloat(String(value ?? "").trim());
+  const raw = String(value ?? "").trim();
+  const parsed = Number.parseFloat(raw);
   if (!Number.isFinite(parsed)) {
     return void 0;
   }
-  return parsed / 1e5;
+  return raw.endsWith("%") ? parsed / 100 : parsed / 1e5;
 }
 function parseDrawingHueDegrees(value) {
   const parsed = Number.parseFloat(String(value ?? "").trim());
@@ -9650,9 +9659,9 @@ function applyDrawingColorTransforms(baseColor, colorNode) {
   }
   const tint = parseDrawingPercent(getVal("a:tint"));
   if (tint !== void 0) {
-    r += (255 - r) * tint;
-    g += (255 - g) * tint;
-    b += (255 - b) * tint;
+    r = 255 - (255 - r) * tint;
+    g = 255 - (255 - g) * tint;
+    b = 255 - (255 - b) * tint;
   }
   const hslKeys = [
     "a:hue",
@@ -16379,8 +16388,16 @@ var PptxDocumentPropertiesUpdater = class {
         const relationships = relsData["Relationships"];
         if (relationships) {
           const rels = Array.isArray(relationships["Relationship"]) ? relationships["Relationship"] : relationships["Relationship"] ? [relationships["Relationship"]] : [];
-          const hasCustomRel = rels.some((r) => String(r?.["@_Type"] || "") === customRelType);
-          if (!hasCustomRel) {
+          const customRelationships = rels.filter(
+            (relationship) => this.isCustomPropertiesRelationship(relationship)
+          );
+          if (customRelationships.length > 0) {
+            const retained = customRelationships[0];
+            relationships["Relationship"] = rels.filter(
+              (relationship) => !this.isCustomPropertiesRelationship(relationship) || relationship === retained
+            );
+            this.context.zip.file("_rels/.rels", this.context.builder.build(relsData));
+          } else {
             let maxId = 0;
             for (const rel of rels) {
               const id = String(rel?.["@_Id"] || "");
@@ -16409,7 +16426,6 @@ var PptxDocumentPropertiesUpdater = class {
    * orphan content-type entry referencing a deleted part.
    */
   async removeCustomPropertiesPackagingArtifacts() {
-    const customRelType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties";
     const ctFile = this.context.zip.file("[Content_Types].xml");
     if (ctFile) {
       try {
@@ -16437,7 +16453,9 @@ var PptxDocumentPropertiesUpdater = class {
         const relationships = relsData["Relationships"];
         if (relationships) {
           const rels = Array.isArray(relationships["Relationship"]) ? relationships["Relationship"] : relationships["Relationship"] ? [relationships["Relationship"]] : [];
-          const filtered = rels.filter((r) => String(r?.["@_Type"] || "") !== customRelType);
+          const filtered = rels.filter(
+            (relationship) => !this.isCustomPropertiesRelationship(relationship)
+          );
           if (filtered.length !== rels.length) {
             relationships["Relationship"] = filtered;
             this.context.zip.file("_rels/.rels", this.context.builder.build(relsData));
@@ -16447,6 +16465,11 @@ var PptxDocumentPropertiesUpdater = class {
       }
     }
   }
+  isCustomPropertiesRelationship(relationship) {
+    const type = String(relationship?.["@_Type"] || "");
+    const target = String(relationship?.["@_Target"] || "").replace(/\\/gu, "/").replace(/^\.\//u, "");
+    return target === "docProps/custom.xml" || type.endsWith("/relationships/custom-properties") || type.endsWith("/relationships/customProperties");
+  }
   normalizeCustomPropertyType(type) {
     const supportedTypes = /* @__PURE__ */ new Set([
       "lpwstr",
@@ -31685,6 +31708,45 @@ function isEotFormat(data) {
   const magic = readUint16LE(data, EOT_MAGIC_OFFSET);
   return magic === EOT_MAGIC;
 }
+function createEotFromSfnt(fontData, options) {
+  const encodeName2 = (value) => {
+    const bytes = new Uint8Array((value.length + 1) * 2);
+    const view2 = new DataView(bytes.buffer);
+    for (let i = 0; i < value.length; i++) {
+      view2.setUint16(i * 2, value.charCodeAt(i), true);
+    }
+    return bytes;
+  };
+  const names = [
+    encodeName2(options.familyName),
+    encodeName2(options.styleName ?? ""),
+    encodeName2(""),
+    encodeName2(options.fullName ?? options.familyName)
+  ];
+  const headerSize = 80 + names.reduce((sum, name) => sum + 4 + name.length, 0);
+  const result = new Uint8Array(headerSize + fontData.length);
+  const view = new DataView(result.buffer);
+  view.setUint32(0, result.length, true);
+  view.setUint32(4, fontData.length, true);
+  view.setUint32(8, 131073, true);
+  view.setUint32(12, 0, true);
+  result[26] = 1;
+  result[27] = options.italic ? 1 : 0;
+  view.setUint32(28, options.weight ?? 400, true);
+  view.setUint16(32, 0, true);
+  view.setUint16(34, EOT_MAGIC, true);
+  let offset = 80;
+  for (const name of names) {
+    view.setUint16(offset, 0, true);
+    offset += 2;
+    view.setUint16(offset, name.length, true);
+    offset += 2;
+    result.set(name, offset);
+    offset += name.length;
+  }
+  result.set(fontData, offset);
+  return result;
+}
 function parseEotHeader(data) {
   if (!isEotFormat(data)) {
     return null;
@@ -31787,7 +31849,8 @@ function guidToKey(guid) {
   }
   const key = new Uint8Array(KEY_LENGTH);
   for (let i = 0; i < KEY_LENGTH; i++) {
-    key[i] = parseInt(stripped.substring(i * 2, i * 2 + 2), 16);
+    const sourceIndex = KEY_LENGTH - i - 1;
+    key[i] = parseInt(stripped.substring(sourceIndex * 2, sourceIndex * 2 + 2), 16);
   }
   return key;
 }
@@ -41639,9 +41702,13 @@ var NAMESPACE_PAIRS = [
     "http://schemas.openxmlformats.org/officeDocument/2006/bibliography"
   ],
   [
-    "http://purl.oclc.org/ooxml/officeDocument/custom-properties",
+    "http://purl.oclc.org/ooxml/officeDocument/customProperties",
     "http://schemas.openxmlformats.org/officeDocument/2006/custom-properties"
   ],
+  [
+    "http://purl.oclc.org/ooxml/officeDocument/relationships/customProperties",
+    "http://schemas.openxmlformats.org/officeDocument/2006/relationships/custom-properties"
+  ],
   [
     "http://purl.oclc.org/ooxml/officeDocument/extended-properties",
     "http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"
@@ -52466,6 +52533,12 @@ function applyImageColorEffects(blip, effects, parseColor, extractOpacity) {
   }
 }
 var EMU_PER_PX7 = 9525;
+function isSyntheticBulletMarkerSegment(segment) {
+  const markerText = String(segment.text ?? "").trim();
+  return Boolean(
+    segment.bulletInfo && (segment.bulletInfo.char && markerText === segment.bulletInfo.char || segment.bulletInfo.autoNumType && /^\S+[.)]$/u.test(markerText) || (segment.bulletInfo.imageDataUrl || segment.bulletInfo.imageRelId) && markerText === "\u{1F4CE}")
+  );
+}
 function buildParagraphPropertiesXml(textStyle, paragraphAlign, bulletInfo, spacing, level) {
   const paragraphProps = {};
   if (typeof level === "number" && Number.isFinite(level) && level > 0) {
@@ -53420,6 +53493,14 @@ var PptxHandlerRuntime = class {
     }
   }
 };
+function parseOoxmlFixedPercentage(value) {
+  const raw = String(value ?? "").trim();
+  if (!raw) {
+    return void 0;
+  }
+  const parsed = raw.endsWith("%") ? Number.parseFloat(raw.slice(0, -1)) * 1e3 : Number.parseInt(raw, 10);
+  return Number.isFinite(parsed) && parsed !== 0 ? Math.round(parsed) : void 0;
+}
 var EMU_PER_PIXEL = 9525;
 var BORDER_SIDES = [
   "left",
@@ -53444,9 +53525,9 @@ function parseSolidFillStyle(solidFill2) {
     return void 0;
   }
   const tintRaw = schemeClr["a:tint"];
-  const tint = tintRaw ? parseInt(String(tintRaw["@_val"] || "0"), 10) || void 0 : void 0;
+  const tint = tintRaw ? parseOoxmlFixedPercentage(tintRaw["@_val"]) : void 0;
   const shadeRaw = schemeClr["a:shade"];
-  const shade = shadeRaw ? parseInt(String(shadeRaw["@_val"] || "0"), 10) || void 0 : void 0;
+  const shade = shadeRaw ? parseOoxmlFixedPercentage(shadeRaw["@_val"]) : void 0;
   return { schemeColor, tint, shade };
 }
 function parseBorderSide(side) {
@@ -53527,12 +53608,12 @@ function parseColorChoiceFill(node) {
   }
   const fill = { schemeColor: "", color: color2 };
   const tintRaw = srgb?.["a:tint"];
-  const tint = tintRaw ? parseInt(String(tintRaw["@_val"] || "0"), 10) || void 0 : void 0;
+  const tint = tintRaw ? parseOoxmlFixedPercentage(tintRaw["@_val"]) : void 0;
   if (tint !== void 0) {
     fill.tint = tint;
   }
   const shadeRaw = srgb?.["a:shade"];
-  const shade = shadeRaw ? parseInt(String(shadeRaw["@_val"] || "0"), 10) || void 0 : void 0;
+  const shade = shadeRaw ? parseOoxmlFixedPercentage(shadeRaw["@_val"]) : void 0;
   if (shade !== void 0) {
     fill.shade = shade;
   }
@@ -53653,11 +53734,11 @@ function parseTableStyleSectionText(section) {
       hasProps = true;
       const tintNode = schemeClr["a:tint"];
       if (tintNode) {
-        result.fontTint = parseInt(String(tintNode["@_val"] || "0"), 10) || void 0;
+        result.fontTint = parseOoxmlFixedPercentage(tintNode["@_val"]);
       }
       const shadeNode = schemeClr["a:shade"];
       if (shadeNode) {
-        result.fontShade = parseInt(String(shadeNode["@_val"] || "0"), 10) || void 0;
+        result.fontShade = parseOoxmlFixedPercentage(shadeNode["@_val"]);
       }
     }
   } else {
@@ -56385,6 +56466,9 @@ var PptxHandlerRuntime13 = class extends PptxHandlerRuntime12 {
           }
           capturedParagraphMeta = true;
         }
+        if (isSyntheticBulletMarkerSegment(segment)) {
+          return;
+        }
         if (segment.isLineBreak) {
           const brNode = {};
           if (segment.breakRunProperties && typeof segment.breakRunProperties === "object") {
@@ -62266,6 +62350,13 @@ var PptxHandlerRuntime24 = class _PptxHandlerRuntime7 extends PptxHandlerRuntime
       };
       for (const variant of variants) {
         const fontData = variant.rawFontData;
+        const isWebFont = variant.format === "woff" || variant.format === "woff2";
+        const hasSfntSignature = fontData.length >= 4 && (fontData[0] === 0 && fontData[1] === 1 && fontData[2] === 0 && fontData[3] === 0 || String.fromCharCode(fontData[0], fontData[1], fontData[2], fontData[3]) === "OTTO" || String.fromCharCode(fontData[0], fontData[1], fontData[2], fontData[3]) === "true" || String.fromCharCode(fontData[0], fontData[1], fontData[2], fontData[3]) === "ttcf");
+        if (!variant.originalRId && (isWebFont || !hasSfntSignature)) {
+          throw new Error(
+            `Cannot embed custom font "${variant.name}" in PowerPoint: use a valid .ttf or .otf font file, not WOFF/WOFF2 browser data.`
+          );
+        }
         const hasOriginal = Boolean(variant.originalRId && variant.partPath);
         const reuseObfuscation = hasOriginal && Boolean(variant.fontGuid);
         const reuseVerbatim = hasOriginal && !variant.fontGuid && Boolean(variant.originalPartBytes);
@@ -62288,10 +62379,16 @@ var PptxHandlerRuntime24 = class _PptxHandlerRuntime7 extends PptxHandlerRuntime
           bytesToWrite = variant.originalPartBytes;
         } else {
           guid = variant.fontGuid ?? generateFontGuid();
-          const fileName = `{${guid}}.fntdata`;
+          const usedFontNumbers = relationships.map((relationship) => /fonts\/font(?<number>\d+)\.fntdata$/iu.exec(String(relationship?.["@_Target"] || ""))?.groups?.number).map((number) => Number(number)).filter((number) => Number.isFinite(number));
+          const fileName = `font${Math.max(0, ...usedFontNumbers) + 1}.fntdata`;
           fontPartPath = `ppt/fonts/${fileName}`;
           relativeTarget4 = `fonts/${fileName}`;
-          bytesToWrite = obfuscateFont(fontData, guid);
+          bytesToWrite = createEotFromSfnt(fontData, {
+            familyName: variant.name,
+            styleName: variant.bold ? variant.italic ? "Bold Italic" : "Bold" : variant.italic ? "Italic" : "Regular",
+            weight: variant.bold ? 700 : 400,
+            italic: variant.italic
+          });
           const existingRel = relationships.find(
             (r) => String(r?.["@_Target"] || "") === relativeTarget4
           );
@@ -62434,12 +62531,16 @@ var PptxHandlerRuntime24 = class _PptxHandlerRuntime7 extends PptxHandlerRuntime
       if (!xmlText2.trim()) {
         continue;
       }
+      const isPresentationXml = path === "ppt/presentation.xml";
+      const containsConvertibleUri = xmlText2.match(/https?:\/\/[^"'<>\s]+/gu)?.some((uri) => isTransitionalNamespaceUri(uri)) ?? false;
+      if (!isPresentationXml && !containsConvertibleUri) {
+        continue;
+      }
       try {
         const parsed = parse(xmlText2);
         if (typeof parsed !== "object" || parsed === null) {
           continue;
         }
-        const isPresentationXml = path === "ppt/presentation.xml";
         convertXmlToStrict(parsed, isPresentationXml);
         this.zip.file(path, this.builder.build(parsed));
       } catch {
@@ -63586,7 +63687,10 @@ var PptxHandlerRuntime30 = class _PptxHandlerRuntime9 extends PptxHandlerRuntime
     }
     const textValueForSave = this.getTextValueForSave(el.text, el.textSegments);
     let textSegmentsForSave = el.textSegments;
-    if (typeof el.text === "string" && this.areTextSegmentsUniform(el.textSegments)) {
+    const hasStructuredListMarkers = Boolean(
+      el.textSegments?.some((segment) => segment.bulletInfo && !segment.bulletInfo.none)
+    );
+    if (typeof el.text === "string" && this.areTextSegmentsUniform(el.textSegments) && !hasStructuredListMarkers) {
       textSegmentsForSave = void 0;
       const existingTextSegments = this.extractTextSegmentsFromTxBodyForRewrite(
         txBody,
@@ -65246,7 +65350,14 @@ var PptxHandlerRuntime40 = class _PptxHandlerRuntime16 extends PptxHandlerRuntim
     if (el.type === "group") {
       const grpXml = this.buildGroupShapeXml(el);
       if (grpXml) {
-        collectors.groups.push(grpXml);
+        if (this.isTemplateElementId(el.id)) {
+          const templateSpTree = this.getTemplateSpTree(ctx.slide.id, el.id);
+          if (templateSpTree) {
+            el.rawXml = this.ensureTemplateShapeAttached(templateSpTree, el.type, grpXml);
+          }
+        } else {
+          collectors.groups.push(grpXml);
+        }
       }
       return;
     }
@@ -67075,11 +67186,17 @@ var PptxHandlerRuntime51 = class _PptxHandlerRuntime18 extends PptxHandlerRuntim
     this.modernCommentAuthorsRelationshipId = modernPackage.authorRelationshipId;
     this.applySlideMasterChanges(options?.slideMasters);
     this.applySlideLayoutChanges(options?.slideLayouts);
+    const dirtyLayoutPaths = new Set(options?.slideLayouts?.map((layout) => layout.path) ?? []);
     for (const [layoutPath, layoutXmlObj] of this.layoutXmlMap.entries()) {
-      this.zip.file(layoutPath, this.builder.build(layoutXmlObj));
+      if (dirtyLayoutPaths.has(layoutPath)) {
+        this.zip.file(layoutPath, this.builder.build(layoutXmlObj));
+      }
     }
+    const dirtyMasterPaths = new Set(options?.slideMasters?.map((master) => master.path) ?? []);
     for (const [masterPath, masterXmlObj] of this.masterXmlMap.entries()) {
-      this.zip.file(masterPath, this.builder.build(masterXmlObj));
+      if (dirtyMasterPaths.has(masterPath)) {
+        this.zip.file(masterPath, this.builder.build(masterXmlObj));
+      }
     }
     await this.persistThemeParts();
     await this.applyEmbeddedFontPreservation(options?.embeddedFonts, options?.embeddedFontList);
@@ -67119,7 +67236,7 @@ var PptxHandlerRuntime51 = class _PptxHandlerRuntime18 extends PptxHandlerRuntim
       }
     } : options?.presentationProperties;
     await this.applyPresentationPropertiesPart(presentationProperties);
-    await this.applyViewPropertiesPart(options?.viewProperties ?? this.loadedViewProperties);
+    await this.applyViewPropertiesPart(options?.viewProperties);
     await this.applyTableStylesPart(options?.tableStyles);
     await this.documentPropertiesUpdater.updateOnSave(slides, {
       coreProperties: options?.coreProperties,
@@ -74565,7 +74682,9 @@ var PptxHandlerRuntime84 = class _PptxHandlerRuntime35 extends PptxHandlerRuntim
     const y = Math.round(parseInt(String(off["@_y"] || "0"), 10) / emuPerPx);
     const width = Math.round(parseInt(String(ext["@_cx"] || "0"), 10) / emuPerPx);
     const height = Math.round(parseInt(String(ext["@_cy"] || "0"), 10) / emuPerPx);
-    if (width <= 0 || height <= 0) {
+    const preliminaryPrstGeom = this.xmlLookupService.getChildByLocalName(spPr, "prstGeom");
+    const preliminaryShapeType = preliminaryPrstGeom ? String(preliminaryPrstGeom["@_prst"] || "rect") : "rect";
+    if ((width <= 0 || height <= 0) && preliminaryShapeType !== "line") {
       return null;
     }
     const rotation = xfrm?.["@_rot"] ? parseInt(String(xfrm["@_rot"]), 10) / 6e4 : void 0;
@@ -74601,6 +74720,14 @@ var PptxHandlerRuntime84 = class _PptxHandlerRuntime35 extends PptxHandlerRuntim
     const strokeColor = this.parseColor(lnFill);
     const strokeWidthRaw = lnNode ? parseInt(String(lnNode["@_w"] || ""), 10) : NaN;
     const strokeWidth = Number.isFinite(strokeWidthRaw) && strokeWidthRaw > 0 ? strokeWidthRaw / 12700 : void 0;
+    const prstDash = lnNode ? this.xmlLookupService.getChildByLocalName(lnNode, "prstDash") : void 0;
+    const headEnd = lnNode ? this.xmlLookupService.getChildByLocalName(lnNode, "headEnd") : void 0;
+    const tailEnd = lnNode ? this.xmlLookupService.getChildByLocalName(lnNode, "tailEnd") : void 0;
+    const arrowType = (node) => {
+      const value = node?.["@_type"];
+      return value === "none" || value === "triangle" || value === "stealth" || value === "diamond" || value === "oval" || value === "arrow" ? value : void 0;
+    };
+    const arrowSize = (value) => value === "sm" || value === "med" || value === "lg" ? value : void 0;
     const txBody = this.xmlLookupService.getChildByLocalName(sp, "txBody");
     const textValues2 = [];
     if (txBody) {
@@ -74640,6 +74767,13 @@ var PptxHandlerRuntime84 = class _PptxHandlerRuntime35 extends PptxHandlerRuntim
       fillColor: fill.fillColor ?? void 0,
       strokeColor: strokeColor ?? void 0,
       strokeWidth,
+      strokeDash: prstDash ? String(prstDash["@_val"] || "") || void 0 : void 0,
+      startArrow: arrowType(headEnd),
+      endArrow: arrowType(tailEnd),
+      startArrowWidth: arrowSize(headEnd?.["@_w"]),
+      startArrowLength: arrowSize(headEnd?.["@_len"]),
+      endArrowWidth: arrowSize(tailEnd?.["@_w"]),
+      endArrowLength: arrowSize(tailEnd?.["@_len"]),
       text: structuredText,
       textSegments,
       fontSize,