Pass the builder tests

vivliostyle · Jan 9, 2025 · 9b29bf7 · 9b29bf7
1 parent 3dd9fed
commit 9b29bf7
Show file tree

Hide file tree

Showing 18 changed files with 162 additions and 310 deletions.
diff --git a/src/config/resolve.ts b/src/config/resolve.ts
@@ -34,6 +34,7 @@ import {
   getEpubRootDir,
   isInContainer,
   isValidUri,
+  pathContains,
   pathEquals,
   readJSON,
   statFileSync,
@@ -599,6 +600,27 @@ export function resolveTaskConfig(
           cover,
         });
 
+  // Check overwrites
+  for (const output of outputs) {
+    const relPath = upath.relative(context, output.path);
+    if (
+      pathContains(output.path, entryContextDir) ||
+      pathEquals(output.path, entryContextDir)
+    ) {
+      throw new Error(
+        `The output path is set to "${relPath}", but this will overwrite the original manuscript file. Please specify a different path.`,
+      );
+    }
+    if (
+      pathContains(output.path, projectConfig.workspaceDir) ||
+      pathEquals(output.path, projectConfig.workspaceDir)
+    ) {
+      throw new Error(
+        `The output path is set to "${relPath}", but this will overwrite the working directory of Vivliostyle. Please specify a different path.`,
+      );
+    }
+  }
+
   const resolvedConfig = {
     ...projectConfig,
     context,
@@ -876,6 +898,7 @@ function resolveComposedProjectConfig({
         themesDir,
       }),
     ) ?? [];
+  rootThemes.forEach((t) => themeIndexes.add(t));
   const tocConfig = {
     tocTitle: config.toc?.title ?? config?.tocTitle ?? TOC_TITLE,
     target: upath.resolve(workspaceDir, config.toc?.htmlPath ?? TOC_FILENAME),

diff --git a/src/config/schema.ts b/src/config/schema.ts
@@ -671,9 +671,9 @@ export const BuildTask = v.pipe(
           v.transform((input) =>
             typeof input === 'string'
               ? { htmlPath: input }
-              : typeof input === 'boolean'
+              : input === true
                 ? {}
-                : input,
+                : input || undefined,
           ),
           v.description($`
             Options for Table of Contents (ToC) documents.

diff --git a/src/processor/compile.ts b/src/processor/compile.ts
@@ -523,23 +523,3 @@ export async function copyAssets({
     await copy(upath.resolve(entryContextDir, asset), target);
   }
 }
-
-export function checkOverwriteViolation(
-  { entryContextDir, workspaceDir }: ResolvedTaskConfig,
-  target: string,
-  fileInformation: string,
-) {
-  if (
-    pathContains(target, entryContextDir) ||
-    pathEquals(target, entryContextDir)
-  ) {
-    throw new Error(
-      `${target} is set as output destination of ${fileInformation}, however, this output path will overwrite the manuscript file(s). Please specify other paths.`,
-    );
-  }
-  if (pathContains(target, workspaceDir) || pathEquals(target, workspaceDir)) {
-    throw new Error(
-      `${target} is set as output destination of ${fileInformation}, however, this output path will overwrite the working directory of Vivliostyle. Please specify other paths.`,
-    );
-  }
-}