@json-to-office/jto 0.34.0 → 0.35.0

package/dist/cli.js

@@ -221,7 +221,9 @@ import {
   collectFontNamesFromPptx,
   POPULAR_GOOGLE_FONTS,
   getUpstreamOverride,
-  isSafeFont
+  isSafeFont,
+  documentFontRegistry,
+  themeFontRegistry
 } from "@json-to-office/shared";
 function collectReferencedNames(config2, customThemes, adapterName) {
   const collect = adapterName === "docx" ? collectFontNamesFromDocx : collectFontNamesFromPptx;
@@ -281,6 +283,14 @@ function collectReferencedItalic(config2, customThemes) {
   }
   return found;
 }
+function toSupplementalWarnings(warnings) {
+  return warnings.map(({ code, message }) => ({
+    component: "fontRegistry",
+    message,
+    severity: "info",
+    context: { code }
+  }));
+}
 function autoGoogleFontEntries(names, skipFamilies, referencedWeights, referencedItalic, warnings) {
   const googleByLower = new Map(
     POPULAR_GOOGLE_FONTS.map((f) => [f.family.toLowerCase(), f])
@@ -316,9 +326,10 @@ function autoGoogleFontEntries(names, skipFamilies, referencedWeights, reference
       let selected = variants;
       if (selected.length === 0) {
         const missing = [...overrideWantedSet].filter((w) => !override.variants.some((v) => v.weight === w)).sort((a, b) => a - b);
-        warnings?.push(
-          `FONT_WEIGHT_NOT_IN_OVERRIDE: family "${match.family}" \u2014 referenced weight(s) ${missing.join(", ")} not in upstream override (has ${override.variants.map((v) => v.weight).filter((w, i, a) => a.indexOf(w) === i).sort((a, b) => a - b).join(", ")}). Fetching all override variants as a fallback.`
-        );
+        warnings?.push({
+          code: "FONT_WEIGHT_NOT_IN_OVERRIDE",
+          message: `FONT_WEIGHT_NOT_IN_OVERRIDE: family "${match.family}" \u2014 referenced weight(s) ${missing.join(", ")} not in upstream override (has ${override.variants.map((v) => v.weight).filter((w, i, a) => a.indexOf(w) === i).sort((a, b) => a - b).join(", ")}). Fetching all override variants as a fallback.`
+        });
         selected = override.variants;
       }
       entries.push({
@@ -396,8 +407,13 @@ var init_generator = __esm({
         const fontMode = rawMode === "substitute" || rawMode === "custom" ? rawMode : void 0;
         const rawSub = callerFonts?.substitution;
         const fontSubstitution = rawSub && typeof rawSub === "object" && !Array.isArray(rawSub) ? rawSub : void 0;
+        const declaredFamilies = [
+          ...callerExtraEntries,
+          ...documentFontRegistry(config2),
+          ...Object.values(customThemes ?? {}).flatMap((t) => themeFontRegistry(t))
+        ];
         const callerFamilies = new Set(
-          callerExtraEntries.map((e) => e.family.toLowerCase())
+          declaredFamilies.map((e) => e.family.toLowerCase())
         );
         const overrideWarnings = [];
         const autoEntries = fontMode === "substitute" ? [] : autoGoogleFontEntries(
@@ -415,13 +431,17 @@ var init_generator = __esm({
           for (const e of callerExtraEntries) {
             const lower = e.family.toLowerCase();
             if (googleFamiliesLower.has(lower) && referencedNames.has(e.family)) {
-              overrideWarnings.push(
-                `[FONT_OVERRIDE_LOCAL] ${e.family}: caller-supplied source used; Google Fonts auto-fetch skipped for this family.`
-              );
+              overrideWarnings.push({
+                code: "FONT_OVERRIDE_LOCAL",
+                message: `[FONT_OVERRIDE_LOCAL] ${e.family}: caller-supplied source used; Google Fonts auto-fetch skipped for this family.`
+              });
             }
           }
         }
-        const bypassCache = options?.bypassCache === true || extraEntries.length > 0;
+        const declaresRegistry = documentFontRegistry(config2).length > 0 || Object.values(customThemes ?? {}).some(
+          (t) => themeFontRegistry(t).length > 0
+        );
+        const bypassCache = options?.bypassCache === true || extraEntries.length > 0 || declaresRegistry;
         const baseDir = typeof options?.baseDir === "string" ? options.baseDir : void 0;
         const cacheKeyData = {
           config: config2,
@@ -435,15 +455,17 @@ var init_generator = __esm({
         const cacheKey = this.cacheService.generateCacheKey(cacheKeyData);
         const hasDynamicContent = this.cacheService.hasDynamicContent(config2);
         if (!bypassCache && !hasDynamicContent) {
-          const cachedBuffer = this.cacheService.get(cacheKey);
-          if (cachedBuffer) {
+          const cached = this.cacheService.get(cacheKey);
+          if (cached) {
             logger.info("Served from cache", { title: config2.metadata?.title });
             return {
               filename: `${config2.metadata?.title || this.adapter.label}${this.adapter.extension}`,
               fileId: Date.now().toString(),
-              buffer: cachedBuffer,
+              buffer: cached.buffer,
+              // Warnings ride along with the bytes: a cache hit describes the same
+              // document, so it must report the same font problems.
               cached: true,
-              warnings: null
+              warnings: cached.warnings
             };
           }
         }
@@ -453,7 +475,7 @@ var init_generator = __esm({
         const registry = PluginRegistry.getInstance();
         let buffer;
         const resolvedFonts = [];
-        const needsFontOpts = extraEntries.length > 0 || fontMode !== void 0 || fontSubstitution !== void 0 || callerStrict !== void 0;
+        const needsFontOpts = extraEntries.length > 0 || declaresRegistry || fontMode !== void 0 || fontSubstitution !== void 0 || callerStrict !== void 0;
         const fontOpts = needsFontOpts ? {
           ...extraEntries.length > 0 && { extraEntries },
           ...fontMode && { mode: fontMode },
@@ -463,24 +485,24 @@ var init_generator = __esm({
             resolvedFonts.push(...r);
           }
         } : void 0;
+        const coreWarnings = [];
         if (registry.hasPlugins()) {
           const plugins = registry.getPlugins();
           const generator = await this.adapter.createGenerator(plugins, {
             customThemes,
             fonts: fontOpts,
-            baseDir
+            baseDir,
+            warnings: coreWarnings
           });
           buffer = await generator.generateBuffer(config2);
         } else {
           buffer = await this.adapter.generateBuffer(config2, {
             customThemes,
             fonts: fontOpts,
-            baseDir
+            baseDir,
+            warnings: coreWarnings
           });
         }
-        this.cacheService.set(cacheKey, buffer, config2, {
-          bypassCache: bypassCache || hasDynamicContent
-        });
         const CANONICAL_WEIGHTS = /* @__PURE__ */ new Set([
           100,
           200,
@@ -495,12 +517,7 @@ var init_generator = __esm({
         const nonCanonical = [...referencedWeights].filter(
           (w) => !CANONICAL_WEIGHTS.has(w)
         );
-        const extraWarnings = overrideWarnings.map((message) => ({
-          component: "fontRegistry",
-          message,
-          severity: "info",
-          context: { code: "FONT_OVERRIDE_LOCAL" }
-        }));
+        const extraWarnings = toSupplementalWarnings(overrideWarnings);
         for (const w of nonCanonical) {
           extraWarnings.push({
             component: "fontRegistry",
@@ -509,12 +526,19 @@ var init_generator = __esm({
             context: { code: "FONT_NONCANONICAL_WEIGHT" }
           });
         }
+        const allWarnings = [...coreWarnings, ...extraWarnings];
+        this.cacheService.set(
+          cacheKey,
+          { buffer, warnings: allWarnings.length > 0 ? allWarnings : null },
+          config2,
+          { bypassCache: bypassCache || hasDynamicContent }
+        );
         return {
           filename: `${config2.metadata?.title || this.adapter.label}${this.adapter.extension}`,
           fileId: Date.now().toString(),
           buffer,
           cached: false,
-          warnings: extraWarnings.length > 0 ? extraWarnings : null,
+          warnings: allWarnings.length > 0 ? allWarnings : null,
           resolvedFonts
         };
       }
@@ -559,7 +583,9 @@ var init_cache = __esm({
         this.cache = new LRUCache({
           max: config.cache.maxItems,
           maxSize: maxSizeBytes,
-          sizeCalculation: (value) => value.length,
+          // Must stay the buffer's byte length: lru-cache rejects a zero or
+          // undefined size when `maxSize` is set.
+          sizeCalculation: (value) => value.buffer.length,
           ttl: config.cache.ttlSeconds * 1e3,
           dispose: (_value, _key, reason) => {
             if (reason === "evict" || reason === "delete") {
@@ -641,404 +667,12 @@ var init_cache = __esm({
   }
 });
 
-// src/server/services/font-staging/noop-stager.ts
-var NoopFontStager;
-var init_noop_stager = __esm({
-  "src/server/services/font-staging/noop-stager.ts"() {
-    "use strict";
-    init_esm_shims();
-    NoopFontStager = class {
-      async stage() {
-        return {
-          envOverrides: {},
-          cleanup: async () => {
-          }
-        };
-      }
-    };
-  }
-});
-
-// src/server/services/font-staging/types.ts
-function nextStagingId() {
-  counter += 1;
-  return `${process.pid}-${counter}`;
-}
-function safeFilenamePart(s) {
-  return s.replace(/[^a-zA-Z0-9._-]/g, "_").slice(0, 48);
-}
-var counter;
-var init_types = __esm({
-  "src/server/services/font-staging/types.ts"() {
-    "use strict";
-    init_esm_shims();
-    counter = 0;
-  }
-});
-
-// src/server/services/font-staging/fontconfig-stager.ts
-import { promises as fs } from "fs";
-import path2 from "path";
-import {
-  synthesizeFamilyName,
-  rewriteFontFamilyName
-} from "@json-to-office/shared";
-function escapeXml(s) {
-  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
-}
-var SYSTEM_FONTS_CONF_CANDIDATES, FontconfigStager;
-var init_fontconfig_stager = __esm({
-  "src/server/services/font-staging/fontconfig-stager.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_types();
-    SYSTEM_FONTS_CONF_CANDIDATES = [
-      "/etc/fonts/fonts.conf",
-      "/opt/homebrew/etc/fonts/fonts.conf",
-      "/usr/local/etc/fonts/fonts.conf"
-    ];
-    FontconfigStager = class {
-      async stage(fonts, tempDir) {
-        const id = nextStagingId();
-        const fontsDir = path2.join(tempDir, "fonts");
-        await fs.mkdir(fontsDir, { recursive: true });
-        let serial = 0;
-        for (const r of fonts) {
-          if (r.sources.length === 0) continue;
-          for (const s of r.sources) {
-            serial += 1;
-            const suffix = s.italic ? "i" : "r";
-            const synth = synthesizeFamilyName(r.family, s.weight, s.italic);
-            const data = synth.family === r.family ? s.data : rewriteFontFamilyName(s.data, synth.family);
-            const name = `${safeFilenamePart(synth.family)}-${s.weight}${suffix}-${id}-${serial}.ttf`;
-            await fs.writeFile(path2.join(fontsDir, name), data);
-          }
-        }
-        await fs.chmod(fontsDir, 365).catch(() => {
-        });
-        const includeLines = await this.pickSystemIncludes();
-        const cacheDir = path2.join(tempDir, "fc-cache");
-        await fs.mkdir(cacheDir, { recursive: true });
-        const configPath = path2.join(tempDir, "fontconfig.xml");
-        const configXml = [
-          '<?xml version="1.0"?>',
-          '<!DOCTYPE fontconfig SYSTEM "fonts.dtd">',
-          "<fontconfig>",
-          `  <dir>${escapeXml(fontsDir)}</dir>`,
-          `  <cachedir>${escapeXml(cacheDir)}</cachedir>`,
-          ...includeLines,
-          "</fontconfig>",
-          ""
-        ].join("\n");
-        await fs.writeFile(configPath, configXml, "utf8");
-        return {
-          envOverrides: {
-            FONTCONFIG_FILE: configPath,
-            XDG_CACHE_HOME: cacheDir
-          },
-          cleanup: async () => {
-          }
-        };
-      }
-      async pickSystemIncludes() {
-        for (const candidate of SYSTEM_FONTS_CONF_CANDIDATES) {
-          try {
-            await fs.access(candidate);
-            return [
-              `  <include ignore_missing="yes">${escapeXml(candidate)}</include>`
-            ];
-          } catch {
-          }
-        }
-        return [`  <include ignore_missing="yes">/etc/fonts/fonts.conf</include>`];
-      }
-    };
-  }
-});
-
-// src/server/services/font-staging/windows-stager.ts
-import { promises as fs2 } from "fs";
-import path3 from "path";
-import {
-  synthesizeFamilyName as synthesizeFamilyName2,
-  rewriteFontFamilyName as rewriteFontFamilyName2
-} from "@json-to-office/shared";
-async function getGdiBindings() {
-  if (cachedBindings) return cachedBindings;
-  const koffi = await import("koffi");
-  const mod = koffi.default ?? koffi;
-  const gdi32 = mod.load("gdi32.dll");
-  cachedBindings = {
-    addFont: gdi32.func("int __stdcall AddFontResourceW(str16)"),
-    removeFont: gdi32.func("bool __stdcall RemoveFontResourceW(str16)")
-  };
-  return cachedBindings;
-}
-var cachedBindings, WindowsFontStager;
-var init_windows_stager = __esm({
-  "src/server/services/font-staging/windows-stager.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_types();
-    cachedBindings = null;
-    WindowsFontStager = class {
-      async stage(fonts, tempDir) {
-        const id = nextStagingId();
-        const fontsDir = path3.join(tempDir, "fonts");
-        await fs2.mkdir(fontsDir, { recursive: true });
-        const stagedPaths = [];
-        let serial = 0;
-        for (const r of fonts) {
-          if (r.sources.length === 0) continue;
-          for (const s of r.sources) {
-            serial += 1;
-            const suffix = s.italic ? "i" : "r";
-            const synth = synthesizeFamilyName2(r.family, s.weight, s.italic);
-            const data = synth.family === r.family ? s.data : rewriteFontFamilyName2(s.data, synth.family);
-            const name = `${safeFilenamePart(synth.family)}-${s.weight}${suffix}-${id}-${serial}.ttf`;
-            const fullPath = path3.join(fontsDir, name);
-            await fs2.writeFile(fullPath, data);
-            stagedPaths.push(fullPath);
-          }
-        }
-        if (stagedPaths.length === 0) {
-          return { envOverrides: {}, cleanup: async () => {
-          } };
-        }
-        const { addFont, removeFont } = await getGdiBindings();
-        const registered = [];
-        for (const p of stagedPaths) {
-          const added = addFont(p);
-          if (added > 0) registered.push(p);
-        }
-        let cleaned = false;
-        return {
-          envOverrides: {
-            // Force GDI backend so the freshly-registered fonts are visible.
-            // Skia on Windows uses DirectWrite which does not reliably see
-            // fonts added via AddFontResourceW.
-            SAL_DISABLE_SKIA: "1"
-          },
-          cleanup: async () => {
-            if (cleaned) return;
-            cleaned = true;
-            for (const p of registered) {
-              try {
-                removeFont(p);
-              } catch {
-              }
-            }
-          }
-        };
-      }
-    };
-  }
-});
-
-// src/server/services/font-staging/macos-stager.ts
-import { promises as fs3 } from "fs";
-import path4 from "path";
-import {
-  synthesizeFamilyName as synthesizeFamilyName3,
-  rewriteFontFamilyName as rewriteFontFamilyName3
-} from "@json-to-office/shared";
-var PYTHON_MACRO, REGISTRY_MOD_XCU, MacOSCoreTextStager;
-var init_macos_stager = __esm({
-  "src/server/services/font-staging/macos-stager.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_types();
-    PYTHON_MACRO = `# Auto-generated by @json-to-office/jto. Runs inside soffice on OnStartApp
-# to make staged fonts visible to LibreOffice's font enumeration. macOS 26
-# blocks Session/Persistent CT registration for unsigned callers, but
-# Process scope still works from inside the target process \u2014 which is
-# exactly where this macro runs.
-import os
-import sys
-import ctypes
-import ctypes.util
-
-
-def _log(msg):
-    # soffice swallows Python stdout in headless mode; stderr surfaces to
-    # the parent's pipe. The stager doesn't read this today but the
-    # converter logs stderr on failure, which is how we'll debug.
-    sys.stderr.write("[jto-font-register] " + msg + "\\n")
-
-
-def register(*_args):
-    paths_env = os.environ.get("JTO_FONT_PATHS", "")
-    if not paths_env:
-        return
-    try:
-        cf = ctypes.CDLL(ctypes.util.find_library("CoreFoundation"))
-        ct = ctypes.CDLL(ctypes.util.find_library("CoreText"))
-    except Exception as e:
-        _log("failed to load CoreFoundation/CoreText: " + repr(e))
-        return
-    cf.CFURLCreateFromFileSystemRepresentation.argtypes = [
-        ctypes.c_void_p, ctypes.c_char_p, ctypes.c_long, ctypes.c_bool,
-    ]
-    cf.CFURLCreateFromFileSystemRepresentation.restype = ctypes.c_void_p
-    cf.CFRelease.argtypes = [ctypes.c_void_p]
-    ct.CTFontManagerRegisterFontsForURL.argtypes = [
-        ctypes.c_void_p, ctypes.c_uint32, ctypes.c_void_p,
-    ]
-    ct.CTFontManagerRegisterFontsForURL.restype = ctypes.c_bool
-
-    kCTFontManagerScopeProcess = 1
-    registered = 0
-    for p in paths_env.split(os.pathsep):
-        if not p:
-            continue
-        try:
-            b = p.encode("utf-8")
-            url = cf.CFURLCreateFromFileSystemRepresentation(
-                None, b, len(b), False
-            )
-            if not url:
-                _log("CFURL failed for " + p)
-                continue
-            ok = ct.CTFontManagerRegisterFontsForURL(
-                url, kCTFontManagerScopeProcess, None
-            )
-            cf.CFRelease(url)
-            if ok:
-                registered += 1
-            else:
-                _log("CT register returned false for " + p)
-        except Exception as e:
-            _log("exception registering " + p + ": " + repr(e))
-    _log("registered " + str(registered) + " font(s) at Process scope")
-
-
-# Expose under "register" (event-binding URL) and module-level run so
-# command-line vnd.sun.star.script invocation works either way.
-g_exportedScripts = (register,)
-`;
-    REGISTRY_MOD_XCU = `<?xml version="1.0" encoding="UTF-8"?>
-<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <item oor:path="/org.openoffice.Office.Events/ApplicationEvents/Bindings">
-    <node oor:name="OnStartApp" oor:op="replace">
-      <prop oor:name="BindingURL" oor:type="xs:string">
-        <value>vnd.sun.star.script:JtoFontRegister.py$register?language=Python&amp;location=user</value>
-      </prop>
-    </node>
-  </item>
-  <item oor:path="/org.openoffice.Office.Common/Security/Scripting">
-    <prop oor:name="MacroSecurityLevel" oor:op="fuse">
-      <value>0</value>
-    </prop>
-  </item>
-</oor:items>
-`;
-    MacOSCoreTextStager = class {
-      async stage(fonts, tempDir) {
-        const embeddable = fonts.filter((r) => r.sources.length > 0);
-        if (embeddable.length === 0) {
-          return { envOverrides: {}, cleanup: async () => {
-          } };
-        }
-        const fontsDir = path4.join(tempDir, "fonts");
-        await fs3.mkdir(fontsDir, { recursive: true });
-        const id = nextStagingId();
-        const fontPaths = [];
-        const staged = [];
-        let serial = 0;
-        for (const r of embeddable) {
-          for (const s of r.sources) {
-            serial += 1;
-            const suffix = s.italic ? "i" : "r";
-            const synth = synthesizeFamilyName3(r.family, s.weight, s.italic);
-            const data = synth.family === r.family ? s.data : rewriteFontFamilyName3(s.data, synth.family);
-            const name = `${safeFilenamePart(synth.family)}-${s.weight}${suffix}-${id}-${serial}.ttf`;
-            const full = path4.join(fontsDir, name);
-            await fs3.writeFile(full, data);
-            fontPaths.push(full);
-            staged.push({
-              family: synth.family,
-              weight: s.weight,
-              italic: s.italic,
-              path: full
-            });
-          }
-        }
-        if (process.env.JTO_DEBUG_FONTS === "1") {
-          console.log(
-            "[jto macos-stager] staged " + staged.length + " font(s) for CT Process-scope registration; JTO_FONT_PATHS has " + fontPaths.length + " entries\n" + staged.map(
-              (s) => `  ${s.family} (w=${s.weight}${s.italic ? " italic" : ""}) \u2192 ${path4.basename(s.path)}`
-            ).join("\n")
-          );
-        }
-        const profileUser = path4.join(tempDir, "user-profile", "user");
-        const scriptsDir = path4.join(profileUser, "Scripts", "python");
-        await fs3.mkdir(scriptsDir, { recursive: true });
-        await fs3.writeFile(
-          path4.join(scriptsDir, "JtoFontRegister.py"),
-          PYTHON_MACRO
-        );
-        await fs3.writeFile(
-          path4.join(profileUser, "registrymodifications.xcu"),
-          REGISTRY_MOD_XCU
-        );
-        return {
-          envOverrides: {
-            // Colon-separated list of staged TTF paths (`:` matches Python's
-            // `os.pathsep` on macOS). The macro reads this at OnStartApp.
-            JTO_FONT_PATHS: fontPaths.join(":"),
-            // Force LibreOffice's Core Graphics backend. Skia on macOS can
-            // skip Core Text's freshly-registered fonts in some builds.
-            SAL_DISABLE_SKIA: "1"
-          },
-          cleanup: async () => {
-          }
-        };
-      }
-    };
-  }
-});
-
-// src/server/services/font-staging/index.ts
-function getFontStager(platform = process.platform) {
-  const hit = cached.get(platform);
-  if (hit) return hit;
-  let stager;
-  switch (platform) {
-    case "win32":
-      stager = new WindowsFontStager();
-      break;
-    case "darwin":
-      stager = new MacOSCoreTextStager();
-      break;
-    case "linux":
-    case "freebsd":
-    case "openbsd":
-      stager = new FontconfigStager();
-      break;
-    default:
-      stager = new NoopFontStager();
-  }
-  cached.set(platform, stager);
-  return stager;
-}
-var cached;
-var init_font_staging = __esm({
-  "src/server/services/font-staging/index.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_noop_stager();
-    init_fontconfig_stager();
-    init_windows_stager();
-    init_macos_stager();
-    cached = /* @__PURE__ */ new Map();
-  }
-});
-
 // src/server/services/libreoffice-converter.ts
 import { execFile } from "child_process";
-import { promises as fs4 } from "fs";
+import { promises as fs } from "fs";
 import os from "os";
-import path5 from "path";
+import path2 from "path";
+import { getFontStager } from "@json-to-office/jto-cli";
 function executeFile(binary, args, timeoutMs, envOverrides) {
   return new Promise((resolve2, reject) => {
     execFile(
@@ -1070,7 +704,7 @@ function toErrorText(value) {
   return String(value);
 }
 function sanitizeBaseName(originalName) {
-  const parsed = path5.parse(originalName || "document");
+  const parsed = path2.parse(originalName || "document");
   return (parsed.name || "document").replace(/[^a-zA-Z0-9._-]/g, "_") || "document";
 }
 var DEFAULT_CONVERSION_TIMEOUT_MS, BINARY_PROBE_TIMEOUT_MS, MAX_EXEC_BUFFER_BYTES, LibreOfficeError, LibreOfficeBinaryNotFoundError, LibreOfficeTimeoutError, LibreOfficeConversionError, LibreOfficeOutputNotFoundError, LibreOfficeConverterService;
@@ -1079,7 +713,6 @@ var init_libreoffice_converter = __esm({
     "use strict";
     init_esm_shims();
     init_config();
-    init_font_staging();
     DEFAULT_CONVERSION_TIMEOUT_MS = 3e4;
     BINARY_PROBE_TIMEOUT_MS = 5e3;
     MAX_EXEC_BUFFER_BYTES = 20 * 1024 * 1024;
@@ -1144,20 +777,20 @@ var init_libreoffice_converter = __esm({
           throw new LibreOfficeConversionError("Input file is empty");
         }
         const binaryPath = await this.resolveBinaryPath();
-        const tempDir = await fs4.mkdtemp(
-          path5.join(os.tmpdir(), "jto-libreoffice-")
+        const tempDir = await fs.mkdtemp(
+          path2.join(os.tmpdir(), "jto-libreoffice-")
         );
         const outputBaseName = sanitizeBaseName(originalName);
         const ext = this.format === "pptx" ? ".pptx" : ".docx";
-        const inputPath = path5.join(tempDir, `${outputBaseName}${ext}`);
-        const pdfPath = path5.join(tempDir, `${outputBaseName}.pdf`);
+        const inputPath = path2.join(tempDir, `${outputBaseName}${ext}`);
+        const pdfPath = path2.join(tempDir, `${outputBaseName}.pdf`);
         const stager = getFontStager();
         const fontsToStage = (resolvedFonts ?? []).filter(
           (r) => r.sources.length > 0
         );
         const stageHandle = fontsToStage.length > 0 ? await stager.stage(fontsToStage, tempDir) : null;
         try {
-          await fs4.writeFile(inputPath, input);
+          await fs.writeFile(inputPath, input);
           const filterName = this.format === "pptx" ? "impress_pdf_Export" : "writer_pdf_Export";
           await this.runConversion(
             binaryPath,
@@ -1167,7 +800,7 @@ var init_libreoffice_converter = __esm({
             stageHandle?.envOverrides
           );
           try {
-            return await fs4.readFile(pdfPath);
+            return await fs.readFile(pdfPath);
           } catch (error) {
             if (error.code === "ENOENT") {
               throw new LibreOfficeOutputNotFoundError(pdfPath);
@@ -1179,7 +812,7 @@ var init_libreoffice_converter = __esm({
             await stageHandle.cleanup().catch(() => {
             });
           }
-          await fs4.rm(tempDir, { recursive: true, force: true }).catch(() => {
+          await fs.rm(tempDir, { recursive: true, force: true }).catch(() => {
           });
         }
       }
@@ -1206,9 +839,9 @@ var init_libreoffice_converter = __esm({
         throw new LibreOfficeBinaryNotFoundError(candidates);
       }
       async isBinaryAvailable(binaryPath) {
-        if (binaryPath.includes(path5.sep)) {
+        if (binaryPath.includes(path2.sep)) {
           try {
-            await fs4.access(binaryPath);
+            await fs.access(binaryPath);
           } catch {
             return false;
           }
@@ -1222,7 +855,7 @@ var init_libreoffice_converter = __esm({
         }
       }
       async runConversion(binaryPath, inputPath, outputDir, filterName, envOverrides) {
-        const userProfilePath = path5.join(outputDir, "user-profile").replace(/\\/g, "/");
+        const userProfilePath = path2.join(outputDir, "user-profile").replace(/\\/g, "/");
         const userInstallation = `file:///${userProfilePath.replace(/^\//, "")}`;
         const args = [
           "--headless",
@@ -1640,36 +1273,36 @@ function isPrivateHost(host) {
   const firstIpv6Group = Number.parseInt(normalized.split(":")[0] || "0", 16);
   return firstIpv6Group >= 64512 && firstIpv6Group <= 65023 || firstIpv6Group >= 65152 && firstIpv6Group <= 65215;
 }
-function assertAllowedUrl(source, path8, allowedHosts) {
+function assertAllowedUrl(source, path5, allowedHosts) {
   if (source.startsWith("data:")) return;
   let url;
   try {
     url = new URL(source);
   } catch {
     throw new UnsafeOutboundSourceError(
-      path8,
+      path5,
       "local and relative file paths are disabled for HTTP requests"
     );
   }
   if (url.protocol !== "https:") {
-    throw new UnsafeOutboundSourceError(path8, "only HTTPS URLs are allowed");
+    throw new UnsafeOutboundSourceError(path5, "only HTTPS URLs are allowed");
   }
   if (url.username || url.password) {
     throw new UnsafeOutboundSourceError(
-      path8,
+      path5,
       "URLs containing credentials are not allowed"
     );
   }
   const host = url.hostname.toLowerCase().replace(/\.$/, "");
   if (isPrivateHost(host)) {
     throw new UnsafeOutboundSourceError(
-      path8,
+      path5,
       `private or local host "${host}" is not allowed`
     );
   }
   if (!allowedHosts.some((pattern) => hostMatches(host, pattern))) {
     throw new UnsafeOutboundSourceError(
-      path8,
+      path5,
       `host "${host}" is not in OUTBOUND_HOST_ALLOWLIST`
     );
   }
@@ -1687,13 +1320,13 @@ function extractCssReferences(input) {
 function extractAbsoluteUrls(input) {
   return input.match(/(?:https?|file):\/\/[^\s'"<>)}\]]+/gi) ?? [];
 }
-function assertSafeSvg(svg, path8, allowedHosts) {
+function assertSafeSvg(svg, path5, allowedHosts) {
   if (/<\s*script\b/i.test(svg) || /<\s*(?:foreignObject|iframe|object|embed)\b/i.test(svg) || /\bon[a-z]+\s*=/i.test(svg)) {
-    throw new UnsafeOutboundSourceError(path8, "active SVG content is disabled");
+    throw new UnsafeOutboundSourceError(path5, "active SVG content is disabled");
   }
   if (/<!\s*(?:DOCTYPE|ENTITY)\b/i.test(svg)) {
     throw new UnsafeOutboundSourceError(
-      path8,
+      path5,
       "SVG document types and entities are disabled"
     );
   }
@@ -1702,20 +1335,20 @@ function assertSafeSvg(svg, path8, allowedHosts) {
   while (match = refPattern.exec(svg)) {
     const ref = match[2].trim();
     if (!ref || ref.startsWith("#") || ref.startsWith("data:")) continue;
-    assertAllowedUrl(ref, path8, allowedHosts);
+    assertAllowedUrl(ref, path5, allowedHosts);
   }
   for (const ref of extractCssReferences(svg)) {
     if (ref.startsWith("#") || ref.startsWith("data:")) continue;
-    assertAllowedUrl(ref, path8, allowedHosts);
+    assertAllowedUrl(ref, path5, allowedHosts);
   }
 }
-function assertSafeEncodedImage(source, path8, allowedHosts) {
+function assertSafeEncodedImage(source, path5, allowedHosts) {
   let candidate = source.trim();
   let declaredSvg = false;
   if (candidate.startsWith("data:")) {
     const comma = candidate.indexOf(",");
     if (comma < 0) {
-      throw new UnsafeOutboundSourceError(path8, "malformed image data URL");
+      throw new UnsafeOutboundSourceError(path5, "malformed image data URL");
     }
     const metadata = candidate.slice(5, comma);
     declaredSvg = metadata.split(";")[0].toLowerCase() === "image/svg+xml";
@@ -1724,7 +1357,7 @@ function assertSafeEncodedImage(source, path8, allowedHosts) {
     try {
       candidate = /(?:^|;)base64(?:;|$)/i.test(metadata) ? Buffer.from(payload, "base64").toString("utf8") : decodeURIComponent(payload);
     } catch {
-      throw new UnsafeOutboundSourceError(path8, "malformed SVG data URL");
+      throw new UnsafeOutboundSourceError(path5, "malformed SVG data URL");
     }
   } else if (!/<\s*svg\b/i.test(candidate)) {
     candidate = Buffer.from(candidate, "base64").toString("utf8");
@@ -1732,37 +1365,37 @@ function assertSafeEncodedImage(source, path8, allowedHosts) {
   const svgStart = candidate.search(/<\s*svg\b/i);
   if (svgStart < 0) {
     if (declaredSvg) {
-      throw new UnsafeOutboundSourceError(path8, "malformed SVG image data");
+      throw new UnsafeOutboundSourceError(path5, "malformed SVG image data");
     }
     return;
   }
-  assertSafeSvg(candidate, path8, allowedHosts);
+  assertSafeSvg(candidate, path5, allowedHosts);
 }
-function assertSafeResources(resources, path8, allowedHosts) {
+function assertSafeResources(resources, path5, allowedHosts) {
   if (typeof resources.js === "string" && resources.js.trim()) {
     throw new UnsafeOutboundSourceError(
-      `${path8}.js`,
+      `${path5}.js`,
       "remote renderer JavaScript resources are disabled"
     );
   }
   if (typeof resources.css === "string") {
     for (const ref of extractCssReferences(resources.css)) {
       if (ref.startsWith("data:")) continue;
-      assertAllowedUrl(ref, `${path8}.css`, allowedHosts);
+      assertAllowedUrl(ref, `${path5}.css`, allowedHosts);
     }
   }
   if (Array.isArray(resources.files) && resources.files.length > 0) {
     throw new UnsafeOutboundSourceError(
-      `${path8}.files`,
+      `${path5}.files`,
       "remote renderer JavaScript resources are disabled"
     );
   }
 }
-function assertNoRemoteReferences(value, path8, allowedHosts, seen) {
+function assertNoRemoteReferences(value, path5, allowedHosts, seen) {
   if (typeof value === "string") {
     if (/\b(?:fetch|XMLHttpRequest|WebSocket|EventSource)\s*\(/i.test(value) || /\b(?:javascript|file):/i.test(value)) {
       throw new UnsafeOutboundSourceError(
-        path8,
+        path5,
         "network-capable JavaScript and file URLs are disabled"
       );
     }
@@ -1771,11 +1404,11 @@ function assertNoRemoteReferences(value, path8, allowedHosts, seen) {
       ...extractCssReferences(value)
     ]) {
       if (url.startsWith("data:")) continue;
-      assertAllowedUrl(url, path8, allowedHosts);
+      assertAllowedUrl(url, path5, allowedHosts);
     }
     if (/^\/\//.test(value.trim())) {
       throw new UnsafeOutboundSourceError(
-        path8,
+        path5,
         "protocol-relative URLs are disabled"
       );
     }
@@ -1785,20 +1418,20 @@ function assertNoRemoteReferences(value, path8, allowedHosts, seen) {
   seen.add(value);
   if (Array.isArray(value)) {
     value.forEach(
-      (entry, index) => assertNoRemoteReferences(entry, `${path8}[${index}]`, allowedHosts, seen)
+      (entry, index) => assertNoRemoteReferences(entry, `${path5}[${index}]`, allowedHosts, seen)
     );
     return;
   }
   for (const [key, child] of Object.entries(value)) {
-    assertNoRemoteReferences(child, `${path8}.${key}`, allowedHosts, seen);
+    assertNoRemoteReferences(child, `${path5}.${key}`, allowedHosts, seen);
   }
 }
-function visit(value, path8, containerKey, allowedHosts, seen) {
+function visit(value, path5, containerKey, allowedHosts, seen) {
   if (!value || typeof value !== "object" || seen.has(value)) return;
   seen.add(value);
   if (Array.isArray(value)) {
     value.forEach(
-      (entry, index) => visit(entry, `${path8}[${index}]`, containerKey, allowedHosts, seen)
+      (entry, index) => visit(entry, `${path5}[${index}]`, containerKey, allowedHosts, seen)
     );
     return;
   }
@@ -1806,7 +1439,7 @@ function visit(value, path8, containerKey, allowedHosts, seen) {
   for (const key of Object.keys(record)) {
     if (DANGEROUS_KEYS.has(key)) {
       throw new UnsafeOutboundSourceError(
-        `${path8}.${key}`,
+        `${path5}.${key}`,
         "prototype mutation keys are disabled"
       );
     }
@@ -1814,31 +1447,31 @@ function visit(value, path8, containerKey, allowedHosts, seen) {
   const kind = typeof record.kind === "string" ? record.kind : void 0;
   if (kind === "file" && typeof record.path === "string") {
     throw new UnsafeOutboundSourceError(
-      `${path8}.path`,
+      `${path5}.path`,
       "local file sources are disabled for HTTP requests"
     );
   }
   if ((kind === "url" || kind === "variable") && typeof record.url === "string") {
-    assertAllowedUrl(record.url, `${path8}.url`, allowedHosts);
+    assertAllowedUrl(record.url, `${path5}.url`, allowedHosts);
   }
   const componentName = typeof record.name === "string" ? record.name.toLowerCase() : void 0;
   const props = isRecord(record.props) ? record.props : void 0;
   if (componentName && props) {
     if (COMPONENT_SOURCE_NAMES.has(componentName) && typeof props.path === "string") {
-      assertAllowedUrl(props.path, `${path8}.props.path`, allowedHosts);
-      assertSafeEncodedImage(props.path, `${path8}.props.path`, allowedHosts);
+      assertAllowedUrl(props.path, `${path5}.props.path`, allowedHosts);
+      assertSafeEncodedImage(props.path, `${path5}.props.path`, allowedHosts);
     }
     if (COMPONENT_SOURCE_NAMES.has(componentName) && typeof props.base64 === "string") {
       assertSafeEncodedImage(
         props.base64,
-        `${path8}.props.base64`,
+        `${path5}.props.base64`,
         allowedHosts
       );
     }
     if ((componentName === "highcharts" || componentName === "visual") && typeof props.serverUrl === "string") {
       assertAllowedUrl(
         props.serverUrl,
-        `${path8}.props.serverUrl`,
+        `${path5}.props.serverUrl`,
         allowedHosts
       );
     }
@@ -1846,30 +1479,30 @@ function visit(value, path8, containerKey, allowedHosts, seen) {
       if (isRecord(props.resources)) {
         assertSafeResources(
           props.resources,
-          `${path8}.props.resources`,
+          `${path5}.props.resources`,
           allowedHosts
         );
       }
       assertNoRemoteReferences(
         props.options,
-        `${path8}.props.options`,
+        `${path5}.props.options`,
         allowedHosts,
         /* @__PURE__ */ new WeakSet()
       );
     }
   }
   if (containerKey === "image" && typeof record.path === "string") {
-    assertAllowedUrl(record.path, `${path8}.path`, allowedHosts);
-    assertSafeEncodedImage(record.path, `${path8}.path`, allowedHosts);
+    assertAllowedUrl(record.path, `${path5}.path`, allowedHosts);
+    assertSafeEncodedImage(record.path, `${path5}.path`, allowedHosts);
   }
   if (typeof record.svg === "string") {
-    assertSafeSvg(record.svg, `${path8}.svg`, allowedHosts);
+    assertSafeSvg(record.svg, `${path5}.svg`, allowedHosts);
   }
   if (containerKey === "resources") {
-    assertSafeResources(record, path8, allowedHosts);
+    assertSafeResources(record, path5, allowedHosts);
   }
   for (const [key, child] of Object.entries(record)) {
-    visit(child, `${path8}.${key}`, key, allowedHosts, seen);
+    visit(child, `${path5}.${key}`, key, allowedHosts, seen);
   }
 }
 function assertSafeOutboundSources(value, policy, rootPath = "request") {
@@ -1890,9 +1523,9 @@ var init_outbound_source_policy = __esm({
     "use strict";
     init_esm_shims();
     UnsafeOutboundSourceError = class extends Error {
-      constructor(path8, reason) {
-        super(`Unsafe outbound source at ${path8}: ${reason}`);
-        this.path = path8;
+      constructor(path5, reason) {
+        super(`Unsafe outbound source at ${path5}: ${reason}`);
+        this.path = path5;
         this.name = "UnsafeOutboundSourceError";
       }
     };
@@ -1902,7 +1535,7 @@ var init_outbound_source_policy = __esm({
 });
 
 // src/server/rasterize-route.ts
-import path6 from "path";
+import path3 from "path";
 import { Type as Type2 } from "@sinclair/typebox";
 import { bodyLimit } from "hono/body-limit";
 import { HTTPException as HTTPException3 } from "hono/http-exception";
@@ -1911,7 +1544,9 @@ import {
   DEFAULT_VISUAL_DPI,
   MIN_VISUAL_DPI,
   MAX_VISUAL_DPI,
-  MAX_RASTERIZE_BATCH_SLIDES
+  MAX_RASTERIZE_BATCH_SLIDES,
+  MAX_RASTERIZE_FONTS,
+  MAX_RASTERIZE_FONT_BYTES
 } from "@json-to-office/shared";
 import {
   createLibreOfficePptxRasterizer,
@@ -1953,11 +1588,23 @@ function assertPixelBudget(slides) {
     });
   }
 }
+function assertFontBudget(fonts) {
+  if (!fonts?.length) return;
+  const bytes = fonts.reduce(
+    (sum, f) => sum + Math.ceil(f.data.length * 0.75),
+    0
+  );
+  if (bytes > MAX_RASTERIZE_FONT_BYTES) {
+    throw new HTTPException3(400, {
+      message: "Requested font payload is too large"
+    });
+  }
+}
 function resolveSafeBaseDir(baseDir) {
   if (baseDir === void 0) return void 0;
-  const resolved = path6.resolve(baseDir);
+  const resolved = path3.resolve(baseDir);
   const cwd = process.cwd();
-  if (resolved !== cwd && !resolved.startsWith(cwd + path6.sep)) {
+  if (resolved !== cwd && !resolved.startsWith(cwd + path3.sep)) {
     throw new HTTPException3(400, {
       message: "baseDir must be inside the server working directory"
     });
@@ -1980,13 +1627,22 @@ function toHttpException(error) {
     message: "Internal server error during rasterization"
   });
 }
+function resolveMaxBodyBytes(explicit) {
+  const fromEnv = Number.parseInt(
+    process.env.MAX_RASTERIZE_BODY_SIZE ?? "",
+    10
+  );
+  const configured = explicit ?? (Number.isFinite(fromEnv) && fromEnv > 0 ? fromEnv : config.requestLimits.maxBodySize);
+  return Math.min(configured, MAX_RASTERIZE_BODY_CEILING);
+}
 function registerRasterizeRoute(router, options = {}) {
   const getRasterizer = options.getRasterizer ?? getSharedRasterizer;
   const getBatchRasterizer = options.getBatchRasterizer ?? getSharedBatchRasterizer;
+  const maxBodyBytes = resolveMaxBodyBytes(options.maxBodyBytes);
   const shared = [
     ...options.preMiddleware ?? [],
     bodyLimit({
-      maxSize: 32 * 1024 * 1024,
+      maxSize: maxBodyBytes,
       onError: () => {
         throw new HTTPException3(413, { message: "Request body too large" });
       }
@@ -2006,10 +1662,11 @@ function registerRasterizeRoute(router, options = {}) {
     ...shared,
     tbValidator(RasterizeRequestSchema),
     async (c) => {
-      const { presentation, dpi, baseDir } = getValidated(c, "json");
+      const { presentation, dpi, baseDir, fonts } = getValidated(c, "json");
       const safeBaseDir = resolveSafeBaseDir(baseDir);
       const effectiveDpi = clampVisualDpi(dpi ?? DEFAULT_VISUAL_DPI);
       assertPixelBudget([{ presentation, dpi: effectiveDpi }]);
+      assertFontBudget(fonts);
       const result = await guard(async () => {
         if (options.sourcePolicy) {
           assertSafeOutboundSources(
@@ -2021,7 +1678,12 @@ function registerRasterizeRoute(router, options = {}) {
         return getRasterizer()({
           presentation,
           dpi: effectiveDpi,
-          baseDir: safeBaseDir
+          baseDir: safeBaseDir,
+          // Conditional so a fontless request reaches the engine with no
+          // `fonts` key at all — an `undefined` would still be an absent
+          // digest, but keeping the object identical to the pre-change shape
+          // makes the cache-key equivalence obvious.
+          ...fonts?.length && { fonts }
         });
       });
       return c.json(result);
@@ -2032,13 +1694,14 @@ function registerRasterizeRoute(router, options = {}) {
     ...shared,
     tbValidator(RasterizeBatchRequestSchema),
     async (c) => {
-      const { slides, baseDir } = getValidated(c, "json");
+      const { slides, baseDir, fonts } = getValidated(c, "json");
       const safeBaseDir = resolveSafeBaseDir(baseDir);
       const effectiveSlides = slides.map((slide) => ({
         presentation: slide.presentation,
         dpi: clampVisualDpi(slide.dpi ?? DEFAULT_VISUAL_DPI)
       }));
       assertPixelBudget(effectiveSlides);
+      assertFontBudget(fonts);
       const result = await guard(async () => {
         if (options.sourcePolicy) {
           slides.forEach(
@@ -2051,7 +1714,8 @@ function registerRasterizeRoute(router, options = {}) {
         }
         return getBatchRasterizer()({
           slides: effectiveSlides,
-          baseDir: safeBaseDir
+          baseDir: safeBaseDir,
+          ...fonts?.length && { fonts }
         });
       });
       return c.json({
@@ -2068,20 +1732,47 @@ function registerRasterizeRoute(router, options = {}) {
     }
   );
 }
-var RasterizeRequestSchema, RasterizeBatchRequestSchema, sharedRasterizer, sharedBatchRasterizer, jsonOnly, DEFAULT_SLIDE_WIDTH_IN, DEFAULT_SLIDE_HEIGHT_IN, MAX_SLIDE_PIXELS, MAX_BATCH_PIXELS;
+var BASE64_PATTERN, RasterizeFontFaceSchema, FontsSchema, RasterizeRequestSchema, RasterizeBatchRequestSchema, sharedRasterizer, sharedBatchRasterizer, jsonOnly, DEFAULT_SLIDE_WIDTH_IN, DEFAULT_SLIDE_HEIGHT_IN, MAX_SLIDE_PIXELS, MAX_BATCH_PIXELS, MAX_RASTERIZE_BODY_CEILING;
 var init_rasterize_route = __esm({
   "src/server/rasterize-route.ts"() {
     "use strict";
     init_esm_shims();
+    init_config();
     init_typebox_validator();
     init_outbound_source_policy();
+    BASE64_PATTERN = "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$";
+    RasterizeFontFaceSchema = Type2.Object(
+      {
+        family: Type2.String({ minLength: 1, maxLength: 128 }),
+        weight: Type2.Integer({ minimum: 1, maximum: 1e3 }),
+        italic: Type2.Boolean(),
+        data: Type2.String({
+          minLength: 1,
+          maxLength: 4 * 1024 * 1024,
+          pattern: BASE64_PATTERN
+        }),
+        format: Type2.Optional(
+          Type2.Union([
+            Type2.Literal("ttf"),
+            Type2.Literal("otf"),
+            Type2.Literal("woff"),
+            Type2.Literal("woff2")
+          ])
+        )
+      },
+      { additionalProperties: false }
+    );
+    FontsSchema = Type2.Optional(
+      Type2.Array(RasterizeFontFaceSchema, { maxItems: MAX_RASTERIZE_FONTS })
+    );
     RasterizeRequestSchema = Type2.Object(
       {
         presentation: Type2.Object({}, { additionalProperties: true }),
         dpi: Type2.Optional(
           Type2.Number({ minimum: MIN_VISUAL_DPI, maximum: MAX_VISUAL_DPI })
         ),
-        baseDir: Type2.Optional(Type2.String())
+        baseDir: Type2.Optional(Type2.String()),
+        fonts: FontsSchema
       },
       { additionalProperties: false }
     );
@@ -2099,7 +1790,13 @@ var init_rasterize_route = __esm({
           ),
           { minItems: 1, maxItems: MAX_RASTERIZE_BATCH_SLIDES }
         ),
-        baseDir: Type2.Optional(Type2.String())
+        baseDir: Type2.Optional(Type2.String()),
+        // Request-level, shared by every slide, exactly like `baseDir`. NOT
+        // inside the per-slide object above, whose `additionalProperties: false`
+        // must keep rejecting per-slide fonts: a uniform slide shape is what
+        // lets batch dedupe and the disk-cache key stay identical to the
+        // single-slide path.
+        fonts: FontsSchema
       },
       { additionalProperties: false }
     );
@@ -2116,19 +1813,20 @@ var init_rasterize_route = __esm({
     DEFAULT_SLIDE_HEIGHT_IN = 7.5;
     MAX_SLIDE_PIXELS = 64e6;
     MAX_BATCH_PIXELS = 256e6;
+    MAX_RASTERIZE_BODY_CEILING = 64 * 1024 * 1024;
   }
 });
 
 // src/server/services/template-media-inliner.ts
-import { promises as fs5 } from "fs";
-import path7 from "path";
+import { promises as fs2 } from "fs";
+import path4 from "path";
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isInlineCandidate(source) {
   if (!source || source.includes("\0")) return false;
   if (source.startsWith("data:")) return false;
-  if (path7.isAbsolute(source)) return false;
+  if (path4.isAbsolute(source)) return false;
   try {
     new URL(source);
     return false;
@@ -2140,17 +1838,17 @@ async function toDataUrl(source, baseDir, state) {
   let cacheKey = source;
   let result = null;
   try {
-    const resolved = await fs5.realpath(path7.resolve(baseDir, source));
+    const resolved = await fs2.realpath(path4.resolve(baseDir, source));
     cacheKey = resolved;
-    const cached2 = state.cache.get(cacheKey);
-    if (cached2 !== void 0) return cached2;
-    const contained = resolved === state.baseDirReal || resolved.startsWith(state.baseDirReal + path7.sep);
+    const cached = state.cache.get(cacheKey);
+    if (cached !== void 0) return cached;
+    const contained = resolved === state.baseDirReal || resolved.startsWith(state.baseDirReal + path4.sep);
     if (contained) {
-      const mime = MIME_BY_EXTENSION[path7.extname(resolved).toLowerCase()];
+      const mime = MIME_BY_EXTENSION[path4.extname(resolved).toLowerCase()];
       if (mime) {
-        const stat = await fs5.stat(resolved);
+        const stat = await fs2.stat(resolved);
         if (stat.isFile() && stat.size <= state.maxFileBytes && stat.size <= state.totalBudget) {
-          const buffer = await fs5.readFile(resolved);
+          const buffer = await fs2.readFile(resolved);
           state.totalBudget -= buffer.length;
           result = `data:${mime};base64,${buffer.toString("base64")}`;
         }
@@ -2198,7 +1896,7 @@ async function inlineTemplateMedia(jsonDefinition, baseDir, options = {}) {
   }
   let baseDirReal;
   try {
-    baseDirReal = await fs5.realpath(baseDir);
+    baseDirReal = await fs2.realpath(baseDir);
   } catch {
     return jsonDefinition;
   }
@@ -2242,9 +1940,9 @@ import {
 import { dirname } from "path";
 function createFormatRouter(adapter) {
   const router = new Hono2();
-  const assertRequestSources = (value, path8) => {
+  const assertRequestSources = (value, path5) => {
     try {
-      assertSafeOutboundSources(value, config.outboundSources, path8);
+      assertSafeOutboundSources(value, config.outboundSources, path5);
     } catch (error) {
       if (error instanceof UnsafeOutboundSourceError) {
         throw new HTTPException4(400, { message: error.message });
@@ -4155,9 +3853,9 @@ var init_unified_server = __esm({
           return await apiApp.fetch(c.req.raw, c.env);
         });
         this.app.use("*", async (c, next) => {
-          const path8 = c.req.path;
-          if (path8.startsWith("/api")) {
-            if (/\.(ts|tsx|js|jsx|css|map)$/.test(path8)) {
+          const path5 = c.req.path;
+          if (path5.startsWith("/api")) {
+            if (/\.(ts|tsx|js|jsx|css|map)$/.test(path5)) {
               return next();
             }
             const response = await apiApp.fetch(c.req.raw, c.env);
@@ -4260,8 +3958,8 @@ var init_unified_server = __esm({
         }
         if (this.viteServer) {
           this.app.use("*", async (c, next) => {
-            const path8 = c.req.path;
-            if ((path8.startsWith("/api") || path8 === "/health") && !/\.(ts|tsx|js|jsx|css|map)$/.test(path8)) {
+            const path5 = c.req.path;
+            if ((path5.startsWith("/api") || path5 === "/health") && !/\.(ts|tsx|js|jsx|css|map)$/.test(path5)) {
               return next();
             }
             const env = c.env;
@@ -4280,7 +3978,7 @@ var init_unified_server = __esm({
       }
       async setupBuiltClient(clientPath) {
         const { serveStatic } = await import("@hono/node-server/serve-static");
-        const fs6 = await import("fs");
+        const fs3 = await import("fs");
         const { extname } = await import("path");
         const mime = await import("mime-types");
         const format = this.adapter.name.replace(/[^a-zA-Z0-9]/g, "");
@@ -4288,7 +3986,7 @@ var init_unified_server = __esm({
           "/assets/*",
           serveStatic({
             root: clientPath,
-            rewriteRequestPath: (path8) => path8.replace(/^\/assets/, "/assets")
+            rewriteRequestPath: (path5) => path5.replace(/^\/assets/, "/assets")
           })
         );
         this.app.use("/*", async (c, next) => {
@@ -4297,9 +3995,9 @@ var init_unified_server = __esm({
           const ext = extname(reqPath);
           if (ext) {
             const filePath = resolve(clientPath, reqPath.slice(1));
-            if (fs6.existsSync(filePath)) {
+            if (fs3.existsSync(filePath)) {
               const mimeType = mime.lookup(filePath) || "application/octet-stream";
-              const content = fs6.readFileSync(filePath);
+              const content = fs3.readFileSync(filePath);
               c.header("Content-Type", mimeType);
               return c.body(content);
             }
@@ -4311,8 +4009,8 @@ var init_unified_server = __esm({
           if (reqPath.startsWith("/api") || reqPath === "/health")
             return c.notFound();
           const indexPath = resolve(clientPath, "index.html");
-          if (fs6.existsSync(indexPath)) {
-            let html = fs6.readFileSync(indexPath, "utf-8");
+          if (fs3.existsSync(indexPath)) {
+            let html = fs3.readFileSync(indexPath, "utf-8");
             html = html.replace(
               "</head>",
               `<script>window.__JTO_FORMAT__ = '${format}';</script>
@@ -4473,7 +4171,7 @@ function createDevCommand(adapter) {
 }
 
 // src/cli.ts
-var PACKAGE_VERSION = true ? "0.34.0" : "dev-mode";
+var PACKAGE_VERSION = true ? "0.35.0" : "dev-mode";
 var program = new Command2();
 program.name("jto").description("JSON to Office CLI - Generate .docx and .pptx from JSON").version(PACKAGE_VERSION);
 registerCoreCommands(program, {