fix: allow relative paths for outDir and staticDir

Author: csvn

src/config.ts

@@ -35,25 +35,35 @@ export interface ResolvedFreshConfig {
 }
 
 export function parseRootPath(root: string, cwd: string): string {
-  if (root.startsWith("file://")) {
-    root = path.fromFileUrl(root);
-  } else if (!path.isAbsolute(root)) {
-    root = path.join(cwd, root);
+  return parseDirPath(root, cwd, true);
+}
+
+function parseDirPath(
+  dirPath: string,
+  root: string,
+  fileToDir = false,
+): string {
+  if (dirPath.startsWith("file://")) {
+    dirPath = path.fromFileUrl(dirPath);
+  } else if (!path.isAbsolute(dirPath)) {
+    dirPath = path.join(root, dirPath);
   }
 
-  const ext = path.extname(root);
-  if (
-    ext === ".ts" || ext === ".tsx" || ext === ".js" || ext === ".jsx" ||
-    ext === ".mjs"
-  ) {
-    root = path.dirname(root);
+  if (fileToDir) {
+    const ext = path.extname(dirPath);
+    if (
+      ext === ".ts" || ext === ".tsx" || ext === ".js" || ext === ".jsx" ||
+      ext === ".mjs"
+    ) {
+      dirPath = path.dirname(dirPath);
+    }
   }
 
   if (Deno.build.os === "windows") {
-    root = root.replaceAll("\\", "/");
+    dirPath = dirPath.replaceAll("\\", "/");
   }
 
-  return root;
+  return dirPath;
 }
 
 export function normalizeConfig(options: FreshConfig): ResolvedFreshConfig {
@@ -62,10 +72,10 @@ export function normalizeConfig(options: FreshConfig): ResolvedFreshConfig {
   return {
     root,
     build: {
-      outDir: options.build?.outDir ?? path.join(root, "_fresh"),
+      outDir: parseDirPath(options.build?.outDir ?? "_fresh", root),
     },
     basePath: options.basePath ?? "",
-    staticDir: options.staticDir ?? path.join(root, "static"),
+    staticDir: parseDirPath(options.staticDir ?? "static", root),
     mode: "production",
   };
 }

src/config_test.ts

@@ -1,5 +1,6 @@
 import { expect } from "@std/expect";
 import { normalizeConfig, parseRootPath } from "./config.ts";
+import type { FreshConfig } from "./mod.ts";
 
 Deno.test("parseRootPath", () => {
   const cwd = Deno.cwd().replaceAll("\\", "/");
@@ -45,3 +46,63 @@ Deno.test("normalizeConfig - root", () => {
     expect(configRoot("file:///C:/foo/bar")).toEqual("C:/foo/bar");
   }
 });
+
+Deno.test("normalizeConfig - build.outDir", () => {
+  const cwd = Deno.cwd().replaceAll("\\", "/");
+  const outDir = (options: FreshConfig) =>
+    normalizeConfig(options).build.outDir;
+
+  // Default outDir
+  expect(outDir({ root: "./src" })).toEqual(`${cwd}/src/_fresh`);
+  expect(outDir({ root: "/src" })).toEqual("/src/_fresh");
+  expect(outDir({ root: "file:///src" })).toEqual("/src/_fresh");
+
+  // Relative outDir
+  expect(outDir({ root: "/src", build: { outDir: "dist" } })).toEqual(
+    "/src/dist",
+  );
+  expect(outDir({ root: "/src", build: { outDir: "./dist" } })).toEqual(
+    "/src/dist",
+  );
+
+  // Absolute outDir
+  expect(outDir({ root: "/src", build: { outDir: "/dist" } })).toEqual(
+    "/dist",
+  );
+  expect(outDir({ root: "/src", build: { outDir: "/dist/fresh" } })).toEqual(
+    "/dist/fresh",
+  );
+  expect(outDir({ root: "/src", build: { outDir: "file:///dist" } })).toEqual(
+    "/dist",
+  );
+});
+
+Deno.test("normalizeConfig - staticDir", () => {
+  const cwd = Deno.cwd().replaceAll("\\", "/");
+  const staticDir = (options: FreshConfig) =>
+    normalizeConfig(options).staticDir;
+
+  // Default staticDir
+  expect(staticDir({ root: "./src" })).toEqual(`${cwd}/src/static`);
+  expect(staticDir({ root: "/src" })).toEqual("/src/static");
+  expect(staticDir({ root: "file:///src" })).toEqual("/src/static");
+
+  // Relative staticDir
+  expect(staticDir({ root: "/src", staticDir: "public" })).toEqual(
+    "/src/public",
+  );
+  expect(staticDir({ root: "/src", staticDir: "./public" })).toEqual(
+    "/src/public",
+  );
+
+  // Absolute staticDir
+  expect(staticDir({ root: "/src", staticDir: "/public" })).toEqual(
+    "/public",
+  );
+  expect(staticDir({ root: "/src", staticDir: "/public/assets" })).toEqual(
+    "/public/assets",
+  );
+  expect(staticDir({ root: "/src", staticDir: "file:///public" })).toEqual(
+    "/public",
+  );
+});