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

package/dist/core/expandHighcharts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expandHighcharts.d.ts","sourceRoot":"","sources":["../../src/core/expandHighcharts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAQL,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,EACvB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EACV,eAAe,EAGf,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAUlB,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,qBAAqB,CAAC;CACrC;AAED;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,qBAAqB,EACnC,QAAQ,EAAE,uBAAuB,GAAG,SAAS,EAC7C,QAAQ,EAAE,eAAe,EAAE,EAC3B,UAAU,CAAC,EAAE,SAAS,iBAAiB,EAAE,GACxC,OAAO,CAAC,yBAAyB,CAAC,CAqBpC"}
+{"version":3,"file":"expandHighcharts.d.ts","sourceRoot":"","sources":["../../src/core/expandHighcharts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAeL,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,EACvB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EACV,eAAe,EAGf,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAUlB,MAAM,WAAW,yBAAyB;IACxC,YAAY,EAAE,qBAAqB,CAAC;CACrC;AAED;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAC9C,YAAY,EAAE,qBAAqB,EACnC,QAAQ,EAAE,uBAAuB,GAAG,SAAS,EAC7C,QAAQ,EAAE,eAAe,EAAE,EAC3B,UAAU,CAAC,EAAE,SAAS,iBAAiB,EAAE,GACxC,OAAO,CAAC,yBAAyB,CAAC,CAwBpC"}

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export type { PptxRendererId } from './renderers/types';
 export { DEFAULT_PPTX_RENDERER_ID } from './renderers/types';
 export { isPptxRendererId, pptxRendererIds, pptxRendererStatuses, } from './renderers/registry';
 export { UncompiledComponentError } from './core/generateFromIr';
+export { getChartRequestStats, resetChartRequestStats, type ChartRequestStats, } from '@json-to-office/shared';
 export { DEFAULT_GENERATED_AT } from './core/finalizePackage';
 export type { PresentationPackagingOptions } from './core/finalizePackage';
 export type { PptxComponentInput, PresentationComponentDefinition, PresentationComponentDefinitionFor, SlideComponentDefinition, ProcessedPresentation, ProcessedSlide, PptxThemeConfig, PipelineWarning, SlideContext, SlideRenderContext, } from './types';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -3937,6 +3937,12 @@ import {
   REMOTE_EXPORT_WARNING,
   chartFamilyResolver,
   chartPointsPerPixel,
+  chartRequestKey,
+  dedupeChartRequest,
+  limitChartRequest,
+  postJsonToService,
+  recordChartRetry,
+  resolveServiceUrl,
   withChartFontFaceCss,
   withChartTypography
 } from "@json-to-office/shared";
@@ -3956,7 +3962,10 @@ async function expandHighchartsComponents(presentation, services, warnings, char
     slideWidth: presentation.slideWidth,
     services,
     warnings,
-    chartFonts
+    chartFonts,
+    // Per deck: a chart repeated on an agenda slide and again in its section
+    // is one render.
+    chartCache: /* @__PURE__ */ new Map()
   };
   const slides = await Promise.all(
     presentation.slides.map(async (slide, index) => ({
@@ -3992,19 +4001,24 @@ async function expandList(components, path4, scope) {
 }
 async function expandOne(component, path4, scope) {
   const props = component.props;
-  const chart = await renderChart(
-    withChartFontFaces(
-      withThemeTypography(
-        withThemeColors(props, scope.theme, scope.warnings),
+  const chart = await limitChartRequest(
+    exportServerUrl(props.serverUrl, scope.services?.serverUrl),
+    scope.services?.concurrency,
+    () => renderChart(
+      withChartFontFaces(
+        withThemeTypography(
+          withThemeColors(props, scope.theme, scope.warnings),
+          scope.theme,
+          scope.slideWidth,
+          scope.warnings
+        ),
         scope.theme,
-        scope.slideWidth,
-        scope.warnings
+        scope.chartFonts
       ),
-      scope.theme,
-      scope.chartFonts
-    ),
-    scope.services,
-    scope.warnings
+      scope.services,
+      scope.warnings,
+      scope.chartCache
+    )
   );
   void path4;
   return {
@@ -4021,14 +4035,18 @@ async function expandOne(component, path4, scope) {
 }
 function assertExportServerAllowed(serverUrl, services, warnings) {
   const notice = remoteExportNotice(serverUrl, services?.allowRemote);
-  if (notice)
-    warnings.push({
-      code: REMOTE_EXPORT_WARNING,
-      component: "highcharts",
-      message: notice
-    });
+  if (!notice) return;
+  const alreadySaid = warnings.some(
+    (warning) => warning.code === REMOTE_EXPORT_WARNING && warning.message === notice
+  );
+  if (alreadySaid) return;
+  warnings.push({
+    code: REMOTE_EXPORT_WARNING,
+    component: "highcharts",
+    message: notice
+  });
 }
-async function renderChart(config, services, warnings) {
+async function renderChart(config, services, warnings, cache) {
   if (!isNodeEnvironment()) {
     throw new Error(
       "Highcharts export server requires a Node.js environment. Chart generation is not available in browser environments."
@@ -4045,25 +4063,27 @@ async function renderChart(config, services, warnings) {
     // for callers that omit it.
     ...config.resources ? { resources: config.resources } : {}
   };
-  const resolvedHeaders = typeof services?.headers === "function" ? await services.headers(requestBody) : services?.headers;
-  const response = await fetch(`${serverUrl}/export`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json", ...resolvedHeaders },
-    body: JSON.stringify(requestBody)
-  }).catch((error) => {
-    throw Object.assign(
-      new Error(
-        `Highcharts Export Server is not running at ${serverUrl}. Start it with: npx highcharts-export-server --enableServer true
-Cause: ${error instanceof Error ? error.message : String(error)}`
-      ),
-      { code: "SERVICE_UNAVAILABLE" }
-    );
+  return dedupeChartRequest(
+    cache,
+    chartRequestKey(serverUrl, requestBody),
+    () => postChart(serverUrl, requestBody, config, services)
+  );
+}
+async function postChart(serverUrl, requestBody, config, services) {
+  const response = await postJsonToService({
+    url: serverUrl,
+    path: "/export",
+    body: requestBody,
+    headers: services?.headers,
+    timeoutMs: services?.timeoutMs,
+    retries: services?.retries,
+    onRetry: recordChartRetry,
+    serviceLabel: "Highcharts export server",
+    // The code lets a server route report a missing export server as a
+    // dependency outage with this message, not as an internal error.
+    onUnreachable: (url, cause) => `Highcharts Export Server is not running at ${url}. Start it with: npx highcharts-export-server --enableServer true
+Cause: ${cause}`
   });
-  if (!response.ok) {
-    throw new Error(
-      `Highcharts export server returned ${response.status}: ${response.statusText}`
-    );
-  }
   return {
     dataUri: `data:image/png;base64,${await response.text()}`,
     widthPx: config.options.chart?.width ?? DEFAULT_CHART_WIDTH_PX,
@@ -4071,8 +4091,7 @@ Cause: ${error instanceof Error ? error.message : String(error)}`
   };
 }
 function exportServerUrl(propsUrl, servicesUrl) {
-  const raw = propsUrl || servicesUrl || DEFAULT_EXPORT_SERVER_URL;
-  return raw.startsWith("http") ? raw : `http://${raw}`;
+  return resolveServiceUrl(propsUrl, servicesUrl, DEFAULT_EXPORT_SERVER_URL);
 }
 function withThemeColors(props, theme, warnings) {
   if (!props.options || props.options.colors || !theme?.colors) return props;
@@ -4784,7 +4803,7 @@ var vermilion_pptx_theme_default = {
     },
     actionTitle: {
       type: "display",
-      color: "primary"
+      color: "accent"
     },
     keyTakeaways: {
       type: "label",
@@ -4813,7 +4832,7 @@ var vermilion_pptx_theme_default = {
     },
     cover: {
       type: "display",
-      color: "primary",
+      color: "accent",
       rule: {
         weightPt: 4,
         color: "accent"
@@ -5244,12 +5263,15 @@ var pptxThemes = PPTX_THEMES;
 // src/themes/design-system.ts
 import {
   designCanvas,
+  resolveMotif,
   resolveTypeRoles,
   validateDesignColors
 } from "@json-to-office/shared";
 function resolvePptxDesignSystem(theme, width = 10, height = 7.5) {
   validateDesignColors(theme, theme.colors);
-  if (!theme.typography) return theme;
+  const motif = resolveMotif(theme.motif);
+  if (!theme.typography)
+    return motif === theme.motif ? theme : withMotif(theme, motif);
   const canvas = designCanvas("pptx", { width, height });
   const roles = resolveTypeRoles(theme, canvas, theme.defaults.fontSize);
   const styles = { ...theme.styles };
@@ -5276,7 +5298,13 @@ function resolvePptxDesignSystem(theme, width = 10, height = 7.5) {
       ...styles[key]
     };
   }
-  return { ...theme, styles };
+  return { ...withMotif(theme, motif), styles };
+}
+function withMotif(theme, motif) {
+  if (motif !== void 0) return { ...theme, motif };
+  const rest = { ...theme };
+  delete rest.motif;
+  return rest;
 }
 function designGrid(theme, width, height) {
   const space = theme.spacing?.canvas?.[designCanvas("pptx", { width, height })];
@@ -6816,6 +6844,10 @@ var PresentationGenerator = {
 // src/index.ts
 init_finalizePackage();
 init_warn();
+import {
+  getChartRequestStats,
+  resetChartRequestStats
+} from "@json-to-office/shared";
 
 // src/blueprints/index.ts
 import { existsSync, readdirSync, readFileSync } from "fs";
@@ -8792,6 +8824,7 @@ export {
   generateBufferWithWarnings,
   generateFromFile,
   generatePluginPresentationSchema,
+  getChartRequestStats,
   getPptxCoreVersion,
   getPptxTheme,
   hasPptxTheme,
@@ -8806,6 +8839,7 @@ export {
   pptxRendererStatuses,
   pptxThemes,
   preparePptxQualityDocument,
+  resetChartRequestStats,
   resolveComponentVersion3 as resolveComponentVersion,
   resolvePptxQualityProfile,
   toAuthoredPointer,