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

package/dist/index.js

@@ -9673,6 +9673,11 @@ function compileList(component, scope, referencePrefix = "list", explicitLevels)
   const props = component.props ?? {};
   const items = props.items ?? [];
   if (items.length === 0) return [];
+  const base = runFormatting3(
+    props.font ?? {},
+    props,
+    ctx
+  );
   const notes = createNoteBinding(props.footnotes, props.endnotes, ctx);
   const reference = declareNumbering(
     props,
@@ -9708,17 +9713,21 @@ function compileList(component, scope, referencePrefix = "list", explicitLevels)
       paragraphNode(
         { ctx, path: itemPath, id: `${scope.id}:i${index}` },
         revision === void 0 ? parseInline(text, {
-          base: {},
+          base,
           hyperlinks: true,
           ...notes ? { resolveNote: notes.resolve } : {},
           resolvePlaceholder: placeholderResolver(ctx),
           resolveCrossReference: crossReferenceResolver(ctx, itemPath)
-        }) : compileRevision(revision, {}, ctx),
+        }) : compileRevision(revision, base, ctx),
         {
           styleId: "Normal",
           formatting: {
             alignment: compileAlignment(props.alignment) ?? "left",
-            spacing: itemSpacing(props.spacing, index, items.length)
+            spacing: itemSpacing(props.spacing, index, items.length),
+            // Every item carries the flags, not just the first: keeping a list
+            // with what introduces it means keeping it whole.
+            ...props.keepNext !== void 0 ? { keepNext: props.keepNext } : {},
+            ...props.keepLines !== void 0 ? { keepLines: props.keepLines } : {}
           },
           ...commentIds && index === firstRendered ? { commentOpen: commentIds } : {},
           ...commentIds && index === lastRendered ? { commentClose: commentIds } : {},
@@ -12398,6 +12407,12 @@ init_defaults();
 init_widthUtils();
 
 // src/quality/text-inventory.ts
+function tocDepth(depth) {
+  const range = asRecord(depth) ?? {};
+  const from = typeof range.from === "number" ? range.from : 1;
+  const to = typeof range.to === "number" ? range.to : 3;
+  return { from, to };
+}
 function asRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
 }
@@ -12418,10 +12433,14 @@ function collectDocxTextInventory(children, basePath = "/children") {
       path: path4,
       text,
       role,
-      order: entries.length,
+      // Renumbered once the walk is done: contents entries are spliced in.
+      order: -1,
       ...extra
     });
   };
+  const headings = [];
+  const tocs = [];
+  let sectionCount = 0;
   const visitCell = (cell, path4, role, inherited) => {
     const cellRole = inherited.repeats ? "chrome" : role;
     const extra = inherited.repeats ? { repeats: true } : {};
@@ -12436,11 +12455,13 @@ function collectDocxTextInventory(children, basePath = "/children") {
         add(`${path4}/content`, rec.content, cellRole, extra);
       else {
         const inner = asRecord(rec.content);
-        if (inner) visitNode(inner, `${path4}/content`, inherited);
+        if (inner)
+          visitNode(inner, `${path4}/content`, { ...inherited, inCell: true });
       }
       return;
     }
-    if (typeof rec.name === "string") visitNode(rec, path4, inherited);
+    if (typeof rec.name === "string")
+      visitNode(rec, path4, { ...inherited, inCell: true });
   };
   const visitNode = (node, path4, inherited) => {
     if (node.enabled === false) return;
@@ -12449,6 +12470,7 @@ function collectDocxTextInventory(children, basePath = "/children") {
     const extra = {
       ...inherited.repeats && { repeats: true }
     };
+    const scope = name === "section" ? { ...inherited, section: ++sectionCount } : inherited;
     switch (name) {
       case "heading": {
         if (inherited.repeats) {
@@ -12457,6 +12479,27 @@ function collectDocxTextInventory(children, basePath = "/children") {
         }
         const level = typeof props.level === "number" && Number.isFinite(props.level) ? props.level : 1;
         add(`${path4}/props/text`, props.text, "heading", { ...extra, level });
+        if (typeof props.text === "string" && props.text.trim() !== "" && !scope.inCell) {
+          headings.push({ text: props.text, level, section: scope.section });
+        }
+        break;
+      }
+      case "toc": {
+        add(`${path4}/props/title`, props.title, "toc-entry", extra);
+        const styles = /* @__PURE__ */ new Set();
+        if (Array.isArray(props.styles)) {
+          for (const mapping of props.styles) {
+            const id = asRecord(mapping)?.styleId;
+            if (typeof id === "string") styles.add(id);
+          }
+        }
+        tocs.push({
+          at: entries.length,
+          path: path4,
+          depth: tocDepth(props.depth),
+          styles,
+          section: props.scope === "document" ? void 0 : scope.section
+        });
         break;
       }
       case "paragraph": {
@@ -12470,6 +12513,13 @@ function collectDocxTextInventory(children, basePath = "/children") {
             ...frame && { frame }
           }
         );
+        if (typeof props.themeStyle === "string" && typeof props.text === "string" && props.text.trim() !== "" && !scope.inCell) {
+          headings.push({
+            text: props.text,
+            themeStyle: props.themeStyle,
+            section: scope.section
+          });
+        }
         break;
       }
       case "list": {
@@ -12522,8 +12572,28 @@ function collectDocxTextInventory(children, basePath = "/children") {
         add(`${path4}/props/description`, props.description, "statistic", extra);
         break;
       }
+      case "chart": {
+        if (props.showTitle !== false) {
+          add(`${path4}/props/title`, props.title, "caption", extra);
+        }
+        if (props.type !== "pie" && props.type !== "doughnut") {
+          add(
+            `${path4}/props/catAxisTitle`,
+            props.catAxisTitle,
+            "caption",
+            extra
+          );
+          add(
+            `${path4}/props/valAxisTitle`,
+            props.valAxisTitle,
+            "caption",
+            extra
+          );
+        }
+        add(`${path4}/props/caption`, props.caption, "caption", extra);
+        break;
+      }
       case "image":
-      case "chart":
       case "highcharts":
       case "visual":
       case "visual-native": {
@@ -12551,7 +12621,7 @@ function collectDocxTextInventory(children, basePath = "/children") {
     if (Array.isArray(node.children)) {
       node.children.forEach((child, index) => {
         const rec = asRecord(child);
-        if (rec) visitNode(rec, `${path4}/children/${index}`, inherited);
+        if (rec) visitNode(rec, `${path4}/children/${index}`, scope);
       });
     }
   };
@@ -12559,6 +12629,29 @@ function collectDocxTextInventory(children, basePath = "/children") {
     const rec = asRecord(child);
     if (rec) visitNode(rec, `${basePath}/${index}`, {});
   });
+  for (const toc of [...tocs].reverse()) {
+    const collected = headings.filter(
+      (heading) => (toc.section === void 0 || heading.section === toc.section) && (heading.level !== void 0 ? heading.level >= toc.depth.from && heading.level <= toc.depth.to : heading.themeStyle !== void 0 && toc.styles.has(heading.themeStyle))
+    );
+    entries.splice(
+      toc.at,
+      0,
+      ...collected.map(
+        (heading, index) => ({
+          id: `docx:text:${toc.path}:entry:${index}`,
+          kind: "docx/text",
+          path: toc.path,
+          text: heading.text,
+          role: "toc-entry",
+          order: 0,
+          optional: true
+        })
+      )
+    );
+  }
+  entries.forEach((entry, index) => {
+    entry.order = index;
+  });
   return entries;
 }