ooxml-core 0.3.0 → 0.5.0

package/dist/docx/load/index.mjs

@@ -1028,6 +1028,23 @@ function patchCellBorders(doc, tc, next, base) {
   orderChildren(props, CELL_ORDER);
   if (!Array.from(props.childNodes).some((node) => node.nodeType === 1)) tc.removeChild(props);
 }
+function patchCellShading(doc, tc, next, base) {
+  if (next.shadingFill === base?.shadingFill && JSON.stringify(next.shadingThemeFill) === JSON.stringify(base?.shadingThemeFill))
+    return;
+  if (next.shadingFill && next.shadingFill !== "auto" && !/^#?[0-9a-f]{6}$/i.test(next.shadingFill))
+    throw new Error("Cell shading must be a six-digit RGB color or auto.");
+  let props = first2(tc, "tcPr");
+  if (!props) {
+    props = makeW(doc, "tcPr");
+    tc.insertBefore(props, tc.firstChild);
+  }
+  for (const old of children2(props, "shd")) props.removeChild(old);
+  const built = buildCellProperties(doc, next);
+  const replacement = built && first2(built, "shd");
+  if (replacement) props.appendChild(replacement);
+  orderChildren(props, CELL_ORDER);
+  if (!Array.from(props.childNodes).some((node) => node.nodeType === 1)) tc.removeChild(props);
+}
 
 // src/docx/write-table.ts
 function canEditTableStructure(table) {
@@ -1076,8 +1093,6 @@ var CELL_DESCRIPTOR_KEYS = [
   "verticalMerge",
   "widthTwips",
   "verticalAlign",
-  "shadingFill",
-  "shadingThemeFill",
   "margins"
 ];
 function pick(source, keys) {
@@ -1105,7 +1120,7 @@ function assertNoDescriptorEdits(table, base) {
       if (!source) continue;
       if (JSON.stringify(pick(cell, CELL_DESCRIPTOR_KEYS)) !== JSON.stringify(pick(source, CELL_DESCRIPTOR_KEYS)))
         throw new Error(
-          "Cannot edit table cell width, merge, vertical alignment, shading, or margins on an existing cell; only cell text and borders are supported. The original DOCX package remains unchanged."
+          "Cannot edit table cell width, merge, vertical alignment, or margins on an existing cell; only cell text, borders and shading are supported. The original DOCX package remains unchanged."
         );
     }
 }
@@ -1174,6 +1189,7 @@ function writeTable(doc, table, node, base, writeParagraph, replaceSlots2) {
         throw new Error("Moving paragraphs between table cells is not supported.");
       const tc = source?.cell ?? makeW(doc, "tc");
       patchCellBorders(doc, tc, cell.borders, source?.model.borders);
+      patchCellShading(doc, tc, cell, source?.model);
       const oldParagraphs = children2(tc, "p");
       const nextParagraphs = cell.paragraphs.map((paragraph) => {
         const index = source?.paragraphs.findIndex((p) => p.id === paragraph.id) ?? -1;
@@ -6458,14 +6474,14 @@ function parseCell(cell, parseParagraph3, id) {
   const vMerge = first2(props, "vMerge");
   if (vMerge) result.verticalMerge = getW(vMerge, "val") === "restart" ? "restart" : "continue";
   const tcW = first2(props, "tcW");
-  if (getW(tcW, "type") !== "nil") {
+  if ((getW(tcW, "type") ?? "dxa") === "dxa") {
     const width = dxa(getW(tcW, "w"));
     if (width !== void 0) result.widthTwips = width;
   }
   const vAlign = enumValue(isStVerticalJc, getW(first2(props, "vAlign"), "val"), "w:tcPr/w:vAlign");
   if (vAlign) result.verticalAlign = vAlign;
   const shd = first2(props, "shd");
-  const fill = parseShadingFill(shd);
+  const fill = parseShadingFill(shd) ?? (getW(shd, "fill") === "auto" && !getW(shd, "themeFill") ? "auto" : void 0);
   if (fill) result.shadingFill = fill;
   const themeFill = parseShadingThemeFill(shd);
   if (themeFill) result.shadingThemeFill = themeFill;
@@ -6534,7 +6550,8 @@ function parseTable(node, id, parseParagraph3) {
   }) : [];
   if (grid.length) table.grid = grid;
   const tblPr = first2(node, "tblPr");
-  const width = dxa(getW(first2(tblPr, "tblW"), "w"));
+  const tableWidth = first2(tblPr, "tblW");
+  const width = (getW(tableWidth, "type") ?? "dxa") === "dxa" ? dxa(getW(tableWidth, "w")) : void 0;
   if (width !== void 0) table.widthTwips = width;
   const justification = enumValue(isStJcTable, getW(first2(tblPr, "jc"), "val"), "w:tblPr/w:jc");
   if (justification) {
@@ -7628,7 +7645,7 @@ function createDocument() {
   };
 }
 
-// node_modules/.bun/@christophervr+ole2@0.3.0/node_modules/@christophervr/ole2/dist/ole-document-doc-fib.js
+// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole-document-doc-fib.js
 var FC_LCB_INDEX = {
   plcfbteChpx: 12,
   plcfbtePapx: 13,
@@ -7697,7 +7714,7 @@ function patchDocFib(wordDoc, fib, patch) {
   view.setUint32(papxOff + 4, patch.plcfbtePapx.lcb, true);
 }
 
-// node_modules/.bun/@christophervr+ole2@0.3.0/node_modules/@christophervr/ole2/dist/ole2-parser-types.js
+// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-types.js
 var OLE_MAGIC = new Uint8Array([208, 207, 17, 224, 161, 177, 26, 225]);
 var ENDOFCHAIN = 4294967294;
 var FREESECT = 4294967295;
@@ -7715,7 +7732,7 @@ var Ole2ParseError = class extends Error {
   }
 };
 
-// node_modules/.bun/@christophervr+ole2@0.3.0/node_modules/@christophervr/ole2/dist/ole2-parser-read.js
+// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-read.js
 function parseOle2(buffer) {
   const data = new Uint8Array(buffer);
   const view = new DataView(buffer);
@@ -7893,7 +7910,7 @@ function parseOle2(buffer) {
   return { entries, getStream };
 }
 
-// node_modules/.bun/@christophervr+ole2@0.3.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-helpers.js
+// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-helpers.js
 function compareDirEntryNames(a, b) {
   if (a.length !== b.length) {
     return a.length - b.length;
@@ -7939,7 +7956,7 @@ function writeInt32Sectors(outBytes, int32Data, firstSector, numSectors, sectorS
   }
 }
 
-// node_modules/.bun/@christophervr+ole2@0.3.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-serialize.js
+// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-write-serialize.js
 function writeHeader(outView, outBytes, params) {
   outBytes.set(OLE_MAGIC, 0);
   outView.setUint16(24, 62, true);
@@ -8031,7 +8048,7 @@ function writeStreamSectors(outBytes, streamData, chain, sectorSize) {
   }
 }
 
-// node_modules/.bun/@christophervr+ole2@0.3.0/node_modules/@christophervr/ole2/dist/ole2-parser-write.js
+// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole2-parser-write.js
 function buildOle2(streams, rootClsid, miniStreamCutoff = 4096) {
   const sectorSize = 512;
   const miniSectorSize = 64;
@@ -8197,7 +8214,7 @@ function buildOle2(streams, rootClsid, miniStreamCutoff = 4096) {
   return output;
 }
 
-// node_modules/.bun/@christophervr+ole2@0.3.0/node_modules/@christophervr/ole2/dist/ole-document-doc-cfb.js
+// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole-document-doc-cfb.js
 function unwrapDocBytes(bytes) {
   if (bytes.length < 8 || bytes[0] !== 208 || bytes[1] !== 207 || bytes[2] !== 17 || bytes[3] !== 224 || bytes[4] !== 161 || bytes[5] !== 177 || bytes[6] !== 26 || bytes[7] !== 225) {
     return void 0;
@@ -8238,7 +8255,7 @@ function unwrapDocBytes(bytes) {
   }
 }
 
-// node_modules/.bun/@christophervr+ole2@0.3.0/node_modules/@christophervr/ole2/dist/ole-document-doc-fkp.js
+// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole-document-doc-fkp.js
 var PAGE_SIZE = 512;
 function parseBteTable(tableStream, at) {
   const view = new DataView(tableStream.buffer, tableStream.byteOffset, tableStream.byteLength);
@@ -8346,7 +8363,7 @@ function buildSingleRunChpxPage(fcStart, fcEnd, blob) {
   return page;
 }
 
-// node_modules/.bun/@christophervr+ole2@0.3.0/node_modules/@christophervr/ole2/dist/ole-document-doc-cp1252.js
+// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole-document-doc-cp1252.js
 var CP1252_HIGH_BLOCK = [
   8364,
   129,
@@ -8414,7 +8431,7 @@ function encodeCp1252(text) {
   return Uint8Array.from(bytes);
 }
 
-// node_modules/.bun/@christophervr+ole2@0.3.0/node_modules/@christophervr/ole2/dist/ole-document-doc-pieces.js
+// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole-document-doc-pieces.js
 var CLXT_PRC = 1;
 var CLXT_PCDT = 2;
 function parsePieceTable(tableStream, clx) {
@@ -8576,7 +8593,7 @@ function buildClxBytes(pieces) {
   return bytes;
 }
 
-// node_modules/.bun/@christophervr+ole2@0.3.0/node_modules/@christophervr/ole2/dist/ole-document-doc-editor.js
+// node_modules/.bun/@christophervr+ole2@0.4.0/node_modules/@christophervr/ole2/dist/ole-document-doc-editor.js
 var RISKY_PLCF_INDICES = [3, 4, 5, 16, 17, 18, 19, 20];
 var RISKY_STTB_INDICES = [21, 22, 23];
 function hasUnsupportedFeatures(wordDoc, fib) {

package/dist/docx/parse-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-table.d.ts","sourceRoot":"","sources":["../../src/docx/parse-table.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAyB,KAAK,UAAU,EAAW,MAAM,UAAU,CAAC;AAgH3E,8FAA8F;AAC9F,wBAAgB,UAAU,CACzB,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,KAAK,SAAS,GACtD,KAAK,CA4CP"}
+{"version":3,"file":"parse-table.d.ts","sourceRoot":"","sources":["../../src/docx/parse-table.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAyB,KAAK,UAAU,EAAW,MAAM,UAAU,CAAC;AAkH3E,8FAA8F;AAC9F,wBAAgB,UAAU,CACzB,IAAI,EAAE,UAAU,EAChB,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,MAAM,KAAK,SAAS,GACtD,KAAK,CA8CP"}

package/dist/docx/write-table-properties.d.ts

@@ -1,4 +1,4 @@
-import type { Table } from './model.js';
+import type { Table, TableCell } from './model.js';
 import type { TableBorders, TableRowProperties } from './table-model.js';
 import { type XmlDocument, type XmlElement } from './xml.js';
 /** Changes only modeled row fields, preserving unmodeled trPr children and attributes. */
@@ -10,4 +10,6 @@ export declare function patchTableMargins(doc: XmlDocument, table: Table, node:
  * (width, shading, margins, extensions) and untouched sides exactly as they were.
  */
 export declare function patchCellBorders(doc: XmlDocument, tc: XmlElement, next: TableBorders | undefined, base: TableBorders | undefined): void;
+/** Replaces only changed cell shading, preserving widths, borders, margins and extension XML. */
+export declare function patchCellShading(doc: XmlDocument, tc: XmlElement, next: TableCell, base?: TableCell): void;
 //# sourceMappingURL=write-table-properties.d.ts.map

package/dist/docx/write-table-properties.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write-table-properties.d.ts","sourceRoot":"","sources":["../../src/docx/write-table-properties.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAIzE,OAAO,EAA0B,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAwCrF,0FAA0F;AAC1F,wBAAgB,kBAAkB,CACjC,GAAG,EAAE,WAAW,EAChB,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,kBAAkB,GAAG,SAAS,EACpC,IAAI,EAAE,kBAAkB,GAAG,SAAS,GAClC,IAAI,CAmBN;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,UAAU,EAChB,IAAI,CAAC,EAAE,KAAK,GACV,IAAI,CAqBN;AAyBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAC/B,GAAG,EAAE,WAAW,EAChB,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,YAAY,GAAG,SAAS,EAC9B,IAAI,EAAE,YAAY,GAAG,SAAS,GAC5B,IAAI,CA0BN"}
+{"version":3,"file":"write-table-properties.d.ts","sourceRoot":"","sources":["../../src/docx/write-table-properties.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAIzE,OAAO,EAA0B,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAwCrF,0FAA0F;AAC1F,wBAAgB,kBAAkB,CACjC,GAAG,EAAE,WAAW,EAChB,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,kBAAkB,GAAG,SAAS,EACpC,IAAI,EAAE,kBAAkB,GAAG,SAAS,GAClC,IAAI,CAmBN;AAED,sFAAsF;AACtF,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,UAAU,EAChB,IAAI,CAAC,EAAE,KAAK,GACV,IAAI,CAqBN;AAyBD;;;GAGG;AACH,wBAAgB,gBAAgB,CAC/B,GAAG,EAAE,WAAW,EAChB,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,YAAY,GAAG,SAAS,EAC9B,IAAI,EAAE,YAAY,GAAG,SAAS,GAC5B,IAAI,CA0BN;AAED,iGAAiG;AACjG,wBAAgB,gBAAgB,CAC/B,GAAG,EAAE,WAAW,EAChB,EAAE,EAAE,UAAU,EACd,IAAI,EAAE,SAAS,EACf,IAAI,CAAC,EAAE,SAAS,GACd,IAAI,CAmBN"}

package/dist/docx/write-table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write-table.d.ts","sourceRoot":"","sources":["../../src/docx/write-table.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAa,MAAM,YAAY,CAAC;AAM9D,OAAO,EAMN,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,MAAM,UAAU,CAAC;AAElB,KAAK,eAAe,GAAG,CACtB,GAAG,EAAE,WAAW,EAChB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,UAAU,EAChB,IAAI,CAAC,EAAE,SAAS,KACZ,UAAU,CAAC;AAChB,KAAK,WAAW,GAAG,CAClB,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,UAAU,EAAE,EACjB,IAAI,EAAE,UAAU,EAAE,KACd,IAAI,CAAC;AAEV,iGAAiG;AACjG,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAiChE;AAgED,wBAAgB,UAAU,CACzB,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,cAAc,EAAE,eAAe,EAC/B,YAAY,EAAE,WAAW,GACvB,UAAU,CAqHZ"}
+{"version":3,"file":"write-table.d.ts","sourceRoot":"","sources":["../../src/docx/write-table.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAa,MAAM,YAAY,CAAC;AAO9D,OAAO,EAMN,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,MAAM,UAAU,CAAC;AAElB,KAAK,eAAe,GAAG,CACtB,GAAG,EAAE,WAAW,EAChB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,UAAU,EAChB,IAAI,CAAC,EAAE,SAAS,KACZ,UAAU,CAAC;AAChB,KAAK,WAAW,GAAG,CAClB,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,UAAU,EAAE,EACjB,IAAI,EAAE,UAAU,EAAE,KACd,IAAI,CAAC;AAEV,iGAAiG;AACjG,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAiChE;AA8DD,wBAAgB,UAAU,CACzB,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,KAAK,GAAG,SAAS,EACvB,cAAc,EAAE,eAAe,EAC/B,YAAY,EAAE,WAAW,GACvB,UAAU,CAsHZ"}