ooxml-core 1.19.1 → 1.20.0

package/dist/docx/embedded.cjs

@@ -2833,7 +2833,10 @@ function writeTable(doc, table, node, base, writeParagraph, replaceSlots2) {
       "Cannot change the structure of a merged, nested, or complex table. The original DOCX package remains unchanged."
     );
   const width = table.rows[0]?.length ?? 0;
-  if (!width || table.rows.some((row) => row.length !== width || row.some((cell) => !cell.paragraphs.length)))
+  const reshaped = structural || !base;
+  if (!width || table.rows.some(
+    (row) => reshaped && row.length !== width || row.some((cell) => !cell.paragraphs.length)
+  ))
     throw new Error("Tables must contain rectangular rows and at least one paragraph per cell.");
   const oldRows = flatRows(node).map((entry2) => entry2.element);
   const sourceById = /* @__PURE__ */ new Map();

package/dist/docx/embedded.mjs

@@ -2827,7 +2827,10 @@ function writeTable(doc, table, node, base, writeParagraph, replaceSlots2) {
       "Cannot change the structure of a merged, nested, or complex table. The original DOCX package remains unchanged."
     );
   const width = table.rows[0]?.length ?? 0;
-  if (!width || table.rows.some((row) => row.length !== width || row.some((cell) => !cell.paragraphs.length)))
+  const reshaped = structural || !base;
+  if (!width || table.rows.some(
+    (row) => reshaped && row.length !== width || row.some((cell) => !cell.paragraphs.length)
+  ))
     throw new Error("Tables must contain rectangular rows and at least one paragraph per cell.");
   const oldRows = flatRows(node).map((entry2) => entry2.element);
   const sourceById = /* @__PURE__ */ new Map();

package/dist/docx/index.cjs

@@ -4088,7 +4088,10 @@ function writeTable(doc, table, node, base, writeParagraph, replaceSlots2) {
       "Cannot change the structure of a merged, nested, or complex table. The original DOCX package remains unchanged."
     );
   const width = table.rows[0]?.length ?? 0;
-  if (!width || table.rows.some((row) => row.length !== width || row.some((cell) => !cell.paragraphs.length)))
+  const reshaped = structural || !base;
+  if (!width || table.rows.some(
+    (row) => reshaped && row.length !== width || row.some((cell) => !cell.paragraphs.length)
+  ))
     throw new Error("Tables must contain rectangular rows and at least one paragraph per cell.");
   const oldRows = flatRows(node).map((entry2) => entry2.element);
   const sourceById = /* @__PURE__ */ new Map();

package/dist/docx/index.mjs

@@ -4082,7 +4082,10 @@ function writeTable(doc, table, node, base, writeParagraph, replaceSlots2) {
       "Cannot change the structure of a merged, nested, or complex table. The original DOCX package remains unchanged."
     );
   const width = table.rows[0]?.length ?? 0;
-  if (!width || table.rows.some((row) => row.length !== width || row.some((cell) => !cell.paragraphs.length)))
+  const reshaped = structural || !base;
+  if (!width || table.rows.some(
+    (row) => reshaped && row.length !== width || row.some((cell) => !cell.paragraphs.length)
+  ))
     throw new Error("Tables must contain rectangular rows and at least one paragraph per cell.");
   const oldRows = flatRows(node).map((entry2) => entry2.element);
   const sourceById = /* @__PURE__ */ new Map();

package/dist/docx/load/index.cjs

@@ -5417,7 +5417,10 @@ function writeTable(doc, table, node, base, writeParagraph, replaceSlots2) {
       "Cannot change the structure of a merged, nested, or complex table. The original DOCX package remains unchanged."
     );
   const width = table.rows[0]?.length ?? 0;
-  if (!width || table.rows.some((row) => row.length !== width || row.some((cell) => !cell.paragraphs.length)))
+  const reshaped = structural || !base;
+  if (!width || table.rows.some(
+    (row) => reshaped && row.length !== width || row.some((cell) => !cell.paragraphs.length)
+  ))
     throw new Error("Tables must contain rectangular rows and at least one paragraph per cell.");
   const oldRows = flatRows(node).map((entry2) => entry2.element);
   const sourceById = /* @__PURE__ */ new Map();

package/dist/docx/load/index.mjs

@@ -5411,7 +5411,10 @@ function writeTable(doc, table, node, base, writeParagraph, replaceSlots2) {
       "Cannot change the structure of a merged, nested, or complex table. The original DOCX package remains unchanged."
     );
   const width = table.rows[0]?.length ?? 0;
-  if (!width || table.rows.some((row) => row.length !== width || row.some((cell) => !cell.paragraphs.length)))
+  const reshaped = structural || !base;
+  if (!width || table.rows.some(
+    (row) => reshaped && row.length !== width || row.some((cell) => !cell.paragraphs.length)
+  ))
     throw new Error("Tables must contain rectangular rows and at least one paragraph per cell.");
   const oldRows = flatRows(node).map((entry2) => entry2.element);
   const sourceById = /* @__PURE__ */ new Map();

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

@@ -1 +1 @@
-{"version":3,"file":"write-table.d.ts","sourceRoot":"","sources":["../../docx/write-table.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAS,SAAS,EAAE,KAAK,EAAa,MAAM,SAAS,CAAC;AASlE,OAAO,EAA4C,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,OAAO,CAAC;AAEpG,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;AA6ED,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,CAyHZ"}
+{"version":3,"file":"write-table.d.ts","sourceRoot":"","sources":["../../docx/write-table.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAS,SAAS,EAAE,KAAK,EAAa,MAAM,SAAS,CAAC;AASlE,OAAO,EAA4C,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,OAAO,CAAC;AAEpG,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;AA6ED,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,CA+HZ"}

package/dist/index.cjs

@@ -2459,6 +2459,12 @@ function parseLiteFragment(xml, container, namespaces) {
     }
     if (lt < 0) break;
     const next = source.charCodeAt(lt + 1);
+    if (next === 33) {
+      const after = skipCommentOrCdata(source, lt, top);
+      if (after < 0) return void 0;
+      pos = after;
+      continue;
+    }
     if (next === 47) {
       const gt = source.indexOf(">", lt);
       if (gt < 0 || stack.length < 2 || source.slice(lt + 2, gt).trimEnd() !== top.tagName)
@@ -2479,6 +2485,25 @@ function parseLiteFragment(xml, container, namespaces) {
   }
   return stack.length === 1 ? root : void 0;
 }
+var DECLARATIONS = /<!DOCTYPE|<!ENTITY/i;
+function skipCommentOrCdata(source, lt, parent) {
+  if (source.startsWith("<!--", lt)) {
+    const end = source.indexOf("-->", lt + 4);
+    if (end < 0) return -1;
+    const body = source.slice(lt + 4, end);
+    if (body.includes("--") || body.endsWith("-") || DECLARATIONS.test(body)) return -1;
+    return end + 3;
+  }
+  if (source.startsWith("<![CDATA[", lt)) {
+    const end = source.indexOf("]]>", lt + 9);
+    if (end < 0) return -1;
+    const text4 = source.slice(lt + 9, end);
+    if (DECLARATIONS.test(text4)) return -1;
+    parent.childNodes.push(text4);
+    return end + 3;
+  }
+  return -1;
+}
 function startTag(source, from, namespaces) {
   const n2 = source.length;
   let i2 = from;

package/dist/index.mjs

@@ -2453,6 +2453,12 @@ function parseLiteFragment(xml, container, namespaces) {
     }
     if (lt < 0) break;
     const next = source.charCodeAt(lt + 1);
+    if (next === 33) {
+      const after = skipCommentOrCdata(source, lt, top);
+      if (after < 0) return void 0;
+      pos = after;
+      continue;
+    }
     if (next === 47) {
       const gt = source.indexOf(">", lt);
       if (gt < 0 || stack.length < 2 || source.slice(lt + 2, gt).trimEnd() !== top.tagName)
@@ -2473,6 +2479,25 @@ function parseLiteFragment(xml, container, namespaces) {
   }
   return stack.length === 1 ? root : void 0;
 }
+var DECLARATIONS = /<!DOCTYPE|<!ENTITY/i;
+function skipCommentOrCdata(source, lt, parent) {
+  if (source.startsWith("<!--", lt)) {
+    const end = source.indexOf("-->", lt + 4);
+    if (end < 0) return -1;
+    const body = source.slice(lt + 4, end);
+    if (body.includes("--") || body.endsWith("-") || DECLARATIONS.test(body)) return -1;
+    return end + 3;
+  }
+  if (source.startsWith("<![CDATA[", lt)) {
+    const end = source.indexOf("]]>", lt + 9);
+    if (end < 0) return -1;
+    const text4 = source.slice(lt + 9, end);
+    if (DECLARATIONS.test(text4)) return -1;
+    parent.childNodes.push(text4);
+    return end + 3;
+  }
+  return -1;
+}
 function startTag(source, from, namespaces) {
   const n2 = source.length;
   let i2 = from;