@dudousxd/nestjs-codegen 0.27.1 → 0.28.0

package/dist/cli/main.js

@@ -685,12 +685,18 @@ function findTypeInFile(name, file) {
 function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
   if (moduleSpecifier.startsWith(".")) {
     const dir = dirname(sourceFile.getFilePath());
-    const noExt = moduleSpecifier.replace(/\.(js|ts)$/, "");
-    return [
-      resolve2(dir, `${noExt}.ts`),
+    const ext = /\.(c|m)?(j|t)sx?$/.exec(moduleSpecifier)?.[0];
+    const base = ext ? moduleSpecifier.slice(0, -ext.length) : moduleSpecifier;
+    const flavour = ext?.startsWith(".c") ? "c" : ext?.startsWith(".m") ? "m" : "";
+    const candidates = [
+      resolve2(dir, `${base}.${flavour}ts`),
+      ...flavour === "" ? [resolve2(dir, `${base}.tsx`)] : [],
       resolve2(dir, `${moduleSpecifier}.ts`),
-      resolve2(dir, moduleSpecifier, "index.ts")
+      resolve2(dir, moduleSpecifier, "index.ts"),
+      resolve2(dir, `${base}.d.${flavour}ts`),
+      ...ext === void 0 ? [resolve2(dir, moduleSpecifier, "index.d.ts")] : []
     ];
+    return [...new Set(candidates)];
   }
   const ctx = _ctxFor(project);
   const baseUrl = ctx.pathsBase ?? ctx.projectRoot;
@@ -5641,14 +5647,26 @@ async function computeInputsHash(config, extraInputs = []) {
     hash.update("\n");
   }
   for (const file of extra) {
-    const contents = await readFile2(join13(cwd, file), "utf8").catch(() => null);
     hash.update(`extra:${file}
 `);
-    hash.update(contents ?? "\0missing");
+    hash.update(await readTrackedInput(join13(cwd, file)));
     hash.update("\n");
   }
   return hash.digest("hex");
 }
+async function readTrackedInput(path) {
+  try {
+    return await readFile2(path, "utf8");
+  } catch (err) {
+    if (err.code !== "EISDIR") return "\0missing";
+  }
+  try {
+    const entries = await readdir(path);
+    return `\0dir:${entries.sort().join("\n")}`;
+  } catch {
+    return "\0missing";
+  }
+}
 async function readManifest(outDir) {
   try {
     const raw = await readFile2(join13(outDir, MANIFEST_FILE), "utf8");
@@ -5804,7 +5822,7 @@ async function generate(config, inputRoutes = [], entryPoint = "cli") {
 
 // src/watch/watcher.ts
 import { readFile as readFile4 } from "fs/promises";
-import { join as join16 } from "path";
+import { join as join16, resolve as resolve5 } from "path";
 import chokidar from "chokidar";
 
 // src/watch/lock-file.ts
@@ -5886,11 +5904,36 @@ async function watch(config, onChange, options = {}) {
     }
     return discovery;
   }
+  const trackedWatcher = chokidar.watch([], {
+    ignoreInitial: true,
+    persistent: true,
+    awaitWriteFinish: { stabilityThreshold: 80, pollInterval: 20 }
+  });
+  const trackedPaths = /* @__PURE__ */ new Set();
+  async function syncTrackedInputs() {
+    const manifest = await readManifest(config.codegen.outDir);
+    const fresh = [];
+    for (const path of manifest?.extraInputs ?? []) {
+      const abs = resolve5(config.codegen.cwd, path);
+      if (trackedPaths.has(abs)) continue;
+      trackedPaths.add(abs);
+      fresh.push(abs);
+    }
+    if (fresh.length > 0) trackedWatcher.add(fresh);
+  }
+  async function generateAndTrack(routes) {
+    try {
+      await generate(config, routes, entryPoint);
+    } finally {
+      await syncTrackedInputs().catch(() => {
+      });
+    }
+  }
   async function runInitialPass() {
     try {
       const initialRoutes = (await getDiscovery()).discover();
       lastRoutes = initialRoutes;
-      await generate(config, initialRoutes, entryPoint);
+      await generateAndTrack(initialRoutes);
     } catch (err) {
       if (err instanceof DriftGuardError) {
         console.error(err.message);
@@ -5900,7 +5943,7 @@ async function watch(config, onChange, options = {}) {
         `[nestjs-codegen] Initial route discovery failed, falling back to pages-only: ${err instanceof Error ? err.message : String(err)}`
       );
       try {
-        await generate(config, lastRoutes, entryPoint);
+        await generateAndTrack(lastRoutes);
       } catch {
       }
     }
@@ -5933,7 +5976,7 @@ async function watch(config, onChange, options = {}) {
     pagesDebounceTimer = setTimeout(async () => {
       pagesDebounceTimer = void 0;
       try {
-        await generate(config, lastRoutes, entryPoint);
+        await generateAndTrack(lastRoutes);
       } catch (err) {
         console.error(
           "[nestjs-codegen] Pages generation failed:",
@@ -5965,7 +6008,7 @@ async function watch(config, onChange, options = {}) {
       try {
         const routes = await (await getDiscovery()).rediscover(changed);
         lastRoutes = routes;
-        await generate(config, routes, entryPoint);
+        await generateAndTrack(routes);
       } catch (err) {
         console.error(
           "[nestjs-codegen] Contracts generation failed:",
@@ -5986,6 +6029,9 @@ async function watch(config, onChange, options = {}) {
   formsWatcher.on("add", (p) => scheduleContractsRegenerate(p));
   formsWatcher.on("change", (p) => scheduleContractsRegenerate(p));
   formsWatcher.on("unlink", (p) => scheduleContractsRegenerate(p));
+  trackedWatcher.on("add", (p) => scheduleContractsRegenerate(p));
+  trackedWatcher.on("change", (p) => scheduleContractsRegenerate(p));
+  trackedWatcher.on("unlink", (p) => scheduleContractsRegenerate(p));
   return {
     close: async () => {
       if (pagesDebounceTimer !== void 0) {
@@ -5999,13 +6045,14 @@ async function watch(config, onChange, options = {}) {
       await pagesWatcher.close();
       await contractsWatcher.close();
       await formsWatcher.close();
+      await trackedWatcher.close();
       await lock.release();
     }
   };
 }
 
 // src/index.ts
-var VERSION = "0.27.1";
+var VERSION = "0.28.0";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {
@@ -6013,9 +6060,9 @@ async function runCodegen(opts = {}) {
   const config = await loadConfig(cwd);
   if (opts.watch) {
     const watcher = await watch(config, void 0, { entryPoint: "cli" });
-    await new Promise((resolve5) => {
+    await new Promise((resolve6) => {
       function onSignal() {
-        watcher.close().then(resolve5).catch(resolve5);
+        watcher.close().then(resolve6).catch(resolve6);
       }
       process.once("SIGINT", onSignal);
       process.once("SIGTERM", onSignal);
@@ -6145,16 +6192,16 @@ async function detectPackageManager(cwd) {
 }
 async function promptFramework() {
   if (!process.stdin.isTTY) return "react";
-  return new Promise((resolve5) => {
+  return new Promise((resolve6) => {
     const rl = createInterface({ input: process.stdin, output: process.stdout });
     rl.question(
       "[nestjs-codegen] Which frontend framework? (react/vue/svelte) [react]: ",
       (answer) => {
         rl.close();
         const trimmed = answer.trim().toLowerCase();
-        if (trimmed === "vue") resolve5("vue");
-        else if (trimmed === "svelte") resolve5("svelte");
-        else resolve5("react");
+        if (trimmed === "vue") resolve6("vue");
+        else if (trimmed === "svelte") resolve6("svelte");
+        else resolve6("react");
       }
     );
   });