pptx-viewer-core 1.2.5 → 1.2.7

package/dist/index.js

@@ -12601,6 +12601,17 @@ function resolveLayoutDisplayName(input) {
   return fallbackFromPath(input.path);
 }
 
+// src/core/utils/strip-parent-dir-segments.ts
+function stripParentDirSegments(path) {
+  let result = path;
+  let previous;
+  do {
+    previous = result;
+    result = previous.replace(/\.\.\//g, "");
+  } while (result !== previous);
+  return result;
+}
+
 // src/core/utils/ole2-parser-types.ts
 var OLE_MAGIC = new Uint8Array([208, 207, 17, 224, 161, 27, 26, 225]);
 var ENDOFCHAIN = 4294967294;
@@ -42078,7 +42089,7 @@ var PptxHandlerRuntime57 = class extends PptxHandlerRuntime56 {
     for (const [, target] of layoutRels.entries()) {
       if (target.includes("slideMaster")) {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
-        const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${target.replace("../", "")}`;
+        const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
           const masterXmlStr = await this.zip.file(masterPath)?.async("string");
           if (masterXmlStr) {
@@ -42102,7 +42113,7 @@ var PptxHandlerRuntime57 = class extends PptxHandlerRuntime56 {
     for (const [, target] of slideRels.entries()) {
       if (target.includes("slideLayout")) {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
-        const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${target.replace("../", "")}`;
+        const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
           const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
           if (layoutXmlStr) {
@@ -42130,7 +42141,7 @@ var PptxHandlerRuntime57 = class extends PptxHandlerRuntime56 {
     for (const [, target] of slideRels.entries()) {
       if (target.includes("slideLayout")) {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
-        const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${target.replace("../", "")}`;
+        const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
           const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
           if (layoutXmlStr) {
@@ -42159,7 +42170,7 @@ var PptxHandlerRuntime57 = class extends PptxHandlerRuntime56 {
     for (const [, target] of layoutRels.entries()) {
       if (target.includes("slideMaster")) {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
-        const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${target.replace("../", "")}`;
+        const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
           const masterXmlStr = await this.zip.file(masterPath)?.async("string");
           if (masterXmlStr) {
@@ -42188,7 +42199,7 @@ var PptxHandlerRuntime58 = class extends PptxHandlerRuntime57 {
     for (const [, target] of slideRels.entries()) {
       if (target.includes("slideLayout")) {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
-        const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${target.replace("../", "")}`;
+        const layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
           const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
           if (layoutXmlStr) {
@@ -42217,7 +42228,7 @@ var PptxHandlerRuntime58 = class extends PptxHandlerRuntime57 {
     for (const [, target] of layoutRels.entries()) {
       if (target.includes("slideMaster")) {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
-        const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${target.replace("../", "")}`;
+        const masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         try {
           const masterXmlStr = await this.zip.file(masterPath)?.async("string");
           if (masterXmlStr) {
@@ -42242,7 +42253,7 @@ var PptxHandlerRuntime58 = class extends PptxHandlerRuntime57 {
     for (const [, target] of slideRels.entries()) {
       if (target.includes("slideLayout")) {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
-        return target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${target.replace("../", "")}`;
+        return target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
       }
     }
     return void 0;
@@ -42258,7 +42269,7 @@ var PptxHandlerRuntime58 = class extends PptxHandlerRuntime57 {
     for (const [, target] of layoutRels.entries()) {
       if (target.includes("slideMaster")) {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
-        return target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${target.replace("../", "")}`;
+        return target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
       }
     }
     return void 0;
@@ -42902,7 +42913,7 @@ var PptxHandlerRuntime61 = class extends PptxHandlerRuntime60 {
     for (const [, target] of layoutRels.entries()) {
       if (target.includes("slideMaster")) {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
-        masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${target.replace("../", "")}`;
+        masterPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
         break;
       }
     }
@@ -43036,7 +43047,7 @@ var PptxHandlerRuntime62 = class extends PptxHandlerRuntime61 {
     for (const [, target] of slideRels.entries()) {
       if (target.includes("slideLayout")) {
         const slideDir = slidePath.substring(0, slidePath.lastIndexOf("/") + 1);
-        layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${target.replace("../", "")}`;
+        layoutPath = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(slideDir, target) : `ppt/${stripParentDirSegments(target)}`;
         break;
       }
     }
@@ -46788,7 +46799,7 @@ var PptxHandlerRuntime78 = class extends PptxHandlerRuntime77 {
           }
           return stack.join("/");
         }
-        return `ppt/${target.replace("../", "")}`;
+        return `ppt/${stripParentDirSegments(target)}`;
       }
     }
     return void 0;
@@ -47348,7 +47359,7 @@ var PptxHandlerRuntime80 = class extends PptxHandlerRuntime79 {
     for (const [, target] of layoutRels.entries()) {
       if (target.includes("slideMaster")) {
         const layoutDir = layoutPath.substring(0, layoutPath.lastIndexOf("/") + 1);
-        return target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${target.replace("../", "")}`;
+        return target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(layoutDir, target) : `ppt/${stripParentDirSegments(target)}`;
       }
     }
     return void 0;
@@ -47417,7 +47428,7 @@ var PptxHandlerRuntime80 = class extends PptxHandlerRuntime79 {
     for (const [, target] of masterRels.entries()) {
       if (target.includes("slideLayout")) {
         const masterDir = masterPath.substring(0, masterPath.lastIndexOf("/") + 1);
-        const resolved = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(masterDir, target) : `ppt/${target.replace("../", "")}`;
+        const resolved = target.startsWith("/") ? target.substring(1) : target.startsWith("..") ? this.resolvePath(masterDir, target) : `ppt/${stripParentDirSegments(target)}`;
         masterLayoutPaths.add(resolved);
       }
     }
@@ -56304,7 +56315,7 @@ function getShapeClipPathFromPreset(shapeType, width, height, adjustments) {
   if (!result || result.svgPath === "") {
     return void 0;
   }
-  const escaped = result.svgPath.replace(/'/g, "\\'");
+  const escaped = result.svgPath.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
   return `path('${escaped}')`;
 }
 function getRoundRectRadiusPx(element) {
@@ -58235,7 +58246,7 @@ function moveSlidesToSection(data, slideIndices, targetSectionId) {
 }
 
 // src/core/builders/sdk/template-engine-helpers.ts
-var PLACEHOLDER_RE = /\{\{([^}]+)\}\}/g;
+var PLACEHOLDER_RE = /\{\{([^{}]+)\}\}/g;
 var EACH_OPEN_RE = /^\s*#each\s+([\w.]+)\s*$/;
 var EACH_CLOSE_RE = /^\s*\/each\s*$/;
 var IF_OPEN_RE = /^\s*#if\s+(!?[\w.]+)\s*$/;
@@ -58299,7 +58310,7 @@ function processInlineConditionals(text, data) {
   let safety = 0;
   const MAX_ITERATIONS = 100;
   while (safety++ < MAX_ITERATIONS) {
-    const ifOpenPattern = /\{\{\s*#if\s+([^}]+)\s*\}\}((?:(?!\{\{\s*#if\s)(?!\{\{\s*\/if\s*\}\}).)*?)\{\{\s*\/if\s*\}\}/s;
+    const ifOpenPattern = /\{\{\s*#if\s+(!?[\w.]+)\s*\}\}((?:(?!\{\{\s*#if\s)(?!\{\{\s*\/if\s*\}\}).)*?)\{\{\s*\/if\s*\}\}/s;
     const match = ifOpenPattern.exec(result);
     if (!match) {
       break;
@@ -58311,6 +58322,8 @@ function processInlineConditionals(text, data) {
   }
   return result;
 }
+
+// src/core/builders/sdk/template-engine-segments.ts
 function replaceTokensAcrossSegments(segments, data) {
   if (segments.length === 0) {
     return;
@@ -58331,7 +58344,7 @@ function replaceTokensAcrossSegments(segments, data) {
   const fullText = textParts.join("");
   const afterConditionals = processInlineConditionals(fullText, data);
   if (afterConditionals !== fullText) {
-    redistributeText(segments, segmentMap, fullText, afterConditionals);
+    redistributeText(segments, fullText, afterConditionals);
     replaceTokensAcrossSegments(segments, data);
     return;
   }
@@ -58389,7 +58402,7 @@ function replaceTokensAcrossSegments(segments, data) {
     }
   }
 }
-function redistributeText(segments, _segmentMap, _originalFull, newFull, _data) {
+function redistributeText(segments, _originalFull, newFull) {
   let placed = false;
   for (const seg of segments) {
     if (seg.isParagraphBreak) {
@@ -58631,15 +58644,126 @@ async function mailMerge(handler, data, records) {
 }
 
 // src/core/builders/sdk/text-operations.ts
-function toGlobalRegex(search) {
+function toSearchRegex(search) {
   if (typeof search === "string") {
     const escaped = search.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     return new RegExp(escaped, "g");
   }
-  if (search.global) {
-    return search;
+  return search;
+}
+function execAll(regex, text) {
+  const results = [];
+  if (regex.global || regex.sticky) {
+    regex.lastIndex = 0;
+    let match;
+    while ((match = regex.exec(text)) !== null) {
+      results.push(match);
+      if (match[0].length === 0) {
+        regex.lastIndex += 1;
+      }
+    }
+    return results;
+  }
+  let offset = 0;
+  let remaining = text;
+  while (remaining.length > 0) {
+    const match = regex.exec(remaining);
+    if (!match) {
+      break;
+    }
+    const adjusted = [...match];
+    adjusted.index = offset + match.index;
+    adjusted.input = text;
+    adjusted.groups = match.groups;
+    results.push(adjusted);
+    const advance = match.index + (match[0].length || 1);
+    offset += advance;
+    remaining = remaining.slice(advance);
+  }
+  return results;
+}
+function expandReplacement(replacement, match, fullText) {
+  const closeAngleIndices = [];
+  for (let k = 0; k < replacement.length; k += 1) {
+    if (replacement[k] === ">") {
+      closeAngleIndices.push(k);
+    }
+  }
+  let result = "";
+  let i = 0;
+  let gtPtr = 0;
+  while (i < replacement.length) {
+    if (replacement[i] !== "$" || i + 1 >= replacement.length) {
+      result += replacement[i];
+      i += 1;
+      continue;
+    }
+    const next = replacement[i + 1];
+    if (next === "$") {
+      result += "$";
+      i += 2;
+    } else if (next === "&") {
+      result += match[0];
+      i += 2;
+    } else if (next === "`") {
+      result += fullText.slice(0, match.index);
+      i += 2;
+    } else if (next === "'") {
+      result += fullText.slice(match.index + match[0].length);
+      i += 2;
+    } else if (next === "<") {
+      while (gtPtr < closeAngleIndices.length && closeAngleIndices[gtPtr] < i + 2) {
+        gtPtr += 1;
+      }
+      const closeIdx = gtPtr < closeAngleIndices.length ? closeAngleIndices[gtPtr] : -1;
+      if (closeIdx === -1) {
+        result += "$";
+        i += 1;
+      } else {
+        const groupName = replacement.slice(i + 2, closeIdx);
+        result += match.groups?.[groupName] ?? "";
+        i = closeIdx + 1;
+      }
+    } else if (next >= "0" && next <= "9") {
+      let digits = next;
+      let digitsEnd = i + 2;
+      if (digitsEnd < replacement.length && replacement[digitsEnd] >= "0" && replacement[digitsEnd] <= "9") {
+        digits += replacement[digitsEnd];
+        digitsEnd += 1;
+      }
+      let groupIndex = Number(digits);
+      if (digits.length === 2 && !(groupIndex >= 1 && groupIndex < match.length)) {
+        digits = digits.slice(0, 1);
+        groupIndex = Number(digits);
+        digitsEnd = i + 2;
+      }
+      if (groupIndex >= 1 && groupIndex < match.length) {
+        result += match[groupIndex] ?? "";
+        i = digitsEnd;
+      } else {
+        result += "$";
+        i += 1;
+      }
+    } else {
+      result += "$";
+      i += 1;
+    }
   }
-  return new RegExp(search.source, `${search.flags}g`);
+  return result;
+}
+function applyReplacements(text, matches, replacement) {
+  if (matches.length === 0) {
+    return text;
+  }
+  let result = "";
+  let cursor = 0;
+  for (const match of matches) {
+    result += text.slice(cursor, match.index);
+    result += expandReplacement(replacement, match, text);
+    cursor = match.index + match[0].length;
+  }
+  result += text.slice(cursor);
+  return result;
 }
 function collectElements(elements) {
   const result = [];
@@ -58655,7 +58779,7 @@ function findText(slides, search) {
   if (typeof search === "string" && search === "") {
     return [];
   }
-  const regex = toGlobalRegex(search);
+  const regex = toSearchRegex(search);
   const results = [];
   slides.forEach((slide, slideIndex) => {
     const allElements = collectElements(slide.elements ?? []);
@@ -58666,9 +58790,7 @@ function findText(slides, search) {
       const segments = element.textSegments ?? [];
       segments.forEach((seg, segIndex) => {
         const text = seg.text ?? "";
-        regex.lastIndex = 0;
-        let match;
-        while ((match = regex.exec(text)) !== null) {
+        for (const match of execAll(regex, text)) {
           results.push({
             slideIndex,
             elementId: element.id,
@@ -58676,9 +58798,6 @@ function findText(slides, search) {
             text: match[0],
             matchIndex: match.index
           });
-          if (match[0].length === 0) {
-            regex.lastIndex += 1;
-          }
         }
       });
     }
@@ -58689,7 +58808,7 @@ function replaceTextInSlide(slide, search, replacement) {
   if (typeof search === "string" && search === "") {
     return 0;
   }
-  const regex = toGlobalRegex(search);
+  const regex = toSearchRegex(search);
   let totalReplacements = 0;
   function processElements2(elements) {
     for (const element of elements) {
@@ -58701,23 +58820,12 @@ function replaceTextInSlide(slide, search, replacement) {
       }
       const segments = element.textSegments ?? [];
       let elementTextChanged = false;
-      for (let segIdx = 0; segIdx < segments.length; segIdx++) {
-        const seg = segments[segIdx];
+      for (const seg of segments) {
         const originalText = seg.text ?? "";
-        regex.lastIndex = 0;
-        let matchCount = 0;
-        let m;
-        const countRegex = toGlobalRegex(search);
-        while ((m = countRegex.exec(originalText)) !== null) {
-          matchCount++;
-          if (m[0].length === 0) {
-            countRegex.lastIndex += 1;
-          }
-        }
-        if (matchCount > 0) {
-          const newText = originalText.replace(toGlobalRegex(search), replacement);
-          seg.text = newText;
-          totalReplacements += matchCount;
+        const matches = execAll(regex, originalText);
+        if (matches.length > 0) {
+          seg.text = applyReplacements(originalText, matches, replacement);
+          totalReplacements += matches.length;
           elementTextChanged = true;
         }
       }
@@ -62681,7 +62789,7 @@ ${htmlRows.join("\n")}
     return parts.join("").trim();
   }
   escapeMarkdownTableCell(text) {
-    return text.replace(/\|/g, "\\|").replace(/\n+/g, " ").trim();
+    return text.replace(/\\/g, "\\\\").replace(/\|/g, "\\|").replace(/\n+/g, " ").trim();
   }
 };
 
@@ -65790,6 +65898,7 @@ exports.setElementLocked = setElementLocked;
 exports.setSmartArtNodeStyle = setSmartArtNodeStyle;
 exports.shouldRenderFallbackLabel = shouldRenderFallbackLabel;
 exports.shouldReturnToZoomSlide = shouldReturnToZoomSlide;
+exports.stripParentDirSegments = stripParentDirSegments;
 exports.subtractPolygons = subtractPolygons;
 exports.subtractShapes = subtractShapes;
 exports.subtractSvgPaths = subtractSvgPaths;