@json-to-office/core-docx 5.3.0 → 6.0.0

package/dist/plugin/example/index.js

@@ -1038,7 +1038,7 @@ var init_vermilion_docx_theme = __esm({
         },
         actionTitle: {
           type: "display",
-          color: "primary"
+          color: "accent"
         },
         keyTakeaways: {
           type: "label",
@@ -1067,7 +1067,7 @@ var init_vermilion_docx_theme = __esm({
         },
         cover: {
           type: "display",
-          color: "primary",
+          color: "accent",
           rule: {
             weightPt: 4,
             color: "accent"
@@ -5433,12 +5433,15 @@ function applyThemeOverrides(theme, overrides) {
 init_defaults();
 import {
   designCanvas,
+  resolveMotif,
   resolveTypeRoles,
   validateDesignColors
 } from "@json-to-office/shared";
 function resolveDocxDesignSystem(theme) {
   validateDesignColors(theme, getThemeColors(theme));
-  if (!theme.typography && !theme.spacing) return theme;
+  const motif = resolveMotif(theme.motif);
+  if (!theme.typography && !theme.spacing)
+    return motif === theme.motif ? theme : withMotif(theme, motif);
   const canvas = designCanvas("docx", theme.page.size);
   const roles = resolveTypeRoles(theme, canvas, theme.fonts.body.size ?? 11);
   const styles = { ...theme.styles };
@@ -5478,7 +5481,7 @@ function resolveDocxDesignSystem(theme) {
   const space = theme.spacing?.canvas?.[canvas];
   const safe = space?.safeAreaIn;
   return {
-    ...theme,
+    ...withMotif(theme, motif),
     styles,
     page: {
       ...theme.page,
@@ -5495,6 +5498,12 @@ function resolveDocxDesignSystem(theme) {
     }
   };
 }
+function withMotif(theme, motif) {
+  if (motif !== void 0) return { ...theme, motif };
+  const rest = { ...theme };
+  delete rest.motif;
+  return rest;
+}
 
 // src/core/generationContext.ts
 function defaultNamedThemeLookup(themeName, customThemes, warnings) {
@@ -5771,7 +5780,10 @@ import {
 import {
   clampVisualDpi,
   DEFAULT_VISUAL_DPI,
-  MAX_RASTERIZE_BATCH_SLIDES
+  MAX_RASTERIZE_BATCH_SLIDES,
+  createLimiter,
+  resolveServiceUrl as resolveServiceUrl2,
+  postJsonToService as postJsonToService2
 } from "@json-to-office/shared";
 import {
   isNativeVisualProps
@@ -5785,54 +5797,8 @@ function isNodeEnvironment() {
   return typeof process !== "undefined" && process.versions != null && process.versions.node != null && typeof process.versions.node === "string";
 }
 
-// src/utils/serviceClient.ts
-var DEFAULT_TIMEOUT_MS = 3e4;
-function resolveServiceUrl(propsUrl, servicesUrl, defaultUrl) {
-  const raw = (propsUrl || servicesUrl || defaultUrl).trim();
-  const withScheme = /^https?:\/\//i.test(raw) ? raw : `http://${raw}`;
-  return withScheme.replace(/\/+$/, "");
-}
-var SERVICE_UNAVAILABLE_CODE = "SERVICE_UNAVAILABLE";
-function serviceUnavailable(message) {
-  return Object.assign(new Error(message), { code: SERVICE_UNAVAILABLE_CODE });
-}
-async function postJsonToService(opts) {
-  const resolvedHeaders = typeof opts.headers === "function" ? await opts.headers(opts.body) : opts.headers;
-  const headers = {
-    "Content-Type": "application/json",
-    ...resolvedHeaders
-  };
-  const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  let response;
-  try {
-    response = await fetch(`${opts.url}${opts.path}`, {
-      method: "POST",
-      headers,
-      body: JSON.stringify(opts.body),
-      signal: controller.signal
-    });
-  } catch (error) {
-    if (error?.name === "AbortError") {
-      throw serviceUnavailable(
-        `${opts.serviceLabel} timed out after ${timeoutMs}ms at ${opts.url}.`
-      );
-    }
-    const cause = error instanceof Error ? error.message : String(error);
-    throw serviceUnavailable(opts.onUnreachable(opts.url, cause));
-  } finally {
-    clearTimeout(timer);
-  }
-  if (!response.ok) {
-    throw new Error(
-      `${opts.serviceLabel} returned ${response.status}: ${response.statusText}`
-    );
-  }
-  return response;
-}
-
 // src/components/visual.ts
+import { resolveServiceUrl, postJsonToService } from "@json-to-office/shared";
 var DEFAULT_RASTERIZE_SERVER_URL = "http://localhost:7802";
 var PIXELS_PER_INCH = 96;
 function buildVisualPresentation(props) {
@@ -5934,26 +5900,6 @@ Cause: ${cause}`
   return result;
 }
 
-// src/utils/promiseLimiter.ts
-function createLimiter(max) {
-  let active = 0;
-  const queue = [];
-  const release = () => {
-    active--;
-    queue.shift()?.();
-  };
-  return async function limit(fn) {
-    while (active >= max)
-      await new Promise((resolve2) => queue.push(resolve2));
-    active++;
-    try {
-      return await fn();
-    } finally {
-      release();
-    }
-  };
-}
-
 // src/core/prerasterizeVisuals.ts
 var DEFAULT_FALLBACK_CONCURRENCY = 4;
 var BATCH_TIMEOUT_BASE_MS = 3e4;
@@ -6122,7 +6068,7 @@ async function prerasterizeVisuals(root, serviceConfig, options = {}) {
     await rasterizeIndividually(unique);
     return map;
   }
-  const serverUrl = resolveServiceUrl(
+  const serverUrl = resolveServiceUrl2(
     void 0,
     serviceConfig?.serverUrl,
     DEFAULT_RASTERIZE_SERVER_URL
@@ -6130,7 +6076,7 @@ async function prerasterizeVisuals(root, serviceConfig, options = {}) {
   const postBatch = async (chunk, fonts) => {
     let response;
     try {
-      response = await postJsonToService({
+      response = await postJsonToService2({
         url: serverUrl,
         path: "/rasterize/batch",
         body: {
@@ -6256,7 +6202,8 @@ function containsComponent(root, name) {
 // src/core/desugarExternals.ts
 import {
   clampVisualDpi as clampVisualDpi2,
-  DEFAULT_VISUAL_DPI as DEFAULT_VISUAL_DPI2
+  DEFAULT_VISUAL_DPI as DEFAULT_VISUAL_DPI2,
+  limitChartRequest
 } from "@json-to-office/shared";
 import {
   isNativeVisualProps as isNativeVisualProps2
@@ -6272,30 +6219,42 @@ import {
   chartPointsPerPixel,
   POINTS_PER_PIXEL_96DPI,
   withChartFontFaceCss,
-  withChartTypography
+  withChartTypography,
+  resolveServiceUrl as resolveServiceUrl3,
+  postJsonToService as postJsonToService3,
+  chartRequestKey,
+  dedupeChartRequest,
+  recordChartRetry
 } from "@json-to-office/shared";
 var DEFAULT_EXPORT_SERVER_URL = "http://localhost:7801";
+function effectiveChartServerUrl(props, servicesConfig) {
+  return resolveServiceUrl3(
+    props.serverUrl,
+    servicesConfig?.serverUrl,
+    DEFAULT_EXPORT_SERVER_URL
+  );
+}
 function assertExportServerAllowed(serverUrl, servicesConfig, warnings) {
   const notice = remoteExportNotice(serverUrl, servicesConfig?.allowRemote);
-  if (notice)
-    warnings?.push({
-      component: "highcharts",
-      severity: "warning",
-      message: notice,
-      context: { code: REMOTE_EXPORT_WARNING, serverUrl }
-    });
+  if (!notice || !warnings) return;
+  const alreadySaid = warnings.some(
+    (warning) => warning.context?.code === REMOTE_EXPORT_WARNING && warning.context?.serverUrl === serverUrl
+  );
+  if (alreadySaid) return;
+  warnings.push({
+    component: "highcharts",
+    severity: "warning",
+    message: notice,
+    context: { code: REMOTE_EXPORT_WARNING, serverUrl }
+  });
 }
-async function generateChart(config, servicesConfig, warnings) {
+async function generateChart(config, servicesConfig, warnings, cache) {
   if (!isNodeEnvironment()) {
     throw new Error(
       "Highcharts export server requires a Node.js environment. Chart generation is not available in browser environments."
     );
   }
-  const serverUrl = resolveServiceUrl(
-    config.serverUrl,
-    servicesConfig?.serverUrl,
-    DEFAULT_EXPORT_SERVER_URL
-  );
+  const serverUrl = effectiveChartServerUrl(config, servicesConfig);
   assertExportServerAllowed(serverUrl, servicesConfig, warnings);
   const requestBody = {
     infile: config.options,
@@ -6306,11 +6265,21 @@ async function generateChart(config, servicesConfig, warnings) {
     // byte-identical to before for callers that omit it.
     ...config.resources ? { resources: config.resources } : {}
   };
-  const response = await postJsonToService({
+  return dedupeChartRequest(
+    cache,
+    chartRequestKey(serverUrl, requestBody),
+    () => postChart(serverUrl, requestBody, config, servicesConfig)
+  );
+}
+async function postChart(serverUrl, requestBody, config, servicesConfig) {
+  const response = await postJsonToService3({
     url: serverUrl,
     path: "/export",
     body: requestBody,
     headers: servicesConfig?.headers,
+    timeoutMs: servicesConfig?.timeoutMs,
+    retries: servicesConfig?.retries,
+    onRetry: recordChartRetry,
     serviceLabel: "Highcharts export server",
     onUnreachable: (url, cause) => `Highcharts Export Server is not running at ${url}. Start it with: npx highcharts-export-server --enableServer true
 Cause: ${cause}`
@@ -6409,13 +6378,13 @@ function withChartFontFaces(config, theme, faces) {
     theme.fonts.heading.family
   ]);
 }
-async function renderChartToImageProps(props, theme, servicesConfig, chartFonts, warnings) {
+async function renderChartToImageProps(props, theme, servicesConfig, chartFonts, warnings, cache) {
   const config = withChartFontFaces(
     withThemeTypography(withThemeColors(props, theme), theme),
     theme,
     chartFonts
   );
-  const chart = await generateChart(config, servicesConfig, warnings);
+  const chart = await generateChart(config, servicesConfig, warnings, cache);
   const hasConfigDimensions = config.width !== void 0 || config.height !== void 0;
   return {
     base64: chart.base64DataUri,
@@ -6435,6 +6404,7 @@ async function desugarExternals(document, options) {
       ...options.visualFonts ? { fonts: options.visualFonts } : {}
     }
   ).catch(() => /* @__PURE__ */ new Map());
+  const chartCache = /* @__PURE__ */ new Map();
   return transformComponents(document, async (node) => {
     if (node.enabled === false) return void 0;
     if (node.name === "visual") {
@@ -6449,14 +6419,21 @@ async function desugarExternals(document, options) {
       });
     }
     if (node.name === "highcharts") {
+      const props = node.props;
+      const chartConfig = options.services?.highcharts;
       return withNodeIdentity(node, {
         name: "image",
-        props: await renderChartToImageProps(
-          node.props,
-          options.theme,
-          options.services?.highcharts,
-          options.chartFonts,
-          options.warnings
+        props: await limitChartRequest(
+          effectiveChartServerUrl(props, chartConfig),
+          chartConfig?.concurrency,
+          () => renderChartToImageProps(
+            props,
+            options.theme,
+            chartConfig,
+            options.chartFonts,
+            options.warnings,
+            chartCache
+          )
         )
       });
     }
@@ -9705,7 +9682,7 @@ function compileParagraph(component, scope) {
       MARKDOWN_LIST_LEVELS[markdown.type]
     );
   }
-  const styleId = paragraphStyleId(props.themeStyle);
+  const styleId = definedParagraphStyleId(props.themeStyle, ctx.theme);
   if (styleId && !ctx.styleIds.has(styleId)) ctx.styleIds.add(styleId);
   const children = compileRuns(props, text, ctx, path3);
   const bookmarkName = typeof props.id === "string" ? props.id : void 0;
@@ -11050,6 +11027,22 @@ function paragraphStyleId(themeStyle) {
   if (heading) return `JTD_HeadingText${heading[1]}`;
   return themeStyle;
 }
+function definedParagraphStyleId(themeStyle, theme) {
+  const id = paragraphStyleId(themeStyle);
+  if (id === void 0) return void 0;
+  if (ALWAYS_EMITTED_PARAGRAPH_STYLE_IDS.has(id)) return id;
+  const styles = theme.styles;
+  const name = themeStyle;
+  return styles && (styles[name] ?? styles[name.toLowerCase()]) ? id : void 0;
+}
+var ALWAYS_EMITTED_PARAGRAPH_STYLE_IDS = /* @__PURE__ */ new Set([
+  "Normal",
+  "Title",
+  "Subtitle",
+  "Header",
+  "Footer",
+  ...Array.from({ length: 6 }, (_, i) => `JTD_HeadingText${i + 1}`)
+]);
 function customOutlineLevel(themeStyle, theme) {
   if (typeof themeStyle !== "string" || !themeStyle) return void 0;
   if (/^heading[1-6]$/.test(themeStyle.toLowerCase())) return void 0;