mixdog 1.2.5 → 1.2.6

package/src/runtime/office/portable/portable-docx-edits.mjs

@@ -180,7 +180,7 @@ async function appendComment(zip, comments, op, text, thread = {}) {
   const stamps = commentStamps();
   zip.file(
     comments.part,
-    comments.xml.replace('</w:comments>', `${commentEntryXml(id, op, text, stamps.local)}</w:comments>`)
+    comments.xml.replace('</w:comments>', () => `${commentEntryXml(id, op, text, stamps.local)}</w:comments>`)
   );
   await registerCommentThread(zip, { commentId: id, ...thread });
   await registerCommentIdentity(zip, { commentId: id, date: stamps.utc });
@@ -363,7 +363,7 @@ export async function setDocxParagraphStyle(zip, op) {
   let nextParagraph = paragraph.xml;
   if (/<w:pPr(?:\s[^>]*)?>/.test(nextParagraph)) {
     if (/<w:pStyle\b[^>]*\/>/.test(nextParagraph)) {
-      nextParagraph = nextParagraph.replace(/<w:pStyle\b[^>]*\/>/, `<w:pStyle w:val="${style}"/>`);
+      nextParagraph = nextParagraph.replace(/<w:pStyle\b[^>]*\/>/, () => `<w:pStyle w:val="${style}"/>`);
     } else {
       nextParagraph = nextParagraph.replace(/<w:pPr(?:\s[^>]*)?>/, (open) => `${open}<w:pStyle w:val="${style}"/>`);
     }
@@ -412,17 +412,18 @@ export async function setDocxTableCell(zip, op, { tracking }) {
     if (first) {
       nextCell = cell[0].replace(
         '</w:tc>',
-        `<w:p><w:ins ${revisionAttributes(id, op.author)}><w:r>` +
+        () =>
+          `<w:p><w:ins ${revisionAttributes(id, op.author)}><w:r>` +
           `${wordTextContent(op.text, { preserve: true })}</w:r></w:ins></w:p></w:tc>`
       );
     }
   } else if (textNodes(cell[0], 'w:t').length) {
     nextCell = withFirstRunText(cell[0], op.text);
   } else {
-    nextCell = cell[0].replace('</w:tc>', `<w:p><w:r>${wordTextContent(op.text)}</w:r></w:p></w:tc>`);
+    nextCell = cell[0].replace('</w:tc>', () => `<w:p><w:r>${wordTextContent(op.text)}</w:r></w:p></w:tc>`);
   }
-  const nextRow = row[0].replace(cell[0], nextCell);
-  const nextTable = table[0].replace(row[0], nextRow);
+  const nextRow = row[0].replace(cell[0], () => nextCell);
+  const nextTable = table[0].replace(row[0], () => nextRow);
   zip.file(
     DOCUMENT_PART,
     `${current.slice(0, table.index)}${nextTable}${current.slice(table.index + table[0].length)}`
@@ -548,7 +549,7 @@ export async function editDocxTableRowsOrColumns(zip, op) {
       const blank = blankTableCells(template[0]);
       nextTable =
         position > rows.length
-          ? table[0].replace(/<\/w:tbl>$/, `${blank}</w:tbl>`)
+          ? table[0].replace(/<\/w:tbl>$/, () => `${blank}</w:tbl>`)
           : `${table[0].slice(0, template.index)}${blank}${table[0].slice(template.index)}`;
     }
   } else {
@@ -633,7 +634,7 @@ export async function addDocxHyperlink(zip, op) {
   } else if (op.paragraph) {
     const model = docxBodyModel(current);
     const paragraph = bodyParagraphAt(model, op.paragraph);
-    const nextParagraph = paragraph.xml.replace(/<\/w:p>$/, `${link}</w:p>`);
+    const nextParagraph = paragraph.xml.replace(/<\/w:p>$/, () => `${link}</w:p>`);
     current = replaceBodyParagraph(current, model, paragraph, nextParagraph);
     anchor = 'paragraph';
   } else {
@@ -788,7 +789,7 @@ export async function addDocxBookmark(zip, op) {
   const opening = /^<w:p(?:\s[^>]*)?>(?:<w:pPr(?:\s[^>]*)?>[\s\S]*?<\/w:pPr>)?/.exec(paragraph.xml)?.[0] || '<w:p>';
   const marked =
     `${opening}<w:bookmarkStart w:id="${id}" w:name="${xmlEncode(name)}"/>` +
-    `${paragraph.xml.slice(opening.length)}`.replace(/<\/w:p>$/, `<w:bookmarkEnd w:id="${id}"/></w:p>`);
+    `${paragraph.xml.slice(opening.length)}`.replace(/<\/w:p>$/, () => `<w:bookmarkEnd w:id="${id}"/></w:p>`);
   zip.file(DOCUMENT_PART, replaceBodyParagraph(current, model, paragraph, marked));
   return { op: op.op, changed: true, name, bookmark: id };
 }
@@ -837,7 +838,7 @@ export async function setDocxHeaderFooter(zip, op) {
 
 // A separator says the number stands against the total ("3 / 12"): asked for with separator:' / ' and no
 // includeTotal, the footer printed "3" alone. includeTotal:false still keeps the number alone.
-export function pageNumbersIncludeTotal(op) {
+function pageNumbersIncludeTotal(op) {
   return op.includeTotal === true || (op.includeTotal !== false && Boolean(String(op.separator ?? '').trim()));
 }
 

package/src/runtime/office/portable/portable-docx-operations.mjs

@@ -82,15 +82,15 @@ const PARAGRAPH_MARK_ID_OFFSET = 900;
 // place ahead of the deletion that rejects it.
 function withParagraphMarkRevision(paragraphXml, mark) {
   if (!/<w:pPr(?:\s[^>]*)?>/.test(paragraphXml)) {
-    return paragraphXml.replace(/^(<w:p(?:\s[^>]*)?>)/, `$1<w:pPr><w:rPr>${mark}</w:rPr></w:pPr>`);
+    return paragraphXml.replace(/^(<w:p(?:\s[^>]*)?>)/, (__m, __1) => `${__1}<w:pPr><w:rPr>${mark}</w:rPr></w:pPr>`);
   }
   if (/<w:rPr(?:\s[^>]*)?>[\s\S]*?<\/w:rPr>\s*<\/w:pPr>/.test(paragraphXml)) {
     return paragraphXml.replace(
       /(<w:rPr(?:\s[^>]*)?>)((?:<w:ins\b[^>]*\/>|<w:ins\b[^>]*>[\s\S]*?<\/w:ins>)?)/,
-      `$1$2${mark}`
+      (__m, __1, __2) => `${__1}${__2}${mark}`
     );
   }
-  return paragraphXml.replace(/<\/w:pPr>/, `<w:rPr>${mark}</w:rPr></w:pPr>`);
+  return paragraphXml.replace(/<\/w:pPr>/, () => `<w:rPr>${mark}</w:rPr></w:pPr>`);
 }
 
 export function docxTocEntries(documentXml, lower, upper, headingLevels = new Map()) {
@@ -328,7 +328,10 @@ export async function addDocxNote(zip, op) {
     `<w:r><w:rPr><w:rStyle w:val="${definition.style}"/>${faces}<w:vertAlign w:val="superscript"/></w:rPr>` +
     `<w:${definition.reference === 'w:footnoteReference' ? 'footnoteRef' : 'endnoteRef'}/></w:r>` +
     `<w:r>${noteRun}<w:t xml:space="preserve"> ${xmlEncode(text)}</w:t></w:r></w:p></${definition.tag}>`;
-  zip.file(definition.part, definition.xml.replace(`</${definition.root}>`, `${entry}</${definition.root}>`));
+  zip.file(
+    definition.part,
+    definition.xml.replace(`</${definition.root}>`, () => `${entry}</${definition.root}>`)
+  );
   // The mark belongs right after the phrase it cites; a phrase split across
   // a tab, field, or drawing falls back to the end of its paragraph.
   const mark =
@@ -336,7 +339,7 @@ export async function addDocxNote(zip, op) {
     `<${definition.reference} w:id="${id}"/></w:r>`;
   const cited = find ? wholeWordPhrase(paragraphTexts(paragraph.xml, 'w:t').join(''), find) : '';
   const phrase = cited ? anchorPhraseInParagraph(paragraph.xml, cited, id, { start: '', end: mark }) : null;
-  const anchored = phrase || paragraph.xml.replace(/<\/w:p>$/, `${mark}</w:p>`);
+  const anchored = phrase || paragraph.xml.replace(/<\/w:p>$/, () => `${mark}</w:p>`);
   const nextInner = `${model.body.inner.slice(0, paragraph.start)}${anchored}${model.body.inner.slice(paragraph.end)}`;
   current = `${current.slice(0, model.body.start)}${nextInner}${current.slice(model.body.end)}`;
   zip.file('word/document.xml', current);
@@ -388,7 +391,7 @@ export async function setDocxDocumentFont(zip, op) {
 }
 
 // The fields one style takes in define_styles: its face, size, weight, ink, and its paragraph's flow.
-export const DOCX_STYLE_FIELDS = Object.freeze([
+const DOCX_STYLE_FIELDS = Object.freeze([
   'name',
   'nameEastAsia',
   'size',
@@ -608,7 +611,7 @@ export async function fitDocxTable(zip, op) {
   let nextTable = grid
     ? table[0].replace(
         grid[0],
-        `<w:tblGrid>${widths.map((width) => `<w:gridCol w:w="${width}"/>`).join('')}</w:tblGrid>`
+        () => `<w:tblGrid>${widths.map((width) => `<w:gridCol w:w="${width}"/>`).join('')}</w:tblGrid>`
       )
     : table[0];
   const declared = `<w:tblW w:w="${usable}" w:type="dxa"/>`;
@@ -616,9 +619,9 @@ export async function fitDocxTable(zip, op) {
     ? wordTableProperties(op.properties)
     : /<w:tblPr>([\s\S]*?)<\/w:tblPr>/.exec(nextTable)?.[1] || '';
   if (/<w:tblW\b[^>]*\/>/.test(tableProperties)) {
-    tableProperties = tableProperties.replace(/<w:tblW\b[^>]*\/>/, declared);
+    tableProperties = tableProperties.replace(/<w:tblW\b[^>]*\/>/, () => declared);
   } else if (/<w:tblStyle\b[^>]*\/>/.test(tableProperties)) {
-    tableProperties = tableProperties.replace(/(<w:tblStyle\b[^>]*\/>)/, `$1${declared}`);
+    tableProperties = tableProperties.replace(/(<w:tblStyle\b[^>]*\/>)/, (__m, __1) => `${__1}${declared}`);
   } else {
     tableProperties = `${declared}${tableProperties}`;
   }
@@ -640,7 +643,10 @@ function controlFilledWith(control, contentInner, text) {
     ? `${/^<w:p(?:\s[^>]*)?>(?:<w:pPr(?:\s[^>]*)?>[\s\S]*?<\/w:pPr>)?/.exec(firstParagraph)?.[0] || '<w:p>'}${run}</w:p>`
     : run;
   const cleaned = control.replace(/<w:showingPlcHdr\b[^>]*\/>/g, '');
-  return cleaned.replace(/<w:sdtContent\b[^>]*>[\s\S]*?<\/w:sdtContent>/, `<w:sdtContent>${paragraph}</w:sdtContent>`);
+  return cleaned.replace(
+    /<w:sdtContent\b[^>]*>[\s\S]*?<\/w:sdtContent>/,
+    () => `<w:sdtContent>${paragraph}</w:sdtContent>`
+  );
 }
 
 /** Fills one named or numbered content control, in the body, a header, or a footer. */
@@ -712,8 +718,8 @@ function paragraphWithText(paragraph, op) {
   if (!nodes.length) {
     if (op.op === 'set_run_text') throw new Error(`DOCX paragraph ${op.paragraph} has no editable text`);
     const run = `<w:r>${wordTextContent(op.text, { preserve: true })}</w:r>`;
-    if (/<\/w:p>\s*$/.test(paragraph.xml)) return paragraph.xml.replace(/<\/w:p>\s*$/, `${run}</w:p>`);
-    if (/\/>\s*$/.test(paragraph.xml)) return paragraph.xml.replace(/\/>\s*$/, `>${run}</w:p>`);
+    if (/<\/w:p>\s*$/.test(paragraph.xml)) return paragraph.xml.replace(/<\/w:p>\s*$/, () => `${run}</w:p>`);
+    if (/\/>\s*$/.test(paragraph.xml)) return paragraph.xml.replace(/\/>\s*$/, () => `>${run}</w:p>`);
     throw new Error(`DOCX paragraph ${op.paragraph} is malformed`);
   }
   if (op.op === 'set_run_text') {
@@ -852,8 +858,7 @@ function mergedDocxTable({ table, rows, row, cells }, op) {
     );
     return `${rowXml.slice(0, joined[0].index)}${merged}${rowXml.slice(end)}`;
   };
-  let nextTable = table[0].replace(
-    row[0],
+  let nextTable = table[0].replace(row[0], () =>
     mergeRow(row[0], cells, `${gridSpan}${rowSpan > 1 ? '<w:vMerge w:val="restart"/>' : ''}`)
   );
   if (rowSpan > 1) {
@@ -862,8 +867,7 @@ function mergedDocxTable({ table, rows, row, cells }, op) {
       if (!continuationRow) break;
       const continuationCells = rowCellMatches(continuationRow[0]);
       if (!continuationCells[first]) continue;
-      nextTable = nextTable.replace(
-        continuationRow[0],
+      nextTable = nextTable.replace(continuationRow[0], () =>
         mergeRow(continuationRow[0], continuationCells, `${gridSpan}<w:vMerge/>`)
       );
     }
@@ -883,7 +887,7 @@ export async function styleOrMergeDocxTableCell(zip, op) {
   if (!cell) throw missingDocxCellError(op, cells);
   const nextTable =
     op.op === 'set_table_cell_style'
-      ? table[0].replace(cell[0], styledDocxCell(cell[0], op))
+      ? table[0].replace(cell[0], () => styledDocxCell(cell[0], op))
       : mergedDocxTable({ table, rows, row, cells }, op);
   current = replaceDocxTable(current, table, nextTable);
   zip.file('word/document.xml', current);

package/src/runtime/office/portable/portable-docx-parts.mjs

@@ -121,7 +121,7 @@ const sectionChildRank = (tag) => SECTION_CHILD_ORDER.indexOf(tag === 'footerRef
 /** Replaces the section's own tag element, or writes it ahead of the first child the schema places after it. */
 export function upsertSectionChild(sectionXml, tag, element) {
   const pattern = new RegExp(`<w:${tag}\\b[^>]*\\/>`);
-  if (pattern.test(sectionXml)) return sectionXml.replace(pattern, element);
+  if (pattern.test(sectionXml)) return sectionXml.replace(pattern, () => element);
   const rank = sectionChildRank(tag);
   const children = /<w:(\w+)\b/g;
   children.lastIndex = sectionXml.indexOf('>') + 1;
@@ -257,7 +257,11 @@ async function ensureNoteStyles(zip, definition) {
       : `<w:style w:type="character" w:styleId="${definition.style}"><w:name w:val="${markName}"/><w:uiPriority w:val="99"/><w:unhideWhenUsed/>` +
         '<w:rPr><w:vertAlign w:val="superscript"/></w:rPr></w:style>',
   ].join('');
-  if (additions) zip.file(part, styles.replace('</w:styles>', `${additions}</w:styles>`));
+  if (additions)
+    zip.file(
+      part,
+      styles.replace('</w:styles>', () => `${additions}</w:styles>`)
+    );
 }
 
 // Word reads the separator notes (ids -1 and 0) before any real note: without
@@ -313,8 +317,8 @@ export async function registerCommentThread(zip, { commentId, parentId = 0, done
     `${parentId ? ` w15:paraIdParent="${commentParagraphId(parentId)}"` : ''}` +
     ` w15:done="${done ? 1 : 0}"/>`;
   const next = pattern.test(extended.xml)
-    ? extended.xml.replace(pattern, entry)
-    : extended.xml.replace('</w15:commentsEx>', `${entry}</w15:commentsEx>`);
+    ? extended.xml.replace(pattern, () => entry)
+    : extended.xml.replace('</w15:commentsEx>', () => `${entry}</w15:commentsEx>`);
   zip.file(extended.part, next);
   return paraId;
 }
@@ -381,7 +385,8 @@ export async function registerCommentIdentity(zip, { commentId, date }) {
       ids.part,
       ids.xml.replace(
         `</${COMMENT_SIDECARS.ids.root}>`,
-        `<w16cid:commentId w16cid:paraId="${paraId}" w16cid:durableId="${durableId}"/></${COMMENT_SIDECARS.ids.root}>`
+        () =>
+          `<w16cid:commentId w16cid:paraId="${paraId}" w16cid:durableId="${durableId}"/></${COMMENT_SIDECARS.ids.root}>`
       )
     );
   }
@@ -391,7 +396,8 @@ export async function registerCommentIdentity(zip, { commentId, date }) {
       extensible.part,
       extensible.xml.replace(
         `</${COMMENT_SIDECARS.extensible.root}>`,
-        `<w16cex:commentExtensible w16cex:durableId="${durableId}" w16cex:dateUtc="${xmlEncode(date)}"/></${COMMENT_SIDECARS.extensible.root}>`
+        () =>
+          `<w16cex:commentExtensible w16cex:durableId="${durableId}" w16cex:dateUtc="${xmlEncode(date)}"/></${COMMENT_SIDECARS.extensible.root}>`
       )
     );
   }
@@ -435,7 +441,7 @@ export function anchorDocxComment(paragraphXml, id) {
   const body = paragraphXml.slice(opening.length);
   return `${opening}<w:commentRangeStart w:id="${id}"/>${body}`.replace(
     /<\/w:p>$/,
-    `<w:commentRangeEnd w:id="${id}"/><w:r><w:commentReference w:id="${id}"/></w:r></w:p>`
+    () => `<w:commentRangeEnd w:id="${id}"/><w:r><w:commentReference w:id="${id}"/></w:r></w:p>`
   );
 }
 
@@ -511,7 +517,7 @@ export async function ensureDocxUpdateFields(zip) {
 export function upsertSectionReference(sectionXml, tag, kind, relationshipId) {
   const element = `<w:${tag} w:type="${kind}" r:id="${relationshipId}"/>`;
   const pattern = new RegExp(`<w:${tag}\\b[^>]*\\bw:type="${kind}"[^>]*\\/>`);
-  if (pattern.test(sectionXml)) return sectionXml.replace(pattern, element);
+  if (pattern.test(sectionXml)) return sectionXml.replace(pattern, () => element);
   const position = sectionXml.indexOf('>') + 1;
   return `${sectionXml.slice(0, position)}${element}${sectionXml.slice(position)}`;
 }
@@ -704,7 +710,7 @@ export async function ensureNumbering(zip, kind, { restart = false } = {}) {
       : xml.indexOf('>', xml.indexOf('<w:numbering')) + 1;
     next = `${xml.slice(0, position)}${numberingDefinition(abstractId, kind)}${xml.slice(position)}`;
   }
-  next = next.replace('</w:numbering>', `${definition}</w:numbering>`);
+  next = next.replace('</w:numbering>', () => `${definition}</w:numbering>`);
   zip.file(part, next);
   return { xml: next, numId, created: true };
 }

package/src/runtime/office/portable/portable-docx-styles.mjs

@@ -62,6 +62,9 @@ export async function documentStyleId(zip, requested, type = 'paragraph') {
       return local ? `${open}${local.id}${close}` : whole;
     }
   );
-  zip.file(STYLES_PART, styles.replace('</w:styles>', `${definition}</w:styles>`));
+  zip.file(
+    STYLES_PART,
+    styles.replace('</w:styles>', () => `${definition}</w:styles>`)
+  );
   return { id: borrowed.id, found: true };
 }

package/src/runtime/office/portable/portable-docx-xml.mjs

@@ -188,8 +188,8 @@ export function justifyWordParagraphs(cellXml, justification) {
   return cellXml.replace(/<w:p(?:\s[^>]*)?>[\s\S]*?<\/w:p>/g, (paragraph) => {
     const stripped = paragraph.replace(/<w:jc\b[^>]*\/>/g, '');
     return /<w:pPr(?:\s[^>]*)?>/.test(stripped)
-      ? stripped.replace(/<\/w:pPr>/, `<w:jc w:val="${justification}"/></w:pPr>`)
-      : stripped.replace(/^(<w:p(?:\s[^>]*)?>)/, `$1<w:pPr><w:jc w:val="${justification}"/></w:pPr>`);
+      ? stripped.replace(/<\/w:pPr>/, () => `<w:jc w:val="${justification}"/></w:pPr>`)
+      : stripped.replace(/^(<w:p(?:\s[^>]*)?>)/, (__m, __1) => `${__1}<w:pPr><w:jc w:val="${justification}"/></w:pPr>`);
   });
 }
 
@@ -202,9 +202,9 @@ export function alignWordTableColumns(tableXml, columnAlignments = []) {
     let nextRow = row[0];
     rowCellMatches(row[0]).forEach((cell, column) => {
       if (!justifications[column]) return;
-      nextRow = nextRow.replace(cell[0], justifyWordParagraphs(cell[0], justifications[column]));
+      nextRow = nextRow.replace(cell[0], () => justifyWordParagraphs(cell[0], justifications[column]));
     });
-    next = next.replace(row[0], nextRow);
+    next = next.replace(row[0], () => nextRow);
   }
   return next;
 }
@@ -302,7 +302,7 @@ function tableRowStyle(properties, row) {
 // The last row is the total when totalRow is set: bold over a rule, so it reads as the sum of the rows above it and
 // not as one more of them.
 const isTotalRow = (properties, row, rows) => properties?.totalRow === true && rows > 1 && row === rows - 1;
-export const TOTAL_ROW_RULE = Object.freeze({ size: 8, color: '374151' });
+const TOTAL_ROW_RULE = Object.freeze({ size: 8, color: '374151' });
 
 // A row's weight: its own rowStyles bold when given, else the header's or the total's.
 function rowBold(properties, row, rows, header) {
@@ -520,9 +520,9 @@ export function applyWordRunFormat(xml, runFormat) {
     const opened = /<w:rPr(?:\s[^>]*)?>([\s\S]*?)<\/w:rPr>/.exec(run);
     if (opened) {
       const merged = mergeWordPropertyElements(opened[1], runFormat, RUN_PROPERTY_ORDER);
-      return run.replace(opened[0], `<w:rPr>${merged}</w:rPr>`);
+      return run.replace(opened[0], () => `<w:rPr>${merged}</w:rPr>`);
     }
-    if (selfClosed) return run.replace(selfClosed[0], `<w:rPr>${runFormat}</w:rPr>`);
+    if (selfClosed) return run.replace(selfClosed[0], () => `<w:rPr>${runFormat}</w:rPr>`);
     return run.replace(/<w:r(?:\s[^>]*)?>/, (open) => `${open}<w:rPr>${runFormat}</w:rPr>`);
   });
 }
@@ -598,7 +598,7 @@ export function rewriteTableColumns(tableXml, columnIndex, mode) {
     } else {
       columns.splice(columnIndex - 1, 0, columns[columnIndex - 1] || columns.at(-1) || '<w:gridCol/>');
     }
-    next = next.replace(grid[0], `<w:tblGrid>${columns.join('')}</w:tblGrid>`);
+    next = next.replace(grid[0], () => `<w:tblGrid>${columns.join('')}</w:tblGrid>`);
   }
   return mapTableRows(next, (row) => {
     const cells = tableRowCells(row);
@@ -749,7 +749,7 @@ export function replaceDocxTable(current, table, nextTable) {
 
 export function replaceWordProperties(xml, owner, propertyTag, value) {
   const pattern = new RegExp(`<w:${propertyTag}(?:\\s[^>]*)?>[\\s\\S]*?<\\/w:${propertyTag}>`);
-  if (pattern.test(xml)) return xml.replace(pattern, `<w:${propertyTag}>${value}</w:${propertyTag}>`);
+  if (pattern.test(xml)) return xml.replace(pattern, () => `<w:${propertyTag}>${value}</w:${propertyTag}>`);
   return xml.replace(
     new RegExp(`<w:${owner}(?:\\s[^>]*)?>`),
     (open) => `${open}<w:${propertyTag}>${value}</w:${propertyTag}>`

package/src/runtime/office/portable/portable-opc.mjs

@@ -206,7 +206,10 @@ export async function ensureContentTypeOverride(zip, part, type) {
   const path = '[Content_Types].xml';
   const xml = await zipText(zip, path);
   if (xml.includes(`PartName="${part}"`)) return;
-  zip.file(path, xml.replace('</Types>', `<Override PartName="${part}" ContentType="${type}"/></Types>`));
+  zip.file(
+    path,
+    xml.replace('</Types>', () => `<Override PartName="${part}" ContentType="${type}"/></Types>`)
+  );
 }
 
 export async function removeContentTypeOverride(zip, part) {
@@ -219,7 +222,10 @@ export async function ensureDefaultContentType(zip, extension, type) {
   const path = '[Content_Types].xml';
   const xml = await zipText(zip, path);
   if (new RegExp(`<Default\\b[^>]*\\bExtension="${extension}"`, 'i').test(xml)) return;
-  zip.file(path, xml.replace(/<Types\b[^>]*>/, `$&<Default Extension="${extension}" ContentType="${type}"/>`));
+  zip.file(
+    path,
+    xml.replace(/<Types\b[^>]*>/, (__m) => `${__m}<Default Extension="${extension}" ContentType="${type}"/>`)
+  );
 }
 
 export async function addPackageRelationship(zip, relsPath, type, target, mode = '') {
@@ -237,7 +243,10 @@ export async function addPackageRelationship(zip, relsPath, type, target, mode =
   const relationship =
     `<Relationship Id="${id}" Type="${type}" Target="${xmlEncode(target)}"` +
     `${mode ? ` TargetMode="${mode}"` : ''}/>`;
-  zip.file(relsPath, xml.replace('</Relationships>', `${relationship}</Relationships>`));
+  zip.file(
+    relsPath,
+    xml.replace('</Relationships>', () => `${relationship}</Relationships>`)
+  );
   return id;
 }
 
@@ -417,7 +426,9 @@ async function clonePartTree(zip, sourcePath, cache = new Map()) {
     const cloned = await clonePartTree(zip, partFromTarget(directory, target), cache);
     if (!cloned) continue;
     const rewrittenTarget = absolute ? `/${cloned}` : posix.relative(posix.dirname(targetPath), cloned);
-    output = output.replace(block, block.replace(`Target="${raw}"`, `Target="${xmlEncode(rewrittenTarget)}"`));
+    output = output.replace(block, () =>
+      block.replace(`Target="${raw}"`, () => `Target="${xmlEncode(rewrittenTarget)}"`)
+    );
   }
   zip.file(partRelationshipPath(targetPath), output);
   return targetPath;
@@ -446,7 +457,9 @@ export async function cloneOwnedSlideParts(zip, relationshipsPath) {
     if (!cloned) continue;
     copied.push(cloned);
     const rewrittenTarget = absolute ? `/${cloned}` : posix.relative(owner, cloned);
-    output = output.replace(block, block.replace(`Target="${raw}"`, `Target="${xmlEncode(rewrittenTarget)}"`));
+    output = output.replace(block, () =>
+      block.replace(`Target="${raw}"`, () => `Target="${xmlEncode(rewrittenTarget)}"`)
+    );
   }
   if (copied.length) zip.file(relationshipsPath, output);
   return copied;
@@ -468,9 +481,11 @@ async function remapLayoutRelationships(source, zip, { layoutPath, targetPath, m
       ? master
       : await importPartTree(source, zip, resolved, cache);
     if (!mapped) continue;
-    output = output.replace(
-      block,
-      block.replace(/\bTarget="[^"]*"/, `Target="${xmlEncode(posix.relative(posix.dirname(targetPath), mapped))}"`)
+    output = output.replace(block, () =>
+      block.replace(
+        /\bTarget="[^"]*"/,
+        () => `Target="${xmlEncode(posix.relative(posix.dirname(targetPath), mapped))}"`
+      )
     );
   }
   zip.file(partRelationshipPath(targetPath), output);
@@ -490,8 +505,8 @@ async function registerLayoutOnMaster(zip, master, targetPath) {
   zip.file(
     master,
     masterXml.includes('</p:sldLayoutIdLst>')
-      ? masterXml.replace('</p:sldLayoutIdLst>', `${entry}</p:sldLayoutIdLst>`)
-      : masterXml.replace(/(<p:clrMap\b[^>]*\/>)/, `$1<p:sldLayoutIdLst>${entry}</p:sldLayoutIdLst>`)
+      ? masterXml.replace('</p:sldLayoutIdLst>', () => `${entry}</p:sldLayoutIdLst>`)
+      : masterXml.replace(/(<p:clrMap\b[^>]*\/>)/, (__m, __1) => `${__1}<p:sldLayoutIdLst>${entry}</p:sldLayoutIdLst>`)
   );
 }
 
@@ -548,9 +563,8 @@ export async function rewriteImportedRelationships(source, zip, sourceOwner, tar
     } else {
       mapped = await importPartTree(source, zip, resolved, cache);
     }
-    output = output.replace(
-      block,
-      block.replace(/\bTarget="[^"]*"/, `Target="${xmlEncode(posix.relative(targetDirectory, mapped))}"`)
+    output = output.replace(block, () =>
+      block.replace(/\bTarget="[^"]*"/, () => `Target="${xmlEncode(posix.relative(targetDirectory, mapped))}"`)
     );
   }
   return output;

package/src/runtime/office/portable/portable-pivot.mjs

@@ -321,12 +321,12 @@ export async function writePivotTable(
   const cacheId = (workbook.match(/<pivotCache\b/g) || []).length + 1;
   const entry = `<pivotCache cacheId="${cacheId}" r:id="${workbookRelationshipId}"/>`;
   if (/<pivotCaches>/.test(workbook)) {
-    workbook = workbook.replace('</pivotCaches>', `${entry}</pivotCaches>`);
+    workbook = workbook.replace('</pivotCaches>', () => `${entry}</pivotCaches>`);
   } else {
     const block = `<pivotCaches>${entry}</pivotCaches>`;
     workbook = /<calcPr\b[^>]*\/>/.test(workbook)
-      ? workbook.replace(/(<calcPr\b[^>]*\/>)/, `$1${block}`)
-      : workbook.replace('</sheets>', `</sheets>${block}`);
+      ? workbook.replace(/(<calcPr\b[^>]*\/>)/, (__m, __1) => `${__1}${block}`)
+      : workbook.replace('</sheets>', () => `</sheets>${block}`);
   }
   zip.file('xl/workbook.xml', workbook);
 

package/src/runtime/office/portable/portable-pptx-chart.mjs

@@ -185,9 +185,9 @@ export async function writePresentationChart(zip, { chartPart, embeddingPart, ch
   const id = /\bId="([^"]+)"/.exec(previous)?.[1] || `rId${Math.max(0, ...taken) + 1}`;
   const relationship = `<Relationship Id="${id}" Type="${OFFICE_RELATIONSHIP_BASE}/package" Target="${target}"/>`;
   let relationships = `${XML_HEADER}<Relationships xmlns="${PACKAGE_RELATIONSHIP_NS}">${relationship}</Relationships>`;
-  if (previous) relationships = existing.replace(previous, relationship);
+  if (previous) relationships = existing.replace(previous, () => relationship);
   else if (existing.includes('</Relationships>'))
-    relationships = existing.replace('</Relationships>', `${relationship}</Relationships>`);
+    relationships = existing.replace('</Relationships>', () => `${relationship}</Relationships>`);
   zip.file(relationshipsPath, relationships);
   zip.file(chartPart, citeChartWorkbook(chart, id));
   await ensureContentTypeOverride(zip, `/${chartPart}`, CHART_CONTENT_TYPE);
@@ -197,7 +197,7 @@ export async function writePresentationChart(zip, { chartPart, embeddingPart, ch
 function citeChartWorkbook(chart, id) {
   const text = String(chart);
   if (/<c:externalData\b[^>]*\br:id="/.test(text)) {
-    return text.replace(/(<c:externalData\b[^>]*\br:id=")[^"]*(")/, `$1${id}$2`);
+    return text.replace(/(<c:externalData\b[^>]*\br:id=")[^"]*(")/, (__m, __1, __2) => `${__1}${id}${__2}`);
   }
   const cited = `<c:externalData r:id="${id}"><c:autoUpdate val="0"/></c:externalData>`;
   const before = /<c:(?:printSettings|userShapes|extLst)\b|<\/c:chartSpace>/.exec(text);

package/src/runtime/office/portable/portable-pptx-charts.mjs

@@ -103,9 +103,9 @@ function accentOnLastPoint(series, count) {
   if (count !== previousCount && accents.length === 1 && pointAt(accents[0]) === previousCount - 1) {
     // The accent and the point now last trade places; one past the new end is dropped by the caller.
     const displaced = points.find((point) => pointAt(point) === count - 1);
-    const moved = (point, to) => point.replace(/<c:idx val="\d+"\/>/, `<c:idx val="${to}"/>`);
-    block = block.replace(accents[0], moved(accents[0], count - 1));
-    if (displaced) block = block.replace(displaced, moved(displaced, previousCount - 1));
+    const moved = (point, to) => point.replace(/<c:idx val="\d+"\/>/, () => `<c:idx val="${to}"/>`);
+    block = block.replace(accents[0], () => moved(accents[0], count - 1));
+    if (displaced) block = block.replace(displaced, () => moved(displaced, previousCount - 1));
   }
   return block;
 }
@@ -132,7 +132,7 @@ function refreshChartDataInPlace(xml, categories, series, op) {
       block = /<c:tx>\s*<c:v>/.test(block)
         ? block.replace(
             /<c:tx>\s*<c:v>[\s\S]*?<\/c:v>\s*<\/c:tx>/,
-            `<c:tx><c:v>${xmlEncode(String(entry.name))}</c:v></c:tx>`
+            () => `<c:tx><c:v>${xmlEncode(String(entry.name))}</c:v></c:tx>`
           )
         : block.replace(
             /(<c:tx>\s*<c:strRef>[\s\S]*?<c:strCache>)[\s\S]*?(<\/c:strCache>)/,
@@ -251,20 +251,20 @@ function withCategoryOrientation(xml, orientation) {
   const element = `<c:orientation val="${orientation}"/>`;
   let oriented;
   if (/<c:orientation val="[^"]*"\/>/.test(categoryAxis)) {
-    oriented = categoryAxis.replace(/<c:orientation val="[^"]*"\/>/, element);
+    oriented = categoryAxis.replace(/<c:orientation val="[^"]*"\/>/, () => element);
   } else if (categoryAxis.includes('<c:scaling/>')) {
-    oriented = categoryAxis.replace('<c:scaling/>', `<c:scaling>${element}</c:scaling>`);
+    oriented = categoryAxis.replace('<c:scaling/>', () => `<c:scaling>${element}</c:scaling>`);
   } else {
-    oriented = categoryAxis.replace('<c:scaling>', `<c:scaling>${element}`);
+    oriented = categoryAxis.replace('<c:scaling>', () => `<c:scaling>${element}`);
   }
   const crosses = orientation === 'maxMin' ? 'max' : 'autoZero';
   let crossed = valueAxis;
   if (/<c:crosses val="[^"]*"\/>/.test(valueAxis)) {
-    crossed = valueAxis.replace(/<c:crosses val="[^"]*"\/>/, `<c:crosses val="${crosses}"/>`);
+    crossed = valueAxis.replace(/<c:crosses val="[^"]*"\/>/, () => `<c:crosses val="${crosses}"/>`);
   } else if (!/<c:crossesAt\b/.test(valueAxis)) {
-    crossed = valueAxis.replace(/(<c:crossAx val="[^"]*"\/>)/, `$1<c:crosses val="${crosses}"/>`);
+    crossed = valueAxis.replace(/(<c:crossAx val="[^"]*"\/>)/, (__m, __1) => `${__1}<c:crosses val="${crosses}"/>`);
   }
-  return xml.replace(categoryAxis, oriented).replace(valueAxis, crossed);
+  return xml.replace(categoryAxis, () => oriented).replace(valueAxis, () => crossed);
 }
 
 // The new series carrying the colours the chart already had.
@@ -420,7 +420,7 @@ export async function handleSetChartAxis(context, op) {
       const bounds =
         `${op.maximum != null ? `<c:max val="${Number(op.maximum)}"/>` : ''}` +
         `${op.minimum != null ? `<c:min val="${Number(op.minimum)}"/>` : ''}`;
-      return cleaned.replace('</c:scaling>', `${bounds}</c:scaling>`);
+      return cleaned.replace('</c:scaling>', () => `${bounds}</c:scaling>`);
     });
   }
   if (op.numberFormat != null) {
@@ -471,7 +471,7 @@ export async function handleSetChartSeries(context, op) {
     if (op.name != null) {
       updated = updated.replace(
         /(<c:tx>[\s\S]*?<c:strCache>[\s\S]*?<c:pt idx="0"><c:v>)[\s\S]*?(<\/c:v>)/,
-        `$1${xmlEncode(String(op.name))}$2`
+        (__m, __1, __2) => `${__1}${xmlEncode(String(op.name))}${__2}`
       );
     }
     if (Array.isArray(op.categories) && op.categories.length) {
@@ -482,9 +482,12 @@ export async function handleSetChartSeries(context, op) {
         block
           .replace(
             /<c:strCache>[\s\S]*?<\/c:strCache>/,
-            `<c:strCache><c:ptCount val="${op.categories.length}"/>${points}</c:strCache>`
+            () => `<c:strCache><c:ptCount val="${op.categories.length}"/>${points}</c:strCache>`
+          )
+          .replace(
+            /(<c:f>[^<]*\$[A-Z]+\$\d+:\$[A-Z]+\$)\d+(<\/c:f>)/,
+            (__m, __1, __2) => `${__1}${op.categories.length + 1}${__2}`
           )
-          .replace(/(<c:f>[^<]*\$[A-Z]+\$\d+:\$[A-Z]+\$)\d+(<\/c:f>)/, `$1${op.categories.length + 1}$2`)
       );
     }
     if (Array.isArray(op.values) && op.values.length) {
@@ -499,10 +502,13 @@ export async function handleSetChartSeries(context, op) {
           .replace(/<c:numCache>[\s\S]*?<\/c:numCache>/, (cache) =>
             cache.replace(
               /<c:ptCount val="\d+"\/>[\s\S]*?(?=<\/c:numCache>)/,
-              `<c:ptCount val="${op.values.length}"/>${points}`
+              () => `<c:ptCount val="${op.values.length}"/>${points}`
             )
           )
-          .replace(/(<c:f>[^<]*\$[A-Z]+\$\d+:\$[A-Z]+\$)\d+(<\/c:f>)/, `$1${op.values.length + 1}$2`)
+          .replace(
+            /(<c:f>[^<]*\$[A-Z]+\$\d+:\$[A-Z]+\$)\d+(<\/c:f>)/,
+            (__m, __1, __2) => `${__1}${op.values.length + 1}${__2}`
+          )
       );
     }
     return updated;
@@ -575,7 +581,7 @@ export async function handleSetChartTrendlineOrSetChartErrorBars(context, op) {
     const anchor = /<c:cat>/.exec(cleaned) || /<c:val>/.exec(cleaned);
     return anchor
       ? `${cleaned.slice(0, anchor.index)}${element}${cleaned.slice(anchor.index)}`
-      : cleaned.replace('</c:ser>', `${element}</c:ser>`);
+      : cleaned.replace('</c:ser>', () => `${element}</c:ser>`);
   });
   if (!changed) throw new Error(`Chart has no series ${op.series ?? ''}`.trim());
   zip.file(chart.part, next);
@@ -610,7 +616,7 @@ export async function handleSetChartDataLabels(context, op) {
     const anchor = /<c:cat>/.exec(cleaned);
     return anchor
       ? `${cleaned.slice(0, anchor.index)}${labels}${cleaned.slice(anchor.index)}`
-      : cleaned.replace('</c:ser>', `${labels}</c:ser>`);
+      : cleaned.replace('</c:ser>', () => `${labels}</c:ser>`);
   });
   if (!changed) throw new Error(`Chart has no series ${op.series ?? ''}`.trim());
   zip.file(chart.part, next);

package/src/runtime/office/portable/portable-pptx-core.mjs

@@ -264,11 +264,11 @@ function setTableCellText(cell, text) {
     `<a:t${/^\s|\s$/.test(value) ? ' xml:space="preserve"' : ''}>${xmlEncode(value)}</a:t></a:r>`;
   const paragraph = /<a:p(?:\s[^>]*)?>[\s\S]*?<\/a:p>/.exec(cell);
   if (paragraph) {
-    const replaced = paragraph[0].replace(/<\/a:p>$/, `${run}</a:p>`);
+    const replaced = paragraph[0].replace(/<\/a:p>$/, () => `${run}</a:p>`);
     return `${cell.slice(0, paragraph.index)}${replaced}${cell.slice(paragraph.index + paragraph[0].length)}`;
   }
   if (!/<\/a:txBody>/.test(cell)) throw new Error('PPTX table cell has no text body');
-  return cell.replace('</a:txBody>', `<a:p>${run}</a:p></a:txBody>`);
+  return cell.replace('</a:txBody>', () => `<a:p>${run}</a:p></a:txBody>`);
 }
 
 export function setTableValues(shapeXml, values) {
@@ -399,7 +399,7 @@ export function writeShapeTree(slideXml, tree, shapes) {
 
 export function appendSlideShape(xml, shape) {
   if (!/<\/p:spTree>/.test(xml)) throw new Error('PPTX slide shape tree is missing');
-  return xml.replace('</p:spTree>', `${shape}</p:spTree>`);
+  return xml.replace('</p:spTree>', () => `${shape}</p:spTree>`);
 }
 
 export function setSlideBackground(xml, color) {
@@ -444,8 +444,8 @@ export function updateShapeGeometry(shape, properties) {
       `<a:ext cx="${properties.width != null ? toEmu(properties.width) : Number(extent?.[1] || 1)}"` +
       ` cy="${properties.height != null ? toEmu(properties.height) : Number(extent?.[2] || 1)}"/></${frameTag}>`;
     if (current) next = `${next.slice(0, current.index)}${frame}${next.slice(current.index + current[0].length)}`;
-    else if (frameTag === 'p:xfrm') next = next.replace('</p:nvGraphicFramePr>', `$&${frame}`);
-    else next = next.replace(/<p:spPr(?:\s[^>]*)?>/, `$&${frame}`);
+    else if (frameTag === 'p:xfrm') next = next.replace('</p:nvGraphicFramePr>', (__m) => `${__m}${frame}`);
+    else next = next.replace(/<p:spPr(?:\s[^>]*)?>/, (__m) => `${__m}${frame}`);
   }
   // A transparency alone keeps the fill's colour, as the Office backend's Fill.Transparency does; it was dropped here.
   const fillColor =