@aixa-transformation/pptx-viewer 2.0.31 → 2.0.33

package/dist/{chunk-YOOFW6LR.js → chunk-WGHMMJOJ.js}

@@ -8630,7 +8630,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;
       }
@@ -8845,6 +8845,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();
@@ -16387,8 +16394,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"] || "");
@@ -16417,7 +16432,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 {
@@ -16445,7 +16459,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));
@@ -16455,6 +16471,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",
@@ -31693,6 +31714,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;
@@ -31795,7 +31855,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;
 }
@@ -41647,9 +41708,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"
@@ -62291,6 +62356,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);
@@ -62313,10 +62385,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
           );