@json-to-office/core-docx 0.30.0 → 0.32.0

package/dist/plugin/example/index.js

@@ -2428,39 +2428,15 @@ async function extractSections(components, context) {
         context
       );
       const shouldPageBreak = component.props?.pageBreak !== false;
-      if (component.props?.title) {
-        const headingLevel = Math.min(
-          Math.max(component.props.level || 1, 1),
-          6
-        );
-        sectionComponents.unshift(
-          resolveComponentDefaults(
-            {
-              name: "heading",
-              props: {
-                text: component.props.title,
-                level: headingLevel,
-                pageBreak: shouldPageBreak,
-                // Apply zero-spacing to prevent unwanted initial line
-                spacing: {
-                  before: 0,
-                  after: 0
-                }
-              }
-            },
-            context.fullTheme
-          )
-        );
-      }
       sections.push({
-        title: component.props?.title,
-        level: component.props?.level,
         components: sectionComponents,
         header: component.props?.header,
         footer: component.props?.footer,
         isExplicitSection: true,
-        // Store pageBreak for titleless sections to be handled at layout level
-        pageBreak: !component.props?.title ? shouldPageBreak : void 0,
+        // Page break is handled at layout level (sections render no title of
+        // their own — a visible title is an explicit heading child; the
+        // authoring label lives in props.meta.title and is never rendered)
+        pageBreak: shouldPageBreak,
         // Preserve page configuration override if present
         page: component.props?.page
       });
@@ -2485,29 +2461,6 @@ async function flattenComponents(components, context) {
         children: await flattenComponents(component.children, context)
       });
     } else if (isSectionComponent(component) && component.children) {
-      if (component.props?.title) {
-        const headingLevel = Math.min(
-          Math.max(component.props.level || 1, 1),
-          6
-        );
-        flattened.push(
-          resolveComponentDefaults(
-            {
-              name: "heading",
-              props: {
-                text: component.props.title,
-                level: headingLevel,
-                // Apply zero-spacing to prevent unwanted initial line
-                spacing: {
-                  before: 0,
-                  after: 0
-                }
-              }
-            },
-            context.fullTheme
-          )
-        );
-      }
       flattened.push(...await flattenComponents(component.children, context));
     } else {
       flattened.push(component);
@@ -2570,7 +2523,6 @@ function applyLayout(sections, theme, themeName) {
         footer: section.footer,
         isUserSection: isSourceUserSection,
         belongsToUserSection: isSourceUserSection,
-        sectionTitleLevel: section.level,
         pageOverride: section.page
       });
       continue;
@@ -2605,8 +2557,6 @@ function applyLayout(sections, theme, themeName) {
         // at the start of column content.
         isUserSection: isSourceUserSection && j === 0,
         belongsToUserSection: isSourceUserSection,
-        // Pass section title level for TOC scoping
-        sectionTitleLevel: section.level,
         // Pass page override for this section
         pageOverride: section.page
       });
@@ -4442,6 +4392,26 @@ function componentHasRevision(component) {
 import { createHash as createHash3 } from "crypto";
 var componentCache = null;
 var cacheKeyGen = null;
+var bypassStats = /* @__PURE__ */ new Map();
+function recordBypass(type, reason) {
+  const entry = bypassStats.get(type);
+  if (entry) {
+    entry.renders++;
+  } else {
+    bypassStats.set(type, { renders: 1, reason });
+  }
+}
+var DATE_INDEPENDENT_PLACEHOLDERS = /* @__PURE__ */ new Set(["PAGE", "TOTAL_PAGES"]);
+function usesDateSensitivePlaceholder(serialized) {
+  const placeholderRegex = /\{([^}{]+)\}/g;
+  let match;
+  while ((match = placeholderRegex.exec(serialized)) !== null) {
+    const name = match[1].toUpperCase();
+    if (DATE_INDEPENDENT_PLACEHOLDERS.has(name)) continue;
+    if (PlaceholderRegistry.has(name)) return true;
+  }
+  return false;
+}
 function createThemeHash(theme) {
   const themeString = JSON.stringify(theme);
   return createHash3("sha256").update(themeString).digest("hex").substring(0, 8);
@@ -4477,22 +4447,31 @@ function initializeComponentCache(cache) {
   }
 }
 async function renderComponentWithCache(component, theme, themeName, context, bypassCache = false) {
-  const forceBypassForType = component.name === "toc" || component.name === "section" || component.name === "visual" || component.name === "heading" || // Both explicit lists and markdown-list paragraphs register numbering in
-  // the current document scope. Cached paragraphs can otherwise reference
-  // definitions that only existed in a previous render.
-  component.name === "list" || component.name === "paragraph" || "id" in component || componentHasRevision(component);
+  const bypassReason = componentHasRevision(
+    component
+  ) ? "revision-ids" : "id" in component ? "bookmark-id" : component.name === "toc" || component.name === "section" || component.name === "visual" || component.name === "heading" || // Both explicit lists and markdown-list paragraphs register
+  // numbering in the current document scope. Cached paragraphs can
+  // otherwise reference definitions that only existed in a previous
+  // render.
+  component.name === "list" || component.name === "paragraph" ? "dynamic-context" : null;
   if (!componentCache) {
     initializeComponentCache();
   }
-  if (!componentCache || bypassCache || forceBypassForType || !componentCache.getConfig().enabled) {
+  if (bypassReason !== null) {
+    recordBypass(component.name, bypassReason);
+    return renderComponent(component, theme, themeName, context);
+  }
+  if (!componentCache || bypassCache || !componentCache.getConfig().enabled) {
     return renderComponent(component, theme, themeName, context);
   }
   const componentProps = JSON.stringify(component.props || {});
   const themeHash = createThemeHash(theme);
   const contextKey = context?.section ? `${context.section.currentLayout}:${context.section.columnCount}` : "no-section";
-  const generationDateKey = getGenerationDate().toISOString();
   const baseDirKey = getBaseDir() ?? "";
   const childrenKey = "children" in component && component.children ? `:children:${JSON.stringify(component.children)}` : "";
+  const generationDateKey = usesDateSensitivePlaceholder(
+    componentProps + childrenKey
+  ) ? getGenerationDate().toISOString() : "no-date";
   const cacheKey = `component:${component.name}:${themeHash}:${contextKey}:${generationDateKey}:${baseDirKey}:${componentProps}${childrenKey}`;
   const cached = await componentCache.get(cacheKey);
   if (cached) {
@@ -6948,8 +6927,6 @@ function renderTocComponent(component, theme, context) {
     );
   }
   const stylesWithLevels = [];
-  const sectionTitleLevel = context?.section?.sectionTitleLevel;
-  const startLevel = effectiveScope === "section" && sectionTitleLevel ? sectionTitleLevel : 0;
   if (componentProps.styles && componentProps.styles.length > 0) {
     for (const styleMapping of componentProps.styles) {
       const styleId = styleMapping.styleId;
@@ -6960,7 +6937,7 @@ function renderTocComponent(component, theme, context) {
       );
     }
   }
-  const effectiveDepthStart = effectiveScope === "section" && sectionTitleLevel ? Math.max(depthStart, startLevel + 1) : depthStart;
+  const effectiveDepthStart = depthStart;
   const effectiveDepthEnd = depthEnd;
   const tocOptions = {
     hyperlink: true,
@@ -7355,6 +7332,11 @@ function createLimiter(max) {
 var DEFAULT_FALLBACK_CONCURRENCY = 4;
 var BATCH_TIMEOUT_BASE_MS = 3e4;
 var BATCH_TIMEOUT_PER_SLIDE_MS = 1e4;
+var prepassStats = {
+  documents: 0,
+  collected: 0,
+  unique: 0
+};
 function collectVisualProps(root) {
   const found = [];
   const seen = /* @__PURE__ */ new WeakSet();
@@ -7431,6 +7413,9 @@ async function prerasterizeVisuals(root, serviceConfig, options = {}) {
     }
   }
   if (targets.size === 0) return map;
+  prepassStats.documents++;
+  prepassStats.collected += visuals.length;
+  prepassStats.unique += targets.size;
   const unique = [...targets.values()];
   const limit = createLimiter(
     Math.max(1, options.concurrency ?? DEFAULT_FALLBACK_CONCURRENCY)
@@ -7831,9 +7816,7 @@ async function renderSection(section, theme, themeName, context, sectionOrdinal,
       currentLayout: section.layoutType,
       columnCount: section.properties.column?.count || 1,
       // Always pass the same bookmark ID for all layout chunks of the same section
-      sectionBookmarkId,
-      // Pass section title level for TOC scoping (excludes section title from its own TOC)
-      sectionTitleLevel: section.sectionTitleLevel
+      sectionBookmarkId
     }
   };
   if (sectionBookmarkId && isFirstLayoutOfUserSection && sharedLinkId !== void 0) {
@@ -8764,10 +8747,13 @@ var nestedSectionsComponent = createComponent({
         components.push({
           name: "section",
           props: {
-            title: "First level 1 section",
-            level: 1
+            meta: { title: "First level 1 section" }
           },
           children: [
+            {
+              name: "heading",
+              props: { text: "First level 1 section", level: 1 }
+            },
             {
               name: "heading",
               props: {
@@ -8799,10 +8785,13 @@ var nestedSectionsComponent = createComponent({
         components.push({
           name: "section",
           props: {
-            title: "Second level 1 section",
-            level: 1
+            meta: { title: "Second level 1 section" }
           },
           children: [
+            {
+              name: "heading",
+              props: { text: "Second level 1 section", level: 1 }
+            },
             {
               name: "heading",
               props: {
@@ -8846,9 +8835,22 @@ var plugin_demo_default = {
     {
       name: "section",
       props: {
-        title: "Weather Information"
+        meta: {
+          title: "Weather Information"
+        }
       },
       children: [
+        {
+          name: "heading",
+          props: {
+            text: "Weather Information",
+            level: 1,
+            spacing: {
+              before: 0,
+              after: 0
+            }
+          }
+        },
         {
           name: "paragraph",
           props: {
@@ -8876,9 +8878,22 @@ var plugin_demo_default = {
     {
       name: "section",
       props: {
-        title: "Sales Data"
+        meta: {
+          title: "Sales Data"
+        }
       },
       children: [
+        {
+          name: "heading",
+          props: {
+            text: "Sales Data",
+            level: 1,
+            spacing: {
+              before: 0,
+              after: 0
+            }
+          }
+        },
         {
           name: "paragraph",
           props: {
@@ -8899,9 +8914,22 @@ var plugin_demo_default = {
     {
       name: "section",
       props: {
-        title: "Quick Links"
+        meta: {
+          title: "Quick Links"
+        }
       },
       children: [
+        {
+          name: "heading",
+          props: {
+            text: "Quick Links",
+            level: 1,
+            spacing: {
+              before: 0,
+              after: 0
+            }
+          }
+        },
         {
           name: "paragraph",
           props: {
@@ -8913,9 +8941,22 @@ var plugin_demo_default = {
     {
       name: "section",
       props: {
-        title: "More Data Examples"
+        meta: {
+          title: "More Data Examples"
+        }
       },
       children: [
+        {
+          name: "heading",
+          props: {
+            text: "More Data Examples",
+            level: 1,
+            spacing: {
+              before: 0,
+              after: 0
+            }
+          }
+        },
         {
           name: "dataTable",
           props: {