@json-to-office/core-docx 4.3.0 → 4.4.1

package/dist/core/layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../src/core/layout.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"layout.d.ts","sourceRoot":"","sources":["../../src/core/layout.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -3293,6 +3293,7 @@ import {
   Header,
   ImageRun,
   Packer,
+  LineRuleType as LineRuleType2,
   Paragraph as Paragraph2
 } from "docx";
 function createDocxJsRenderer() {
@@ -3546,21 +3547,33 @@ function sectionChildren(section2, resources) {
   const blocks = section2.children.map((block2) => emitBlock(block2, resources));
   const bookmark = section2.bookmark;
   if (!bookmark) return blocks;
-  const out = [];
+  const out = [...blocks];
   if (bookmark.opens) {
-    out.push(
-      new Paragraph2({
-        children: [new BookmarkStart2(bookmark.name, bookmark.id)],
-        spacing: { before: 0, after: 0, line: 0 }
-      })
-    );
+    const start = new BookmarkStart2(bookmark.name, bookmark.id);
+    const first = out[0];
+    if (first instanceof Paragraph2) {
+      first.addRunToFront(start);
+    } else {
+      out.unshift(anchorParagraph(start));
+    }
   }
-  out.push(...blocks);
   if (bookmark.closes) {
-    out.push(new Paragraph2({ children: [new BookmarkEnd2(bookmark.id)] }));
+    const end = new BookmarkEnd2(bookmark.id);
+    const last = out[out.length - 1];
+    if (last instanceof Paragraph2) {
+      last.addChildElement(end);
+    } else {
+      out.push(anchorParagraph(end));
+    }
   }
   return out;
 }
+function anchorParagraph(anchor) {
+  return new Paragraph2({
+    children: [anchor],
+    spacing: { before: 0, after: 0, line: 20, lineRule: LineRuleType2.EXACT }
+  });
+}
 function coreProperties(ir) {
   const { metadata } = ir;
   return {
@@ -9059,6 +9072,15 @@ function compileColumns(component, scope) {
   if (configs.length === 0) return [];
   const available = getAvailableWidthTwips(ctx.theme, ctx.themeName);
   const { widths, gaps } = columnMetrics(configs, props.gap, available);
+  const stated = widths.map(
+    (width, index) => width + gaps[index] / 2 + (index > 0 ? gaps[index - 1] / 2 : 0)
+  );
+  const statedTotal = stated.reduce((sum, cell) => sum + cell, 0);
+  const scale = statedTotal > available ? available / statedTotal : 1;
+  const exact = stated.map((cell) => cell * scale);
+  const cells = exact.map((cell) => Math.round(cell));
+  const total = exact.reduce((sum, cell) => sum + cell, 0);
+  cells[cells.length - 1] += Math.round(total) - cells.reduce((a, b) => a + b, 0);
   const contents = configs.map(() => []);
   const children = component.children ?? [];
   children.forEach((child, index) => {
@@ -9070,7 +9092,7 @@ function compileColumns(component, scope) {
       kind: "table",
       id: scope.id,
       path: path4,
-      columnGrid: { unit: "twips", values: [] },
+      columnGrid: { unit: "twips", values: cells },
       width: { kind: "percent", value: 100 },
       layout: "fixed",
       borders: NO_BORDERS,
@@ -9095,7 +9117,7 @@ function compileColumns(component, scope) {
                   children: []
                 }
               ],
-              widthTwips: widths[index],
+              widthTwips: cells[index],
               margins: {
                 topTwips: 0,
                 rightTwips: gaps[index] / 2,
@@ -11432,12 +11454,6 @@ function determineComponentLayout(component) {
     }
     return "single";
   }
-  if ("children" in component && component.children) {
-    const hasColumns = component.children.some(
-      (child) => isColumnsComponent(child)
-    );
-    return hasColumns ? "multi-column" : "single";
-  }
   return "single";
 }
 function processLayoutComponents(components) {
@@ -15117,7 +15133,7 @@ var client_report_docx_blueprint_default = {
                 slots: {
                   number: "01",
                   title: "{{Section title: the finding, as a statement}}",
-                  tracker: "{{Tracker: one or two words}}"
+                  tracker: "{{Tracker: one word}}"
                 }
               }
             },
@@ -15175,7 +15191,7 @@ var client_report_docx_blueprint_default = {
                 slots: {
                   number: "02",
                   title: "{{Section title: the finding, as a statement}}",
-                  tracker: "{{Tracker: one or two words}}"
+                  tracker: "{{Tracker: one word}}"
                 }
               }
             },
@@ -15248,7 +15264,7 @@ var client_report_docx_blueprint_default = {
                 slots: {
                   number: "03",
                   title: "{{Section title: the finding, as a statement}}",
-                  tracker: "{{Tracker: one or two words}}"
+                  tracker: "{{Tracker: one word}}"
                 }
               }
             },
@@ -15302,7 +15318,7 @@ var client_report_docx_blueprint_default = {
                 slots: {
                   number: "04",
                   title: "{{Section title: the finding, as a statement}}",
-                  tracker: "{{Tracker: one or two words}}"
+                  tracker: "{{Tracker: one word}}"
                 }
               }
             },
@@ -15374,7 +15390,7 @@ var client_report_docx_blueprint_default = {
                 slots: {
                   number: "01",
                   title: "{{Section title: the finding, as a statement}}",
-                  tracker: "{{Tracker: one or two words}}"
+                  tracker: "{{Tracker: one word}}"
                 }
               }
             },
@@ -15415,7 +15431,7 @@ var client_report_docx_blueprint_default = {
                 slots: {
                   number: "02",
                   title: "{{Section title: the finding, as a statement}}",
-                  tracker: "{{Tracker: one or two words}}"
+                  tracker: "{{Tracker: one word}}"
                 }
               }
             },
@@ -15453,7 +15469,7 @@ var client_report_docx_blueprint_default = {
                 slots: {
                   number: "03",
                   title: "{{Section title: the finding, as a statement}}",
-                  tracker: "{{Tracker: one or two words}}"
+                  tracker: "{{Tracker: one word}}"
                 }
               }
             },
@@ -15504,7 +15520,7 @@ var client_report_docx_blueprint_default = {
                 slots: {
                   number: "04",
                   title: "{{Section title: the finding, as a statement}}",
-                  tracker: "{{Tracker: one or two words}}"
+                  tracker: "{{Tracker: one word}}"
                 }
               }
             },