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

package/dist/plugin/example/index.js

@@ -1336,7 +1336,8 @@ var init_consulting_docx_theme = __esm({
           },
           stat: {
             face: "heading",
-            weight: 700,
+            size: 22,
+            weight: 400,
             color: "accent",
             lineHeight: 1
           },
@@ -1643,7 +1644,7 @@ var init_themes = __esm({
     getTheme = (themeName) => {
       return themes[themeName];
     };
-    getThemeWithFallback = (themeName, fallbackTheme = "minimal") => {
+    getThemeWithFallback = (themeName, fallbackTheme = "consulting") => {
       const theme = getTheme(themeName) || getTheme(fallbackTheme);
       if (!theme) {
         throw new Error(
@@ -1723,7 +1724,7 @@ function resolveTheme(theme, themeName) {
   if (themeName) {
     return getTheme(themeName);
   }
-  return getTheme("minimal");
+  return getTheme("consulting");
 }
 function resolveFontFamily(theme, fontRef) {
   if (!theme?.fonts?.body?.family) {
@@ -1840,6 +1841,21 @@ function getPageDimensions(size) {
   }
   return { width: size.width, height: size.height };
 }
+function themeForSectionPage(theme, page) {
+  if (!page || !page.size && !page.margins) return theme;
+  const base = getPageSetup(theme);
+  return {
+    ...theme,
+    page: {
+      ...theme.page,
+      size: page.size ?? theme.page?.size ?? "A4",
+      margins: { ...theme.page?.margins, ...base.margin, ...page.margins }
+    }
+  };
+}
+function pageSizeDiffers(a, b) {
+  return a.width !== b.width || a.height !== b.height;
+}
 var resolveTableParagraphSpacing, PAGE_SIZES, getTableStyle, getDocumentMargins, getPageSetup;
 var init_layoutUtils = __esm({
   "src/styles/utils/layoutUtils.ts"() {
@@ -3203,7 +3219,7 @@ function emitBlock(block2, resources = /* @__PURE__ */ new Map()) {
   }
 }
 function emitToc(block2) {
-  return new TableOfContents(block2.alias ?? "Table of Contents", {
+  return new ThemedTableOfContents(block2.alias ?? "Table of Contents", {
     ...block2.hyperlink !== void 0 ? { hyperlink: block2.hyperlink } : {},
     ...block2.headingRange ? {
       headingStyleRange: `${block2.headingRange.from}-${block2.headingRange.to}`
@@ -3335,7 +3351,7 @@ function emitBorder(border3) {
     ...border3.spacePoints !== void 0 ? { space: border3.spacePoints } : {}
   };
 }
-var ALIGNMENT2, PAGE_FIELDS, isSequenceField, WRAP_TYPE, VERTICAL_ALIGN, TABLE_ANCHOR, HORIZONTAL_POSITION, VERTICAL_POSITION, BORDER_STYLE;
+var ALIGNMENT2, PAGE_FIELDS, isSequenceField, WRAP_TYPE, ThemedTableOfContents, VERTICAL_ALIGN, TABLE_ANCHOR, HORIZONTAL_POSITION, VERTICAL_POSITION, BORDER_STYLE;
 var init_emit = __esm({
   "src/renderers/docxjs/emit.ts"() {
     "use strict";
@@ -3355,6 +3371,11 @@ var init_emit = __esm({
       tight: TextWrappingType.TIGHT,
       topAndBottom: TextWrappingType.TOP_AND_BOTTOM
     };
+    ThemedTableOfContents = class extends TableOfContents {
+    };
+    Object.defineProperty(ThemedTableOfContents.prototype, "getTabStopsForLevel", {
+      value: () => []
+    });
     VERTICAL_ALIGN = {
       top: VerticalAlign.TOP,
       center: VerticalAlign.CENTER,
@@ -4115,13 +4136,30 @@ import {
   spliceChartXml
 } from "@json-to-office/shared/rendering";
 function spliceInput(chart) {
+  const { bold, ...rest } = chart.textFont;
+  const textFont = rest;
+  const axisTitleFont = { ...rest, bold };
+  const chartTitleFont = {
+    ...rest,
+    fontSize: Math.round(rest.fontSize * CHART_TITLE_SCALE),
+    bold: true
+  };
   return {
     chartType: chart.chartType,
     series: chart.series,
     colors: chart.colors,
+    textFont,
+    titleFont: chartTitleFont,
     ...chart.legendPosition ? { legendPosition: chart.legendPosition } : {},
-    ...chart.categoryAxisTitle ? { categoryAxis: { title: chart.categoryAxisTitle } } : {},
-    ...chart.valueAxisTitle ? { valueAxis: { title: chart.valueAxisTitle } } : {}
+    ...chart.categoryAxisTitle ? {
+      categoryAxis: {
+        title: chart.categoryAxisTitle,
+        titleFont: axisTitleFont
+      }
+    } : {},
+    ...chart.valueAxisTitle ? {
+      valueAxis: { title: chart.valueAxisTitle, titleFont: axisTitleFont }
+    } : {}
   };
 }
 function declareWorkbookContentType(zip) {
@@ -4165,10 +4203,12 @@ function spliceChartParts(zip, charts) {
   }
   declareWorkbookContentType(zip);
 }
+var CHART_TITLE_SCALE;
 var init_chartParts = __esm({
   "src/renderers/office-open/chartParts.ts"() {
     "use strict";
     init_chartWorkbook();
+    CHART_TITLE_SCALE = 1.4;
   }
 });
 
@@ -4714,9 +4754,6 @@ function tocEntry(entry) {
   return {
     paragraph: {
       style: `TOC${entry.level}`,
-      tabStops: [
-        { type: "right", position: TOC_PAGE_TAB_TWIPS, leader: "dot" }
-      ],
       children: [{ text: entry.text }, { children: [{ tab: true }] }]
     }
   };
@@ -4746,13 +4783,18 @@ function table(value, ctx) {
   return {
     rows: value.rows.map((row) => tableRow(row, ctx)),
     width: {
-      size: value.width.kind === "auto" ? 0 : value.width.value,
+      // `w:w` is an integer in OOXML. A grid that splits a remainder between
+      // unstated columns comes out fractional, and the XML would carry it
+      // verbatim; floored here, as the docxjs backend floors it.
+      size: value.width.kind === "auto" ? 0 : value.width.kind === "twips" ? Math.floor(value.width.value) : value.width.value,
       type: value.width.kind === "twips" ? "dxa" : value.width.kind === "percent" ? "pct" : "auto"
     },
     layout: value.layout,
     // An empty grid is a table with nothing to say about its columns, which is
     // not the same as one whose columns are all zero wide.
-    ...value.columnGrid.values.length > 0 ? { columnWidths: value.columnGrid.values } : {},
+    ...value.columnGrid.values.length > 0 ? {
+      columnWidths: value.columnGrid.unit === "twips" ? value.columnGrid.values.map(Math.floor) : value.columnGrid.values
+    } : {},
     ...value.alignment ? { alignment: alignment(value.alignment) } : {},
     ...value.borders ? { borders: borders2(value.borders) } : {},
     ...value.cellMargins ? { margins: cellMargins(value.cellMargins) } : {},
@@ -4944,7 +4986,7 @@ function numberingConfig2(numbering) {
     }))
   };
 }
-var WRAP_TYPE2, BODY_ANCHOR, TOC_PAGE_TAB_TWIPS;
+var WRAP_TYPE2, BODY_ANCHOR;
 var init_emit2 = __esm({
   "src/renderers/office-open/emit.ts"() {
     "use strict";
@@ -4960,7 +5002,6 @@ var init_emit2 = __esm({
       middle: "ctr",
       bottom: "b"
     };
-    TOC_PAGE_TAB_TWIPS = 9025;
   }
 });
 
@@ -5241,7 +5282,9 @@ function addPngTextChunk(data, marker) {
     }
     offset = chunkEnd;
   }
-  return Buffer.concat([data, marker]);
+  throw new Error(
+    "Cannot mark a PNG that has no intact IEND chunk; its bytes were not checked to decode before rendering"
+  );
 }
 function addJpegComment(data, marker) {
   if (data.length < 2 || data[0] !== 255 || data[1] !== 216) {
@@ -5544,7 +5587,7 @@ function resolveThemeContext(documentIn, options = {}) {
   }
   const document = documentIn.props === void 0 ? { ...documentIn, props: {} } : documentIn;
   const authoredThemeName = document.props.theme || void 0;
-  const baseThemeName = authoredThemeName ?? "minimal";
+  const baseThemeName = authoredThemeName ?? "consulting";
   let theme = resolveNamedTheme ? resolveNamedTheme(
     baseThemeName,
     warnings,
@@ -6225,6 +6268,7 @@ function containsComponent(root, name) {
 }
 
 // src/core/desugarExternals.ts
+init_layoutUtils();
 import {
   clampVisualDpi as clampVisualDpi2,
   DEFAULT_VISUAL_DPI as DEFAULT_VISUAL_DPI2,
@@ -6428,8 +6472,18 @@ async function desugarExternals(document, options) {
     }
   ).catch(() => /* @__PURE__ */ new Map());
   const chartCache = /* @__PURE__ */ new Map();
-  return transformComponents(document, async (node) => {
+  const replace = (theme, inSection) => async function replaceNode(node) {
     if (node.enabled === false) return void 0;
+    if (node.name === "section" && !inSection) {
+      const page = node.props.page;
+      return transformComponents(
+        node,
+        replace(themeForSectionPage(theme, page), true)
+      );
+    }
+    return replaceExternal(node, theme);
+  };
+  const replaceExternal = async (node, theme) => {
     if (node.name === "visual") {
       if (isNativeVisualProps2(node.props)) return void 0;
       return withNodeIdentity(node, {
@@ -6447,7 +6501,7 @@ async function desugarExternals(document, options) {
         name: "image",
         props: await renderChartToImageProps(
           node.props,
-          options.theme,
+          theme,
           options.services?.highcharts,
           options.chartFonts,
           options.warnings,
@@ -6456,7 +6510,8 @@ async function desugarExternals(document, options) {
       });
     }
     return void 0;
-  });
+  };
+  return transformComponents(document, replace(options.theme, false));
 }
 async function visualImageProps(props, prerastered, options) {
   const serviceConfig = options.services?.pptx;
@@ -6491,6 +6546,7 @@ init_imageUtils();
 import {
   isNativeVisualProps as isNativeVisualProps3
 } from "@json-to-office/shared-docx";
+import { imageIntegrityDefect } from "@json-to-office/shared/images/node";
 async function loadImageResources(components) {
   const sources = /* @__PURE__ */ new Set();
   for (const component of components) collectSources(component, sources);
@@ -6500,6 +6556,8 @@ async function loadImageResources(components) {
     [...sources].map(async (source) => {
       try {
         const result = await getImageBuffer(source);
+        const defect = imageIntegrityDefect(result.buffer);
+        if (defect) throw new Error(defect);
         const intrinsic = readIntrinsic(result.buffer, source);
         loaded.set(source, {
           bytes: result.buffer,
@@ -7100,7 +7158,12 @@ function resolveColors(entries, at, deps) {
 init_themes();
 init_colorUtils();
 init_styleHelpers();
-import { capsFormatting, synthesizeFamilyName } from "@json-to-office/shared";
+import {
+  capsFormatting,
+  designCanvas as designCanvas2,
+  synthesizeFamilyName,
+  typeScaleSizes
+} from "@json-to-office/shared";
 var RIGHT_MARGIN_TAB_TWIPS = 9026 * 2;
 var STATISTIC_NUMBER_STYLE_ID = "StatisticNumber";
 var STATISTIC_DESCRIPTION_STYLE_ID = "StatisticDescription";
@@ -7109,6 +7172,27 @@ var STATISTIC_SIZE_POINTS = {
   medium: 28,
   large: 40
 };
+function statisticSizes(theme, size) {
+  const sizeOf = (style) => {
+    const value = theme.styles?.[style]?.size;
+    return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : void 0;
+  };
+  const role = sizeOf("stat");
+  const medium = sizeOf(STATISTIC_NUMBER_STYLE_ID) ?? role ?? STATISTIC_SIZE_POINTS.medium;
+  const scale = role === void 0 ? void 0 : theme.typography?.scale?.[designCanvas2("docx", theme.page?.size)];
+  const steps = scale ? typeScaleSizes(scale) : [];
+  const below = [...steps].reverse().find((step) => step < medium - 0.01);
+  const above = steps.find((step) => step > medium + 0.01);
+  const number = size === "small" ? role !== void 0 && below !== void 0 ? below : STATISTIC_SIZE_POINTS.small : size === "large" ? role !== void 0 && above !== void 0 ? above : STATISTIC_SIZE_POINTS.large : medium;
+  const label = sizeOf("label");
+  return {
+    number,
+    medium,
+    // Half-points in the document, floored at 6pt.
+    suffix: label ?? Math.max(12, Math.round(number)) / 2,
+    description: sizeOf(STATISTIC_DESCRIPTION_STYLE_ID) ?? label ?? 10
+  };
+}
 function getStyleSafe(theme, styleName) {
   return theme.styles && Object.hasOwn(theme.styles, styleName) ? theme.styles[styleName] : void 0;
 }
@@ -7284,8 +7368,8 @@ function chromeRun(fontProps, theme, sizeHalfPoints) {
     ...fontProps.italic !== void 0 && { italic: fontProps.italic }
   };
 }
-function createDocumentStyles(themeNameOrObject = "minimal", language) {
-  const theme = typeof themeNameOrObject === "string" ? getTheme(themeNameOrObject) || getTheme("minimal") : themeNameOrObject;
+function createDocumentStyles(themeNameOrObject = "consulting", language) {
+  const theme = typeof themeNameOrObject === "string" ? getTheme(themeNameOrObject) || getTheme("consulting") : themeNameOrObject;
   const paragraphStyles = [
     // Normal body text style
     {
@@ -7756,14 +7840,19 @@ function createDocumentStyles(themeNameOrObject = "minimal", language) {
   };
 }
 function createStatisticStyles(theme) {
+  const sizes = statisticSizes(theme, "medium");
+  const stat = theme.styles?.stat;
+  const faces = ["heading", "body", "mono", "light"];
+  const face = faces.find((candidate) => candidate === stat?.font) ?? "heading";
+  const weight = typeof stat?.fontWeight === "number" ? stat.fontWeight : void 0;
   const definitions = [
     {
       id: STATISTIC_NUMBER_STYLE_ID,
       name: "Statistic Number",
-      font: "heading",
-      sizePoints: STATISTIC_SIZE_POINTS.medium,
-      color: theme.colors.primary,
-      bold: true,
+      font: face,
+      sizePoints: sizes.medium,
+      color: typeof stat?.color === "string" ? stat.color : theme.colors.primary,
+      bold: weight === void 0 ? true : weight >= 600,
       // Space above separates the figure from whatever preceded it; none below,
       // because the description is the other half of the same block.
       spacing: { before: 12, after: 0 },
@@ -7776,7 +7865,7 @@ function createStatisticStyles(theme) {
       id: STATISTIC_DESCRIPTION_STYLE_ID,
       name: "Statistic Description",
       font: "body",
-      sizePoints: 10,
+      sizePoints: sizes.description,
       color: theme.colors.textMuted,
       bold: false,
       spacing: { before: 0, after: 12 },
@@ -9395,8 +9484,25 @@ function resolveSectionChrome(sections) {
   });
 }
 function compileSection(section2, index, ordinal, chrome, ctx) {
+  const documentTheme = ctx.theme;
+  ctx.theme = themeForSectionPage(documentTheme, section2.pageOverride);
+  try {
+    return compileSectionBody(section2, index, ordinal, chrome, ctx);
+  } finally {
+    ctx.theme = documentTheme;
+  }
+}
+function compileSectionBody(section2, index, ordinal, chrome, ctx) {
   const path3 = `sections[${index}]`;
   const { page, column } = section2.properties;
+  if (section2.forcedPageBreak) {
+    warnOnce(
+      ctx,
+      "section",
+      `${path3} is set to continue on the page but changes the paper size or orientation, which a continuous section break cannot do, so it starts on a new page instead. Set pageBreak: true on the section to say so, or keep the page size of the section before it.`,
+      "W_SECTION_PAGE_BREAK_FORCED"
+    );
+  }
   if (column && column.count > 1) {
     ctx.features.require("columns", `${path3}.properties.columns`);
   }
@@ -10348,9 +10454,10 @@ function compileStatistic(component, scope) {
     );
   }
   const text = (value) => normalizeUnicodeText(String(value ?? ""));
-  const numberPoints = STATISTIC_SIZE_POINTS[String(props.size)] ?? STATISTIC_SIZE_POINTS.medium;
-  const resized = numberPoints !== STATISTIC_SIZE_POINTS.medium;
-  const suffixHalfPoints = Math.max(12, Math.round(numberPoints));
+  const sizes = statisticSizes(ctx.theme, props.size);
+  const numberPoints = sizes.number;
+  const resized = numberPoints !== sizes.medium;
+  const suffixHalfPoints = Math.round(sizes.suffix * 2);
   const numberRuns = [];
   const numberText = text(props.number);
   if (numberText) {
@@ -11250,6 +11357,24 @@ function compileImage2(component, scope) {
   return blocks;
 }
 var DEFAULT_CHART_HEIGHT_INCHES = 3;
+var MAX_CHART_TEXT_POINTS = 10;
+function chartTextFont(theme) {
+  const bodySize = getThemeFonts(theme).body?.size;
+  let color = "000000";
+  try {
+    color = resolveColor("textPrimary", theme);
+  } catch {
+  }
+  return {
+    fontFamily: resolveFontFamily(theme, "body"),
+    fontSize: Math.min(
+      typeof bodySize === "number" && bodySize > 0 ? bodySize : 11,
+      MAX_CHART_TEXT_POINTS
+    ),
+    bold: false,
+    color
+  };
+}
 function compileChart(component, scope) {
   const { ctx, path: path3 } = scope;
   const props = component.props ?? {};
@@ -11318,6 +11443,7 @@ function compileChart(component, scope) {
     ...props.legendPos ? { legendPosition: props.legendPos } : {},
     ...typeof props.catAxisTitle === "string" ? { categoryAxisTitle: props.catAxisTitle } : {},
     ...typeof props.valAxisTitle === "string" ? { valueAxisTitle: props.valAxisTitle } : {},
+    textFont: chartTextFont(ctx.theme),
     ...typeof props.alt === "string" && props.alt ? { altText: props.alt } : {},
     ...props.floating ? { floating: compileFloating(props.floating, ctx, path3) } : {}
   };
@@ -12064,6 +12190,18 @@ init_styles();
 init_widthUtils();
 function applyLayout(sections, theme, themeName) {
   const layoutSections = [];
+  const push = (layoutSection) => {
+    const previous = layoutSections[layoutSections.length - 1];
+    if (previous && layoutSection.properties.type === "continuous" && pageSizeDiffers(
+      previous.properties.page.size,
+      layoutSection.properties.page.size
+    )) {
+      layoutSection.properties.type = "nextPage";
+      layoutSection.breakBefore = true;
+      layoutSection.forcedPageBreak = true;
+    }
+    layoutSections.push(layoutSection);
+  };
   for (let i = 0; i < sections.length; i++) {
     const section2 = sections[i];
     const layoutGroups = analyzeLayoutGroups(section2.components);
@@ -12072,7 +12210,7 @@ function applyLayout(sections, theme, themeName) {
       const isFirstSection = i === 0;
       const breakBefore = isFirstSection || Boolean(section2.pageBreak);
       const sectionType2 = breakBefore ? "nextPage" : "continuous";
-      layoutSections.push({
+      push({
         properties: createSectionProperties(
           getColumnSettings("single"),
           theme,
@@ -12094,7 +12232,12 @@ function applyLayout(sections, theme, themeName) {
     for (let j = 0; j < layoutGroups.length; j++) {
       const group = layoutGroups[j];
       const isSingleColumnsGroup = group.components.length === 1 && isColumnsComponent(group.components[0]);
-      const columnSettings = isSingleColumnsGroup ? createColumnSettingsFromConfig(group.components[0], theme, themeName) : getColumnSettings(group.layout);
+      const columnSettings = isSingleColumnsGroup ? createColumnSettingsFromConfig(
+        group.components[0],
+        // Percentages are of this section's text measure, not the theme's.
+        theme ? themeForSectionPage(theme, section2.page) : theme,
+        themeName
+      ) : getColumnSettings(group.layout);
       const isFirstSection = i === 0 && j === 0;
       const titlelessSectionBreak = Boolean(section2.pageBreak && j === 0);
       const breakBefore = group.breakBefore || isFirstSection || titlelessSectionBreak;
@@ -12102,7 +12245,7 @@ function applyLayout(sections, theme, themeName) {
       const contentComponents = isSingleColumnsGroup ? processLayoutComponents(
         group.components[0].children || []
       ) : processLayoutComponents(group.components);
-      layoutSections.push({
+      push({
         properties: createSectionProperties(
           columnSettings,
           theme,
@@ -12649,10 +12792,10 @@ import {
 } from "@json-to-office/quality";
 import { DEFAULT_DOCX_RENDERER_ID as DEFAULT_DOCX_RENDERER_ID2 } from "@json-to-office/shared-docx";
 import {
-  designCanvas as designCanvas2,
+  designCanvas as designCanvas3,
   designColors as designColors2,
   resolveDesignColor as resolveDesignColor2,
-  typeScaleSizes
+  typeScaleSizes as typeScaleSizes2
 } from "@json-to-office/shared";
 
 // src/json/normalizer.ts
@@ -12988,7 +13131,8 @@ async function expandBlocksWithPlugins(document, theme, plugins, render, preserv
     document: second.standard,
     preserved: first.preserved,
     sourceMap: evaluator.sourceMap,
-    blocks: evaluator.blocks
+    blocks: evaluator.blocks,
+    pluginOutputs: evaluator.pluginOutputs
   };
 }
 
@@ -13775,10 +13919,7 @@ function textSizeFact(node, props, path3, typography, role) {
   };
 }
 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 sizes = statisticSizes(typography.theme, props.size);
   const present = (value) => value !== void 0 && value !== null && String(value).trim() !== "";
   const facts = [];
   const add = (suffix, role, fontSizePt) => facts.push({
@@ -13789,19 +13930,11 @@ function statisticSizeFacts(props, path3, typography) {
     fontSizePt,
     authored: false
   });
-  if (present(props.number)) add("number", "statistic", painted);
+  if (present(props.number)) add("number", "statistic", sizes.number);
   if (present(props.unit) || present(props.trend) || present(props.trendValue))
-    add(
-      "suffix",
-      "statistic-suffix",
-      Math.max(12, Math.round(numberPoints)) / 2
-    );
+    add("suffix", "statistic-suffix", sizes.suffix);
   if (present(props.description))
-    add(
-      "description",
-      "statistic-description",
-      styled("StatisticDescription") ?? 10
-    );
+    add("description", "statistic-description", sizes.description);
   return facts;
 }
 function tocSizeFacts(props, path3, typography) {
@@ -13903,8 +14036,8 @@ function prepareDocxQualityDocument(document, options = {}) {
     fonts: options.fonts,
     warnings: options.warnings
   });
-  const expanded = expandBlocks(themed.document, themed.theme);
-  const context = expanded.blocks.length > 0 ? { ...themed, document: expanded.document } : themed;
+  const expanded = options.expanded ?? expandBlocks(themed.document, themed.theme);
+  const context = options.expanded !== void 0 || expanded.blocks.length > 0 ? { ...themed, document: expanded.document } : themed;
   const resolved = resolveDocumentTree(context.document, context.theme);
   const basePage = pageBox(resolved.theme, context.themeName);
   const typography = {
@@ -13916,7 +14049,7 @@ function prepareDocxQualityDocument(document, options = {}) {
   let previousHeadingLevel;
   const authoredPath = (path3) => toAuthoredPointer(
     themed.sourceMap ?? {},
-    toAuthoredPointer(expanded.sourceMap, path3)
+    toAuthoredPointer(expanded.sourceMap, path3, expanded.pluginOutputs)
   );
   const addFact = (raw) => {
     const fact = {
@@ -14055,7 +14188,7 @@ function prepareDocxQualityDocument(document, options = {}) {
     );
     if (size) roleSizesPt[key] = size.fontSizePt;
   }
-  const scale = resolved.theme.typography?.scale?.[designCanvas2("docx", resolved.theme.page?.size)];
+  const scale = resolved.theme.typography?.scale?.[designCanvas3("docx", resolved.theme.page?.size)];
   const typeScalePt = [
     .../* @__PURE__ */ new Set([
       ...Object.values(roleSizesPt),
@@ -14063,7 +14196,7 @@ function prepareDocxQualityDocument(document, options = {}) {
         const size = resolveFontSize(resolved.theme, role);
         return size === void 0 ? [] : [size];
       }),
-      ...scale ? typeScaleSizes(scale) : []
+      ...scale ? typeScaleSizes2(scale) : []
     ])
   ].sort((a, b) => a - b);
   addFact({
@@ -14219,6 +14352,7 @@ function prepareDocxQualityDocument(document, options = {}) {
       for (const fact of svgTextFacts(props, path3)) addFact(fact);
       const drawn = drawnRatio(props);
       const natural = readableRatio(props);
+      const authored = authoredPropsAt(path3);
       addFact({
         id: `docx:image:${path3}`,
         kind: "docx/image",
@@ -14226,7 +14360,13 @@ function prepareDocxQualityDocument(document, options = {}) {
         ...typeof props.alt === "string" && props.alt.trim() !== "" && { alt: props.alt },
         captioned: isCaptioned(facts, authoredPath(path3)),
         ...drawn !== void 0 && { drawnRatio: drawn },
-        ...natural !== void 0 && { naturalRatio: natural }
+        ...natural !== void 0 && { naturalRatio: natural },
+        ...authoredPath(path3) === path3 && finiteNumber(authored?.width) !== void 0 && finiteNumber(authored?.height) !== void 0 && {
+          authoredSizePx: {
+            width: authored.width,
+            height: authored.height
+          }
+        }
       });
     }
     if (node.name === "heading") {
@@ -14715,7 +14855,7 @@ function createBuilderImpl(state) {
     }
     return new Set(list);
   }
-  async function expandDocument(document, options) {
+  async function expandDocument(document, options, provenance = false) {
     const preserveSet = resolvePreserveSet(options);
     const rootIn = document;
     const internalDocument = rootIn.props === void 0 ? { ...rootIn, props: {} } : rootIn;
@@ -14775,7 +14915,7 @@ function createBuilderImpl(state) {
       warnings,
       resolveNamedTheme: resolveDocumentTheme
     });
-    if (modedRoot.props.blocks !== void 0) {
+    if (modedRoot.props.blocks !== void 0 || provenance) {
       const expanded = await expandBlocksWithPlugins(
         modedRoot,
         modedTheme,
@@ -14823,6 +14963,7 @@ function createBuilderImpl(state) {
         modedDoc: modedDoc2,
         sourceMap: expanded.sourceMap,
         blockPaths: expanded.blocks,
+        pluginOutputs: expanded.pluginOutputs,
         warnings,
         preserveSet,
         processed: {
@@ -14871,8 +15012,64 @@ function createBuilderImpl(state) {
       throw error;
     }
   }
+  async function prepareQuality(document, options) {
+    const {
+      modedRoot,
+      modedTheme,
+      themeName,
+      modedDoc,
+      sourceMap,
+      blockPaths,
+      pluginOutputs,
+      warnings
+    } = await expandDocument(document, options, true);
+    const prepared = prepareDocxQualityDocument(
+      document,
+      {
+        context: { document: modedRoot, theme: modedTheme, themeName },
+        expanded: {
+          document: modedDoc,
+          sourceMap: sourceMap ?? {},
+          blocks: blockPaths ?? [],
+          ...pluginOutputs && { pluginOutputs }
+        },
+        customThemes: state.customThemes,
+        fonts: state.fonts,
+        renderer: options?.renderer ?? state.renderer ?? modedRoot.renderer,
+        warnings
+      }
+    );
+    return { prepared, warnings: warnings.length > 0 ? warnings : null };
+  }
+  async function generateBufferFromPrepared(prepared, options) {
+    const { context } = prepared.model;
+    const warnings = [];
+    const baseDir = options?.baseDir ?? state.baseDir;
+    const deterministic = options?.deterministic ?? state.deterministic;
+    const generatedAt = options?.generatedAt ?? state.generatedAt;
+    const renderer = options?.renderer ?? state.renderer ?? prepared.renderer;
+    const { buffer } = await generateBufferViaIr(context.document, {
+      context,
+      prepared,
+      ...state.services ? { services: state.services } : {},
+      ...state.fonts ? { fonts: state.fonts } : {},
+      ...baseDir !== void 0 ? { baseDir } : {},
+      ...deterministic !== void 0 ? { deterministic } : {},
+      ...generatedAt !== void 0 ? { generatedAt } : {},
+      ...renderer !== void 0 ? { renderer } : {},
+      warnings
+    });
+    return {
+      buffer,
+      warnings: warnings.length > 0 ? warnings : null,
+      standardDefinition: context.document,
+      preservedDefinition: void 0
+    };
+  }
   async function generateBuffer(document, options) {
     try {
+      const reused = options?.prepared && resolvePreserveSet(options) === void 0 ? options.prepared : void 0;
+      if (reused) return await generateBufferFromPrepared(reused, options);
       const {
         modedRoot,
         modedTheme,
@@ -15002,6 +15199,7 @@ function createBuilderImpl(state) {
     generateBuffer,
     generateFile,
     expandStandardDefinition,
+    prepareQuality,
     getComponentNames,
     validate,
     generateSchema,