@json-to-office/core-docx 0.15.0 → 0.17.0

package/dist/index.js

@@ -1954,7 +1954,8 @@ import {
   isTableComponent,
   isListComponent,
   isTocComponent,
-  isHighchartsComponent
+  isHighchartsComponent,
+  isVisualComponent
 } from "@json-to-office/shared-docx";
 
 // src/core/generator.ts
@@ -2050,6 +2051,9 @@ function resolveListProps(props, theme) {
 function resolveHighchartsProps(props, _theme) {
   return props;
 }
+function resolveVisualProps(props, _theme) {
+  return props;
+}
 function getCustomComponentDefaults(theme, componentName) {
   const defaults = getComponentDefaults(theme);
   return defaults?.[componentName] || {};
@@ -2079,7 +2083,8 @@ var RESOLVER_MAP = {
   section: resolveSectionProps,
   columns: resolveColumnsProps,
   list: resolveListProps,
-  highcharts: resolveHighchartsProps
+  highcharts: resolveHighchartsProps,
+  visual: resolveVisualProps
 };
 function resolveComponentDefaults(component, theme) {
   if (!component.props) return component;
@@ -4068,7 +4073,7 @@ async function clearComponentCache() {
   }
 }
 async function renderComponentWithCache(component, theme, themeName, context, bypassCache = false) {
-  const forceBypassForType = component.name === "toc" || component.name === "section" || componentHasRevision(component);
+  const forceBypassForType = component.name === "toc" || component.name === "section" || component.name === "visual" || componentHasRevision(component);
   if (!componentCache) {
     initializeComponentCache();
   }
@@ -6350,21 +6355,61 @@ function hasNodeBuiltins() {
   }
 }
 
+// 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(/\/+$/, "");
+}
+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 new Error(
+        `${opts.serviceLabel} timed out after ${timeoutMs}ms at ${opts.url}.`
+      );
+    }
+    const cause = error instanceof Error ? error.message : String(error);
+    throw new Error(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/highcharts.ts
 var DEFAULT_EXPORT_SERVER_URL = "http://localhost:7801";
-function getExportServerUrl(propsUrl, servicesUrl) {
-  const raw = propsUrl || servicesUrl || DEFAULT_EXPORT_SERVER_URL;
-  return raw.startsWith("http") ? raw : `http://${raw}`;
-}
 async function generateChart(config, servicesConfig) {
   if (!isNodeEnvironment()) {
     throw new Error(
       "Highcharts export server requires a Node.js environment. Chart generation is not available in browser environments."
     );
   }
-  const serverUrl = getExportServerUrl(
+  const serverUrl = resolveServiceUrl(
     config.serverUrl,
-    servicesConfig?.serverUrl
+    servicesConfig?.serverUrl,
+    DEFAULT_EXPORT_SERVER_URL
   );
   const requestBody = {
     infile: config.options,
@@ -6372,26 +6417,15 @@ async function generateChart(config, servicesConfig) {
     b64: true,
     scale: config.scale
   };
-  const resolvedHeaders = typeof servicesConfig?.headers === "function" ? await servicesConfig.headers(requestBody) : servicesConfig?.headers;
-  const headers = {
-    "Content-Type": "application/json",
-    ...resolvedHeaders
-  };
-  const response = await fetch(`${serverUrl}/export`, {
-    method: "POST",
-    headers,
-    body: JSON.stringify(requestBody)
-  }).catch((error) => {
-    throw 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)}`
-    );
+  const response = await postJsonToService({
+    url: serverUrl,
+    path: "/export",
+    body: requestBody,
+    headers: servicesConfig?.headers,
+    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}`
   });
-  if (!response.ok) {
-    throw new Error(
-      `Highcharts export server returned ${response.status}: ${response.statusText}`
-    );
-  }
   const base64Data = await response.text();
   const base64DataUri = `data:image/png;base64,${base64Data}`;
   const width = config.options.chart.width;
@@ -6425,6 +6459,116 @@ async function renderHighchartsComponent(component, theme, themeName, context) {
   return imageParagraphs;
 }
 
+// src/components/visual.ts
+import {
+  clampVisualDpi,
+  DEFAULT_VISUAL_DPI
+} from "@json-to-office/shared";
+var DEFAULT_RASTERIZE_SERVER_URL = "http://localhost:7802";
+var PIXELS_PER_INCH = 96;
+function buildVisualPresentation(props) {
+  const { canvas, elements } = props;
+  const presentationProps = {
+    slideWidth: canvas.width,
+    slideHeight: canvas.height
+  };
+  if (canvas.theme) presentationProps.theme = canvas.theme;
+  const slideProps = {};
+  if (canvas.background) slideProps.background = canvas.background;
+  return {
+    name: "pptx",
+    props: presentationProps,
+    children: [
+      {
+        name: "slide",
+        props: slideProps,
+        children: elements ?? []
+      }
+    ]
+  };
+}
+function defaultVisualWidthPx(props) {
+  return Math.round(props.canvas.width * PIXELS_PER_INCH);
+}
+function visualToImageOptions(props) {
+  return {
+    width: props.width ?? defaultVisualWidthPx(props),
+    ...props.height !== void 0 && { height: props.height },
+    alignment: props.alignment ?? "center",
+    ...props.caption !== void 0 && { caption: props.caption },
+    ...props.spacing !== void 0 && { spacing: props.spacing },
+    ...props.floating !== void 0 && { floating: props.floating },
+    ...props.keepNext !== void 0 && { keepNext: props.keepNext },
+    ...props.keepLines !== void 0 && { keepLines: props.keepLines }
+  };
+}
+function visualToImageProps(props, base64DataUri) {
+  return {
+    base64: base64DataUri,
+    ...visualToImageOptions(props),
+    ...props.alt !== void 0 && { alt: props.alt }
+  };
+}
+async function rasterize(presentation, dpi, propsServerUrl, serviceConfig) {
+  if (!isNodeEnvironment()) {
+    throw new Error(
+      "Visual rasterization requires a Node.js environment. It is not available in browser environments."
+    );
+  }
+  if (serviceConfig?.render) {
+    return serviceConfig.render({ presentation, dpi });
+  }
+  const serverUrl = resolveServiceUrl(
+    propsServerUrl,
+    serviceConfig?.serverUrl,
+    DEFAULT_RASTERIZE_SERVER_URL
+  );
+  const response = await postJsonToService({
+    url: serverUrl,
+    path: "/rasterize",
+    body: { presentation, dpi },
+    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}`
+  });
+  let result;
+  try {
+    result = await response.json();
+  } catch {
+    throw new Error(
+      "PPTX rasterization service returned a non-JSON response (expected { base64DataUri, width, height })."
+    );
+  }
+  if (!result?.base64DataUri) {
+    throw new Error(
+      "PPTX rasterization service returned a malformed response (missing base64DataUri)."
+    );
+  }
+  return result;
+}
+async function renderVisualComponent(component, theme, themeName, context) {
+  if (!isVisualComponent(component)) return [];
+  const props = component.props;
+  const serviceConfig = context?.services?.pptx;
+  const presentation = buildVisualPresentation(props);
+  const dpi = clampVisualDpi(
+    props.dpi ?? serviceConfig?.dpi ?? DEFAULT_VISUAL_DPI
+  );
+  const result = await rasterize(
+    presentation,
+    dpi,
+    props.serverUrl,
+    serviceConfig
+  );
+  return await createImage(
+    result.base64DataUri,
+    theme,
+    themeName,
+    visualToImageOptions(props)
+  );
+}
+
 // src/components/text-space-after.ts
 import { Type } from "@sinclair/typebox";
 
@@ -6581,7 +6725,7 @@ async function renderDocument(structure, layout, options) {
     }
   });
 }
-async function renderHeaderFooterComponents(components, theme, themeName, _context) {
+async function renderHeaderFooterComponents(components, theme, themeName, context) {
   if (!components || components.length === 0) {
     return [];
   }
@@ -6713,6 +6857,14 @@ async function renderHeaderFooterComponents(components, theme, themeName, _conte
     } else if (isTableComponent(component)) {
       const tables = await renderTableComponent(component, theme, themeName);
       elements.push(...tables);
+    } else if (isVisualComponent(component)) {
+      const visualEls = await renderVisualComponent(
+        component,
+        theme,
+        themeName,
+        context
+      );
+      elements.push(...visualEls);
     }
   }
   return elements;
@@ -6833,6 +6985,8 @@ async function renderComponent(component, theme, themeName, context) {
       themeName,
       context
     );
+  } else if (isVisualComponent(component)) {
+    return await renderVisualComponent(component, theme, themeName, context);
   } else if (isSectionComponent(component)) {
     return await renderSectionComponent(component, theme, themeName, context);
   }
@@ -7133,9 +7287,32 @@ async function generateDocumentWithCustomThemes(documentIn, customThemes, servic
   return renderedDocument;
 }
 async function generateDocumentFromJson(jsonConfig, options) {
+  const validation = options?.validation;
+  if (validation?.enabled !== false) {
+    const result = validateJsonComponent(jsonConfig, {
+      allowUnknownFields: validation?.allowUnknownFields
+    });
+    if (!result.valid) {
+      throw new JsonValidationError(
+        "Document validation failed",
+        result.errors
+      );
+    }
+  }
   let componentToConvert;
   if (typeof jsonConfig === "string") {
-    const parsed = parseJsonComponent(jsonConfig);
+    let parsed;
+    try {
+      parsed = JSON.parse(jsonConfig);
+    } catch (error) {
+      throw new JsonParsingError("Invalid JSON syntax", [
+        {
+          path: "",
+          message: error instanceof Error ? error.message : "Invalid JSON",
+          code: "JSON_PARSE_ERROR"
+        }
+      ]);
+    }
     if (!isReportComponent(parsed)) {
       throw new Error("Parsed JSON must be a docx component");
     }
@@ -7204,6 +7381,112 @@ var DocumentGenerator = {
   isReportComponentDefinition
 };
 
+// src/core/flattenVisuals.ts
+import {
+  clampVisualDpi as clampVisualDpi2,
+  DEFAULT_VISUAL_DPI as DEFAULT_VISUAL_DPI2
+} from "@json-to-office/shared";
+var DEFAULT_CONCURRENCY = 4;
+function createLimiter(max) {
+  let active = 0;
+  const queue = [];
+  const release = () => {
+    active--;
+    queue.shift()?.();
+  };
+  return async function limit(fn) {
+    if (active >= max)
+      await new Promise((resolve2) => queue.push(resolve2));
+    active++;
+    try {
+      return await fn();
+    } finally {
+      release();
+    }
+  };
+}
+async function flattenVisuals(doc, options) {
+  const ctx = {
+    rasterize: options.rasterize,
+    dpi: options.dpi,
+    limit: createLimiter(
+      Math.max(1, options.concurrency ?? DEFAULT_CONCURRENCY)
+    )
+  };
+  return await flattenNode(doc, ctx);
+}
+async function rasterizeVisual(obj, ctx) {
+  const props = obj.props;
+  const dpi = clampVisualDpi2(props.dpi ?? ctx.dpi ?? DEFAULT_VISUAL_DPI2);
+  const result = await ctx.limit(
+    () => ctx.rasterize({ presentation: buildVisualPresentation(props), dpi })
+  );
+  const image = {
+    name: "image",
+    props: visualToImageProps(props, result.base64DataUri)
+  };
+  if (obj.id !== void 0) image.id = obj.id;
+  if (obj.enabled !== void 0) image.enabled = obj.enabled;
+  return image;
+}
+async function flattenNode(node, ctx) {
+  if (Array.isArray(node)) {
+    return Promise.all(node.map((n) => flattenNode(n, ctx)));
+  }
+  if (!node || typeof node !== "object") return node;
+  const obj = node;
+  if (obj.name === "visual" && obj.props && obj.enabled !== false) {
+    return rasterizeVisual(obj, ctx);
+  }
+  const next = { ...obj };
+  if (Array.isArray(obj.children)) {
+    next.children = await flattenNode(obj.children, ctx);
+  }
+  if (obj.props && typeof obj.props === "object") {
+    const props = obj.props;
+    let propsChanged = false;
+    const nextProps = { ...props };
+    for (const key of ["header", "footer"]) {
+      if (Array.isArray(props[key])) {
+        nextProps[key] = await flattenNode(props[key], ctx);
+        propsChanged = true;
+      }
+    }
+    if (Array.isArray(props.columns)) {
+      nextProps.columns = await Promise.all(
+        props.columns.map((col) => flattenColumn(col, ctx))
+      );
+      propsChanged = true;
+    }
+    if (propsChanged) next.props = nextProps;
+  }
+  return next;
+}
+async function flattenColumn(col, ctx) {
+  if (!col || typeof col !== "object") return col;
+  const column = col;
+  const nextCol = { ...column };
+  const header = column.header;
+  if (header && typeof header === "object" && "content" in header) {
+    nextCol.header = {
+      ...header,
+      content: await flattenNode(header.content, ctx)
+    };
+  }
+  if (Array.isArray(column.cells)) {
+    nextCol.cells = await Promise.all(
+      column.cells.map(async (cell) => {
+        if (cell && typeof cell === "object" && "content" in cell) {
+          const c = cell;
+          return { ...c, content: await flattenNode(c.content, ctx) };
+        }
+        return cell;
+      })
+    );
+  }
+  return nextCol;
+}
+
 // src/utils/warningsDocument.ts
 function generateWarningsDocument(warnings) {
   if (!warnings || warnings.length === 0) {
@@ -7430,22 +7713,20 @@ import {
   ComponentValidationError as ComponentValidationError2,
   UnknownPreservedComponentError
 } from "@json-to-office/shared/plugin";
-function validateComponentProps(schema, props, componentName) {
+function validateComponentProps(schema, props, componentName, opts) {
   return validateCustomComponentProps(schema.propsSchema, props, {
-    clean: true,
-    applyDefaults: true,
+    clean: opts?.clean ?? true,
+    applyDefaults: opts?.applyDefaults ?? true,
     componentName
   });
 }
-function validateDocument(document, customComponents) {
+function validateDocument(document, customComponents, options) {
+  const knownCustomNames = new Set(customComponents.map((c) => c.name));
   const documentResult = validateDocumentUnified(document, {
-    clean: true,
-    applyDefaults: true
+    knownCustomNames,
+    allowUnknownFields: options?.allowUnknownFields
   });
-  if (!documentResult.valid) {
-    return { ...documentResult, success: false };
-  }
-  const errors = [];
+  const errors = [...documentResult.errors || []];
   function validateComponents(components, pathPrefix = "children") {
     components.forEach((componentData, index) => {
       const customComponent = customComponents.find(
@@ -7462,7 +7743,9 @@ function validateDocument(document, customComponents) {
       const validation = validateComponentProps(
         versionEntry,
         componentData.props,
-        customComponent.name
+        customComponent.name,
+        // Reject unknown custom props unless the caller allows them.
+        { clean: options?.allowUnknownFields === true }
       );
       if (!validation.valid && validation.errors) {
         const indexedErrors = validation.errors.map(
@@ -7827,10 +8110,26 @@ function createBuilderImpl(state) {
     try {
       const preserveSet = resolvePreserveSet(options);
       const internalDocument = document;
-      validateDocument(
-        internalDocument,
-        state.components
-      );
+      const vOpts = {
+        ...state.validation,
+        ...options?.validation
+      };
+      if (vOpts.enabled !== false) {
+        const result = validateDocument(
+          internalDocument,
+          state.components,
+          { allowUnknownFields: vOpts.allowUnknownFields }
+        );
+        if (!result.valid) {
+          throw new ComponentValidationError2(
+            (result.errors ?? []).map((e) => ({
+              path: e.path ?? "",
+              message: e.message
+            })),
+            internalDocument
+          );
+        }
+      }
       const baseThemeName = internalDocument.props.theme || "minimal";
       const docTheme = resolveDocumentTheme(baseThemeName);
       const warnings = [];
@@ -7924,21 +8223,21 @@ function createBuilderImpl(state) {
   function validate(document) {
     try {
       const internalDocument = document;
-      validateDocument(
+      const result = validateDocument(
         internalDocument,
         state.components
       );
-      return { valid: true };
-    } catch (error) {
-      if (error instanceof ComponentValidationError2) {
-        return {
-          valid: false,
-          errors: error.errors.map((e) => ({
-            path: e.path,
-            message: e.message
-          }))
-        };
+      if (result.valid) {
+        return { valid: true };
       }
+      return {
+        valid: false,
+        errors: (result.errors ?? []).map((e) => ({
+          path: e.path ?? "",
+          message: e.message
+        }))
+      };
+    } catch (error) {
       return {
         valid: false,
         errors: [
@@ -7988,7 +8287,8 @@ function createDocumentGenerator(options) {
     debug: options.debug ?? false,
     enableCache: options.enableCache ?? false,
     services: options.services,
-    fonts: options.fonts
+    fonts: options.fonts,
+    validation: options.validation
   };
   return createBuilderImpl(initialState);
 }
@@ -8023,6 +8323,7 @@ export {
   examples,
   exportPluginSchema,
   exportThemeToJson,
+  flattenVisuals,
   formatDate,
   formatWarningsText,
   generateAndSave,
@@ -8057,6 +8358,7 @@ export {
   isSectionComponent,
   isStatisticComponent,
   isTableComponent,
+  isVisualComponent,
   loadJsonExample,
   loadThemeFromFile,
   loadThemeFromJson,