@json-to-office/jto 1.6.0 → 1.7.0

package/dist/cli.js

@@ -249,6 +249,18 @@ function toQualityWarnings(diagnostics) {
     }
   }));
 }
+function documentTitle(config2) {
+  const props = config2?.props;
+  const metadata = props?.metadata;
+  const title = metadata?.title ?? props?.title;
+  return typeof title === "string" ? title : void 0;
+}
+function documentFilenameBase(config2) {
+  const title = documentTitle(config2);
+  if (title === void 0) return void 0;
+  const base = title.replace(/[^a-zA-Z0-9._-]/g, "_").slice(0, MAX_FILENAME_BASE);
+  return /^[._]*$/.test(base) ? void 0 : base;
+}
 function collectReferencedNames(config2, customThemes, adapterName) {
   const collect = adapterName === "docx" ? collectFontNamesFromDocx : collectFontNamesFromPptx;
   const names = /* @__PURE__ */ new Set();
@@ -395,12 +407,13 @@ function autoGoogleFontEntries(names, skipFamilies, referencedWeights, reference
   }
   return entries;
 }
-var GeneratorService;
+var MAX_FILENAME_BASE, GeneratorService;
 var init_generator = __esm({
   "src/server/services/generator.ts"() {
     "use strict";
     init_esm_shims();
     init_logger();
+    MAX_FILENAME_BASE = 100;
     GeneratorService = class {
       adapter;
       cacheService;
@@ -535,9 +548,9 @@ var init_generator = __esm({
         if (!bypassCache && !hasDynamicContent) {
           const cached = this.cacheService.get(cacheKey);
           if (cached) {
-            logger.info("Served from cache", { title: config2.metadata?.title });
+            logger.info("Served from cache", { title: documentTitle(config2) });
             return {
-              filename: `${config2.metadata?.title || this.adapter.label}${this.adapter.extension}`,
+              filename: `${documentFilenameBase(config2) || this.adapter.label}${this.adapter.extension}`,
               fileId: Date.now().toString(),
               buffer: cached.buffer,
               // Render warnings ride with bytes. Quality is request policy, so it
@@ -548,7 +561,7 @@ var init_generator = __esm({
           }
         }
         logger.info(`Generating ${this.adapter.label}`, {
-          title: config2.metadata?.title
+          title: documentTitle(config2)
         });
         let buffer;
         if (registry.hasPlugins()) {
@@ -608,7 +621,7 @@ var init_generator = __esm({
           { bypassCache: bypassCache || hasDynamicContent }
         );
         return {
-          filename: `${config2.metadata?.title || this.adapter.label}${this.adapter.extension}`,
+          filename: `${documentFilenameBase(config2) || this.adapter.label}${this.adapter.extension}`,
           fileId: Date.now().toString(),
           buffer,
           cached: false,
@@ -1968,7 +1981,9 @@ function isInlineCandidate(source) {
     return true;
   }
 }
-async function toDataUrl(source, baseDir, state) {
+async function toDataUrl(source, baseDir, state, mimeByExtension) {
+  const mime = mimeByExtension[path4.extname(source).toLowerCase()];
+  if (!mime) return null;
   let cacheKey = source;
   let result = null;
   try {
@@ -1978,14 +1993,11 @@ async function toDataUrl(source, baseDir, state) {
     if (cached !== void 0) return cached;
     const contained = resolved === state.baseDirReal || resolved.startsWith(state.baseDirReal + path4.sep);
     if (contained) {
-      const mime = MIME_BY_EXTENSION[path4.extname(resolved).toLowerCase()];
-      if (mime) {
-        const stat = await fs2.stat(resolved);
-        if (stat.isFile() && stat.size <= state.maxFileBytes && stat.size <= state.totalBudget) {
-          const buffer = await fs2.readFile(resolved);
-          state.totalBudget -= buffer.length;
-          result = `data:${mime};base64,${buffer.toString("base64")}`;
-        }
+      const stat = await fs2.stat(resolved);
+      if (stat.isFile() && stat.size <= state.maxFileBytes && stat.size <= state.totalBudget) {
+        const buffer = await fs2.readFile(resolved);
+        state.totalBudget -= buffer.length;
+        result = `data:${mime};base64,${buffer.toString("base64")}`;
       }
     }
   } catch {
@@ -2003,14 +2015,37 @@ async function visit2(value, containerKey, baseDir, state, seen) {
     return;
   }
   const record = value;
+  if (record.kind === "file" && typeof record.path === "string" && isInlineCandidate(record.path)) {
+    const inlined = await toDataUrl(
+      record.path,
+      baseDir,
+      state,
+      FONT_MIME_BY_EXTENSION
+    );
+    if (inlined !== null) {
+      record.kind = "data";
+      record.data = inlined;
+      delete record.path;
+    }
+  }
   const componentName = typeof record.name === "string" ? record.name.toLowerCase() : void 0;
   const props = isRecord2(record.props) ? record.props : void 0;
   if (componentName === "image" && props && typeof props.path === "string" && isInlineCandidate(props.path)) {
-    const inlined = await toDataUrl(props.path, baseDir, state);
+    const inlined = await toDataUrl(
+      props.path,
+      baseDir,
+      state,
+      IMAGE_MIME_BY_EXTENSION
+    );
     if (inlined !== null) props.path = inlined;
   }
   if (containerKey === "image" && typeof record.path === "string" && isInlineCandidate(record.path)) {
-    const inlined = await toDataUrl(record.path, baseDir, state);
+    const inlined = await toDataUrl(
+      record.path,
+      baseDir,
+      state,
+      IMAGE_MIME_BY_EXTENSION
+    );
     if (inlined !== null) record.path = inlined;
   }
   for (const [key, child] of Object.entries(record)) {
@@ -2044,12 +2079,12 @@ async function inlineTemplateMedia(jsonDefinition, baseDir, options = {}) {
   await visit2(clone, void 0, baseDir, state, /* @__PURE__ */ new WeakSet());
   return clone;
 }
-var MIME_BY_EXTENSION;
+var IMAGE_MIME_BY_EXTENSION, FONT_MIME_BY_EXTENSION;
 var init_template_media_inliner = __esm({
   "src/server/services/template-media-inliner.ts"() {
     "use strict";
     init_esm_shims();
-    MIME_BY_EXTENSION = {
+    IMAGE_MIME_BY_EXTENSION = {
       ".png": "image/png",
       ".jpg": "image/jpeg",
       ".jpeg": "image/jpeg",
@@ -2060,6 +2095,12 @@ var init_template_media_inliner = __esm({
       ".tiff": "image/tiff",
       ".tif": "image/tiff"
     };
+    FONT_MIME_BY_EXTENSION = {
+      ".ttf": "font/ttf",
+      ".otf": "font/otf",
+      ".woff": "font/woff",
+      ".woff2": "font/woff2"
+    };
   }
 });
 
@@ -4329,7 +4370,7 @@ function createDevCommand(adapter) {
 }
 
 // src/cli.ts
-var PACKAGE_VERSION = true ? "1.6.0" : "dev-mode";
+var PACKAGE_VERSION = true ? "1.7.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, {