pptx-viewer-core 1.2.5 → 1.2.6

package/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project are documented here.
 This file is generated from [Conventional Commits](https://www.conventionalcommits.org)
 by [git-cliff](https://git-cliff.org); do not edit it by hand.
 
+## [1.2.5](https://github.com/ChristopherVR/pptx-viewer/releases/tag/pptx-viewer-core@1.2.5) - 2026-07-09
+
+### Other
+
+- Reconcile with origin/main before push (by @ChristopherVR) ([b8c46bc](https://github.com/ChristopherVR/pptx-viewer/commit/b8c46bc3622e301d3365f5c489144e5aa5401782))
+
 ## [1.2.4](https://github.com/ChristopherVR/pptx-viewer/releases/tag/pptx-viewer-core@1.2.4) - 2026-07-09
 
 ## [1.2.3](https://github.com/ChristopherVR/pptx-viewer/releases/tag/pptx-viewer-core@1.2.3) - 2026-07-08

package/dist/index.d.mts

@@ -10950,7 +10950,8 @@ interface TemplateData {
  *
  * This file is the public API facade. Implementation is split across:
  * - `template-engine-types.ts` -- shared types
- * - `template-engine-helpers.ts` -- token replacement, conditionals, element processing
+ * - `template-engine-helpers.ts` -- token replacement, conditionals
+ * - `template-engine-segments.ts` -- cross-segment replacement, element processing
  * - `template-engine-loops.ts` -- `{{#each}}` loop expansion
  *
  * @module sdk/template-engine

package/dist/index.d.ts

@@ -10950,7 +10950,8 @@ interface TemplateData {
  *
  * This file is the public API facade. Implementation is split across:
  * - `template-engine-types.ts` -- shared types
- * - `template-engine-helpers.ts` -- token replacement, conditionals, element processing
+ * - `template-engine-helpers.ts` -- token replacement, conditionals
+ * - `template-engine-segments.ts` -- cross-segment replacement, element processing
  * - `template-engine-loops.ts` -- `{{#each}}` loop expansion
  *
  * @module sdk/template-engine

package/dist/index.js

@@ -42078,7 +42078,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/${target.replace(/\.\.\//g, "")}`;
         try {
           const masterXmlStr = await this.zip.file(masterPath)?.async("string");
           if (masterXmlStr) {
@@ -42102,7 +42102,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/${target.replace(/\.\.\//g, "")}`;
         try {
           const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
           if (layoutXmlStr) {
@@ -42130,7 +42130,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/${target.replace(/\.\.\//g, "")}`;
         try {
           const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
           if (layoutXmlStr) {
@@ -42159,7 +42159,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/${target.replace(/\.\.\//g, "")}`;
         try {
           const masterXmlStr = await this.zip.file(masterPath)?.async("string");
           if (masterXmlStr) {
@@ -42188,7 +42188,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/${target.replace(/\.\.\//g, "")}`;
         try {
           const layoutXmlStr = await this.zip.file(layoutPath)?.async("string");
           if (layoutXmlStr) {
@@ -42217,7 +42217,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/${target.replace(/\.\.\//g, "")}`;
         try {
           const masterXmlStr = await this.zip.file(masterPath)?.async("string");
           if (masterXmlStr) {
@@ -42242,7 +42242,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/${target.replace(/\.\.\//g, "")}`;
       }
     }
     return void 0;
@@ -42258,7 +42258,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/${target.replace(/\.\.\//g, "")}`;
       }
     }
     return void 0;
@@ -42902,7 +42902,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/${target.replace(/\.\.\//g, "")}`;
         break;
       }
     }
@@ -43036,7 +43036,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/${target.replace(/\.\.\//g, "")}`;
         break;
       }
     }
@@ -46788,7 +46788,7 @@ var PptxHandlerRuntime78 = class extends PptxHandlerRuntime77 {
           }
           return stack.join("/");
         }
-        return `ppt/${target.replace("../", "")}`;
+        return `ppt/${target.replace(/\.\.\//g, "")}`;
       }
     }
     return void 0;
@@ -47348,7 +47348,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/${target.replace(/\.\.\//g, "")}`;
       }
     }
     return void 0;
@@ -47417,7 +47417,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/${target.replace(/\.\.\//g, "")}`;
         masterLayoutPaths.add(resolved);
       }
     }
@@ -56304,7 +56304,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 +58235,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 +58299,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 +58311,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 +58333,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 +58391,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 +58633,81 @@ 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;
   }
-  return new RegExp(search.source, `${search.flags}g`);
+  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) {
+  return replacement.replace(
+    /\$(\$|&|`|'|<([^>]+)>|\d{1,2})/g,
+    (whole, token, groupName) => {
+      if (token === "$") {
+        return "$";
+      }
+      if (token === "&") {
+        return match[0];
+      }
+      if (token === "`") {
+        return fullText.slice(0, match.index);
+      }
+      if (token === "'") {
+        return fullText.slice(match.index + match[0].length);
+      }
+      if (groupName !== void 0) {
+        return match.groups?.[groupName] ?? "";
+      }
+      const groupIndex = Number(token);
+      return groupIndex >= 1 && groupIndex < match.length ? match[groupIndex] ?? "" : whole;
+    }
+  );
+}
+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 +58723,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 +58734,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 +58742,6 @@ function findText(slides, search) {
             text: match[0],
             matchIndex: match.index
           });
-          if (match[0].length === 0) {
-            regex.lastIndex += 1;
-          }
         }
       });
     }
@@ -58689,7 +58752,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 +58764,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 +62733,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();
   }
 };