@vivliostyle/cli 9.1.0 → 9.2.0

package/dist/{chunk-KSJHCVYG.js → chunk-XYOW6HSN.js}

@@ -25,10 +25,10 @@ import {
   touchTmpFile,
   useTmpDirectory,
   writeFileIfChanged
-} from "./chunk-7BGVK3JL.js";
+} from "./chunk-U63QI2TT.js";
 import {
   VivliostyleConfigSchema
-} from "./chunk-ASL7KKVE.js";
+} from "./chunk-SEVGSYUZ.js";
 import {
   CONTAINER_LOCAL_HOSTNAME,
   CONTAINER_URL,
@@ -230,7 +230,7 @@ function mergeInlineConfig({ tasks, inlineOptions }, inlineConfig) {
 import { VFM } from "@vivliostyle/vfm";
 import { lookup as mime } from "mime-types";
 import fs3 from "node:fs";
-import { pathToFileURL as pathToFileURL2 } from "node:url";
+import { fileURLToPath, pathToFileURL as pathToFileURL2 } from "node:url";
 import npa from "npm-package-arg";
 import upath2 from "upath";
 
@@ -351,6 +351,7 @@ function parseTheme({
     name,
     specifier: resolvedSpecifier,
     location: upath2.join(themesDir, "node_modules", name),
+    registry: Boolean(parsed.registry),
     importPath
   };
 }
@@ -399,6 +400,26 @@ function parseFileMetadata({
   }
   return { title, themes };
 }
+function parseCustomStyle({
+  customStyle,
+  entryContextDir
+}) {
+  if (isValidUri(customStyle)) {
+    return customStyle;
+  }
+  const stylePath = upath2.resolve(entryContextDir, customStyle);
+  if (!pathContains(entryContextDir, stylePath)) {
+    throw Error(
+      `Custom style file ${customStyle} is not in ${entryContextDir}. Make sure the file is located in the context directory or a subdirectory.`
+    );
+  }
+  if (!fs3.existsSync(stylePath)) {
+    throw new Error(`Custom style file not found: ${customStyle}`);
+  }
+  return pathToFileURL2(stylePath).href.slice(
+    pathToFileURL2(entryContextDir).href.replace(/\/$/, "").length + 1
+  );
+}
 function resolveTaskConfig(config, options) {
   const context = options.cwd ?? cwd;
   Logger.debug("resolveTaskConfig > context %s", context);
@@ -410,8 +431,6 @@ function resolveTaskConfig(config, options) {
   const bleed = options.bleed;
   const cropOffset = options.cropOffset;
   const css = options.css;
-  const customStyle = options.style && (isValidUri(options.style) ? options.style : pathToFileURL2(options.style).href);
-  const customUserStyle = options.userStyle && (isValidUri(options.userStyle) ? options.userStyle : pathToFileURL2(options.userStyle).href);
   const singleDoc = options.singleDoc ?? false;
   const quick = options.quick ?? false;
   const temporaryFilePrefix = config.temporaryFilePrefix ?? `.vs-${Date.now()}.`;
@@ -443,12 +462,14 @@ function resolveTaskConfig(config, options) {
   const staticRoutes = config.static ?? {};
   const viteConfig = config.vite;
   const viteConfigFile = config.viteConfigFile ?? true;
+  const customStyle = options.style && parseCustomStyle({ customStyle: options.style, entryContextDir }) || void 0;
+  const customUserStyle = options.userStyle && parseCustomStyle({ customStyle: options.userStyle, entryContextDir }) || void 0;
   const outputs = (() => {
     const defaultPdfOptions = {
       format: "pdf",
-      renderMode: "local",
-      preflight: config.pressReady ? "press-ready" : void 0,
-      preflightOption: []
+      renderMode: options.renderMode ?? "local",
+      preflight: options.preflight ?? (config.pressReady ? "press-ready" : void 0),
+      preflightOption: options.preflightOption ?? []
     };
     if (config.output) {
       return config.output.map((target) => {
@@ -490,18 +511,23 @@ function resolveTaskConfig(config, options) {
   })();
   const { server, rootUrl } = (() => {
     let host = config.server?.host ?? false;
+    let allowedHosts = config.server?.allowedHosts || [];
     const port = config.server?.port ?? 13e3;
     if (outputs.some(
       (target) => target.format === "pdf" && target.renderMode === "docker"
-    )) {
+    ) && !isInContainer()) {
       host = true;
+      if (Array.isArray(allowedHosts) && !allowedHosts.includes(CONTAINER_LOCAL_HOSTNAME)) {
+        allowedHosts.push(CONTAINER_LOCAL_HOSTNAME);
+      }
     }
-    const rootHostname = isInContainer() ? CONTAINER_LOCAL_HOSTNAME : !host ? "localhost" : host === true ? "0.0.0.0" : host;
+    const rootHostname = !host ? "localhost" : host === true ? "0.0.0.0" : host;
     return {
       server: {
         host,
         port,
-        proxy: config.server?.proxy ?? {}
+        proxy: config.server?.proxy ?? {},
+        allowedHosts
       },
       rootUrl: `http://${rootHostname}:${port}`
     };
@@ -620,12 +646,19 @@ function resolveSingleInputConfig({
   const author = config?.author;
   const entries = [];
   const exportAliases = [];
+  let isLocalResource = true;
   if (isValidUri(input.entry)) {
-    sourcePath = input.entry;
-    serverRootDir = UseTemporaryServerRoot;
-    workspaceDir = context;
+    const url = new URL(input.entry);
+    if (url.protocol === "file:") {
+      sourcePath = fileURLToPath(url);
+    } else {
+      isLocalResource = false;
+      sourcePath = input.entry;
+    }
   } else {
     sourcePath = upath2.resolve(context, input.entry);
+  }
+  if (isLocalResource) {
     statFileSync(sourcePath);
     switch (input.format) {
       case "webbook":
@@ -648,6 +681,9 @@ function resolveSingleInputConfig({
         return input.format;
     }
     serverRootDir = workspaceDir;
+  } else {
+    serverRootDir = UseTemporaryServerRoot;
+    workspaceDir = context;
   }
   const themesDir = upath2.resolve(workspaceDir, "themes");
   if (input.format === "markdown") {
@@ -713,9 +749,6 @@ function resolveSingleInputConfig({
     let webbookPath;
     if (isValidUri(sourcePath)) {
       const url = new URL(sourcePath);
-      if (/^https?:/i.test(url.protocol) && !url.pathname.endsWith("/") && !/\.\w+$/.test(url.pathname)) {
-        url.pathname = `${url.pathname}/`;
-      }
       webbookEntryUrl = url.href;
     } else {
       const rootFileUrl = pathToFileURL2(workspaceDir).href;
@@ -1169,10 +1202,9 @@ import upath7 from "upath";
 import { copy as copy3, move } from "fs-extra/esm";
 import fs8 from "node:fs";
 import picomatch from "picomatch";
-import prettier from "prettier";
-import parserHtml from "prettier/parser-html";
 import { glob as glob2 } from "tinyglobby";
 import upath6 from "upath";
+import serializeToXml2 from "w3c-xmlserializer";
 import MIMEType2 from "whatwg-mimetype";
 
 // src/output/webbook.ts
@@ -1190,7 +1222,7 @@ import jsdom, {
 } from "@vivliostyle/jsdom";
 import DOMPurify from "dompurify";
 import { toHtml } from "hast-util-to-html";
-import { fileURLToPath, pathToFileURL as pathToFileURL3 } from "node:url";
+import { fileURLToPath as fileURLToPath2, pathToFileURL as pathToFileURL3 } from "node:url";
 import upath3 from "upath";
 import MIMEType from "whatwg-mimetype";
 import { jsx, jsxs } from "hastscript/jsx-runtime";
@@ -1228,7 +1260,8 @@ var htmlPurify = DOMPurify(
   // @ts-expect-error: jsdom.DOMWindow should have trustedTypes property
   new JSDOM("").window
 );
-var ResourceLoader = class extends BaseResourceLoader {
+var ResourceLoader = class _ResourceLoader extends BaseResourceLoader {
+  static dataUrlOrigin = "http://localhost/";
   fetcherMap = /* @__PURE__ */ new Map();
   fetch(url, options) {
     Logger.debug(`[JSDOM] Fetching resource: ${url}`);
@@ -1244,7 +1277,7 @@ var ResourceLoader = class extends BaseResourceLoader {
     outputDir,
     onError
   }) {
-    const rootHref = /^https?:/i.test(new URL(rootUrl).protocol) ? new URL("/", rootUrl).href : new URL(".", rootUrl).href;
+    const rootHref = rootUrl.startsWith("data:") ? _ResourceLoader.dataUrlOrigin : /^https?:/i.test(rootUrl) ? new URL("/", rootUrl).href : new URL(".", rootUrl).href;
     const normalizeToLocalPath = (urlString, mimeType) => {
       let url = new URL(urlString);
       url.hash = "";
@@ -1295,13 +1328,39 @@ async function getJsdomFromUrlOrFile({
     });
   } else if (url.protocol === "file:") {
     if (resourceLoader) {
-      const file = resourceLoader._readFile(fileURLToPath(url));
+      const file = resourceLoader._readFile(fileURLToPath2(url));
       resourceLoader.fetcherMap.set(url.href, file);
     }
-    dom = await JSDOM.fromFile(fileURLToPath(url), {
+    dom = await JSDOM.fromFile(fileURLToPath2(url), {
+      virtualConsole,
+      resources: resourceLoader,
+      contentType: src.endsWith(".xhtml") || src.endsWith(".xml") ? "application/xhtml+xml; charset=UTF-8" : "text/html; charset=UTF-8"
+    });
+  } else if (url.protocol === "data:") {
+    const [head, body] = url.href.split(",", 2);
+    const data = decodeURIComponent(body);
+    const buffer = Buffer.from(
+      data,
+      /;base64$/i.test(head) ? "base64" : "utf8"
+    );
+    const dummyUrl = `${ResourceLoader.dataUrlOrigin}index.html`;
+    if (resourceLoader) {
+      let timeoutId;
+      const promise = new Promise((resolve) => {
+        timeoutId = setTimeout(resolve, 0, buffer);
+      });
+      promise.abort = () => {
+        if (timeoutId !== void 0) {
+          clearTimeout(timeoutId);
+        }
+      };
+      resourceLoader.fetcherMap.set(dummyUrl, promise);
+    }
+    dom = new JSDOM(buffer.toString(), {
       virtualConsole,
       resources: resourceLoader,
-      contentType: "text/html; charset=UTF-8"
+      contentType: "text/html; charset=UTF-8",
+      url: dummyUrl
     });
   } else {
     throw new Error(`Unsupported protocol: ${url.protocol}`);
@@ -2429,8 +2488,13 @@ async function retrieveWebbookEntry({
     resourceLoader,
     baseUrl: webbookEntryUrl
   }) || {};
-  const rootUrl = /^https?:/i.test(webbookEntryUrl) ? new URL("/", webbookEntryUrl).href : new URL(".", webbookEntryUrl).href;
-  const pathContains2 = (url) => !upath5.relative(rootUrl, url).startsWith("..");
+  let pathContains2;
+  if (webbookEntryUrl.startsWith("data:")) {
+    pathContains2 = (url) => false;
+  } else {
+    const rootUrl = /^https?:/i.test(webbookEntryUrl) ? new URL("/", webbookEntryUrl).href : new URL(".", webbookEntryUrl).href;
+    pathContains2 = (url) => !upath5.relative(rootUrl, url).startsWith("..");
+  }
   const retriever = new Map(resourceLoader.fetcherMap);
   if (manifest && manifestUrl) {
     [manifest.resources || []].flat().forEach((v2) => {
@@ -2498,7 +2562,11 @@ async function retrieveWebbookEntry({
     manifest && JSON.stringify(manifest, null, 2)
   );
   return {
-    entryHtmlFile: upath5.join(outputDir, entryHtml),
+    entryHtmlFile: upath5.join(
+      outputDir,
+      entryHtml,
+      ...upath5.extname(entryHtml) ? [] : ["index.html"]
+    ),
     manifest
   };
 }
@@ -2556,7 +2624,9 @@ async function copyWebPublicationAssets({
   manifestPath,
   input,
   outputDir,
-  entries
+  entries,
+  customStyle,
+  customUserStyle
 }) {
   const relExportAliases = exportAliases.map(({ source, target }) => ({
     source: upath5.relative(input, source),
@@ -2568,7 +2638,9 @@ async function copyWebPublicationAssets({
       cwd: input,
       outputs,
       themesDir,
-      entries
+      entries,
+      customStyle,
+      customUserStyle
     }),
     ...await glob(
       [
@@ -3011,10 +3083,13 @@ async function transformManuscript(entry, {
       styleOptions: coverEntry
     });
   }
-  const html = await prettier.format(content.serialize(), {
-    parser: "html",
-    plugins: [parserHtml]
-  });
+  let html;
+  if (content.window.document.contentType === "application/xhtml+xml") {
+    html = `${XML_DECLARATION}
+${serializeToXml2(content.window.document)}`;
+  } else {
+    html = content.serialize();
+  }
   const htmlBuffer = Buffer.from(html, "utf8");
   if (!source || source.type === "file" && !pathEquals(source.pathname, entry.target)) {
     writeFileIfChanged(entry.target, htmlBuffer);
@@ -3110,6 +3185,8 @@ function getAssetMatcherSettings({
   outputs,
   themesDir,
   entries,
+  customStyle,
+  customUserStyle,
   cwd: cwd2,
   ignore = []
 }) {
@@ -3133,7 +3210,12 @@ function getAssetMatcherSettings({
     // Step 2: Glob files matched with `includes`
     // Ignore only files matched `excludes`
     {
-      patterns: includes,
+      patterns: [
+        ...includes,
+        // Copy custom (user) style if specified
+        customStyle,
+        customUserStyle
+      ].filter((s) => Boolean(s)),
       ignore: ignorePatterns
     }
   ];
@@ -3164,7 +3246,9 @@ async function copyAssets({
   copyAsset,
   outputs,
   themesDir,
-  entries
+  entries,
+  customStyle,
+  customUserStyle
 }) {
   if (pathEquals(entryContextDir, workspaceDir)) {
     return;
@@ -3176,6 +3260,8 @@ async function copyAssets({
     outputs,
     themesDir,
     entries,
+    customStyle,
+    customUserStyle,
     ignore: [
       // don't copy workspace itself
       ...relWorkspaceDir ? [upath6.join(relWorkspaceDir, "**")] : []
@@ -3276,7 +3362,7 @@ function vsDevServerPlugin({
   let server;
   let program;
   const transformCache = /* @__PURE__ */ new Map();
-  const projectDeps = /* @__PURE__ */ new Set();
+  let matchProjectDep;
   async function reload(forceUpdate = false) {
     const prevConfig = config;
     config = await reloadConfig(prevConfig, inlineConfig, server?.config);
@@ -3319,14 +3405,34 @@ function vsDevServerPlugin({
       serveAssetsMatcher
     };
     const configPath = locateVivliostyleConfig(inlineConfig);
+    const projectDeps = [];
     if (configPath) {
-      projectDeps.add(configPath);
+      projectDeps.push(configPath);
       server?.watcher.add(configPath);
     }
     if (config.viewerInput.type === "webpub") {
-      projectDeps.add(config.viewerInput.manifestPath);
+      projectDeps.push(config.viewerInput.manifestPath);
       server?.watcher.add(config.viewerInput.manifestPath);
     }
+    const flattenWatchTarget = (themes) => [...themes].flatMap((theme) => {
+      if (theme.type === "file") {
+        return [theme.source];
+      }
+      if (theme.type === "package" && !theme.registry) {
+        return [theme.specifier];
+      }
+      return [];
+    });
+    const prevThemeFiles = flattenWatchTarget(prevConfig.themeIndexes);
+    const themeFiles = flattenWatchTarget(config.themeIndexes);
+    server?.watcher.unwatch(
+      prevThemeFiles.filter((target) => !themeFiles.includes(target))
+    );
+    server?.watcher.add(themeFiles);
+    projectDeps.push(...themeFiles);
+    matchProjectDep = (pathname) => projectDeps.some(
+      (dep) => pathEquals(dep, pathname) || pathContains(dep, pathname)
+    );
   }
   async function transform(entry, config2, host) {
     const rootUrl = host ? `${server?.config.server.https ? "https" : "http"}://${host}` : config2.rootUrl;
@@ -3343,7 +3449,7 @@ function vsDevServerPlugin({
         }
         return { content: html, etag };
       } catch (error) {
-        console.error(getFormattedError(error));
+        server?.config.logger.error(getFormattedError(error));
         transformCache.delete(entry.target);
         return;
       }
@@ -3446,7 +3552,7 @@ function vsDevServerPlugin({
     configureServer(viteServer) {
       server = viteServer;
       const handleUpdate = async (pathname) => {
-        if (!projectDeps.has(pathname)) {
+        if (!matchProjectDep?.(pathname)) {
           return;
         }
         await reload();
@@ -3596,7 +3702,8 @@ function getViewerParams(src, {
   customUserStyle,
   singleDoc,
   quick,
-  viewerParam
+  viewerParam,
+  base
 }) {
   const pageSizeValue = size && ("format" in size ? size.format : `${size.width} ${size.height}`);
   function escapeParam(url) {
@@ -3605,10 +3712,12 @@ function getViewerParams(src, {
   let viewerParams = src ? `src=${escapeParam(src)}` : "";
   viewerParams += `&bookMode=${!singleDoc}&renderAllPages=${!quick}`;
   if (customStyle) {
-    viewerParams += `&style=${escapeParam(customStyle)}`;
+    const param = isValidUri(customStyle) ? customStyle : upath10.posix.join(base, customStyle);
+    viewerParams += `&style=${escapeParam(param)}`;
   }
   if (customUserStyle) {
-    viewerParams += `&userStyle=${escapeParam(customUserStyle)}`;
+    const param = isValidUri(customUserStyle) ? customUserStyle : upath10.posix.join(base, customUserStyle);
+    viewerParams += `&userStyle=${escapeParam(param)}`;
   }
   if (pageSizeValue || cropMarks || bleed || cropOffset || css) {
     let pageStyle = "@page{";
@@ -3683,7 +3792,7 @@ async function getViewerFullUrl({
   });
   const viewerParams = getViewerParams(
     sourceUrl === EMPTY_DATA_URI ? void 0 : sourceUrl,
-    config
+    { base, ...config }
   );
   viewerUrl.hash = "";
   return `${viewerUrl.href}#${viewerParams}`;
@@ -3800,4 +3909,4 @@ export {
   getViewerFullUrl,
   createViteServer
 };
-//# sourceMappingURL=chunk-KSJHCVYG.js.map
+//# sourceMappingURL=chunk-XYOW6HSN.js.map