@json-to-office/core-pptx 5.4.0 → 6.1.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,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"}
+{"version":3,"file":"expandHighcharts.d.ts","sourceRoot":"","sources":["../../src/core/expandHighcharts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAcL,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.js

@@ -3937,12 +3937,11 @@ import {
   REMOTE_EXPORT_WARNING,
   chartFamilyResolver,
   chartPointsPerPixel,
-  chartRequestKey,
-  dedupeChartRequest,
-  limitChartRequest,
   postJsonToService,
+  recordChartCollected,
   recordChartRetry,
   resolveServiceUrl,
+  sendChartRequest,
   withChartFontFaceCss,
   withChartTypography
 } from "@json-to-office/shared";
@@ -4001,24 +4000,21 @@ async function expandList(components, path4, scope) {
 }
 async function expandOne(component, path4, scope) {
   const props = component.props;
-  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
-        ),
+  recordChartCollected();
+  const chart = await renderChart(
+    withChartFontFaces(
+      withThemeTypography(
+        withThemeColors(props, scope.theme, scope.warnings),
         scope.theme,
-        scope.chartFonts
+        scope.slideWidth,
+        scope.warnings
       ),
-      scope.services,
-      scope.warnings,
-      scope.chartCache
-    )
+      scope.theme,
+      scope.chartFonts
+    ),
+    scope.services,
+    scope.warnings,
+    scope.chartCache
   );
   void path4;
   return {
@@ -4063,14 +4059,16 @@ async function renderChart(config, services, warnings, cache) {
     // for callers that omit it.
     ...config.resources ? { resources: config.resources } : {}
   };
-  return dedupeChartRequest(
+  return sendChartRequest({
     cache,
-    chartRequestKey(serverUrl, requestBody),
-    () => postChart(serverUrl, requestBody, config, services)
-  );
+    serverUrl,
+    concurrency: services?.concurrency,
+    requestBody,
+    send: () => postChart(serverUrl, requestBody, config, services)
+  });
 }
 async function postChart(serverUrl, requestBody, config, services) {
-  const response = await postJsonToService({
+  const base64Data = await postJsonToService({
     url: serverUrl,
     path: "/export",
     body: requestBody,
@@ -4082,10 +4080,11 @@ async function postChart(serverUrl, requestBody, config, services) {
     // 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}`
+Cause: ${cause}`,
+    decode: (response) => response.text()
   });
   return {
-    dataUri: `data:image/png;base64,${await response.text()}`,
+    dataUri: `data:image/png;base64,${base64Data}`,
     widthPx: config.options.chart?.width ?? DEFAULT_CHART_WIDTH_PX,
     heightPx: config.options.chart?.height ?? 720
   };
@@ -4803,7 +4802,7 @@ var vermilion_pptx_theme_default = {
     },
     actionTitle: {
       type: "display",
-      color: "primary"
+      color: "accent"
     },
     keyTakeaways: {
       type: "label",
@@ -4832,7 +4831,7 @@ var vermilion_pptx_theme_default = {
     },
     cover: {
       type: "display",
-      color: "primary",
+      color: "accent",
       rule: {
         weightPt: 4,
         color: "accent"
@@ -5263,12 +5262,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 };
@@ -5295,7 +5297,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 })];