@json-to-office/core-docx 0.26.1 → 0.28.0

package/dist/plugin/createDocumentGenerator.d.ts

@@ -27,6 +27,12 @@ export interface DocumentGeneratorOptions {
     deterministic?: boolean;
     /** Default build timestamp for generated metadata. */
     generatedAt?: string | Date;
+    /**
+     * Directory that relative asset paths (image `path` props) resolve against.
+     * Per-call `options.baseDir` overrides it; defaults to `process.cwd()`
+     * when neither is set (#142).
+     */
+    baseDir?: string;
 }
 /**
  * Create a document generator with chainable component registration.

package/dist/plugin/createDocumentGenerator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createDocumentGenerator.d.ts","sourceRoot":"","sources":["../../src/plugin/createDocumentGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAI7C,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9E,OAAO,KAAK,EAEV,wBAAwB,EAOxB,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAmBjB;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,kEAAkE;IAClE,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC3C,4CAA4C;IAC5C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,oFAAoF;IACpF,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB;;;;OAIG;IACH,UAAU,CAAC,EAAE,2BAA2B,CAAC;IACzC,gFAAgF;IAChF,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sDAAsD;IACtD,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAqnBD;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,CAAC,SAAS,EAAE,CAAC,CAgBvC"}
+{"version":3,"file":"createDocumentGenerator.d.ts","sourceRoot":"","sources":["../../src/plugin/createDocumentGenerator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAK7C,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9E,OAAO,KAAK,EAEV,wBAAwB,EAOxB,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAmBjB;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,kEAAkE;IAClE,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC3C,4CAA4C;IAC5C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,oFAAoF;IACpF,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB;;;;OAIG;IACH,UAAU,CAAC,EAAE,2BAA2B,CAAC;IACzC,gFAAgF;IAChF,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sDAAsD;IACtD,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAyoBD;;GAEG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,wBAAwB,GAChC,wBAAwB,CAAC,SAAS,EAAE,CAAC,CAiBvC"}

package/dist/plugin/example/index.js

@@ -1915,6 +1915,9 @@ function resolveBuiltInTheme(themeName, options = {}) {
   return getThemeWithFallback(themeName);
 }
 
+// src/plugin/createDocumentGenerator.ts
+init_themes();
+
 // src/core/generationContext.ts
 import { applyExportMode, scopedThemeName } from "@json-to-office/shared";
 
@@ -1963,8 +1966,13 @@ function resolveThemeContext(documentIn, options = {}) {
     );
   }
   const document = documentIn.props === void 0 ? { ...documentIn, props: {} } : documentIn;
-  const baseThemeName = document.props.theme || "minimal";
-  let theme = resolveNamedTheme ? resolveNamedTheme(baseThemeName, warnings) : defaultNamedThemeLookup(baseThemeName, customThemes, warnings);
+  const authoredThemeName = document.props.theme || void 0;
+  const baseThemeName = authoredThemeName ?? "minimal";
+  let theme = resolveNamedTheme ? resolveNamedTheme(
+    baseThemeName,
+    warnings,
+    authoredThemeName !== void 0
+  ) : defaultNamedThemeLookup(baseThemeName, customThemes, warnings);
   const themeOverrides = document.props.themeOverrides;
   let themeName = baseThemeName;
   if (themeOverrides) {
@@ -2862,9 +2870,34 @@ import {
 } from "docx";
 
 // src/utils/imageUtils.ts
-init_widthUtils();
 import { readFileSync } from "fs";
 import probe from "probe-image-size";
+
+// src/utils/generationContext.ts
+import { AsyncLocalStorage } from "async_hooks";
+import { isAbsolute, resolve } from "path";
+var generationDateStorage = new AsyncLocalStorage();
+function runWithGenerationDate(date, callback) {
+  return generationDateStorage.run(date, callback);
+}
+function getGenerationDate() {
+  return generationDateStorage.getStore() ?? /* @__PURE__ */ new Date();
+}
+var baseDirStorage = new AsyncLocalStorage();
+function runWithBaseDir(baseDir, callback) {
+  return baseDir === void 0 ? callback() : baseDirStorage.run(resolve(baseDir), callback);
+}
+function getBaseDir() {
+  return baseDirStorage.getStore();
+}
+function resolveFromBaseDir(filePath) {
+  const base = baseDirStorage.getStore();
+  if (!base || isAbsolute(filePath)) return filePath;
+  return resolve(base, filePath);
+}
+
+// src/utils/imageUtils.ts
+init_widthUtils();
 import { ImageRun } from "docx";
 function parseWidthValue(width, availableWidthPx) {
   if (typeof width === "number") {
@@ -3040,7 +3073,7 @@ async function getImageBuffer(imagePath) {
   if (isValidUrl(imagePath)) {
     return await downloadImageFromUrl(imagePath);
   }
-  return { buffer: readFileSync(imagePath) };
+  return { buffer: readFileSync(resolveFromBaseDir(imagePath)) };
 }
 async function getImageDimensions(imagePath) {
   try {
@@ -4112,16 +4145,6 @@ function parseTextWithHyperlinks(text, baseStyle = {}, options = {}) {
   return runs;
 }
 
-// src/utils/generationContext.ts
-import { AsyncLocalStorage } from "async_hooks";
-var generationDateStorage = new AsyncLocalStorage();
-function runWithGenerationDate(date, callback) {
-  return generationDateStorage.run(date, callback);
-}
-function getGenerationDate() {
-  return generationDateStorage.getStore() ?? /* @__PURE__ */ new Date();
-}
-
 // src/utils/placeholderProcessor.ts
 function styledPlaceholderText(text, context) {
   return new TextRun2({
@@ -4468,8 +4491,9 @@ async function renderComponentWithCache(component, theme, themeName, context, by
   const themeHash = createThemeHash(theme);
   const contextKey = context?.section ? `${context.section.currentLayout}:${context.section.columnCount}` : "no-section";
   const generationDateKey = getGenerationDate().toISOString();
+  const baseDirKey = getBaseDir() ?? "";
   const childrenKey = "children" in component && component.children ? `:children:${JSON.stringify(component.children)}` : "";
-  const cacheKey = `component:${component.name}:${themeHash}:${contextKey}:${generationDateKey}:${componentProps}${childrenKey}`;
+  const cacheKey = `component:${component.name}:${themeHash}:${contextKey}:${generationDateKey}:${baseDirKey}:${componentProps}${childrenKey}`;
   const cached = await componentCache.get(cacheKey);
   if (cached) {
     return cached.result;
@@ -7164,14 +7188,14 @@ function visualToImageOptions(props) {
     ...props.keepLines !== void 0 && { keepLines: props.keepLines }
   };
 }
-async function rasterize(presentation, dpi, propsServerUrl, serviceConfig) {
+async function rasterize(presentation, dpi, propsServerUrl, serviceConfig, baseDir) {
   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 });
+    return serviceConfig.render({ presentation, dpi, baseDir });
   }
   const serverUrl = resolveServiceUrl(
     propsServerUrl,
@@ -7181,7 +7205,7 @@ async function rasterize(presentation, dpi, propsServerUrl, serviceConfig) {
   const response = await postJsonToService({
     url: serverUrl,
     path: "/rasterize",
-    body: { presentation, dpi },
+    body: { presentation, dpi, ...baseDir !== void 0 && { baseDir } },
     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\`.
@@ -7214,7 +7238,8 @@ async function renderVisualComponent(component, theme, themeName, context) {
     presentation,
     dpi,
     props.serverUrl,
-    serviceConfig
+    serviceConfig,
+    getBaseDir()
   );
   return await createImage(
     result.base64DataUri,
@@ -7308,10 +7333,13 @@ function coreProperties(metadata) {
 async function renderDocument(structure, layout, options) {
   return runWithGenerationDate(
     structure.metadata.date,
-    () => globalBookmarkRegistry.runScoped(
-      () => globalRevisionIdRegistry.runScoped(
-        () => globalNumberingRegistry.runScoped(
-          () => renderDocumentScoped(structure, layout, options)
+    () => runWithBaseDir(
+      options?.baseDir,
+      () => globalBookmarkRegistry.runScoped(
+        () => globalRevisionIdRegistry.runScoped(
+          () => globalNumberingRegistry.runScoped(
+            () => renderDocumentScoped(structure, layout, options)
+          )
         )
       )
     )
@@ -7837,7 +7865,7 @@ async function packageDocument(document, options) {
 // src/plugin/createDocumentGenerator.ts
 function createBuilderImpl(state) {
   const componentMap = new Map(state.components.map((c) => [c.name, c]));
-  function resolveDocumentTheme(themeName, warnings) {
+  function resolveDocumentTheme(themeName, warnings, authored) {
     if (state.customThemes) {
       if (state.customThemes[themeName]) {
         return state.customThemes[themeName];
@@ -7849,6 +7877,12 @@ function createBuilderImpl(state) {
         return state.customThemes[key];
       }
     }
+    if (authored && hasTheme(themeName)) {
+      return resolveBuiltInTheme(themeName, {
+        customThemes: state.customThemes,
+        warnings
+      });
+    }
     if (state.theme) {
       return state.theme;
     }
@@ -7995,7 +8029,8 @@ function createBuilderImpl(state) {
       fonts: state.fonts,
       validation: state.validation,
       deterministic: state.deterministic,
-      generatedAt: state.generatedAt
+      generatedAt: state.generatedAt,
+      baseDir: state.baseDir
     };
     return createBuilderImpl(
       newState
@@ -8094,7 +8129,8 @@ function createBuilderImpl(state) {
       const layout = applyLayout(structure.sections, modedTheme, themeName);
       const generatedDocument = await renderDocument(structure, layout, {
         services: state.services,
-        bypassCache: !state.enableCache
+        bypassCache: !state.enableCache,
+        baseDir: options?.baseDir ?? state.baseDir
       });
       const preservedDefinition = preserveSet ? {
         ...modedRoot,
@@ -8224,7 +8260,8 @@ function createDocumentGenerator(options) {
     fonts: options.fonts,
     validation: options.validation,
     deterministic: options.deterministic ?? true,
-    generatedAt: options.generatedAt
+    generatedAt: options.generatedAt,
+    baseDir: options.baseDir
   };
   return createBuilderImpl(initialState);
 }
@@ -8278,7 +8315,7 @@ var WeatherV2PropsSchema = Type3.Object(
   }
 );
 async function fetchWeather(city, units) {
-  await new Promise((resolve) => setTimeout(resolve, 100));
+  await new Promise((resolve2) => setTimeout(resolve2, 100));
   const mockData = {
     London: {
       temperature: units === "imperial" ? 59 : 15,
@@ -8311,7 +8348,7 @@ async function fetchWeather(city, units) {
   };
 }
 async function fetchForecast(city, units, days) {
-  await new Promise((resolve) => setTimeout(resolve, 50));
+  await new Promise((resolve2) => setTimeout(resolve2, 50));
   const dayNames = ["Mon", "Tue", "Wed", "Thu", "Fri"];
   const base = units === "imperial" ? 65 : 18;
   return dayNames.slice(0, days).map((day, i) => ({