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

package/dist/plugin/createDocumentGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createDocumentGenerator.d.ts","sourceRoot":"","sources":["../../src/plugin/createDocumentGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAK7C,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAEV,wBAAwB,EAOxB,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAejB;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,kEAAkE;IAClE,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC3C,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,oFAAoF;IACpF,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB;;;;OAIG;IACH,UAAU,CAAC,EAAE,2BAA2B,CAAC;IACzC,gFAAgF;IAChF,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sDAAsD;IACtD,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAoyBD;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,CAAC,SAAS,EAAE,CAAC,CAkBvC"}
+{"version":3,"file":"createDocumentGenerator.d.ts","sourceRoot":"","sources":["../../src/plugin/createDocumentGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAK7C,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,KAAK,EAEV,wBAAwB,EAQxB,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAgBjB;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,kEAAkE;IAClE,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC3C,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,oFAAoF;IACpF,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB;;;;OAIG;IACH,UAAU,CAAC,EAAE,2BAA2B,CAAC;IACzC,gFAAgF;IAChF,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sDAAsD;IACtD,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAq4BD;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,CAAC,SAAS,EAAE,CAAC,CAkBvC"}

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) {
@@ -5544,7 +5545,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,
@@ -7100,7 +7101,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 +7115,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 +7311,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 +7783,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 +7808,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 },
@@ -10348,9 +10380,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) {
@@ -12649,10 +12682,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 +13021,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 +13809,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 +13820,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 +13926,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 +13939,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 +14078,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 +14086,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 +14242,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 +14250,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 +14745,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 +14805,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 +14853,7 @@ function createBuilderImpl(state) {
         modedDoc: modedDoc2,
         sourceMap: expanded.sourceMap,
         blockPaths: expanded.blocks,
+        pluginOutputs: expanded.pluginOutputs,
         warnings,
         preserveSet,
         processed: {
@@ -14871,8 +14902,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 +15089,7 @@ function createBuilderImpl(state) {
     generateBuffer,
     generateFile,
     expandStandardDefinition,
+    prepareQuality,
     getComponentNames,
     validate,
     generateSchema,