@vivliostyle/cli 10.3.0 → 10.4.0

package/README.md

@@ -59,7 +59,10 @@ Options:
   -l, --language <language>     language
   -s, --size <size>             paper size
   -T, --theme <theme>           theme
+  --no-theme                    Do not include a theme.
   --template <template>         Template source in the format of `[provider]:repo[/subpath][#ref]` or as a local directory to copy from.
+  --install-dependencies        Install dependencies after creating a project.
+  --no-install-dependencies     Do not install dependencies after creating a project.
   --create-config-file-only     Create a Vivliostyle config file without generating project template files.
   --proxy-server <proxyServer>  HTTP/SOCK proxy server url
   --proxy-bypass <proxyBypass>  optional comma-separated domains to bypass proxy
@@ -123,8 +126,8 @@ Options:
   --bleed <bleed>                    extent of the bleed area for printing with crop marks [3mm]
   --crop-offset <offset>             distance between the edge of the trim size and the edge of the media size. [auto (13mm + bleed)]
   --css <CSS>                        custom style CSS code. (ex: ":root {--my-color: lime;}")
-  --style <stylesheet>               additional stylesheet URL or path
-  --user-style <user_stylesheet>     user stylesheet URL or path
+  --style <stylesheet>               Additional stylesheet for Vivliostyle viewer.
+  --user-style <user_stylesheet>     Additional user stylesheet for Vivliostyle viewer.
   -d, --single-doc                   single HTML document input
   -p, --press-ready                  make generated PDF compatible with press ready PDF/X-1a [false]
                                      This option is equivalent with "--preflight press-ready"
@@ -184,8 +187,8 @@ Options:
   --bleed <bleed>                    extent of the bleed area for printing with crop marks [3mm]
   --crop-offset <offset>             distance between the edge of the trim size and the edge of the media size. [auto (13mm + bleed)]
   --css <CSS>                        custom style CSS code. (ex: ":root {--my-color: lime;}")
-  --style <stylesheet>               additional stylesheet URL or path
-  --user-style <user_stylesheet>     user stylesheet URL or path
+  --style <stylesheet>               Additional stylesheet for Vivliostyle viewer.
+  --user-style <user_stylesheet>     Additional user stylesheet for Vivliostyle viewer.
   -d, --single-doc                   single HTML document input
   -q, --quick                        quick loading with rough page count
   --title <title>                    title

package/dist/{chunk-RBKPG6VU.js → chunk-4DTPH2XX.js}

@@ -1,7 +1,7 @@
 import {
   Logger,
   useTmpDirectory
-} from "./chunk-RILZCPJE.js";
+} from "./chunk-VAPIKX4A.js";
 
 // src/config/vite.ts
 import upath from "upath";
@@ -75,4 +75,4 @@ async function resolveViteConfig({
 export {
   resolveViteConfig
 };
-//# sourceMappingURL=chunk-RBKPG6VU.js.map
+//# sourceMappingURL=chunk-4DTPH2XX.js.map

package/dist/{chunk-QLK3XMQI.js → chunk-DEJL63H2.js}

@@ -1,6 +1,16 @@
 import {
   GlobMatcher,
+  locateVivliostyleConfig
+} from "./chunk-Q4EIXB5V.js";
+import {
+  ValidString,
+  VivliostyleInlineConfigWithoutChecks,
+  VivliostylePackageMetadata
+} from "./chunk-J2YGULSR.js";
+import {
   Logger,
+  cliVersion,
+  coreVersion,
   cwd,
   getDefaultBrowserTag,
   getOsLocale,
@@ -8,22 +18,16 @@ import {
   registerExitHandler,
   toTitleCase,
   whichPm
-} from "./chunk-RILZCPJE.js";
-import {
-  ValidString,
-  VivliostyleInlineConfigWithoutChecks,
-  VivliostylePackageMetadata
-} from "./chunk-3QOSSWIX.js";
+} from "./chunk-VAPIKX4A.js";
 import {
   DEFAULT_CONFIG_FILENAME,
   DEFAULT_PROJECT_AUTHOR,
   DEFAULT_PROJECT_TITLE,
-  TEMPLATE_DEFAULT_FILES,
-  TEMPLATE_SETTINGS,
-  cliVersion,
-  coreVersion,
-  languages
-} from "./chunk-ZEBXHUJX.js";
+  LANGUAGES,
+  TEMPLATE_DEFAULT_PACKAGE_JSON,
+  TEMPLATE_DEFAULT_VIVLIOSTYLE_CONFIG_JS,
+  TEMPLATE_SETTINGS
+} from "./chunk-DK3HFVHX.js";
 import {
   __callDispose,
   __using
@@ -113,6 +117,7 @@ import {
 } from "yoctocolors";
 async function askQuestion({
   question: questions,
+  interactiveLogger,
   schema,
   validateProgressMessage
 }) {
@@ -166,10 +171,15 @@ async function askQuestion({
         process.exit(0);
       }
       response[name] = result2;
+      interactiveLogger.messageHistory.push({
+        type: "question",
+        message: question.message,
+        answer: result2
+      });
     }
     let result;
     if (schema && schema.async) {
-      result = await interactiveLogLoading(
+      result = await interactiveLogger?.logLoading(
         validateProgressMessage ?? "",
         () => v.safeParseAsync(schema, response)
       );
@@ -182,7 +192,7 @@ async function askQuestion({
     if (success) {
       return output;
     }
-    interactiveLogWarn(issues[0].message);
+    interactiveLogger.logWarn(issues[0].message);
   }
 }
 var promptStateSymbol = {
@@ -377,93 +387,102 @@ ${userInputText}`;
 function autocompleteMultiSelectPrompt(opts) {
   return autocompletePrompt(opts, true);
 }
-async function interactiveLogLoading(message, fn, deferredTimeMs = 300) {
-  if (!Logger.isInteractive) {
-    return await fn();
-  }
-  const output = Logger.stdout;
-  const columns = getColumns(output);
-  const showMessage = (msg) => {
-    const wrapped = wrapAnsi(msg, columns, { hard: true, trim: false });
-    output.write(wrapped);
-    return () => {
-      const prevLines = wrapped.split("\n");
-      if (prevLines.length > 1) {
-        output.write(cursor.up(prevLines.length - 1));
-      }
-      output.write(cursor.to(0));
-      output.write(erase.down());
+var InteractiveLogger = class {
+  messageHistory = [];
+  async logLoading(message, fn, deferredTimeMs = 300) {
+    this.messageHistory.push({ type: "loading", message });
+    if (!Logger.isInteractive || import.meta.env?.VITEST) {
+      return await fn();
+    }
+    const output = Logger.stdout;
+    const columns = getColumns(output);
+    const showMessage = (msg) => {
+      const wrapped = wrapAnsi(msg, columns, { hard: true, trim: false });
+      output.write(wrapped);
+      return () => {
+        const prevLines = wrapped.split("\n");
+        if (prevLines.length > 1) {
+          output.write(cursor.up(prevLines.length - 1));
+        }
+        output.write(cursor.to(0));
+        output.write(erase.down());
+      };
     };
-  };
-  let timer;
-  let clearMessage;
-  const promise = new Promise((resolve) => {
-    timer = setTimeout(() => {
-      output.write(`${blueBright("\u2551")}
+    let timer;
+    let clearMessage;
+    const promise = new Promise((resolve) => {
+      timer = setTimeout(() => {
+        output.write(`${blueBright("\u2551")}
 `);
-      clearMessage = showMessage(
-        `${blueBright(`${promptStateSymbol.active}\u2500`)} ${dim(message)}
+        clearMessage = showMessage(
+          `${blueBright(`${promptStateSymbol.active}\u2500`)} ${dim(message)}
 `
+        );
+        resolve();
+      }, deferredTimeMs);
+    });
+    const result = await fn().then((r) => {
+      if (!clearMessage) {
+        return r;
+      }
+      return new Promise(
+        (resolve) => setTimeout(() => resolve(r), deferredTimeMs)
       );
-      resolve();
-    }, deferredTimeMs);
-  });
-  const result = await fn().then((r) => {
-    if (!clearMessage) {
-      return r;
-    }
-    return new Promise(
-      (resolve) => setTimeout(() => resolve(r), deferredTimeMs)
-    );
-  }).catch(async (e) => {
-    await promise;
-    clearMessage?.();
-    showMessage(
-      `${redBright(`${promptStateSymbol.error}\u2500`)} ${dim(message)}
+    }).catch(async (e) => {
+      await promise;
+      clearMessage?.();
+      showMessage(
+        `${redBright(`${promptStateSymbol.error}\u2500`)} ${dim(message)}
 
 `
-    );
-    throw e;
-  });
-  clearTimeout(timer);
-  if (clearMessage) {
-    clearMessage();
-    showMessage(
-      `${blueBright(`${promptStateSymbol.submit}\u2500`)} ${dim(message)}
+      );
+      throw e;
+    });
+    clearTimeout(timer);
+    if (clearMessage) {
+      clearMessage();
+      showMessage(
+        `${blueBright(`${promptStateSymbol.submit}\u2500`)} ${dim(message)}
 `
-    );
-  }
-  return result;
-}
-function interactiveLogInfo(message) {
-  if (import.meta.env?.VITEST) {
-    return;
+      );
+    }
+    return result;
   }
-  Logger.stdout.write(
-    `${blueBright(`${promptStateSymbol.submit}\u2500`)} ${message.split("\n").join(`
+  logInfo(message) {
+    this.messageHistory.push({ type: "info", message });
+    if (import.meta.env?.VITEST) {
+      return;
+    }
+    Logger.stdout.write(
+      `${blueBright(`${promptStateSymbol.submit}\u2500`)} ${message.split("\n").join(`
 ${blueBright("\u2551")}  `)}
 `
-  );
-}
-function interactiveLogWarn(message) {
-  if (import.meta.env?.VITEST) {
-    return;
+    );
   }
-  Logger.stdout.write(
-    `${yellowBright(`${promptStateSymbol.error}\u2500`)} ${yellowBright(message.split("\n").join(`
+  logWarn(message) {
+    this.messageHistory.push({ type: "warn", message });
+    if (import.meta.env?.VITEST) {
+      return;
+    }
+    Logger.stdout.write(
+      `${yellowBright(`${promptStateSymbol.error}\u2500`)} ${yellowBright(message.split("\n").join(`
 ${yellowBright("\u2551")}  `))}
 `
-  );
-}
-function interactiveLogOutro(message) {
-  if (import.meta.env?.VITEST) {
-    return;
+    );
   }
-  Logger.stdout.write(`${blueBright("\u2551")}
+  logOutro(message) {
+    this.messageHistory.push({ type: "outro", message });
+    if (import.meta.env?.VITEST) {
+      return;
+    }
+    Logger.stdout.write(
+      `${blueBright("\u2551")}
 ${blueBright("\u2559\u2500")} ${message}
 
-`);
-}
+`
+    );
+  }
+};
 
 // src/npm.ts
 import { fetch as _fetch } from "node-fetch-native";
@@ -517,6 +536,7 @@ async function create(inlineConfig) {
   Logger.setLogOptions(inlineConfig);
   Logger.debug("create > inlineConfig %O", inlineConfig);
   const fetch = createFetch(inlineConfig);
+  const interactiveLogger = new InteractiveLogger();
   let {
     projectPath,
     cwd: cwd2 = cwd,
@@ -525,29 +545,34 @@ async function create(inlineConfig) {
     language,
     theme,
     template,
+    installDependencies,
     createConfigFileOnly = false
   } = inlineConfig;
   let extraTemplateVariables = {};
   let themePackage;
-  let installDependencies;
   let useLocalTemplate = false;
   if (template && !/^([\w-.]+):/.test(template)) {
     const absTemplatePath = upath.resolve(cwd2, template);
     useLocalTemplate = fs.existsSync(upath.resolve(cwd2, template)) && fs.statSync(upath.resolve(cwd2, template)).isDirectory();
+    const usingPresetTemplate = TEMPLATE_SETTINGS.find(
+      (t) => t.value === template
+    );
     if (useLocalTemplate) {
       template = absTemplatePath;
-      interactiveLogInfo(
+      interactiveLogger.logInfo(
         `Using the specified local template directory
 ${dim2(upath.relative(cwd2, absTemplatePath) || ".")}`
       );
+    } else if (usingPresetTemplate) {
+      template = usingPresetTemplate.template;
     } else {
-      interactiveLogWarn(
+      interactiveLogger.logWarn(
         `The specified theme ${green2(template)} was not found as a local directory. Proceeding to fetch it from GitHub repository.`
       );
     }
   }
   if (!projectPath) {
-    ({ projectPath } = await askProjectPath());
+    ({ projectPath } = await askProjectPath({ interactiveLogger }));
   }
   const dist = upath.join(cwd2, projectPath);
   if (createConfigFileOnly) {
@@ -558,35 +583,41 @@ ${dim2(upath.relative(cwd2, absTemplatePath) || ".")}`
     throw new Error(`Destination ${dist} is not empty.`);
   }
   if (!title) {
-    ({ title } = createConfigFileOnly ? { title: DEFAULT_PROJECT_TITLE } : await askTitle({ projectPath }));
+    ({ title } = createConfigFileOnly ? { title: DEFAULT_PROJECT_TITLE } : await askTitle({ projectPath, interactiveLogger }));
   }
   if (!author) {
-    ({ author } = createConfigFileOnly ? { author: DEFAULT_PROJECT_AUTHOR } : await askAuthor());
+    ({ author } = createConfigFileOnly ? { author: DEFAULT_PROJECT_AUTHOR } : await askAuthor({ interactiveLogger }));
   }
   if (!language) {
-    ({ language } = createConfigFileOnly ? { language: await getOsLocale() } : await askLanguage());
+    ({ language } = createConfigFileOnly ? { language: await getOsLocale() } : await askLanguage({ interactiveLogger }));
   }
   if (!createConfigFileOnly) {
     let presetTemplate;
     if (!template) {
-      ({ presetTemplate } = await askPresetTemplate());
+      ({ presetTemplate } = await askPresetTemplate({ interactiveLogger }));
       if (presetTemplate) {
         template = presetTemplate.template;
       }
     }
-    if (!theme) {
+    if (!theme && theme !== false) {
       ({ theme, themePackage } = await askTheme({
         presetTemplate,
         template,
-        fetch
+        fetch,
+        interactiveLogger
       }));
     }
     if (!template) {
-      ({ template, extraTemplateVariables } = await askThemeTemplate(
-        themePackage?.vivliostyle
-      ));
+      ({ template, extraTemplateVariables } = await askThemeTemplate({
+        themeMetadata: themePackage?.vivliostyle,
+        interactiveLogger
+      }));
+    }
+    if (typeof installDependencies !== "boolean") {
+      ({ installDependencies } = await askInstallDependencies({
+        interactiveLogger
+      }));
     }
-    ({ installDependencies } = await askInstallDependencies());
   }
   const browserType = "chrome";
   const browserTag = getDefaultBrowserTag(browserType);
@@ -625,7 +656,11 @@ ${dim2(upath.relative(cwd2, absTemplatePath) || ".")}`
   } else {
     var _stack2 = [];
     try {
-      interactiveLogOutro("All configurations are set! Creating your project...");
+      if (interactiveLogger.messageHistory.length > 0) {
+        interactiveLogger.logOutro(
+          "All configurations are set! Creating your project..."
+        );
+      }
       const _3 = __using(_stack2, Logger.startLogging(
         useLocalTemplate ? "Copying a local template" : "Downloading a template"
       ));
@@ -675,7 +710,9 @@ ${dim2(upath.relative(cwd2, absTemplatePath) || ".")}`
     });
   }
 }
-async function askProjectPath() {
+async function askProjectPath({
+  interactiveLogger
+}) {
   return await askQuestion({
     question: {
       projectPath: {
@@ -687,10 +724,14 @@ async function askProjectPath() {
     },
     schema: v2.required(
       v2.pick(VivliostyleInlineConfigWithoutChecks, ["projectPath"])
-    )
+    ),
+    interactiveLogger
   });
 }
-async function askTitle({ projectPath }) {
+async function askTitle({
+  projectPath,
+  interactiveLogger
+}) {
   return await askQuestion({
     question: {
       title: {
@@ -700,10 +741,13 @@ async function askTitle({ projectPath }) {
         placeholder: toTitleCase(projectPath) || DEFAULT_PROJECT_TITLE
       }
     },
-    schema: v2.required(v2.pick(VivliostyleInlineConfigWithoutChecks, ["title"]))
+    schema: v2.required(v2.pick(VivliostyleInlineConfigWithoutChecks, ["title"])),
+    interactiveLogger
   });
 }
-async function askAuthor() {
+async function askAuthor({
+  interactiveLogger
+}) {
   return await askQuestion({
     question: {
       author: {
@@ -715,17 +759,20 @@ async function askAuthor() {
     },
     schema: v2.required(
       v2.pick(VivliostyleInlineConfigWithoutChecks, ["author"])
-    )
+    ),
+    interactiveLogger
   });
 }
-async function askLanguage() {
+async function askLanguage({
+  interactiveLogger
+}) {
   const initialValue = await getOsLocale();
   return await askQuestion({
     question: {
       language: {
         type: "autocomplete",
         message: "What's the language?",
-        options: Object.entries(languages).map(([value, displayName]) => ({
+        options: Object.entries(LANGUAGES).map(([value, displayName]) => ({
           value,
           label: displayName,
           hint: value
@@ -735,11 +782,14 @@ async function askLanguage() {
     },
     schema: v2.required(
       v2.pick(VivliostyleInlineConfigWithoutChecks, ["language"])
-    )
+    ),
+    interactiveLogger
   });
 }
 var PRESET_TEMPLATE_NOT_USE = "Use templates from the community theme";
-async function askPresetTemplate() {
+async function askPresetTemplate({
+  interactiveLogger
+}) {
   const { presetTemplate } = await askQuestion({
     question: {
       presetTemplate: {
@@ -762,7 +812,8 @@ async function askPresetTemplate() {
           (value) => value === PRESET_TEMPLATE_NOT_USE ? void 0 : TEMPLATE_SETTINGS.find((t) => t.value === value)
         )
       )
-    })
+    }),
+    interactiveLogger
   });
   return { presetTemplate };
 }
@@ -776,10 +827,11 @@ var THEME_ANSWER_MANUAL = "Install other themes from npm";
 async function askTheme({
   template,
   presetTemplate,
-  fetch
+  fetch,
+  interactiveLogger
 }) {
   const useCommunityThemes = !presetTemplate && !template;
-  const themePackages = await interactiveLogLoading(
+  const themePackages = await interactiveLogger.logLoading(
     "Fetching a list of Vivliostyle themes...",
     async () => {
       let themes = (await listVivliostyleThemes({ fetch })).objects;
@@ -842,7 +894,8 @@ async function askTheme({
       }
     },
     schema: v2.objectAsync({ theme: validateThemeMetadataSchema }),
-    validateProgressMessage: "Fetching package metadata..."
+    validateProgressMessage: "Fetching package metadata...",
+    interactiveLogger
   });
   if (theme === THEME_ANSWER_NOT_USE) {
     return { theme: void 0, themePackage: void 0 };
@@ -877,7 +930,8 @@ async function askTheme({
           validateThemeMetadataSchema
         )
       }),
-      validateProgressMessage: "Fetching package metadata..."
+      validateProgressMessage: "Fetching package metadata...",
+      interactiveLogger
     }).then((ret) => ret.themeManualInput);
   }
   return {
@@ -887,7 +941,10 @@ async function askTheme({
     themePackage
   };
 }
-async function askThemeTemplate(themeMetadata) {
+async function askThemeTemplate({
+  interactiveLogger,
+  themeMetadata
+}) {
   const themeTemplate = themeMetadata?.template;
   const options = Object.entries(themeTemplate || {}).map(([value, tmpl]) => ({
     label: tmpl.name || value,
@@ -895,7 +952,7 @@ async function askThemeTemplate(themeMetadata) {
     hint: truncateString(tmpl.description || "")
   }));
   if (!themeTemplate || options.length === 0) {
-    interactiveLogWarn(
+    interactiveLogger.logWarn(
       "The chosen theme does not set template settings. Applying the minimal template."
     );
     return {
@@ -916,19 +973,23 @@ async function askThemeTemplate(themeMetadata) {
         v2.string(),
         v2.transform((input) => themeTemplate[input])
       )
-    })
+    }),
+    interactiveLogger
   });
   let extraTemplateVariables = {};
   if (usingTemplate.prompt?.length) {
     extraTemplateVariables = await askQuestion({
       question: Object.fromEntries(
         usingTemplate.prompt.map((q) => [q.name, q])
-      )
+      ),
+      interactiveLogger
     });
   }
   return { template: usingTemplate.source, extraTemplateVariables };
 }
-async function askInstallDependencies() {
+async function askInstallDependencies({
+  interactiveLogger
+}) {
   return await askQuestion({
     question: {
       installDependencies: {
@@ -942,7 +1003,8 @@ async function askInstallDependencies() {
     },
     schema: v2.object({
       installDependencies: v2.boolean()
-    })
+    }),
+    interactiveLogger
   });
 }
 async function setupTemplate({
@@ -990,13 +1052,16 @@ async function setupTemplate({
     }
     cleanupExitHandler()?.();
   }
-  for (const [file, content] of Object.entries(TEMPLATE_DEFAULT_FILES)) {
-    const targetPath = upath.join(cwd2, projectPath, file);
-    if (fs.existsSync(targetPath)) {
-      continue;
-    }
-    fs.mkdirSync(upath.dirname(targetPath), { recursive: true });
-    fs.writeFileSync(targetPath, content, "utf8");
+  const packageJsonPath = upath.join(cwd2, projectPath, "package.json");
+  if (!fs.existsSync(packageJsonPath)) {
+    fs.writeFileSync(packageJsonPath, TEMPLATE_DEFAULT_PACKAGE_JSON, "utf8");
+  }
+  if (!locateVivliostyleConfig({ cwd: upath.join(cwd2, projectPath) })) {
+    fs.writeFileSync(
+      upath.join(cwd2, projectPath, DEFAULT_CONFIG_FILENAME),
+      TEMPLATE_DEFAULT_VIVLIOSTYLE_CONFIG_JS,
+      "utf8"
+    );
   }
   const replaceTemplateVariable = (dir) => {
     for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
@@ -1024,7 +1089,7 @@ function setupConfigFile({
   templateVariables
 }) {
   const targetPath = upath.join(cwd2, projectPath, DEFAULT_CONFIG_FILENAME);
-  const content = TEMPLATE_DEFAULT_FILES[DEFAULT_CONFIG_FILENAME];
+  const content = TEMPLATE_DEFAULT_VIVLIOSTYLE_CONFIG_JS;
   fs.mkdirSync(upath.dirname(targetPath), { recursive: true });
   fs.writeFileSync(targetPath, format(content, templateVariables), "utf8");
 }
@@ -1080,4 +1145,4 @@ For more information, visit ${terminalLink(yellow2("https://docs.vivliostyle.org
 export {
   create
 };
-//# sourceMappingURL=chunk-QLK3XMQI.js.map
+//# sourceMappingURL=chunk-DEJL63H2.js.map