Absolutize ignored files so the comparison against the watcher yielde…

…d files works

src/Project.ts

@@ -1,7 +1,7 @@
 import _ from "lodash";
 import type { Compiler } from "./Compiler.js";
-import type { ProjectConfig } from "./Options.js";
 import { PathTrie } from "./PathTrie.js";
+import type { ProjectConfig } from "./ProjectConfig.js";
 import type { Supervisor } from "./Supervisor.js";
 import { log } from "./utils.js";
 

src/ProjectConfig.ts

@@ -0,0 +1,56 @@
+import type { Options as SwcOptions } from "@swc/core";
+import fs from "fs-extra";
+import _ from "lodash";
+import path from "path";
+import { log } from "./utils.js";
+
+export type SwcConfig = string | SwcOptions;
+
+export interface RunOptions {
+  argv: string[];
+  terminalCommands: boolean;
+  reloadOnChanges: boolean;
+}
+
+export interface ProjectConfig {
+  ignore: string[];
+  swc?: SwcConfig;
+  esm?: boolean;
+  extensions: string[];
+  cacheDir: string;
+}
+
+export const projectConfig = async (root: string): Promise<ProjectConfig> => {
+  const location = path.join(root, "wds.js");
+  const base: ProjectConfig = {
+    ignore: [],
+    extensions: [".ts", ".tsx", ".jsx"],
+    cacheDir: path.join(root, "node_modules/.cache/wds"),
+    esm: true,
+  };
+
+  try {
+    await fs.access(location);
+  } catch (error: any) {
+    log.debug(`Not loading project config from ${location}`);
+    return base;
+  }
+
+  let required = await import(location);
+  if (required.default) {
+    required = required.default;
+  }
+  log.debug(`Loaded project config from ${location}`);
+  const result = _.defaults(required, base);
+
+  const projectRootDir = path.dirname(location);
+  // absolutize the cacheDir if not already
+  if (!result.cacheDir.startsWith("/")) {
+    result.cacheDir = path.resolve(projectRootDir, result.cacheDir);
+  }
+
+  // absolutize the ignore paths if not already
+  result.ignore = result.ignore.map((p: string) => (p.startsWith("/") ? p : path.resolve(projectRootDir, p)));
+
+  return result;
+};

src/Supervisor.ts

@@ -2,8 +2,8 @@ import type { ChildProcess, StdioOptions } from "child_process";
 import { spawn } from "child_process";
 import { EventEmitter, once } from "events";
 import { setTimeout } from "timers/promises";
-import type { RunOptions } from "./Options.js";
 import type { Project } from "./Project.js";
+import type { RunOptions } from "./ProjectConfig.js";
 import { log } from "./utils.js";
 
 /** */

src/SwcCompiler.ts

@@ -13,8 +13,8 @@ import path from "path";
 import { fileURLToPath } from "url";
 import writeFileAtomic from "write-file-atomic";
 import type { Compiler } from "./Compiler.js";
-import type { ProjectConfig } from "./Options.js";
-import { log, projectConfig } from "./utils.js";
+import { projectConfig, type ProjectConfig } from "./ProjectConfig.js";
+import { log } from "./utils.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const require = createRequire(import.meta.url);

src/index.ts

@@ -9,12 +9,12 @@ import { fileURLToPath } from "url";
 import Watcher from "watcher";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
-import type { ProjectConfig, RunOptions } from "./Options.js";
 import { Project } from "./Project.js";
+import { projectConfig, type ProjectConfig, type RunOptions } from "./ProjectConfig.js";
 import { Supervisor } from "./Supervisor.js";
 import { MissingDestinationError, SwcCompiler } from "./SwcCompiler.js";
 import { MiniServer } from "./mini-server.js";
-import { log, projectConfig } from "./utils.js";
+import { log } from "./utils.js";
 
 const dirname = fileURLToPath(new URL(".", import.meta.url));
 
@@ -63,15 +63,18 @@ const startTerminalCommandListener = (project: Project) => {
   return reader;
 };
 
+const gitDir = `${path.sep}.git${path.sep}`;
+const nodeModulesDir = `${path.sep}node_modules${path.sep}`;
+
 const startFilesystemWatcher = (project: Project) => {
   const watcher = new Watcher([project.workspaceRoot], {
     ignoreInitial: true,
     recursive: true,
     ignore: ((filePath: string) => {
-      if (filePath.includes("node_modules")) return true;
+      if (filePath.includes(nodeModulesDir)) return true;
       if (filePath.endsWith(".d.ts")) return true;
       if (filePath.endsWith(".map")) return true;
-      if (filePath.endsWith(".git")) return true;
+      if (filePath.includes(gitDir)) return true;
       if (filePath.endsWith(".DS_Store")) return true;
       if (filePath.endsWith(".tsbuildinfo")) return true;
 

src/utils.ts

@@ -1,10 +1,4 @@
-import fs from "fs-extra";
-import _ from "lodash";
-import path from "path";
 import { threadId } from "worker_threads";
-// @ts-expect-error see https://github.com/microsoft/TypeScript/issues/52529, can't import types from .cts to .ts files that are ESM
-import type { ProjectConfig } from "./Options";
-
 const logPrefix = `[wds pid=${process.pid} thread=${threadId}]`;
 export const log = {
   debug: (...args: any[]) => process.env["WDS_DEBUG"] && console.warn(logPrefix, ...args),
@@ -20,34 +14,3 @@ export async function time<T>(run: () => Promise<T>) {
 
   return (diff[0] + diff[1] / 1e9).toFixed(5);
 }
-
-export const projectConfig = async (root: string): Promise<ProjectConfig> => {
-  const location = path.join(root, "wds.js");
-  const base: ProjectConfig = {
-    ignore: [],
-    extensions: [".ts", ".tsx", ".jsx"],
-    cacheDir: path.join(root, "node_modules/.cache/wds"),
-    esm: true,
-  };
-
-  try {
-    await fs.access(location);
-  } catch (error: any) {
-    log.debug(`Not loading project config from ${location}`);
-    return base;
-  }
-
-  let required = await import(location);
-  if (required.default) {
-    required = required.default;
-  }
-  log.debug(`Loaded project config from ${location}`);
-  const result = _.defaults(required, base);
-
-  // absolutize the cacheDir if not already
-  if (!result.cacheDir.startsWith("/")) {
-    result.cacheDir = path.resolve(path.dirname(location), result.cacheDir);
-  }
-
-  return result;
-};