mixdog 1.2.5 → 1.2.6

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

@@ -112,7 +112,10 @@ export async function handleAddCommentOrDeleteComment(context, op) {
     `<p:cm authorId="${authorId}" dt="${new Date().toISOString().replace(/\.\d+Z$/, 'Z')}" idx="${index}">` +
     `<p:pos x="${Math.max(0, toEmu(op.left ?? 12))}" y="${Math.max(0, toEmu(op.top ?? 12))}"/>` +
     `<p:text>${xmlEncode(text)}</p:text></p:cm>`;
-  zip.file(part, xml.replace('</p:cmLst>', `${entry}</p:cmLst>`));
+  zip.file(
+    part,
+    xml.replace('</p:cmLst>', () => `${entry}</p:cmLst>`)
+  );
   return { op: op.op, changed: true, slide: Number(op.slide), comment: index };
 }
 
@@ -338,10 +341,11 @@ export async function handleSetLayout(context, op) {
   const target = posix.relative('ppt/slides', layout.path);
   const pattern = /<Relationship\b[^>]*\bType="[^"]*\/slideLayout"[^>]*\/>/;
   const next = pattern.test(rels)
-    ? rels.replace(pattern, (block) => block.replace(/\bTarget="[^"]*"/, `Target="${xmlEncode(target)}"`))
+    ? rels.replace(pattern, (block) => block.replace(/\bTarget="[^"]*"/, () => `Target="${xmlEncode(target)}"`))
     : rels.replace(
         '</Relationships>',
-        `<Relationship Id="${nextRelationshipId(rels)}" Type="${OFFICE_RELATIONSHIP_BASE}/slideLayout" Target="${xmlEncode(target)}"/></Relationships>`
+        () =>
+          `<Relationship Id="${nextRelationshipId(rels)}" Type="${OFFICE_RELATIONSHIP_BASE}/slideLayout" Target="${xmlEncode(target)}"/></Relationships>`
       );
   zip.file(relationships, next);
   return { op: op.op, changed: true, slide: Number(op.slide), layout: layout.name || layout.type };
@@ -398,7 +402,7 @@ export async function handleSetTransition(context, op) {
     const anchorEnd = anchor.index + anchor[0].length;
     next = `${stripped.slice(0, anchorEnd)}${element}${stripped.slice(anchorEnd)}`;
   } else if (element) {
-    next = stripped.replace('</p:sld>', `${element}</p:sld>`);
+    next = stripped.replace('</p:sld>', () => `${element}</p:sld>`);
   }
   zip.file(path, next);
   return { op: op.op, changed: true, slide: Number(op.slide), effect: requested };

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

@@ -138,7 +138,7 @@ export function writeSlideIdList(presentation, entries) {
   }
   const size = /<p:sldSz\b/.exec(presentation);
   if (size) return `${presentation.slice(0, size.index)}${element}${presentation.slice(size.index)}`;
-  return presentation.replace('</p:presentation>', `${element}</p:presentation>`);
+  return presentation.replace('</p:presentation>', () => `${element}</p:presentation>`);
 }
 
 export function slideIdEntries(presentation) {
@@ -355,7 +355,7 @@ async function ensureNotesMaster(zip) {
       presentationPath,
       anchor
         ? `${presentation.slice(0, anchor.index)}${element}${presentation.slice(anchor.index)}`
-        : presentation.replace('</p:presentation>', `${element}</p:presentation>`)
+        : presentation.replace('</p:presentation>', () => `${element}</p:presentation>`)
     );
   }
   return part;
@@ -387,7 +387,10 @@ export async function ensureCommentAuthor(zip, author, initials) {
   const entry =
     `<p:cmAuthor id="${id}" name="${xmlEncode(author)}" initials="${xmlEncode(initials)}"` +
     ` lastIdx="1" clrIdx="${id}"/>`;
-  zip.file(part, xml.replace('</p:cmAuthorLst>', `${entry}</p:cmAuthorLst>`));
+  zip.file(
+    part,
+    xml.replace('</p:cmAuthorLst>', () => `${entry}</p:cmAuthorLst>`)
+  );
   return id;
 }
 
@@ -438,7 +441,7 @@ export async function copySlideNotes(zip, sourcePath, targetPath) {
     zip.file(
       partRelationshipPath(notes),
       relationships.replace(/<Relationship\b[^>]*\/>/g, (entry) =>
-        /\bType="[^"]*\/slide"/.test(entry) ? entry.replace(/\bTarget="[^"]*"/, `Target="${target}"`) : entry
+        /\bType="[^"]*\/slide"/.test(entry) ? entry.replace(/\bTarget="[^"]*"/, () => `Target="${target}"`) : entry
       )
     );
   }

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

@@ -427,7 +427,10 @@ async function frameInsideSlide(context, shapeXml, extent) {
   const width = Math.min(Number(extent[1]), Math.max(1, room(slide.width, offset[1])));
   const height = Math.min(Number(extent[2]), Math.max(1, room(slide.height, offset[2])));
   if (width === Number(extent[1]) && height === Number(extent[2])) return { xml: shapeXml, extent, clamped: false };
-  const xml = shapeXml.replace(/(<a:ext\b[^>]*\bcx=")\d+("[^>]*\bcy=")\d+(")/, `$1${width}$2${height}$3`);
+  const xml = shapeXml.replace(
+    /(<a:ext\b[^>]*\bcx=")\d+("[^>]*\bcy=")\d+(")/,
+    (__m, __1, __2, __3) => `${__1}${width}${__2}${height}${__3}`
+  );
   return { xml, extent: [extent[0], String(width), String(height)], clamped: true };
 }
 
@@ -475,7 +478,10 @@ async function replacedPicture(zip, path, shape, op) {
   const previous = /<a:blip\b[^>]*\br:embed="([^"]*)"/.exec(shape.xml)?.[1];
   if (!previous) throw new Error(`PPTX picture ${op.shape} on slide ${op.slide} has no image reference`);
   const media = await addSlideImage(zip, path, op.path);
-  let updated = shape.xml.replace(/(<a:blip\b[^>]*\br:embed=")[^"]*(")/, `$1${media.relationshipId}$2`);
+  let updated = shape.xml.replace(
+    /(<a:blip\b[^>]*\br:embed=")[^"]*(")/,
+    (__m, __1, __2) => `${__1}${media.relationshipId}${__2}`
+  );
   const detail = { image: media.part, replaced: previous };
   // The frame is the page's design and the new picture rarely shares its
   // ratio: stretched into it the photograph comes out squeezed (the audit's
@@ -499,7 +505,7 @@ async function replacedPicture(zip, path, shape, op) {
       : '';
     updated = updated
       .replace(/<a:srcRect\b[^>]*\/>/, '')
-      .replace(/(<a:blip\b[^>]*?(?:\/>|>[\s\S]*?<\/a:blip>))/, `$1${rect}`);
+      .replace(/(<a:blip\b[^>]*?(?:\/>|>[\s\S]*?<\/a:blip>))/, (__m, __1) => `${__1}${rect}`);
     detail.cropped = cropped;
   }
   // The frame keeps the description of the picture that used to be in it, so
@@ -508,8 +514,8 @@ async function replacedPicture(zip, path, shape, op) {
   if (altText) {
     const encoded = xmlEncode(altText);
     updated = /<p:cNvPr\b[^>]*\bdescr="/.test(updated)
-      ? updated.replace(/(<p:cNvPr\b[^>]*\bdescr=")[^"]*(")/, `$1${encoded}$2`)
-      : updated.replace(/(<p:cNvPr\b[^>]*?)(\/?>)/, `$1 descr="${encoded}"$2`);
+      ? updated.replace(/(<p:cNvPr\b[^>]*\bdescr=")[^"]*(")/, (__m, __1, __2) => `${__1}${encoded}${__2}`)
+      : updated.replace(/(<p:cNvPr\b[^>]*?)(\/?>)/, (__m, __1, __2) => `${__1} descr="${encoded}"${__2}`);
     detail.altText = altText;
   }
   return { updated, detail };
@@ -524,7 +530,7 @@ function filledCellProperties(tcPr, fill, anchor) {
   let attributes = open[1];
   if (anchor)
     attributes = /\banchor="/.test(attributes)
-      ? attributes.replace(/\banchor="[^"]*"/, `anchor="${anchor}"`)
+      ? attributes.replace(/\banchor="[^"]*"/, () => `anchor="${anchor}"`)
       : `${attributes} anchor="${anchor}"`;
   let children = open[2] ? '' : tcPr.slice(open[0].length, tcPr.lastIndexOf('</a:tcPr>'));
   if (fill) {
@@ -568,7 +574,7 @@ export async function handleSetTableCellStyle(context, op) {
   else if (properties.fillColor) fill = solidFillXml(properties.fillColor);
   const anchor = textAnchor(properties.verticalAlignment);
   // The cell's own text frame may name an anchor too (this writer's add_table sets one); it follows the cell's.
-  if (anchor) styled = styled.replace(/(<a:bodyPr\b[^>]*?\banchor=")[^"]*"/, `$1${anchor}"`);
+  if (anchor) styled = styled.replace(/(<a:bodyPr\b[^>]*?\banchor=")[^"]*"/, (__m, __1) => `${__1}${anchor}"`);
   if (fill || anchor) {
     if (!/<a:tcPr\b/.test(styled)) styled = styled.replace('</a:tc>', '<a:tcPr/></a:tc>');
     styled = styled.replace(/<a:tcPr\b[^>]*?(?:\/>|>[\s\S]*?<\/a:tcPr>)/, (tcPr) =>
@@ -758,7 +764,7 @@ export async function handleCropImage(context, op) {
   const rect = `<a:srcRect l="${edge(op.left)}" t="${edge(op.top)}" r="${edge(op.right)}" b="${edge(op.bottom)}"/>`;
   const updated = shape.xml
     .replace(/<a:srcRect\b[^>]*\/>/, '')
-    .replace(/(<a:blip\b[^>]*?(?:\/>|>[\s\S]*?<\/a:blip>))/, `$1${rect}`);
+    .replace(/(<a:blip\b[^>]*?(?:\/>|>[\s\S]*?<\/a:blip>))/, (__m, __1) => `${__1}${rect}`);
   writeShape(context, slide, shape, updated);
   return { op: op.op, changed: true, slide: Number(op.slide), shape: Number(op.shape) };
 }
@@ -871,7 +877,10 @@ export async function handleAddAnimation(context, op) {
   const id = () => nextId++;
   const timing = timingWithAnimation(existing, animationNodes(shapeId, request, id), request.trigger, id);
   const stripped = current.replace(/<p:timing>[\s\S]*?<\/p:timing>/, '');
-  zip.file(path, stripped.replace('</p:sld>', `${timing}</p:sld>`));
+  zip.file(
+    path,
+    stripped.replace('</p:sld>', () => `${timing}</p:sld>`)
+  );
   return {
     op: op.op,
     changed: true,

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

@@ -141,7 +141,7 @@ export async function writeWorksheetNote(zip, sheet, worksheetXml, { cell, text,
     authorId = authors.length - 1;
     comments = comments.replace(
       /<authors>[\s\S]*?<\/authors>/,
-      `<authors>${authors.map((entry) => `<author>${xmlEncode(entry)}</author>`).join('')}</authors>`
+      () => `<authors>${authors.map((entry) => `<author>${xmlEncode(entry)}</author>`).join('')}</authors>`
     );
   }
   const pattern = new RegExp(`<comment\\b[^>]*\\bref="${parsed.ref}"[^>]*>[\\s\\S]*?<\\/comment>`);
@@ -155,11 +155,17 @@ export async function writeWorksheetNote(zip, sheet, worksheetXml, { cell, text,
   const entry =
     `<comment ref="${parsed.ref}" authorId="${authorId}">` +
     `<text><r><t xml:space="preserve">${xmlEncode(body)}</t></r></text></comment>`;
-  zip.file(context.commentsPart, comments.replace('</commentList>', `${entry}</commentList>`));
+  zip.file(
+    context.commentsPart,
+    comments.replace('</commentList>', () => `${entry}</commentList>`)
+  );
   if (!existing) {
     const vml = await zipText(zip, context.vmlPart);
     const shapeId = 1025 + (vml.match(/<v:shape\b/g) || []).length;
-    zip.file(context.vmlPart, vml.replace('</xml>', `${vmlNoteShape(shapeId, parsed)}</xml>`));
+    zip.file(
+      context.vmlPart,
+      vml.replace('</xml>', () => `${vmlNoteShape(shapeId, parsed)}</xml>`)
+    );
   }
   return { worksheet: context.worksheet, changed: true, cell: parsed.ref };
 }

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

@@ -90,7 +90,7 @@ export function upsertWorksheetSection(xml, name, element) {
     const found = worksheetSection(base, candidate);
     if (found) return `${base.slice(0, found.index)}${element}${base.slice(found.index)}`;
   }
-  return base.replace(/<\/worksheet>\s*$/, `${element}</worksheet>`);
+  return base.replace(/<\/worksheet>\s*$/, () => `${element}</worksheet>`);
 }
 
 export function mergedRanges(xml) {
@@ -158,7 +158,7 @@ export function shiftWorksheetColumns(xml, from, count) {
       if (count < 0 && column >= from && column < from - count) continue;
       const next = column >= from ? column + count : column;
       if (next < 1) continue;
-      kept.push(cell.xml.replace(/(\br=")[A-Za-z]+(\d+")/, `$1${columnLabel(next)}$2`));
+      kept.push(cell.xml.replace(/(\br=")[A-Za-z]+(\d+")/, (__m, __1, __2) => `${__1}${columnLabel(next)}${__2}`));
     }
     return `<row${open[1]}>${kept.join('')}</row>`;
   });
@@ -217,13 +217,13 @@ export function appendDifferentialFormat(stylesXml, { color = '', fillColor = ''
   if (found >= 0) return { xml: stylesXml, id: found };
   items.push(dxf);
   const element = `<dxfs count="${items.length}">${items.join('')}</dxfs>`;
-  if (section) return { xml: stylesXml.replace(section[0], element), id: items.length - 1 };
+  if (section) return { xml: stylesXml.replace(section[0], () => element), id: items.length - 1 };
   const styles = /<cellStyles\b[^>]*?(?:\/>|>[\s\S]*?<\/cellStyles>)/.exec(stylesXml);
   if (styles) {
     const position = styles.index + styles[0].length;
     return { xml: `${stylesXml.slice(0, position)}${element}${stylesXml.slice(position)}`, id: items.length - 1 };
   }
-  return { xml: stylesXml.replace('</styleSheet>', `${element}</styleSheet>`), id: items.length - 1 };
+  return { xml: stylesXml.replace('</styleSheet>', () => `${element}</styleSheet>`), id: items.length - 1 };
 }
 
 export function mergedCellAnchor(xml, reference) {
@@ -629,5 +629,5 @@ export function upsertDefinedName(xml, entry, matches) {
   if (!element) return xml;
   const calculation = /<calcPr\b[^>]*?(?:\/>|>[\s\S]*?<\/calcPr>)/.exec(xml);
   if (calculation) return `${xml.slice(0, calculation.index)}${element}${xml.slice(calculation.index)}`;
-  return xml.replace(/<\/workbook>\s*$/, `${element}</workbook>`);
+  return xml.replace(/<\/workbook>\s*$/, () => `${element}</workbook>`);
 }

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

@@ -310,7 +310,10 @@ export async function addWorksheetChart(zip, sheet, xml, op, sheets) {
   const anchorCount = countDrawingAnchors(drawingXml);
   const width = spannedWidth(xml, op, await workbookDigitWidth(zip)) ?? op.width;
   const anchor = chartFrameAnchor({ ...op, width }, anchorCount, chartRelationshipId);
-  zip.file(drawingPart, drawingXml.replace('</xdr:wsDr>', `${anchor}</xdr:wsDr>`));
+  zip.file(
+    drawingPart,
+    drawingXml.replace('</xdr:wsDr>', () => `${anchor}</xdr:wsDr>`)
+  );
   return {
     op: op.op,
     changed: true,

package/src/runtime/office/portable/portable-xlsx-drawings.mjs

@@ -122,7 +122,10 @@ export async function addWorksheetImage(zip, sheet, xml, op) {
     ...imagePlacementSize(op, data),
     altText: op.altText,
   });
-  zip.file(drawing.part, drawingXml.replace('</xdr:wsDr>', `${anchor}</xdr:wsDr>`));
+  zip.file(
+    drawing.part,
+    drawingXml.replace('</xdr:wsDr>', () => `${anchor}</xdr:wsDr>`)
+  );
   zip.file(sheet.path, xml);
   return {
     op: op.op,
@@ -266,15 +269,15 @@ export async function setWorksheetDrawing(zip, sheet, xml, op) {
     const width = op.width !== undefined ? Number(op.width) : Math.max(1, to.x - from.x);
     const height = op.height !== undefined ? Number(op.height) : Math.max(1, to.y - from.y);
     body = body
-      .replace(/<xdr:from>[\s\S]*?<\/xdr:from>/, write('from', at(left, top)))
-      .replace(/<xdr:to>[\s\S]*?<\/xdr:to>/, write('to', at(left + width, top + height)));
+      .replace(/<xdr:from>[\s\S]*?<\/xdr:from>/, () => write('from', at(left, top)))
+      .replace(/<xdr:to>[\s\S]*?<\/xdr:to>/, () => write('to', at(left + width, top + height)));
   }
   if (target.kind !== 'twoCellAnchor' && (op.left !== undefined || op.top !== undefined)) {
     if (target.kind === 'absoluteAnchor') {
       const current = /<xdr:pos\b([^>]*)\/>/.exec(body)?.[1] || '';
       const x = op.left !== undefined ? emu(op.left) : Number(xmlAttribute(current, 'x')) || 0;
       const y = op.top !== undefined ? emu(op.top) : Number(xmlAttribute(current, 'y')) || 0;
-      body = body.replace(/<xdr:pos\b[^>]*\/>/, `<xdr:pos x="${x}" y="${y}"/>`);
+      body = body.replace(/<xdr:pos\b[^>]*\/>/, () => `<xdr:pos x="${x}" y="${y}"/>`);
     } else {
       if (op.left === undefined || op.top === undefined) {
         throw new Error(`Drawing "${label}" hangs off a cell; set_drawing needs left and top together to move it.`);
@@ -282,7 +285,8 @@ export async function setWorksheetDrawing(zip, sheet, xml, op) {
       // Measuring the offset from A1 makes the point given the point drawn.
       body = body.replace(
         /<xdr:from>[\s\S]*?<\/xdr:from>/,
-        `<xdr:from><xdr:col>0</xdr:col><xdr:colOff>${emu(op.left)}</xdr:colOff>` +
+        () =>
+          `<xdr:from><xdr:col>0</xdr:col><xdr:colOff>${emu(op.left)}</xdr:colOff>` +
           `<xdr:row>0</xdr:row><xdr:rowOff>${emu(op.top)}</xdr:rowOff></xdr:from>`
       );
     }
@@ -291,7 +295,7 @@ export async function setWorksheetDrawing(zip, sheet, xml, op) {
     const current = /<xdr:ext\b([^>]*)\/>/.exec(body)?.[1] || '';
     const cx = op.width !== undefined ? emu(op.width) : Number(xmlAttribute(current, 'cx')) || 0;
     const cy = op.height !== undefined ? emu(op.height) : Number(xmlAttribute(current, 'cy')) || 0;
-    body = body.replace(/<xdr:ext\b[^>]*\/>/, `<xdr:ext cx="${cx}" cy="${cy}"/>`);
+    body = body.replace(/<xdr:ext\b[^>]*\/>/, () => `<xdr:ext cx="${cx}" cy="${cy}"/>`);
   }
   if (body === target.body) throw new Error(`XLSX ${op.op} needs left, top, width, or height`);
   zip.file(part, `${drawingXml.slice(0, target.start)}${body}${drawingXml.slice(target.end)}`);

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

@@ -107,7 +107,8 @@ export async function addWorksheet(zip, name) {
     relsPath,
     rels.replace(
       '</Relationships>',
-      `<Relationship Id="${relationshipId}" Type="${WORKSHEET_RELATIONSHIP}" Target="worksheets/sheet${ordinal}.xml"/></Relationships>`
+      () =>
+        `<Relationship Id="${relationshipId}" Type="${WORKSHEET_RELATIONSHIP}" Target="worksheets/sheet${ordinal}.xml"/></Relationships>`
     )
   );
   const sheetIds = [...workbook.matchAll(/<sheet\b[^>]*\bsheetId="(\d+)"/g)].map((match) => Number(match[1]));
@@ -117,7 +118,7 @@ export async function addWorksheet(zip, name) {
   if (!sheetsSection) throw new Error('Workbook is missing its sheet list');
   const next = sheetsSection[0].endsWith('/>')
     ? `<sheets>${entry}</sheets>`
-    : sheetsSection[0].replace('</sheets>', `${entry}</sheets>`);
+    : sheetsSection[0].replace('</sheets>', () => `${entry}</sheets>`);
   zip.file(
     workbookPath,
     `${workbook.slice(0, sheetsSection.index)}${next}${workbook.slice(sheetsSection.index + sheetsSection[0].length)}`
@@ -126,7 +127,7 @@ export async function addWorksheet(zip, name) {
   if (!types.includes(`PartName="/${part}"`)) {
     zip.file(
       '[Content_Types].xml',
-      types.replace('</Types>', `<Override PartName="/${part}" ContentType="${WORKSHEET_CONTENT_TYPE}"/></Types>`)
+      types.replace('</Types>', () => `<Override PartName="/${part}" ContentType="${WORKSHEET_CONTENT_TYPE}"/></Types>`)
     );
   }
   return { name: label, path: part, sheetId };
@@ -142,7 +143,7 @@ export async function renameWorksheet(zip, sheet, name, sheets) {
   const rewritten = await renameSheetReferences(zip, sheets, sheet, label, 'rename_sheet');
   const workbook = await zipText(zip, workbookPath);
   const match = pattern.exec(workbook);
-  const replaced = match[0].replace(/\bname="[^"]*"/, `name="${xmlEncode(label)}"`);
+  const replaced = match[0].replace(/\bname="[^"]*"/, () => `name="${xmlEncode(label)}"`);
   zip.file(
     workbookPath,
     `${workbook.slice(0, match.index)}${replaced}${workbook.slice(match.index + match[0].length)}`
@@ -171,7 +172,9 @@ export async function deleteWorksheet(zip, sheets, sheet) {
   workbook = upsertDefinedName(workbook, '', (item) => localSheetId(item) === index);
   workbook = workbook.replace(/<definedName\b[^>]*?(?:\/>|>[\s\S]*?<\/definedName>)/g, (item) => {
     const local = localSheetId(item);
-    return local !== null && local > index ? item.replace(/\blocalSheetId="\d+"/, `localSheetId="${local - 1}"`) : item;
+    return local !== null && local > index
+      ? item.replace(/\blocalSheetId="\d+"/, () => `localSheetId="${local - 1}"`)
+      : item;
   });
   zip.file(workbookPath, workbook);
   const relsPath = 'xl/_rels/workbook.xml.rels';

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

@@ -99,7 +99,7 @@ async function formatPivotValues(zip, xml, area, destination, anchor, layout) {
     if (!id) return;
     table = table.replace(
       new RegExp(`(<dataField\\b[^>]*\\bfld="${field}")([^>]*?)(\\/?>)`),
-      `$1$2 numFmtId="${id}"$3`
+      (__m, __1, __2, __3) => `${__1}${__2} numFmtId="${id}"${__3}`
     );
   });
   zip.file(layout.tablePart, table);

package/src/runtime/office/portable/portable-xlsx-reference-shift.mjs

@@ -320,8 +320,8 @@ function movedSheetRanges(xml, move, refused) {
     const count = (kept.match(/<brk\b/g) || []).length;
     if (!count) return '';
     const manual = (kept.match(/<brk\b[^>]*\bman="(?:1|true)"/g) || []).length;
-    let breakAttributes = attributes.replace(/\bcount="\d+"/, `count="${count}"`);
-    breakAttributes = breakAttributes.replace(/\bmanualBreakCount="\d+"/, `manualBreakCount="${manual}"`);
+    let breakAttributes = attributes.replace(/\bcount="\d+"/, () => `count="${count}"`);
+    breakAttributes = breakAttributes.replace(/\bmanualBreakCount="\d+"/, () => `manualBreakCount="${manual}"`);
     return `<${breaks}${breakAttributes}>${kept}</${breaks}>`;
   });
   return next;
@@ -340,8 +340,8 @@ function movedAnchors(drawing, move) {
     return { index, next: moved ? moved - 1 : move.from - 1, reset: !moved };
   };
   const written = (block, index, reset) => {
-    const moved = block.replace(indexPattern, `<xdr:${tag}>${index}</xdr:${tag}>`);
-    return reset ? moved.replace(offsetPattern, `<xdr:${tag}Off>0</xdr:${tag}Off>`) : moved;
+    const moved = block.replace(indexPattern, () => `<xdr:${tag}>${index}</xdr:${tag}>`);
+    return reset ? moved.replace(offsetPattern, () => `<xdr:${tag}Off>0</xdr:${tag}Off>`) : moved;
   };
   return drawing.replace(
     /<xdr:(oneCellAnchor|twoCellAnchor)\b([^>]*)>([\s\S]*?)<\/xdr:\1>/g,
@@ -379,7 +379,7 @@ function movedNoteShape(shape, move) {
   if (moved === null) return '';
   const delta = moved - 1 - index;
   return shape
-    .replace(pattern, `<x:${tag}>${moved - 1}</x:${tag}>`)
+    .replace(pattern, () => `<x:${tag}>${moved - 1}</x:${tag}>`)
     .replace(/<x:Anchor>([^<]*)<\/x:Anchor>/, (_whole, anchor) => {
       const corners = anchor.split(',').map((value) => value.trim());
       for (const position of move.rows ? [2, 6] : [0, 4]) corners[position] = String(Number(corners[position]) + delta);
@@ -598,7 +598,7 @@ async function duplicateOwnedPart(zip, part, rewriteChart) {
   if (override)
     zip.file(
       '[Content_Types].xml',
-      types.replace('</Types>', `<Override PartName="/${copy}" ContentType="${override[1]}"/></Types>`)
+      types.replace('</Types>', () => `<Override PartName="/${copy}" ContentType="${override[1]}"/></Types>`)
     );
   await duplicateOwnedRelationships(zip, part, copy, rewriteChart);
   return copy;
@@ -661,7 +661,11 @@ export async function copySheetParts(zip, sheets, source, copy) {
       `<definedName${setXmlAttribute(attributes, 'localSheetId', sheets.length)}>${xmlEncode(repointed)}</definedName>`
     );
   }
-  if (added.length) zip.file(workbookPath, workbook.replace('</definedNames>', `${added.join('')}</definedNames>`));
+  if (added.length)
+    zip.file(
+      workbookPath,
+      workbook.replace('</definedNames>', () => `${added.join('')}</definedNames>`)
+    );
 }
 
 // Excel's record of the order it last calculated formula cells in, by address. Cells that moved leave it naming

package/src/runtime/office/portable/portable-xlsx-sheet-edits.mjs

@@ -393,7 +393,7 @@ export async function setWorksheetVisibility(zip, sheet, _xml, op) {
   const attrs =
     state === 'visible'
       ? match[0].replace(/\s*\bstate="[^"]*"/, '')
-      : match[0].replace(/\s*\bstate="[^"]*"/, '').replace(/\/>$/, ` state="${state}"/>`);
+      : match[0].replace(/\s*\bstate="[^"]*"/, '').replace(/\/>$/, () => ` state="${state}"/>`);
   zip.file(WORKBOOK_PATH, `${workbook.slice(0, match.index)}${attrs}${workbook.slice(match.index + match[0].length)}`);
   return { op: op.op, changed: true, sheet: sheet.name, visibility };
 }
@@ -460,7 +460,7 @@ export async function setRowHeightOrColumnWidth(zip, sheet, xml, op) {
         (tag) =>
           tag
             .replace(/\s*\b(?:ht|customHeight)="[^"]*"/g, '')
-            .replace(/(\/?>)$/, ` ht="${Math.round(size * 100) / 100}" customHeight="1"$1`),
+            .replace(/(\/?>)$/, (__m, __1) => ` ht="${Math.round(size * 100) / 100}" customHeight="1"${__1}`),
         true
       );
     }
@@ -606,7 +606,10 @@ export async function copyWorksheet(zip, sheet, xml, op, sheets) {
   const workbook = await zipText(zip, WORKBOOK_PATH);
   const sheetIds = [...workbook.matchAll(/<sheet\b[^>]*\bsheetId="(\d+)"/g)].map((match) => Number(match[1]));
   const entry = `<sheet name="${xmlEncode(label)}" sheetId="${Math.max(0, ...sheetIds) + 1}" r:id="${relationshipId}"/>`;
-  zip.file(WORKBOOK_PATH, workbook.replace('</sheets>', `${entry}</sheets>`));
+  zip.file(
+    WORKBOOK_PATH,
+    workbook.replace('</sheets>', () => `${entry}</sheets>`)
+  );
   await copySheetParts(zip, sheets, sheet, { name: label, path: copyPart });
   return { op: op.op, changed: true, sheet: label };
 }

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

@@ -306,7 +306,7 @@ export function containerInner(xml, tag, from = 0) {
 export function setXmlAttribute(attributes, name, value) {
   const pattern = new RegExp(`\\b${name}="[^"]*"`, 'i');
   return pattern.test(attributes)
-    ? attributes.replace(pattern, `${name}="${value}"`)
+    ? attributes.replace(pattern, () => `${name}="${value}"`)
     : `${attributes} ${name}="${value}"`;
 }
 

package/src/runtime/shared/atomic-file.mjs

@@ -88,21 +88,30 @@ function nextRenameDelayMs(err, attempt, backoffs) {
   return backoffs[attempt] + Math.floor(Math.random() * Math.min(50, Math.max(1, backoffs[attempt])));
 }
 
+/**
+ * Attempt `attempt` (0-based) of the renameWithRetry schedule: null when the
+ * rename landed, else the delay before the next attempt. Throws the rename's
+ * own error when that error or the attempt count ends the loop — the same
+ * final error renameWithRetrySync throws. A caller that must not block waits
+ * the delay asynchronously between attempts.
+ */
+export function renameAttempt(src, dst, attempt, opts = {}) {
+  try {
+    renameSync(src, dst);
+    return null;
+  } catch (err) {
+    const delayMs = nextRenameDelayMs(err, attempt, renameBackoffs(opts));
+    if (delayMs === null) throw err;
+    return delayMs;
+  }
+}
+
 export function renameWithRetrySync(src, dst, opts = {}) {
-  const backoffs = renameBackoffs(opts);
-  let lastErr = null;
-  for (let attempt = 0; attempt <= backoffs.length; attempt++) {
-    try {
-      renameSync(src, dst);
-      return true;
-    } catch (err) {
-      lastErr = err;
-      const delayMs = nextRenameDelayMs(err, attempt, backoffs);
-      if (delayMs === null) break;
-      sleepSync(delayMs);
-    }
+  for (let attempt = 0; ; attempt++) {
+    const delayMs = renameAttempt(src, dst, attempt, opts);
+    if (delayMs === null) return true;
+    sleepSync(delayMs);
   }
-  throw lastErr;
 }
 
 async function renameWithRetry(src, dst, opts = {}) {