@json-to-office/jto-ops 7.2.0 → 7.6.2

package/dist/index.js

@@ -926,6 +926,22 @@ var UNSAFE_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototyp
 function safeThemeKey(name) {
   return name && !UNSAFE_KEYS.has(name) ? name : "custom";
 }
+function anchorThemeFontFiles(theme, themeFile) {
+  const registry = theme?.fontRegistry;
+  if (!Array.isArray(registry)) return theme;
+  const themeDir = path5.dirname(path5.resolve(process.cwd(), themeFile));
+  return {
+    ...theme,
+    fontRegistry: registry.map(
+      (entry) => Array.isArray(entry?.sources) ? {
+        ...entry,
+        sources: entry.sources.map(
+          (source) => source?.kind === "file" && typeof source.path === "string" && !path5.isAbsolute(source.path) ? { ...source, path: path5.resolve(themeDir, source.path) } : source
+        )
+      } : entry
+    )
+  };
+}
 var CLI_THEME_KEY = "jto-cli-theme";
 function withRequestedTheme(document, theme, customThemes) {
   if (!theme || typeof document !== "object" || document === null) {
@@ -1323,6 +1339,7 @@ var DocxFormatAdapter = class {
         );
       }
       if (fileTheme) {
+        fileTheme = anchorThemeFontFiles(fileTheme, options.themePath);
         registry[safeThemeKey(fileTheme.name)] = fileTheme;
       }
     }
@@ -1337,7 +1354,10 @@ var DocxFormatAdapter = class {
       if (options.theme.endsWith(".json") && fs5.existsSync(options.theme)) {
         try {
           return {
-            requested: await core.loadThemeFromFile(options.theme),
+            requested: anchorThemeFontFiles(
+              await core.loadThemeFromFile(options.theme),
+              options.theme
+            ),
             customThemes,
             label: options.theme
           };
@@ -1717,6 +1737,7 @@ var PptxFormatAdapter = class {
         );
       }
       if (fileTheme) {
+        fileTheme = anchorThemeFontFiles(fileTheme, options.themePath);
         registry[safeThemeKey(fileTheme.name)] = fileTheme;
       }
     }
@@ -1735,7 +1756,7 @@ var PptxFormatAdapter = class {
             "utf-8"
           );
           return {
-            requested: JSON.parse(content),
+            requested: anchorThemeFontFiles(JSON.parse(content), options.theme),
             customThemes,
             label: options.theme
           };
@@ -4181,10 +4202,8 @@ function conditions(props, children, theme, font, canvas) {
     const page = isRecord2(props2.page) ? props2.page : {};
     return { ...child, props: { ...props2, page: { ...page, size: canvas } } };
   });
-  const chart = JSON.stringify(sections).includes('"name":"chart"');
   return {
     name: "docx",
-    ...chart && { renderer: "office-open" },
     props: {
       ...props,
       theme,