@json-to-office/core-docx 6.8.0 → 6.8.1

package/dist/plugin/example/index.js

@@ -3764,7 +3764,9 @@ function createDocxJsRenderer() {
 function buildDocument(ir, resources = /* @__PURE__ */ new Map()) {
   return new Document({
     styles: emitStyles(ir.styles),
-    sections: ir.sections.map((section2) => sectionOptions(section2, resources)),
+    sections: ir.sections.map(
+      (section2, index) => sectionOptions(section2, resources, index === ir.sections.length - 1)
+    ),
     ...coreProperties(ir),
     features: {
       updateFields: ir.settings.updateFields,
@@ -3920,7 +3922,7 @@ function collectImagePlacements(ir) {
   }
   return placements;
 }
-function sectionOptions(section2, resources) {
+function sectionOptions(section2, resources, closesDocument = false) {
   const { page, columns } = section2.properties;
   const options = {
     properties: {
@@ -3959,7 +3961,7 @@ function sectionOptions(section2, resources) {
         }
       } : {}
     },
-    children: sectionChildren(section2, resources)
+    children: sectionChildren(section2, resources, closesDocument)
   };
   const headers = chromeSlots(section2.headers, Header, resources);
   if (headers) options.headers = headers;
@@ -3981,12 +3983,13 @@ function chromeSlots(set, Part, resources) {
 function partChildren(part, resources) {
   return part.children.map((block2) => emitBlock(block2, resources));
 }
-function sectionChildren(section2, resources) {
+function sectionChildren(section2, resources, closesDocument = false) {
   const blocks = section2.children.map((block2) => emitBlock(block2, resources));
   const bookmark = section2.bookmark;
-  if (!bookmark) return blocks;
+  const endsInFrame = closesDocument && lastBlockIsFrame(section2);
+  if (!bookmark && !endsInFrame) return blocks;
   const out = [...blocks];
-  if (bookmark.opens) {
+  if (bookmark?.opens) {
     const start = new BookmarkStart2(bookmark.name, bookmark.id);
     const first = out[0];
     if (first instanceof Paragraph2) {
@@ -3995,20 +3998,26 @@ function sectionChildren(section2, resources) {
       out.unshift(anchorParagraph(start));
     }
   }
-  if (bookmark.closes) {
+  if (bookmark?.closes) {
     const end = new BookmarkEnd2(bookmark.id);
     const last = out[out.length - 1];
-    if (last instanceof Paragraph2) {
+    if (last instanceof Paragraph2 && !endsInFrame) {
       last.addChildElement(end);
     } else {
       out.push(anchorParagraph(end));
     }
+  } else if (endsInFrame) {
+    out.push(anchorParagraph());
   }
   return out;
 }
+function lastBlockIsFrame(section2) {
+  const last = section2.children[section2.children.length - 1];
+  return last?.kind === "paragraph" && last.frame !== void 0;
+}
 function anchorParagraph(anchor) {
   return new Paragraph2({
-    children: [anchor],
+    children: anchor ? [anchor] : [],
     spacing: { before: 0, after: 0, line: 20, lineRule: LineRuleType2.EXACT }
   });
 }
@@ -4827,7 +4836,7 @@ function borders2(value) {
   }
   return out;
 }
-function section(value, ctx) {
+function section(value, ctx, closesDocument = false) {
   const { page, columns } = value.properties;
   return {
     properties: {
@@ -4879,7 +4888,7 @@ function section(value, ctx) {
         }
       } : {}
     },
-    children: sectionChildren2(value, ctx),
+    children: sectionChildren2(value, ctx, closesDocument),
     ...value.headers ? { headers: headerFooterSet(value.headers, ctx) } : {},
     ...value.footers ? { footers: headerFooterSet(value.footers, ctx) } : {}
   };
@@ -4892,8 +4901,16 @@ function headerFooterSet(set, ctx) {
   }
   return out;
 }
-function sectionChildren2(value, ctx) {
+function sectionChildren2(value, ctx, closesDocument = false) {
   const blocks = value.children.map((child) => block(child, ctx));
+  const last = value.children[value.children.length - 1];
+  if (closesDocument && last?.kind === "paragraph" && last.frame !== void 0)
+    blocks.push({
+      paragraph: {
+        children: [],
+        spacing: { before: 0, after: 0, line: 20, lineRule: "exact" }
+      }
+    });
   const bookmark = value.bookmark;
   if (!bookmark) return blocks;
   return [
@@ -5062,7 +5079,9 @@ async function buildDocumentOptions(ir, charts = [], svgRasterFallback) {
   };
   return {
     styles: emitStyles2(ir.styles),
-    sections: ir.sections.map((value) => section(value, ctx)),
+    sections: ir.sections.map(
+      (value, index) => section(value, ctx, index === ir.sections.length - 1)
+    ),
     ...coreProperties2(ir),
     features: {
       updateFields: ir.settings.updateFields,