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

package/dist/plugin/example/index.js

@@ -5870,7 +5870,7 @@ async function rasterizeVisualSlide(presentation, dpi, propsServerUrl, serviceCo
     serviceConfig?.serverUrl,
     DEFAULT_RASTERIZE_SERVER_URL
   );
-  const response = await postJsonToService({
+  const body = await postJsonToService({
     url: serverUrl,
     path: "/rasterize",
     body: {
@@ -5882,11 +5882,12 @@ async function rasterizeVisualSlide(presentation, dpi, propsServerUrl, serviceCo
     headers: serviceConfig?.headers,
     serviceLabel: "PPTX rasterization service",
     onUnreachable: (url, cause) => `PPTX rasterization service is not reachable at ${url}. Configure services.pptx with a \`render\` callback or a running \`serverUrl\`.
-Cause: ${cause}`
+Cause: ${cause}`,
+    decode: (response) => response.text()
   });
   let result;
   try {
-    result = await response.json();
+    result = JSON.parse(body);
   } catch {
     throw new Error(
       "PPTX rasterization service returned a non-JSON response (expected { base64DataUri, width, height })."
@@ -6074,9 +6075,9 @@ async function prerasterizeVisuals(root, serviceConfig, options = {}) {
     DEFAULT_RASTERIZE_SERVER_URL
   );
   const postBatch = async (chunk, fonts) => {
-    let response;
+    let body;
     try {
-      response = await postJsonToService2({
+      body = await postJsonToService2({
         url: serverUrl,
         path: "/rasterize/batch",
         body: {
@@ -6089,14 +6090,21 @@ async function prerasterizeVisuals(root, serviceConfig, options = {}) {
         },
         headers: serviceConfig?.headers,
         timeoutMs: BATCH_TIMEOUT_BASE_MS + BATCH_TIMEOUT_PER_SLIDE_MS * chunk.length,
+        // The per-visual fallback below IS this call's retry, and a better
+        // one: it degrades to smaller work instead of repeating the same
+        // large request. Retrying here first would spend three full batch
+        // timeouts — up to seventeen minutes on a 32-slide chunk — before
+        // the fallback that was going to run anyway gets its turn.
+        retries: 0,
         serviceLabel: "PPTX batch rasterization service",
-        onUnreachable: (url, cause) => `PPTX rasterization service is not reachable at ${url}. Cause: ${cause}`
+        onUnreachable: (url, cause) => `PPTX rasterization service is not reachable at ${url}. Cause: ${cause}`,
+        decode: (response) => response.text()
       });
     } catch (error) {
       return { applied: false, schemaRejected: isSchemaRejection(error) };
     }
     try {
-      if (applyBatchResponse(chunk, await response.json(), map)) {
+      if (applyBatchResponse(chunk, JSON.parse(body), map)) {
         return { applied: true };
       }
     } catch {
@@ -6203,7 +6211,7 @@ function containsComponent(root, name) {
 import {
   clampVisualDpi as clampVisualDpi2,
   DEFAULT_VISUAL_DPI as DEFAULT_VISUAL_DPI2,
-  limitChartRequest
+  recordChartCollected
 } from "@json-to-office/shared";
 import {
   isNativeVisualProps as isNativeVisualProps2
@@ -6222,9 +6230,8 @@ import {
   withChartTypography,
   resolveServiceUrl as resolveServiceUrl3,
   postJsonToService as postJsonToService3,
-  chartRequestKey,
-  dedupeChartRequest,
-  recordChartRetry
+  recordChartRetry,
+  sendChartRequest
 } from "@json-to-office/shared";
 var DEFAULT_EXPORT_SERVER_URL = "http://localhost:7801";
 function effectiveChartServerUrl(props, servicesConfig) {
@@ -6265,14 +6272,16 @@ async function generateChart(config, servicesConfig, warnings, cache) {
     // byte-identical to before for callers that omit it.
     ...config.resources ? { resources: config.resources } : {}
   };
-  return dedupeChartRequest(
+  return sendChartRequest({
     cache,
-    chartRequestKey(serverUrl, requestBody),
-    () => postChart(serverUrl, requestBody, config, servicesConfig)
-  );
+    serverUrl,
+    concurrency: servicesConfig?.concurrency,
+    requestBody,
+    send: () => postChart(serverUrl, requestBody, config, servicesConfig)
+  });
 }
 async function postChart(serverUrl, requestBody, config, servicesConfig) {
-  const response = await postJsonToService3({
+  const base64Data = await postJsonToService3({
     url: serverUrl,
     path: "/export",
     body: requestBody,
@@ -6282,16 +6291,13 @@ async function postChart(serverUrl, requestBody, config, servicesConfig) {
     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}`
+Cause: ${cause}`,
+    decode: (response) => response.text()
   });
-  const base64Data = await response.text();
-  const base64DataUri = `data:image/png;base64,${base64Data}`;
-  const width = config.options.chart.width;
-  const height = config.options.chart.height;
   return {
-    base64DataUri,
-    width,
-    height
+    base64DataUri: `data:image/png;base64,${base64Data}`,
+    width: config.options.chart.width,
+    height: config.options.chart.height
   };
 }
 function toChartColor(value, theme) {
@@ -6419,21 +6425,16 @@ async function desugarExternals(document, options) {
       });
     }
     if (node.name === "highcharts") {
-      const props = node.props;
-      const chartConfig = options.services?.highcharts;
+      recordChartCollected();
       return withNodeIdentity(node, {
         name: "image",
-        props: await limitChartRequest(
-          effectiveChartServerUrl(props, chartConfig),
-          chartConfig?.concurrency,
-          () => renderChartToImageProps(
-            props,
-            options.theme,
-            chartConfig,
-            options.chartFonts,
-            options.warnings,
-            chartCache
-          )
+        props: await renderChartToImageProps(
+          node.props,
+          options.theme,
+          options.services?.highcharts,
+          options.chartFonts,
+          options.warnings,
+          chartCache
         )
       });
     }