@aixa-transformation/pptx-viewer 2.0.31 → 2.0.35

package/dist/{chunk-3IIMAKXR.mjs → chunk-ZKWWCC2U.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();
@@ -16381,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"] || "");
@@ -16411,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 {
@@ -16439,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));
@@ -16449,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",
@@ -31680,6 +31701,31 @@ function readUtf16LE2(data, offset, byteLength) {
   }
   return chars.join("");
 }
+function readUint16BE(data, offset) {
+  return (data[offset] ?? 0) << 8 | (data[offset + 1] ?? 0);
+}
+function readUint32BE(data, offset) {
+  return ((data[offset] ?? 0) << 24 >>> 0 | (data[offset + 1] ?? 0) << 16 | (data[offset + 2] ?? 0) << 8 | (data[offset + 3] ?? 0)) >>> 0;
+}
+function findSfntTable(data, tag) {
+  if (data.length < 12) return null;
+  const numTables = readUint16BE(data, 4);
+  for (let i = 0; i < numTables; i++) {
+    const record = 12 + i * 16;
+    if (record + 16 > data.length) break;
+    const recordTag = String.fromCharCode(
+      data[record],
+      data[record + 1],
+      data[record + 2],
+      data[record + 3]
+    );
+    if (recordTag !== tag) continue;
+    const offset = readUint32BE(data, record + 8);
+    const length = readUint32BE(data, record + 12);
+    return offset + length <= data.length ? { offset, length } : null;
+  }
+  return null;
+}
 function isEotFormat(data) {
   if (data.length < 36) {
     return false;
@@ -31687,6 +31733,70 @@ 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 = 82 + names.reduce((sum, name) => sum + 2 + name.length, 0) + 2;
+  const result = new Uint8Array(headerSize + fontData.length);
+  const view = new DataView(result.buffer);
+  const os2 = findSfntTable(fontData, "OS/2");
+  const head = findSfntTable(fontData, "head");
+  view.setUint32(0, result.length, true);
+  view.setUint32(4, fontData.length, true);
+  view.setUint32(8, 131073, true);
+  view.setUint32(12, 0, true);
+  if (os2 && os2.length >= 42) {
+    result.set(fontData.slice(os2.offset + 32, os2.offset + 42), 16);
+  }
+  result[26] = 1;
+  result[27] = options.italic ? 1 : 0;
+  view.setUint32(
+    28,
+    options.weight ?? (os2 && os2.length >= 6 ? readUint16BE(fontData, os2.offset + 4) : 400),
+    true
+  );
+  view.setUint16(
+    32,
+    os2 && os2.length >= 10 ? readUint16BE(fontData, os2.offset + 8) : 0,
+    true
+  );
+  view.setUint16(34, EOT_MAGIC, true);
+  if (os2 && os2.length >= 58) {
+    for (let i = 0; i < 4; i++) {
+      view.setUint32(36 + i * 4, readUint32BE(fontData, os2.offset + 42 + i * 4), true);
+    }
+  }
+  if (os2 && os2.length >= 86) {
+    view.setUint32(52, readUint32BE(fontData, os2.offset + 78), true);
+    view.setUint32(56, readUint32BE(fontData, os2.offset + 82), true);
+  }
+  if (head && head.length >= 12) {
+    view.setUint32(60, readUint32BE(fontData, head.offset + 8), true);
+  }
+  let offset = 82;
+  for (const name of names) {
+    view.setUint16(offset, Math.max(0, name.length - 2), true);
+    offset += 2;
+    result.set(name, offset);
+    offset += name.length;
+  }
+  view.setUint16(offset, 0, true);
+  offset += 2;
+  result.set(fontData, offset);
+  return result;
+}
 function parseEotHeader(data) {
   if (!isEotFormat(data)) {
     return null;
@@ -31719,8 +31829,10 @@ function parseEotHeader(data) {
   const styleName = readNameString();
   const versionName = readNameString();
   const fullName = readNameString();
-  if (version >= 131074) {
+  if (version >= 131073 && offset + 4 <= data.length && readUint16LE(data, offset) === 0 && readUint16LE(data, offset + 2) === 0) {
     readNameString();
+  }
+  if (version >= 131074) {
     offset += 8;
     if (offset + 4 <= data.length) {
       const signatureSize = readUint16LE(data, offset + 2);
@@ -31789,7 +31901,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;
 }
@@ -41641,9 +41754,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"
@@ -62249,8 +62366,14 @@ var PptxHandlerRuntime24 = class _PptxHandlerRuntime7 extends PptxHandlerRuntime
       }
       return;
     }
+    const newFontsWithData = fontsWithData.filter(
+      (font) => !(font.originalRId && font.partPath)
+    );
+    if (newFontsWithData.length === 0) {
+      return;
+    }
     const fontsByName = /* @__PURE__ */ new Map();
-    for (const font of fontsWithData) {
+    for (const font of newFontsWithData) {
       const existing = fontsByName.get(font.name) ?? [];
       existing.push(font);
       fontsByName.set(font.name, existing);
@@ -62285,6 +62408,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);
@@ -62307,10 +62437,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
           );
@@ -62339,8 +62475,28 @@ var PptxHandlerRuntime24 = class _PptxHandlerRuntime7 extends PptxHandlerRuntime
       const generatedList = {
         "p:embeddedFont": embeddedFontEntries.length === 1 ? embeddedFontEntries[0] : embeddedFontEntries
       };
-      const metadata = explicitFontList ? serializeEmbeddedFontList(explicitFontList) : explicitFonts === void 0 && this.loadedEmbeddedFontList ? serializeEmbeddedFontList(this.loadedEmbeddedFontList) : generatedList;
-      setEmbeddedFontList(this.presentationData, metadata);
+      const preservedMetadata = explicitFontList ?? this.loadedEmbeddedFontList;
+      let metadata = generatedList;
+      let metadataAppliedInPlace = false;
+      if (preservedMetadata?.rawXml && !explicitFontList) {
+        const rawList = preservedMetadata.rawXml;
+        const embeddedFontKey = Object.keys(rawList).find(
+          (key) => key.replace(/^.*:/u, "") === "embeddedFont"
+        ) ?? "p:embeddedFont";
+        const preservedEntries = this.ensureArray(rawList[embeddedFontKey]);
+        rawList[embeddedFontKey] = [...preservedEntries, ...embeddedFontEntries];
+        metadataAppliedInPlace = true;
+      } else if (preservedMetadata) {
+        metadata = serializeEmbeddedFontList(preservedMetadata);
+        const embeddedFontKey = Object.keys(metadata).find(
+          (key) => key.replace(/^.*:/u, "") === "embeddedFont"
+        ) ?? "p:embeddedFont";
+        const preservedEntries = this.ensureArray(metadata[embeddedFontKey]);
+        metadata[embeddedFontKey] = [...preservedEntries, ...embeddedFontEntries];
+      }
+      if (!metadataAppliedInPlace) {
+        setEmbeddedFontList(this.presentationData, metadata);
+      }
     }
     const ctXml = await this.zip.file("[Content_Types].xml")?.async("string");
     if (ctXml) {