mixdog 0.9.162 → 0.9.164

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

@@ -1,6 +1,6 @@
 import { basename, extname, join, posix } from 'node:path';
 import { resolveImageLayout } from './image-layout.mjs';
-import { shrinkFontSizeToFit } from './text-metrics.mjs';
+import { contrastRatio, shrinkFontSizeToFit } from './text-metrics.mjs';
 import { pictureXml, resolveGeometry, shapeXml, supportedShapeTypes, tableXml, textBodyXml, toEmu } from './portable-slide-shapes.mjs';
 import { readFile } from 'node:fs/promises';
 import { addPackageRelationship, ensureDefaultContentType, imagePixelSize, partRelationshipPath, removePackageRelationship, zipText } from './portable-opc.mjs';
@@ -176,6 +176,15 @@ export async function handleSetText(context, op) {
 }
 
 
+// The ink a filled shape can carry: white on a dark card, near-black on a light
+// one, and nothing at all when the fill is a theme reference or absent, so the
+// inherited colour keeps deciding.
+function inkOnFill(fill) {
+  const field = String(fill || '').replace(/^#/, '').toUpperCase();
+  if (!/^[0-9A-F]{6}$/.test(field)) return undefined;
+  return (contrastRatio('FFFFFF', field) ?? 0) >= (contrastRatio('1F2429', field) ?? 0) ? 'FFFFFF' : '1F2429';
+}
+
 export async function handleAddTextboxOrAddShape(context, op) {
   const { zip } = context;
   const slides = context.slides;
@@ -209,7 +218,10 @@ export async function handleAddTextboxOrAddShape(context, op) {
       defaults: {
         fontName: op.fontName ?? properties.fontName,
         fontSize: op.fontSize ?? properties.fontSize ?? 18,
-        color: op.color ?? properties.color,
+        // A caller who fills a shape and says nothing about its text gets ink
+        // the fill can carry. The default dark ink on a dark card was text the
+        // runtime's own contrast check then reported as unreadable.
+        color: op.color ?? properties.color ?? inkOnFill(op.fillColor ?? properties.fillColor),
         bold: properties.bold,
         italic: properties.italic,
         align: properties.align,
@@ -289,6 +301,7 @@ export async function handleAddImage(context, op) {
     width: placement.width,
     height: placement.height,
     crop: placement.crop,
+    altText: op.altText,
   });
   zip.file(path, appendSlideShape(current, picture));
   return {
@@ -351,6 +364,9 @@ export async function handleFitText(context, op) {
     slide: Number(op.slide),
     shape: Number(op.shape),
     scale: Number(fitted.scale.toFixed(2)),
+    // The size the copy now reads at: shrinking is the last repair, so the
+    // author sees what it cost and can rewrite the line instead.
+    fontSize: Math.max(...fitted.sizes.map((size) => Number(size) || 0), 0) || undefined,
   };
 }
 
@@ -383,6 +399,16 @@ export async function handleSetTableDataOrReplaceImage(context, op) {
     const media = await addSlideImage(zip, path, op.path);
     updated = shape.xml.replace(/(<a:blip\b[^>]*\br:embed=")[^"]*(")/, `$1${media.relationshipId}$2`);
     detail = { image: media.part, replaced: previous };
+    // The frame keeps the description of the picture that used to be in it, so
+    // a replaced photo is announced as the old one until the caller renames it.
+    const altText = String(op.altText ?? '').trim();
+    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`);
+      detail.altText = altText;
+    }
   }
   const nextInner = `${tree.inner.slice(0, shape.start)}${updated}${tree.inner.slice(shape.end)}`;
   const nextSlide = `${current.slice(0, tree.start)}${nextInner}${current.slice(tree.end)}`;
@@ -485,7 +511,7 @@ export async function handleAddMedia(context, op) {
   const poster = await addSlideImage(zip, path, op.poster);
   const id = nextShapeId(current);
   const shape = '<p:pic><p:nvPicPr>'
-    + `<p:cNvPr id="${id}" name="${xmlEncode(posix.basename(mediaPart))}">`
+    + `<p:cNvPr id="${id}" name="${xmlEncode(posix.basename(mediaPart))}"${op.altText ? ` descr="${xmlEncode(String(op.altText))}"` : ''}>`
     + '<a:hlinkClick xmlns:a="' + DRAWING_MAIN_NS + '" r:id="" action="ppaction://media"/></p:cNvPr>'
     + '<p:cNvPicPr><a:picLocks noChangeAspect="1"/></p:cNvPicPr>'
     + `<p:nvPr><a:${kind}File xmlns:a="${DRAWING_MAIN_NS}" r:link="${linkId}"/>`
@@ -543,14 +569,18 @@ export async function handleAddAnimation(context, op) {
     fly: { presetID: 2, filter: 'slide(fromBottom)' },
     float: { presetID: 30, filter: 'slide(fromBottom)' },
   };
-  const requested = String(op.effect || 'fade').toLowerCase().replace(/\s+/g, '');
+  // Every other multiword value in this runtime is written with a separator
+  // (outside_end, section_next), so on_click and after_previous name the same
+  // triggers as onclick and afterprevious.
+  const named = (value) => String(value || '').toLowerCase().replace(/[\s_-]+/g, '');
+  const requested = named(op.effect) || 'fade';
   if (!Object.hasOwn(effects, requested)) {
     throw new Error(`add_animation effect must be one of: ${Object.keys(effects).join(', ')}`);
   }
   const triggers = { onclick: 'clickEffect', withprevious: 'withEffect', afterprevious: 'afterEffect' };
-  const trigger = String(op.trigger || 'onclick').toLowerCase().replace(/\s+/g, '');
+  const trigger = named(op.trigger) || 'onclick';
   if (!Object.hasOwn(triggers, trigger)) {
-    throw new Error(`add_animation trigger must be one of: ${Object.keys(triggers).join(', ')}`);
+    throw new Error('add_animation trigger must be one of: on_click, with_previous, after_previous');
   }
   const effect = effects[requested];
   const duration = Math.max(1, Math.round((Number(op.duration) > 0 ? Number(op.duration) : 0.5) * 1000));

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

@@ -1,7 +1,7 @@
 import { presentationSlides, renumberPresentationSlides } from './portable-pptx-package.mjs';
 import { resolvePptxTargets } from './pptx-targets.mjs';
 import { handleAddChart, handleSetChartAxis, handleSetChartData, handleSetChartDataLabels, handleSetChartSeries, handleSetChartTrendlineOrSetChartErrorBars } from './portable-pptx-charts.mjs';
-import { handleAddCommentOrDeleteComment, handleAddProvenance, handleAddSlide, handleApplyTheme, handleDeleteSlide, handleDuplicateSlide, handleFillTemplate, handleImportSlides, handleKeepSlides, handleMoveSlide, handleReplaceText, handleSetFooterOrSetSlideNumber, handleSetLayout, handleSetNotes, handleSetSlideBackground, handleSetTransition } from './portable-pptx-deck.mjs';
+import { handleAddCommentOrDeleteComment, handleAddProvenance, handleAddSlide, handleApplyTheme, handleDeleteSlide, handleDuplicateSlide, handleFillTemplate, handleImportSlides, handleKeepSlides, handleMoveSlide, handleReplaceText, handleSetFooterOrSetSlideNumber, handleSetLayout, handleSetNotes, handleSetSlideBackground, handleSetSlideVisibility, handleSetTransition } from './portable-pptx-deck.mjs';
 import { handleAddAnimation, handleAddImage, handleAddMedia, handleAddTable, handleAddTextboxOrAddShape, handleAlignShapesOrDistributeShapes, handleCropImage, handleDeleteShape, handleFitText, handleGroupShapesOrUngroupShape, handleSetHyperlink, handleSetShape, handleSetTableDataOrReplaceImage, handleSetText, handleZOrder } from './portable-pptx-shapes.mjs';
 export { inspectPptxTextBoxes } from './portable-pptx-core.mjs';
 
@@ -49,6 +49,7 @@ const PPTX_OPERATIONS = Object.freeze({
   crop_image: handleCropImage,
   add_animation: handleAddAnimation,
   set_transition: handleSetTransition,
+  set_slide_visibility: handleSetSlideVisibility,
   set_shape: handleSetShape,
 });
 

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

@@ -26,80 +26,139 @@ export function worksheetGeometry(xml) {
     return width === 0 ? 0 : Math.floor(width * 7 + 5) * 0.75;
   };
   const rowPoints = (index) => rows.get(index) ?? defaultRow;
-  const edgeCell = (points, size, limit) => {
+  // Which cell a point falls in. A drawing that starts exactly on a boundary
+  // sits in the cell that begins there (an image placed at D2 is in D2, not in
+  // C1), while one that ends on a boundary still ends in the cell before it.
+  const edgeCell = (points, size, limit, trailing) => {
     let edge = 0;
     for (let index = 1; index <= limit; index += 1) {
       edge += size(index);
-      if (edge >= points) return index;
+      if (trailing ? edge >= points : edge > points) return index;
     }
     throw new Error('Worksheet drawing exceeds the Excel page grid');
   };
   return {
     columnPoints,
     rowPoints,
-    columnAt: (points) => edgeCell(points, columnPoints, 16_384),
-    rowAt: (points) => edgeCell(points, rowPoints, 1_048_576),
+    columnAt: (points, { trailing = false } = {}) => edgeCell(points, columnPoints, 16_384, trailing),
+    rowAt: (points, { trailing = false } = {}) => edgeCell(points, rowPoints, 1_048_576, trailing),
   };
 }
 
-export async function contentPrintArea(zip, sheet, xml) {
-  let lastColumn = 1;
-  let lastRow = 1;
-  for (const cell of cellRecords(xml, await sharedStrings(zip))) {
-    if (!cell.formula && (cell.value == null || cell.value === '')) continue;
-    const parsed = parseCellRef(cell.ref);
-    lastColumn = Math.max(lastColumn, columnNumber(parsed.col));
-    lastRow = Math.max(lastRow, parsed.row);
-  }
-  for (const reference of mergedRanges(xml)) {
-    const area = parseAreaRange(reference);
-    lastColumn = Math.max(lastColumn, area.endCol);
-    lastRow = Math.max(lastRow, area.endRow);
-  }
+/** Every chart and picture anchored to a worksheet, resolved onto the cell grid
+ *  (1-based, inclusive). Excel writes three anchor kinds and our own writer uses
+ *  the absolute one, so the print area and the snapshot read the same resolver
+ *  rather than each parsing anchors again. `body` is the anchor's own markup,
+ *  which the caller inspects to tell a chart frame from a picture. */
+export async function worksheetDrawings(zip, sheet, xml) {
   const relations = await zipText(zip, partRelationshipPath(sheet.path));
   const geometry = worksheetGeometry(xml);
-  for (const match of relations.matchAll(/<Relationship\b([^>]*?)\/>/g)) {
+  const drawings = [];
+  for (const match of (relations || '').matchAll(/<Relationship\b([^>]*?)\/>/g)) {
     const attrs = match[1];
     if (!String(xmlAttribute(attrs, 'Type') || '').endsWith('/drawing') || xmlAttribute(attrs, 'TargetMode') === 'External') continue;
     const target = xmlAttribute(attrs, 'Target');
     const part = target.startsWith('/') ? target.slice(1) : posix.normalize(posix.join(posix.dirname(sheet.path), target));
     const drawing = await zipText(zip, part);
-    for (const anchor of drawing.matchAll(/<xdr:(absoluteAnchor|oneCellAnchor|twoCellAnchor)\b[^>]*>([\s\S]*?)<\/xdr:\1>/g)) {
+    for (const anchor of (drawing || '').matchAll(/<xdr:(absoluteAnchor|oneCellAnchor|twoCellAnchor)\b[^>]*>([\s\S]*?)<\/xdr:\1>/g)) {
+      const kind = anchor[1];
       const body = anchor[2];
       const marker = (tag) => {
         const value = new RegExp(`<xdr:${tag}>([\\s\\S]*?)<\\/xdr:${tag}>`).exec(body)?.[1] || '';
         const number = (name) => Number(new RegExp(`<xdr:${name}>(\\d+)<\\/xdr:${name}>`).exec(value)?.[1]) || 0;
         return { column: number('col'), row: number('row'), x: number('colOff') / 12700, y: number('rowOff') / 12700 };
       };
-      if (anchor[1] === 'twoCellAnchor') {
+      const start = kind === 'absoluteAnchor' ? null : marker('from');
+      if (start && (start.column >= 16_384 || start.row >= 1_048_576)) {
+        throw new Error('Worksheet drawing anchor exceeds the Excel grid');
+      }
+      if (kind === 'twoCellAnchor') {
         const end = marker('to');
         if (end.column >= 16_384 || end.row >= 1_048_576) throw new Error('Worksheet drawing anchor exceeds the Excel grid');
-        lastColumn = Math.max(lastColumn, end.column + (end.x > 0 ? 1 : 0));
-        lastRow = Math.max(lastRow, end.row + (end.y > 0 ? 1 : 0));
+        drawings.push({
+          part,
+          kind,
+          body,
+          startColumn: start.column + 1,
+          startRow: start.row + 1,
+          endColumn: end.column + (end.x > 0 ? 1 : 0),
+          endRow: end.row + (end.y > 0 ? 1 : 0),
+        });
         continue;
       }
       const extent = /<xdr:ext\b([^>]*?)\/>/.exec(body)?.[1] || '';
       let x = 0;
       let y = 0;
-      if (anchor[1] === 'absoluteAnchor') {
+      if (kind === 'absoluteAnchor') {
         const position = /<xdr:pos\b([^>]*?)\/>/.exec(body)?.[1] || '';
         x = Number(xmlAttribute(position, 'x')) / 12700 || 0;
         y = Number(xmlAttribute(position, 'y')) / 12700 || 0;
       } else {
-        const start = marker('from');
-        if (start.column >= 16_384 || start.row >= 1_048_576) throw new Error('Worksheet drawing anchor exceeds the Excel grid');
         x = start.x;
         y = start.y;
         for (let index = 1; index <= start.column; index += 1) x += geometry.columnPoints(index);
         for (let index = 1; index <= start.row; index += 1) y += geometry.rowPoints(index);
       }
-      lastColumn = Math.max(lastColumn, geometry.columnAt(x + (Number(xmlAttribute(extent, 'cx')) || 0) / 12700));
-      lastRow = Math.max(lastRow, geometry.rowAt(y + (Number(xmlAttribute(extent, 'cy')) || 0) / 12700));
+      const width = (Number(xmlAttribute(extent, 'cx')) || 0) / 12700;
+      const height = (Number(xmlAttribute(extent, 'cy')) || 0) / 12700;
+      drawings.push({
+        part,
+        kind,
+        body,
+        startColumn: geometry.columnAt(x),
+        startRow: geometry.rowAt(y),
+        endColumn: geometry.columnAt(x + width, { trailing: true }),
+        endRow: geometry.rowAt(y + height, { trailing: true }),
+        left: x,
+        top: y,
+        width,
+        height,
+      });
     }
   }
+  return drawings;
+}
+
+export async function contentPrintArea(zip, sheet, xml) {
+  let lastColumn = 1;
+  let lastRow = 1;
+  for (const cell of cellRecords(xml, await sharedStrings(zip))) {
+    if (!cell.formula && (cell.value == null || cell.value === '')) continue;
+    const parsed = parseCellRef(cell.ref);
+    lastColumn = Math.max(lastColumn, columnNumber(parsed.col));
+    lastRow = Math.max(lastRow, parsed.row);
+  }
+  for (const reference of mergedRanges(xml)) {
+    const area = parseAreaRange(reference);
+    lastColumn = Math.max(lastColumn, area.endCol);
+    lastRow = Math.max(lastRow, area.endRow);
+  }
+  for (const drawing of await worksheetDrawings(zip, sheet, xml)) {
+    lastColumn = Math.max(lastColumn, drawing.endColumn);
+    lastRow = Math.max(lastRow, drawing.endRow);
+  }
   return `A1:${columnLabel(lastColumn)}${lastRow}`;
 }
 
+// A chart or picture beside a table is wider than a portrait page, and a sheet
+// with no page setup exports by column blocks — the page break runs through the
+// chart. A sheet that declares nothing takes one page wide and keeps paging down
+// (a fit only scales down, so a small sheet prints as before); a declared fit,
+// print scale, or print area is the author's and stays.
+export function fitDrawingSheetOnePageWide(xml) {
+  if (/<pageSetUpPr\b[^>]*\bfitToPage="1"/.test(xml)) return { xml, applied: false };
+  const setup = worksheetSection(xml, 'pageSetup');
+  if (setup && /\bscale="/.test(setup[0])) return { xml, applied: false };
+  const sheetPr = worksheetSection(xml, 'sheetPr');
+  const attrs = sheetPr ? /^<sheetPr\b([^>]*?)(?:\/>|>)/.exec(sheetPr[0])?.[1] || '' : '';
+  const body = sheetPr && !sheetPr[0].endsWith('/>')
+    ? sheetPr[0].slice(sheetPr[0].indexOf('>') + 1, sheetPr[0].lastIndexOf('</sheetPr>')) : '';
+  let next = upsertWorksheetSection(xml, 'sheetPr', `<sheetPr${attrs}>${body.replace(/<pageSetUpPr\b[^>]*?\/>/, '')}<pageSetUpPr fitToPage="1"/></sheetPr>`);
+  const existing = setup ? setup[0].replace(/\s+fitTo(?:Width|Height)="[^"]*"/g, '') : '<pageSetup/>';
+  next = upsertWorksheetSection(next, 'pageSetup', existing.replace(/\/?>$/, ' fitToWidth="1" fitToHeight="0"/>'));
+  return { xml: next, applied: true };
+}
+
 export async function applyWorksheetPageSetup(zip, sheets, sheet, xml, op) {
   const orientation = String(op.orientation || '').toLowerCase();
   if (orientation && !['portrait', 'landscape'].includes(orientation)) {
@@ -107,6 +166,12 @@ export async function applyWorksheetPageSetup(zip, sheets, sheet, xml, op) {
   }
   const fitWide = Number(op.fitToPagesWide) || 0;
   const fitTall = op.fitToPagesTall == null ? null : Number(op.fitToPagesTall) || 0;
+  // A call that sets only the print area or margins keeps the fit the sheet
+  // already declares: with fitToPage on and the counts dropped, Excel would
+  // read the default 1 × 1 and shrink a long sheet onto one page.
+  const carriedFit = fitWide || fitTall != null
+    ? ''
+    : (worksheetSection(xml, 'pageSetup')?.[0].match(/\s+fitTo(?:Width|Height)="[^"]*"/g) || []).join('');
   if (fitWide || fitTall != null) {
     const existing = worksheetSection(xml, 'sheetPr');
     const attrs = existing ? /^<sheetPr\b([^>]*?)(?:\/>|>)/.exec(existing[0])?.[1] || '' : '';
@@ -118,7 +183,7 @@ export async function applyWorksheetPageSetup(zip, sheets, sheet, xml, op) {
   xml = upsertWorksheetSection(xml, 'printOptions', centered ? `<printOptions${centered}/>` : '');
   const margin = (value, fallback) => Number.isFinite(Number(value)) && Number(value) >= 0 ? Number(value) : fallback;
   xml = upsertWorksheetSection(xml, 'pageMargins', `<pageMargins left="${margin(op.leftMargin, 0.7)}" right="${margin(op.rightMargin, 0.7)}" top="${margin(op.topMargin, 0.75)}" bottom="${margin(op.bottomMargin, 0.75)}" header="0.3" footer="0.3"/>`);
-  xml = upsertWorksheetSection(xml, 'pageSetup', `<pageSetup paperSize="9"${orientation ? ` orientation="${orientation}"` : ''}${fitWide ? ` fitToWidth="${fitWide}"` : ''}${fitTall == null ? '' : ` fitToHeight="${fitTall}"`}/>`);
+  xml = upsertWorksheetSection(xml, 'pageSetup', `<pageSetup paperSize="9"${orientation ? ` orientation="${orientation}"` : ''}${fitWide ? ` fitToWidth="${fitWide}"` : ''}${fitTall == null ? '' : ` fitToHeight="${fitTall}"`}${carriedFit}/>`);
   const printArea = op.fitToContent === true ? await contentPrintArea(zip, sheet, xml) : op.printArea;
   if (printArea) {
     const area = parseAreaRange(printArea);

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

@@ -109,9 +109,52 @@ function buildFill(color) {
     : '<fill><patternFill patternType="none"/></fill>';
 }
 
+// A cell's four edges: the rule under a header, the rule over a total, the frame of an input block.
+// Each side is { style, color }; a side the caller does not name keeps what the cell had.
+const BORDER_SIDES = Object.freeze(['left', 'right', 'top', 'bottom']);
+const BORDER_STYLES = Object.freeze(['none', 'hair', 'thin', 'medium', 'thick', 'dashed', 'dotted', 'double']);
+
+function parseBorder(xml) {
+  const border = {};
+  for (const side of BORDER_SIDES) {
+    const element = new RegExp(`<${side}\\b([^>]*?)(?:\\/>|>([\\s\\S]*?)<\\/${side}>)`).exec(xml || '');
+    const style = element ? attribute(element[1], 'style') : '';
+    border[side] = style && style !== 'none'
+      ? { style, color: normalizeColor(attribute(/<color\b([^>]*?)\/>/.exec(element[2] || '')?.[1], 'rgb')) }
+      : null;
+  }
+  return border;
+}
+
+function buildBorder(border) {
+  const side = (name) => {
+    const edge = border[name];
+    if (!edge) return `<${name}/>`;
+    return `<${name} style="${edge.style}">${edge.color ? `<color rgb="${edge.color}"/>` : '<color auto="1"/>'}</${name}>`;
+  };
+  return `<border>${side('left')}${side('right')}${side('top')}${side('bottom')}<diagonal/></border>`;
+}
+
+function mergeBorders(base, requested) {
+  const next = { ...base };
+  const sides = requested && typeof requested === 'object' && !Array.isArray(requested) ? requested : {};
+  // One spec for every side (`borders: { style: 'thin', color }`) or a spec per side.
+  const uniform = BORDER_SIDES.every((name) => sides[name] === undefined) && (sides.style || sides.color);
+  for (const name of BORDER_SIDES) {
+    const spec = uniform ? sides : sides[name];
+    if (spec === undefined) continue;
+    if (spec === null || spec === false || spec === 'none' || spec?.style === 'none' || spec?.enabled === false) { next[name] = null; continue; }
+    const style = String(spec?.style || 'thin').toLowerCase();
+    if (!BORDER_STYLES.includes(style)) throw new Error(`set_style borders.${name}.style "${style}" is not one of ${BORDER_STYLES.join(', ')}`);
+    next[name] = { style, color: normalizeColor(spec?.color) };
+  }
+  return next;
+}
+
 function parseXf(xml) {
   const attrs = /^<xf\b([^>]*?)(?:\/>|>)/.exec(xml)?.[1] || '';
   const alignment = /<alignment\b([^>]*?)\/?>/.exec(xml)?.[1] || '';
+  const protection = /<protection\b([^>]*?)\/?>/.exec(xml)?.[1] || '';
   return {
     numFmtId: Number(attribute(attrs, 'numFmtId')) || 0,
     fontId: Number(attribute(attrs, 'fontId')) || 0,
@@ -121,6 +164,9 @@ function parseXf(xml) {
     horizontal: attribute(alignment, 'horizontal'),
     vertical: attribute(alignment, 'vertical'),
     wrapText: attribute(alignment, 'wrapText') === '1',
+    // Every cell is locked until told otherwise; the flag only takes effect
+    // once the sheet itself is protected.
+    locked: attribute(protection, 'locked') !== '0',
   };
 }
 
@@ -131,14 +177,18 @@ function buildXf(xf) {
       + `${xf.vertical ? ` vertical="${xf.vertical}"` : ''}`
       + `${xf.wrapText ? ' wrapText="1"' : ''}/>`
     : '';
+  // An unlocked cell is how a protected sheet keeps its entry fields typable.
+  const protection = xf.locked === false ? '<protection locked="0"/>' : '';
   const head = `<xf numFmtId="${xf.numFmtId}" fontId="${xf.fontId}" fillId="${xf.fillId}"`
     + ` borderId="${xf.borderId}" xfId="${xf.xfId}"`
     + `${xf.numFmtId ? ' applyNumberFormat="1"' : ''}`
     + `${xf.fontId ? ' applyFont="1"' : ''}`
     + `${xf.fillId ? ' applyFill="1"' : ''}`
     + `${xf.borderId ? ' applyBorder="1"' : ''}`
-    + `${aligned ? ' applyAlignment="1"' : ''}`;
-  return aligned ? `${head}>${alignment}</xf>` : `${head}/>`;
+    + `${aligned ? ' applyAlignment="1"' : ''}`
+    + `${protection ? ' applyProtection="1"' : ''}`;
+  const body = `${alignment}${protection}`;
+  return body ? `${head}>${body}</xf>` : `${head}/>`;
 }
 
 function register(items, candidate) {
@@ -218,6 +268,11 @@ export function applyCellStyle(stylesXml, baseIndex, properties = {}) {
     next.fillId = register(sections.fills, buildFill(fill));
   }
 
+  if (Object.hasOwn(properties, 'borders')) {
+    const merged = mergeBorders(parseBorder(sections.borders[base.borderId] || ''), properties.borders);
+    next.borderId = BORDER_SIDES.some((name) => merged[name]) ? register(sections.borders, buildBorder(merged)) : 0;
+  }
+
   if (Object.hasOwn(properties, 'numberFormat')) {
     next.numFmtId = registerNumberFormat(sections.numFmts, properties.numberFormat);
   }
@@ -228,6 +283,7 @@ export function applyCellStyle(stylesXml, baseIndex, properties = {}) {
     next.vertical = VERTICAL[String(properties.verticalAlignment).toLowerCase()] || '';
   }
   if (Object.hasOwn(properties, 'wrapText')) next.wrapText = properties.wrapText === true;
+  if (Object.hasOwn(properties, 'locked')) next.locked = properties.locked !== false;
 
   const index = register(sections.cellXfs, buildXf(next));
   return { xml: serialize(stylesXml, sections), index };
@@ -299,6 +355,7 @@ export function resolveCellStyles(stylesXml) {
       ...(font.color ? { color: font.color.slice(-6) } : {}),
       ...(fill ? { fillColor: fill.slice(-6) } : {}),
       ...(xf.horizontal ? { horizontalAlignment: xf.horizontal } : {}),
+      ...(xf.locked === false ? { locked: false } : {}),
     };
   });
 }