@json-to-office/core-docx 6.6.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,
@@ -13755,6 +13774,55 @@ function textSizeFact(node, props, path3, typography, role) {
     ...size.authored && { sizePath: `${path3}/props/font/size` }
   };
 }
+function statisticSizeFacts(props, path3, typography) {
+  const named = STATISTIC_SIZE_POINTS[String(props.size)];
+  const styled = (id) => finiteNumber(asRecord2(typography.styles[id])?.size);
+  const numberPoints = named ?? STATISTIC_SIZE_POINTS.medium;
+  const painted = props.size === "small" || props.size === "large" ? numberPoints : styled("StatisticNumber") ?? numberPoints;
+  const present = (value) => value !== void 0 && value !== null && String(value).trim() !== "";
+  const facts = [];
+  const add = (suffix, role, fontSizePt) => facts.push({
+    id: `docx:text-size:${path3}:${suffix}`,
+    kind: "docx/text-size",
+    path: path3,
+    role,
+    fontSizePt,
+    authored: false
+  });
+  if (present(props.number)) add("number", "statistic", painted);
+  if (present(props.unit) || present(props.trend) || present(props.trendValue))
+    add(
+      "suffix",
+      "statistic-suffix",
+      Math.max(12, Math.round(numberPoints)) / 2
+    );
+  if (present(props.description))
+    add(
+      "description",
+      "statistic-description",
+      styled("StatisticDescription") ?? 10
+    );
+  return facts;
+}
+function tocSizeFacts(props, path3, typography) {
+  const depth = asRecord2(props.depth);
+  const from = finiteNumber(depth?.from) ?? 1;
+  const to = finiteNumber(depth?.to) ?? 3;
+  const facts = [];
+  for (let level = from; level <= to; level++) {
+    const size = finiteNumber(asRecord2(typography.styles[`TOC${level}`])?.size);
+    if (size === void 0) continue;
+    facts.push({
+      id: `docx:text-size:${path3}:toc${level}`,
+      kind: "docx/text-size",
+      path: path3,
+      role: `toc${level}`,
+      fontSizePt: size,
+      authored: false
+    });
+  }
+  return facts;
+}
 function tableTextSizeFacts(props, authored, path3, typography, page) {
   const facts = [];
   const sizeOf = (holder) => finiteNumber(asRecord2(asRecord2(holder)?.font)?.size);
@@ -13968,6 +14036,16 @@ function prepareDocxQualityDocument(document, options = {}) {
     (value) => `#${resolveDesignColor2(value, visualColors)}`
   ) ?? SERIES_COLOR_TOKENS.filter((token) => paletteHexes[token] !== void 0);
   const authoredPropsAt = (pointer) => asRecord2(asRecord2(nodeAtPointer(context.document, pointer))?.props);
+  const ownSize = (fact) => {
+    if (!fact?.sizePath) return fact;
+    const written = finiteNumber(
+      asRecord2(authoredPropsAt(fact.path)?.font)?.size
+    );
+    if (written !== void 0) return fact;
+    const inherited2 = { ...fact, authored: false };
+    delete inherited2.sizePath;
+    return inherited2;
+  };
   const roleSizesPt = {};
   for (const key of Object.keys(typography.styles)) {
     const size = effectiveFontSize(
@@ -14121,10 +14199,22 @@ function prepareDocxQualityDocument(document, options = {}) {
       const fact = lineBoxFact(node, props, path3, typography, context.document);
       if (fact) addFact(fact);
       if (typeof props.text === "string" && props.text.trim() !== "") {
-        const fact2 = textSizeFact(node, props, path3, typography);
+        const fact2 = ownSize(textSizeFact(node, props, path3, typography));
         if (fact2) addFact({ ...fact2, generated: authoredPath(path3) !== path3 });
       }
     }
+    if (node.name === "list" && Array.isArray(props.items) && props.items.length > 0) {
+      const fact = ownSize(textSizeFact(node, props, path3, typography, "list"));
+      if (fact) addFact({ ...fact, generated: authoredPath(path3) !== path3 });
+    }
+    if (node.name === "statistic") {
+      for (const fact of statisticSizeFacts(props, path3, typography))
+        addFact({ ...fact, generated: authoredPath(path3) !== path3 });
+    }
+    if (node.name === "toc") {
+      for (const fact of tocSizeFacts(props, path3, typography))
+        addFact({ ...fact, generated: authoredPath(path3) !== path3 });
+    }
     if (node.name === "image" || node.name === "visual") {
       for (const fact of svgTextFacts(props, path3)) addFact(fact);
       const drawn = drawnRatio(props);
@@ -14149,6 +14239,7 @@ function prepareDocxQualityDocument(document, options = {}) {
         kind: "docx/heading",
         path: `${path3}/props/level`,
         level,
+        generated: authoredPath(path3) !== path3,
         keepNext: props.keepNext === true || props.keepNext === void 0 && styleKeepNext === true,
         ...previousHeadingLevel !== void 0 && {
           previousLevel: previousHeadingLevel
@@ -14189,7 +14280,10 @@ function prepareDocxQualityDocument(document, options = {}) {
       index,
       words: texts.filter((fact) => bodyRoles.has(fact.role)).reduce((total, fact) => total + wordsOf(fact.text), 0),
       exhibits: own.filter((fact) => exhibitKinds.has(fact.kind)).length,
-      headings: texts.filter((fact) => fact.role === "heading").length
+      headings: texts.filter((fact) => fact.role === "heading").length,
+      // Anything the reader sees on the section's own pages: a heading, a
+      // contents field, body copy. Running heads repeat onto any page.
+      rendersText: texts.some((fact) => fact.role !== "chrome")
     });
     if (hasColumnsComponent(rec)) return;
     const page = pageBox(
@@ -14265,10 +14359,15 @@ function isCaptioned(facts, image) {
   return facts.some((fact) => {
     if (fact.kind !== "docx/text") return false;
     const text = fact;
-    const near = siblingOf(text.path) === siblingOf(image) || text.path.startsWith(`${image}/`) || image.startsWith(`${text.path}/`);
+    const node = text.path.replace(/\/props(?:\/.*)?$/, "");
+    const beside = siblingOf(node) === siblingOf(image) && Math.abs(indexIn(node) - indexIn(image)) === 1;
+    const near = beside || text.path.startsWith(`${image}/`) || image.startsWith(`${node}/`);
     return near && (text.role === "caption" || CAPTION_LABEL.test(text.text));
   });
 }
+function indexIn(pointer) {
+  return Number(pointer.slice(pointer.lastIndexOf("/") + 1));
+}
 function siblingOf(pointer) {
   return pointer.slice(0, pointer.lastIndexOf("/"));
 }