@dudousxd/nestjs-codegen 0.4.1 → 0.5.1

package/dist/cli/main.cjs

@@ -160,6 +160,19 @@ function applyDefaults(userConfig, cwd) {
       enabled: userConfig.forms?.enabled ?? true,
       watch: userConfig.forms?.watch ?? "src/**/*.dto.ts",
       zodImport: userConfig.forms?.zodImport ?? "zod"
+    },
+    openapi: {
+      enabled: userConfig.openapi?.enabled ?? false,
+      fileName: userConfig.openapi?.fileName ?? "openapi.json",
+      title: userConfig.openapi?.title ?? "NestJS API",
+      version: userConfig.openapi?.version ?? "1.0.0",
+      description: userConfig.openapi?.description ?? null
+    },
+    mocks: {
+      enabled: userConfig.mocks?.enabled ?? false,
+      fileName: userConfig.mocks?.fileName ?? "mocks.ts",
+      seed: userConfig.mocks?.seed ?? 1,
+      baseUrl: userConfig.mocks?.baseUrl ?? ""
     }
   };
 }
@@ -197,8 +210,8 @@ Run \`nestjs-codegen init\` to create a starter config.`
 }
 
 // src/generate.ts
-var import_promises9 = require("fs/promises");
-var import_node_path10 = require("path");
+var import_promises11 = require("fs/promises");
+var import_node_path12 = require("path");
 
 // src/discovery/pages.ts
 var import_promises2 = require("fs/promises");
@@ -727,17 +740,28 @@ function emitFilterQueryType(c) {
   return `import('@dudousxd/nestjs-filter-client').TypedFilterQuery<${emitFilterQueryTypeArgs(c)}>`;
 }
 function buildResponseType(c, outDir) {
+  const respRef = c.contractSource.responseRef;
+  if (c.contractSource.stream) {
+    if (respRef) return respRef.isArray ? `Array<${respRef.name}>` : respRef.name;
+    return c.contractSource.response;
+  }
   if (c.controllerRef) {
     let relPath = (0, import_node_path4.relative)(outDir, c.controllerRef.filePath).replace(/\.ts$/, "");
     if (!relPath.startsWith(".")) relPath = `./${relPath}`;
     return `Awaited<ReturnType<import('${relPath}').${c.controllerRef.className}['${c.controllerRef.methodName}']>>`;
   }
-  const respRef = c.contractSource.responseRef;
   if (respRef) {
     return respRef.isArray ? `Array<${respRef.name}>` : respRef.name;
   }
   return c.contractSource.response;
 }
+function buildErrorType(c) {
+  const errRef = c.contractSource.errorRef;
+  if (errRef) {
+    return errRef.isArray ? `Array<${errRef.name}>` : errRef.name;
+  }
+  return c.contractSource.error ?? "unknown";
+}
 function emitRouterTypeBlock(tree, indent, outDir) {
   const pad = " ".repeat(indent);
   const lines = [];
@@ -752,12 +776,14 @@ function emitRouterTypeBlock(tree, indent, outDir) {
       const bodyRef = c.contractSource.bodyRef;
       const body = method === "GET" ? "never" : bodyRef ? bodyRef.isArray ? `Array<${bodyRef.name}>` : bodyRef.name : c.contractSource.body ?? "never";
       const response = buildResponseType(c, outDir);
+      const error = buildErrorType(c);
       const params = buildParamsType(c.params);
       const safeMethod = JSON.stringify(method);
       const safeUrl = JSON.stringify(c.path);
       const filterFields = c.contractSource.filterFields?.length ? c.contractSource.filterFields.map((f) => JSON.stringify(f)).join(" | ") : "never";
+      const stream = c.contractSource.stream ? "true" : "false";
       lines.push(
-        `${pad}${objKey}: { method: ${safeMethod}; url: ${safeUrl}; params: ${params}; query: ${query}; body: ${body}; response: ${response}; filterFields: ${filterFields} };`
+        `${pad}${objKey}: { method: ${safeMethod}; url: ${safeUrl}; params: ${params}; query: ${query}; body: ${body}; response: ${response}; error: ${error}; filterFields: ${filterFields}; stream: ${stream} };`
       );
     } else {
       lines.push(`${pad}${objKey}: {`);
@@ -829,15 +855,21 @@ function emitReqHelper() {
     ""
   ];
 }
-function renderLeaf(pad, objKey, req, requestExpr, members) {
+function renderLeaf(pad, objKey, req, requestExpr, members, streamExpr) {
   const lines = [`${pad}${objKey}: (input?: ${req.inputType}) => ({`];
   lines.push(`${pad}  ...__req<${req.responseType}>(() => ${requestExpr}),`);
+  if (streamExpr) {
+    lines.push(`${pad}  stream: () => ${streamExpr},`);
+  }
   for (const [name, value] of Object.entries(members)) {
     lines.push(`${pad}  ${name}: ${value},`);
   }
   lines.push(`${pad}}),`);
   return lines;
 }
+function renderStreamExpr(req) {
+  return `fetcher.sse<${req.responseType}>(${req.urlExpr}, ${req.optsExpr})`;
+}
 function emitApiObjectBlock(tree, indent, p) {
   const pad = " ".repeat(indent);
   const lines = [];
@@ -872,7 +904,8 @@ function emitApiObjectBlock(tree, indent, p) {
     }
     const members = {};
     for (const [name, { value }] of owned) members[name] = value;
-    lines.push(...renderLeaf(pad, objKey, req, leaf.requestExpr, members));
+    const streamExpr = node.contractSource.stream ? renderStreamExpr(req) : void 0;
+    lines.push(...renderLeaf(pad, objKey, req, leaf.requestExpr, members, streamExpr));
   }
   return lines;
 }
@@ -910,6 +943,8 @@ var ROUTE_NAMESPACE = [
   '  export type Params<K extends string> = ResolveByName<K, "params">;',
   '  export type Error<K extends string> = ResolveByName<K, "error">;',
   '  export type FilterFields<K extends string> = ResolveByName<K, "filterFields">;',
+  "  /** The streamed element type of an `@Sse()`/streaming route \u2014 the type yielded by its `stream()` AsyncIterable. */",
+  '  export type Stream<K extends string> = ResolveByName<K, "response">;',
   "  export type Request<K extends string> = {",
   "    body: Body<K>;",
   "    query: Query<K>;",
@@ -926,6 +961,7 @@ var PATH_NAMESPACE = [
   '  export type Params<M extends string, U extends string> = ResolveByPath<M, U, "params">;',
   '  export type Error<M extends string, U extends string> = ResolveByPath<M, U, "error">;',
   '  export type FilterFields<M extends string, U extends string> = ResolveByPath<M, U, "filterFields">;',
+  '  export type Stream<M extends string, U extends string> = ResolveByPath<M, U, "response">;',
   "}",
   ""
 ];
@@ -937,6 +973,7 @@ var EMPTY_ROUTE_NAMESPACE = [
   "  export type Params<K extends string> = never;",
   "  export type Error<K extends string> = never;",
   "  export type FilterFields<K extends string> = never;",
+  "  export type Stream<K extends string> = never;",
   "  export type Request<K extends string> = { body: never; query: never; params: never };",
   "}",
   ""
@@ -949,6 +986,7 @@ var EMPTY_PATH_NAMESPACE = [
   "  export type Params<M extends string, U extends string> = never;",
   "  export type Error<M extends string, U extends string> = never;",
   "  export type FilterFields<M extends string, U extends string> = never;",
+  "  export type Stream<M extends string, U extends string> = never;",
   "}",
   ""
 ];
@@ -972,7 +1010,7 @@ function buildApiFile(routes, outDir, opts = {}) {
   for (const r of contracted) {
     const cs = r.contract?.contractSource;
     if (!cs) continue;
-    const refs = r.controllerRef ? [cs.queryRef, cs.bodyRef] : [cs.queryRef, cs.bodyRef, cs.responseRef];
+    const refs = r.controllerRef && !cs.stream ? [cs.queryRef, cs.bodyRef, cs.errorRef] : [cs.queryRef, cs.bodyRef, cs.responseRef, cs.errorRef];
     for (const ref of refs) {
       if (!ref) continue;
       let names = importsByFile.get(ref.filePath);
@@ -1150,18 +1188,27 @@ function refRootIdentifier(refName) {
 function hasSource(src) {
   return !!(src.schema || src.zodText || src.zodRef);
 }
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+var wordBoundaryRegexCache = /* @__PURE__ */ new Map();
+function wordBoundaryRegex(token) {
+  let re = wordBoundaryRegexCache.get(token);
+  if (re === void 0) {
+    re = new RegExp(`\\b${escapeRegExp(token)}\\b`, "g");
+    wordBoundaryRegexCache.set(token, re);
+  }
+  return re;
+}
 function applyRenames(text, renames) {
   if (!renames || renames.size === 0) return text;
   let out = text;
   for (const [from, to] of renames) {
     if (from === to) continue;
-    out = out.replace(new RegExp(`\\b${escapeRegExp(from)}\\b`, "g"), to);
+    out = out.replace(wordBoundaryRegex(from), to);
   }
   return out;
 }
-function escapeRegExp(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function isSelfReferential(name, text) {
   return new RegExp(`\\b${escapeRegExp(name)}\\b`).test(text);
 }
@@ -1173,7 +1220,23 @@ function planNestedSchemas(entries) {
     const local = Object.entries(entry.nestedSchemas);
     if (local.length === 0) continue;
     const rename = /* @__PURE__ */ new Map();
-    for (const [name] of local) rename.set(name, name);
+    const renameValues = /* @__PURE__ */ new Set();
+    const setRename = (key, value) => {
+      const prev = rename.get(key);
+      rename.set(key, value);
+      if (prev !== void 0 && prev !== value) {
+        let stillUsed = false;
+        for (const v of rename.values()) {
+          if (v === prev) {
+            stillUsed = true;
+            break;
+          }
+        }
+        if (!stillUsed) renameValues.delete(prev);
+      }
+      renameValues.add(value);
+    };
+    for (const [name] of local) setRename(name, name);
     const textFor = (name) => {
       const raw = entry.nestedSchemas?.[name] ?? "";
       return applyRenames(raw, rename);
@@ -1191,11 +1254,11 @@ function planNestedSchemas(entries) {
         if (existing === text) continue;
         let i = 2;
         let candidate = `${name}_${i}`;
-        while (globalSchemas.has(candidate) && globalSchemas.get(candidate) !== textFor(name) || [...rename.values()].includes(candidate)) {
+        while (globalSchemas.has(candidate) && globalSchemas.get(candidate) !== textFor(name) || renameValues.has(candidate)) {
           i += 1;
           candidate = `${name}_${i}`;
         }
-        rename.set(name, candidate);
+        setRename(name, candidate);
         changed = true;
       }
     }
@@ -1405,11 +1468,467 @@ async function emitIndex(outDir, hasContracts = false, hasForms = false) {
   await (0, import_promises6.writeFile)((0, import_node_path7.join)(outDir, "index.d.ts"), content, "utf8");
 }
 
-// src/emit/emit-pages.ts
+// src/emit/emit-mocks.ts
 var import_promises7 = require("fs/promises");
 var import_node_path8 = require("path");
-async function emitPages(pages, outDir, _options = {}) {
+
+// src/ir/schema-node-to-json-schema.ts
+var DEFAULT_CTX = { refPrefix: "#/components/schemas/" };
+function parseLiteral(raw) {
+  const t = raw.trim();
+  if (t === "true") return true;
+  if (t === "false") return false;
+  if (t === "null") return null;
+  const q = t[0];
+  if ((q === "'" || q === '"' || q === "`") && t[t.length - 1] === q) {
+    return t.slice(1, -1).replace(/\\'/g, "'").replace(/\\"/g, '"').replace(/\\`/g, "`").replace(/\\\\/g, "\\");
+  }
+  if (/^[+-]?(\d+\.?\d*|\.\d+)([eE][+-]?\d+)?$/.test(t)) {
+    return Number(t);
+  }
+  return t;
+}
+function literalsType(values) {
+  const types = new Set(values.map((v) => v === null ? "null" : typeof v));
+  if (types.size === 1) {
+    const only = [...types][0];
+    if (only === "string") return "string";
+    if (only === "number") return "number";
+    if (only === "boolean") return "boolean";
+  }
+  return void 0;
+}
+function convert(node, ctx) {
+  switch (node.kind) {
+    case "string": {
+      const out = { type: "string" };
+      for (const c of node.checks) {
+        if (c.check === "email") out.format = "email";
+        else if (c.check === "url") out.format = "uri";
+        else if (c.check === "uuid") out.format = "uuid";
+        else if (c.check === "min") out.minLength = Number(c.value);
+        else if (c.check === "max") out.maxLength = Number(c.value);
+        else if (c.check === "regex") {
+          const m = /^\/(.*)\/[a-z]*$/.exec(c.pattern);
+          out.pattern = m ? m[1] : c.pattern;
+        }
+      }
+      return out;
+    }
+    case "number": {
+      const out = { type: "number" };
+      for (const c of node.checks) {
+        if (c.check === "int") out.type = "integer";
+        else if (c.check === "min") out.minimum = Number(c.value);
+        else if (c.check === "max") out.maximum = Number(c.value);
+        else if (c.check === "positive") out.exclusiveMinimum = 0;
+        else if (c.check === "negative") out.exclusiveMaximum = 0;
+      }
+      return out;
+    }
+    case "boolean":
+      return { type: "boolean" };
+    case "date":
+      return { type: "string", format: "date-time" };
+    case "unknown":
+      return node.note ? { description: node.note } : {};
+    case "instanceof":
+      return { type: "object", description: `instanceof ${node.ctor}` };
+    case "enum": {
+      const values = node.literals.map(parseLiteral);
+      const t = literalsType(values);
+      const out = { enum: values };
+      if (t) out.type = t;
+      return out;
+    }
+    case "literal": {
+      const value = parseLiteral(node.raw);
+      const out = { const: value };
+      const t = literalsType([value]);
+      if (t) out.type = t;
+      return out;
+    }
+    case "union": {
+      const options = node.options.map((o) => convert(o, ctx));
+      const out = { oneOf: options };
+      if (node.discriminator) {
+        out.discriminator = { propertyName: node.discriminator };
+      }
+      return out;
+    }
+    case "object": {
+      const properties = {};
+      const required = [];
+      for (const f of node.fields) {
+        if (f.value.kind === "optional") {
+          properties[f.key] = convert(f.value.inner, ctx);
+        } else {
+          properties[f.key] = convert(f.value, ctx);
+          required.push(f.key);
+        }
+      }
+      const out = { type: "object", properties };
+      if (required.length > 0) out.required = required;
+      out.additionalProperties = node.passthrough;
+      return out;
+    }
+    case "array":
+      return { type: "array", items: convert(node.element, ctx) };
+    case "optional":
+      return widenNullable(convert(node.inner, ctx));
+    case "ref":
+    case "lazyRef":
+      return { $ref: `${ctx.refPrefix}${node.name}` };
+    case "annotated":
+      return convert(node.inner, ctx);
+  }
+}
+function widenNullable(schema) {
+  if (schema.$ref) {
+    return { anyOf: [schema, { type: "null" }] };
+  }
+  if (typeof schema.type === "string") {
+    return { ...schema, type: [schema.type, "null"] };
+  }
+  if (Array.isArray(schema.type)) {
+    return schema.type.includes("null") ? schema : { ...schema, type: [...schema.type, "null"] };
+  }
+  return { anyOf: [schema, { type: "null" }] };
+}
+function schemaModuleToJsonSchema(mod, ctx = DEFAULT_CTX) {
+  const named = {};
+  for (const [name, node] of mod.named) {
+    named[name] = convert(node, ctx);
+  }
+  return { root: convert(mod.root, ctx), named };
+}
+
+// src/emit/mock-gen-runtime.ts
+var MOCK_GEN_RUNTIME = `
+/** mulberry32 \u2014 a tiny, fast, seedable PRNG. \`next()\` returns a float in [0, 1). */
+function makeRng(seed) {
+  let a = seed >>> 0;
+  return {
+    next() {
+      a |= 0;
+      a = (a + 0x6d2b79f5) | 0;
+      let t = Math.imul(a ^ (a >>> 15), 1 | a);
+      t = (t + Math.imul(t ^ (t >>> 7), 61 | t)) ^ t;
+      return ((t ^ (t >>> 14)) >>> 0) / 4294967296;
+    },
+  };
+}
+
+function __pick(rng, items) {
+  return items[Math.floor(rng.next() * items.length)];
+}
+
+function __intBetween(rng, min, max) {
+  return Math.floor(rng.next() * (max - min + 1)) + min;
+}
+
+const __WORDS = ['lorem', 'ipsum', 'dolor', 'sit', 'amet', 'consectetur', 'adipiscing', 'elit', 'sed', 'tempor'];
+const __FIRST_NAMES = ['Ada', 'Alan', 'Grace', 'Linus', 'Margaret', 'Dennis'];
+const __LAST_NAMES = ['Lovelace', 'Turing', 'Hopper', 'Torvalds', 'Hamilton', 'Ritchie'];
+
+function __fakeWords(rng, count) {
+  let out = [];
+  for (let i = 0; i < count; i++) out.push(__pick(rng, __WORDS));
+  return out.join(' ');
+}
+
+function __hex(rng, len) {
+  let s = '';
+  for (let i = 0; i < len; i++) s += Math.floor(rng.next() * 16).toString(16);
+  return s;
+}
+
+function __fakeUuid(rng) {
+  return __hex(rng, 8) + '-' + __hex(rng, 4) + '-4' + __hex(rng, 3) + '-' + __pick(rng, ['8', '9', 'a', 'b']) + __hex(rng, 3) + '-' + __hex(rng, 12);
+}
+
+function __fakeString(rng, schema) {
+  switch (schema.format) {
+    case 'email':
+      return __pick(rng, __FIRST_NAMES).toLowerCase() + '.' + __pick(rng, __LAST_NAMES).toLowerCase() + '@example.com';
+    case 'uri':
+    case 'url':
+      return 'https://example.com/' + __pick(rng, __WORDS);
+    case 'uuid':
+      return __fakeUuid(rng);
+    case 'date-time':
+      return new Date(Date.UTC(2020, __intBetween(rng, 0, 11), __intBetween(rng, 1, 28))).toISOString();
+    default:
+      return __fakeWords(rng, __intBetween(rng, 1, 3));
+  }
+}
+
+/** Generate a mock value for a JSON Schema node (depth-capped recursion via $ref). */
+function generateMock(schema, rng, defs, depth) {
+  defs = defs || {};
+  depth = depth || 0;
+  if (schema.$ref) {
+    const name = schema.$ref.replace('#/components/schemas/', '');
+    const target = defs[name];
+    if (!target || depth > 4) return null;
+    return generateMock(target, rng, defs, depth + 1);
+  }
+  if ('const' in schema) return schema.const;
+  if (schema.enum && schema.enum.length > 0) return __pick(rng, schema.enum);
+  if (schema.oneOf && schema.oneOf.length > 0) return generateMock(__pick(rng, schema.oneOf), rng, defs, depth);
+  if (schema.anyOf && schema.anyOf.length > 0) return generateMock(__pick(rng, schema.anyOf), rng, defs, depth);
+  let type = Array.isArray(schema.type)
+    ? (schema.type.filter((t) => t !== 'null')[0] || 'null')
+    : schema.type;
+  switch (type) {
+    case 'string':
+      return __fakeString(rng, schema);
+    case 'integer':
+      return __intBetween(rng, typeof schema.minimum === 'number' ? schema.minimum : 0, typeof schema.maximum === 'number' ? schema.maximum : 1000);
+    case 'number':
+      return __intBetween(rng, typeof schema.minimum === 'number' ? schema.minimum : 0, typeof schema.maximum === 'number' ? schema.maximum : 1000) + Math.round(rng.next() * 100) / 100;
+    case 'boolean':
+      return rng.next() < 0.5;
+    case 'null':
+      return null;
+    case 'array': {
+      const count = depth > 2 ? 0 : __intBetween(rng, 1, 2);
+      const items = schema.items || {};
+      let arr = [];
+      for (let i = 0; i < count; i++) arr.push(generateMock(items, rng, defs, depth + 1));
+      return arr;
+    }
+    case 'object': {
+      const out = {};
+      const props = schema.properties || {};
+      for (const key of Object.keys(props)) out[key] = generateMock(props[key], rng, defs, depth + 1);
+      return out;
+    }
+    default:
+      return {};
+  }
+}
+`.trim();
+
+// src/emit/emit-mocks.ts
+var REF_PREFIX = "#/components/schemas/";
+function toMswPath(path, baseUrl) {
+  return `${baseUrl}${path}`;
+}
+function responseSchemaFor(route, defs) {
+  const cs = route.contract.contractSource;
+  if (cs.responseSchema) {
+    const { root, named } = schemaModuleToJsonSchema(cs.responseSchema, { refPrefix: REF_PREFIX });
+    for (const [name, node] of Object.entries(named)) {
+      if (!(name in defs)) defs[name] = node;
+    }
+    return root;
+  }
+  return {};
+}
+function buildMocksFile(routes, opts = {}) {
+  const seed = opts.seed ?? 1;
+  const baseUrl = opts.baseUrl ?? "";
+  const contracted = routes.filter((r) => r.contract);
+  const defs = {};
+  const handlers = [];
+  for (const r of contracted) {
+    const schema = responseSchemaFor(r, defs);
+    const method = r.method.toLowerCase();
+    const mswMethod = method === "get" || method === "post" || method === "put" || method === "patch" || method === "delete" ? method : "all";
+    const path = toMswPath(r.path, baseUrl);
+    const cs = r.contract.contractSource;
+    const schemaLiteral = JSON.stringify(schema);
+    const pathLit = JSON.stringify(path);
+    if (cs.stream) {
+      handlers.push(
+        [
+          `  // ${r.name} (stream)`,
+          `  http.${mswMethod}(${pathLit}, () => {`,
+          `    const value = generateMock(${schemaLiteral}, makeRng(SEED), DEFS);`,
+          "    const body = `data: ${JSON.stringify(value)}\\n\\n`;",
+          "    return new HttpResponse(body, { headers: { 'Content-Type': 'text/event-stream' } });",
+          "  }),"
+        ].join("\n")
+      );
+    } else {
+      handlers.push(
+        [
+          `  // ${r.name}`,
+          `  http.${mswMethod}(${pathLit}, () => {`,
+          `    const value = generateMock(${schemaLiteral}, makeRng(SEED), DEFS);`,
+          "    return HttpResponse.json(value);",
+          "  }),"
+        ].join("\n")
+      );
+    }
+  }
+  const lines = [
+    "// Generated by @dudousxd/nestjs-codegen. Do not edit.",
+    "// MSW handlers returning deterministic, schema-shaped mock data.",
+    "/* eslint-disable */",
+    "// @ts-nocheck",
+    "",
+    "import { http, HttpResponse } from 'msw';",
+    "",
+    `const SEED = ${seed};`,
+    "",
+    "// ---------------------------------------------------------------------------",
+    "// Embedded mock-data runtime (mulberry32 PRNG + JSON-Schema value generator).",
+    "// Dependency-free: no @faker-js/faker. Deterministic for a given SEED.",
+    "// ---------------------------------------------------------------------------",
+    MOCK_GEN_RUNTIME,
+    "",
+    "// Shared component schemas referenced by $ref.",
+    `const DEFS = ${JSON.stringify(defs, null, 2)};`,
+    "",
+    "/** MSW request handlers, one per contracted route. */",
+    "export const handlers = [",
+    ...handlers,
+    "];",
+    ""
+  ];
+  return lines.join("\n");
+}
+async function emitMocks(routes, outDir, opts = {}) {
   await (0, import_promises7.mkdir)(outDir, { recursive: true });
+  const content = buildMocksFile(routes, opts);
+  const fileName = opts.fileName ?? "mocks.ts";
+  await (0, import_promises7.writeFile)((0, import_node_path8.join)(outDir, fileName), content, "utf8");
+}
+
+// src/emit/emit-openapi.ts
+var import_promises8 = require("fs/promises");
+var import_node_path9 = require("path");
+var REF_PREFIX2 = "#/components/schemas/";
+function toOpenApiPath(path) {
+  return path.replace(/:([^/]+)/g, "{$1}");
+}
+function positionSchema(schema, tsType, components) {
+  if (schema) {
+    const { root, named } = schemaModuleToJsonSchema(schema, { refPrefix: REF_PREFIX2 });
+    for (const [name, node] of Object.entries(named)) {
+      if (!(name in components)) components[name] = node;
+    }
+    return root;
+  }
+  return tsType ? { description: tsType } : {};
+}
+function buildParameters(route) {
+  const params = [];
+  for (const p of route.params) {
+    if (p.source === "path") {
+      params.push({
+        name: p.name,
+        in: "path",
+        required: true,
+        schema: { type: "string" }
+      });
+    } else if (p.source === "query") {
+      params.push({
+        name: p.name,
+        in: "query",
+        required: false,
+        schema: { type: "string" }
+      });
+    } else if (p.source === "header") {
+      params.push({
+        name: p.name,
+        in: "header",
+        required: false,
+        schema: { type: "string" }
+      });
+    }
+  }
+  return params;
+}
+function buildResponses(cs, components) {
+  const responses = {};
+  const successSchema = positionSchema(
+    // Prefer rich response IR when present; otherwise fall back to the TS type.
+    cs.responseSchema ?? null,
+    cs.response,
+    components
+  );
+  const successContentType = cs.stream ? "text/event-stream" : "application/json";
+  responses["200"] = {
+    description: cs.stream ? "Server-sent event stream" : "Successful response",
+    content: { [successContentType]: { schema: successSchema } }
+  };
+  const errorSchema = positionSchema(null, cs.error ?? null, components);
+  const errorBody = {
+    description: "Error response",
+    content: { "application/json": { schema: errorSchema } }
+  };
+  if (cs.error || cs.errorRef) {
+    responses["400"] = errorBody;
+    responses.default = errorBody;
+  } else {
+    responses.default = {
+      description: "Error response",
+      content: { "application/json": { schema: {} } }
+    };
+  }
+  return responses;
+}
+function buildOperation(route, components) {
+  const cs = route.contract.contractSource;
+  const op = {
+    operationId: route.name,
+    parameters: buildParameters(route),
+    responses: buildResponses(cs, components)
+  };
+  const method = route.method.toUpperCase();
+  const hasBody = method !== "GET" && method !== "HEAD" && method !== "DELETE";
+  if (hasBody && (cs.bodySchema || cs.body)) {
+    const bodySchema = positionSchema(cs.bodySchema, cs.body, components);
+    op.requestBody = {
+      required: true,
+      content: { "application/json": { schema: bodySchema } }
+    };
+  }
+  return op;
+}
+function buildOpenApiSpec(routes, opts = {}) {
+  const components = {};
+  const paths = {};
+  for (const route of routes) {
+    if (!route.contract) continue;
+    const oaPath = toOpenApiPath(route.path);
+    const method = route.method.toLowerCase();
+    let pathItem = paths[oaPath];
+    if (!pathItem) {
+      pathItem = {};
+      paths[oaPath] = pathItem;
+    }
+    pathItem[method] = buildOperation(route, components);
+  }
+  const info = opts.info ?? {};
+  const doc = {
+    openapi: "3.1.0",
+    info: {
+      title: info.title ?? "NestJS API",
+      version: info.version ?? "1.0.0",
+      ...info.description ? { description: info.description } : {}
+    },
+    paths,
+    components: { schemas: components }
+  };
+  return doc;
+}
+async function emitOpenApi(routes, outDir, opts = {}) {
+  await (0, import_promises8.mkdir)(outDir, { recursive: true });
+  const doc = buildOpenApiSpec(routes, opts);
+  const fileName = opts.fileName ?? "openapi.json";
+  await (0, import_promises8.writeFile)((0, import_node_path9.join)(outDir, fileName), `${JSON.stringify(doc, null, 2)}
+`, "utf8");
+}
+
+// src/emit/emit-pages.ts
+var import_promises9 = require("fs/promises");
+var import_node_path10 = require("path");
+async function emitPages(pages, outDir, _options = {}) {
+  await (0, import_promises9.mkdir)(outDir, { recursive: true });
   const pageNameUnion = pages.length > 0 ? pages.map((p) => JSON.stringify(p.name)).join(" | ") : "never";
   const augBody = pages.map((p) => {
     const key = needsQuotes(p.name) ? JSON.stringify(p.name) : p.name;
@@ -1428,7 +1947,7 @@ ${augBody}
   }
 ${sharedPropsBlock}}
 `;
-  await (0, import_promises7.writeFile)((0, import_node_path8.join)(outDir, "pages.d.ts"), content, "utf8");
+  await (0, import_promises9.writeFile)((0, import_node_path10.join)(outDir, "pages.d.ts"), content, "utf8");
 }
 function buildSharedPropsBlock(sharedProps) {
   if (!sharedProps) return "";
@@ -1447,7 +1966,7 @@ ${propsBody}
 `;
 }
 function buildAugmentationType(page, outDir) {
-  let importPath = (0, import_node_path8.relative)(outDir, page.absolutePath).replace(/\.(tsx?|vue|svelte)$/, "");
+  let importPath = (0, import_node_path10.relative)(outDir, page.absolutePath).replace(/\.(tsx?|vue|svelte)$/, "");
   if (!importPath.startsWith(".")) {
     importPath = `./${importPath}`;
   }
@@ -1458,12 +1977,12 @@ function needsQuotes(name) {
 }
 
 // src/emit/emit-routes.ts
-var import_promises8 = require("fs/promises");
-var import_node_path9 = require("path");
+var import_promises10 = require("fs/promises");
+var import_node_path11 = require("path");
 async function emitRoutes(routes, outDir) {
-  await (0, import_promises8.mkdir)(outDir, { recursive: true });
+  await (0, import_promises10.mkdir)(outDir, { recursive: true });
   const content = buildRoutesFile(routes);
-  await (0, import_promises8.writeFile)((0, import_node_path9.join)(outDir, "routes.ts"), content, "utf8");
+  await (0, import_promises10.writeFile)((0, import_node_path11.join)(outDir, "routes.ts"), content, "utf8");
 }
 function buildRoutesFile(routes) {
   if (routes.length === 0) {
@@ -1611,24 +2130,41 @@ async function generate(config, inputRoutes = []) {
     });
   }
   const hasForms = await emitForms(routes, config.codegen.outDir, config.forms, config.validation);
+  if (hasContracts && config.openapi.enabled) {
+    await emitOpenApi(routes, config.codegen.outDir, {
+      fileName: config.openapi.fileName,
+      info: {
+        title: config.openapi.title,
+        version: config.openapi.version,
+        ...config.openapi.description ? { description: config.openapi.description } : {}
+      }
+    });
+  }
+  if (hasContracts && config.mocks.enabled) {
+    await emitMocks(routes, config.codegen.outDir, {
+      fileName: config.mocks.fileName,
+      seed: config.mocks.seed,
+      baseUrl: config.mocks.baseUrl
+    });
+  }
   await emitIndex(config.codegen.outDir, hasContracts, hasForms);
   if (extensions.length > 0) {
     const extraFiles = await collectEmittedFiles(extensions, ctx);
     for (const file of extraFiles) {
-      const dest = (0, import_node_path10.join)(config.codegen.outDir, file.path);
-      await (0, import_promises9.mkdir)((0, import_node_path10.dirname)(dest), { recursive: true });
-      await (0, import_promises9.writeFile)(dest, file.contents, "utf8");
+      const dest = (0, import_node_path12.join)(config.codegen.outDir, file.path);
+      await (0, import_promises11.mkdir)((0, import_node_path12.dirname)(dest), { recursive: true });
+      await (0, import_promises11.writeFile)(dest, file.contents, "utf8");
     }
   }
 }
 
 // src/watch/watcher.ts
-var import_promises12 = require("fs/promises");
-var import_node_path14 = require("path");
+var import_promises14 = require("fs/promises");
+var import_node_path16 = require("path");
 var import_chokidar = __toESM(require("chokidar"), 1);
 
 // src/discovery/contracts-fast.ts
-var import_node_path12 = require("path");
+var import_node_path14 = require("path");
 var import_fast_glob2 = __toESM(require("fast-glob"), 1);
 var import_ts_morph9 = require("ts-morph");
 
@@ -1640,7 +2176,7 @@ var import_ts_morph4 = require("ts-morph");
 
 // src/discovery/type-ref-resolution.ts
 var import_node_fs = require("fs");
-var import_node_path11 = require("path");
+var import_node_path13 = require("path");
 var import_ts_morph3 = require("ts-morph");
 var _EMPTY_CTX = { projectRoot: "", tsconfigPaths: null };
 var _ctxByProject = /* @__PURE__ */ new WeakMap();
@@ -1692,12 +2228,12 @@ function findTypeInFile(name, file) {
 }
 function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
   if (moduleSpecifier.startsWith(".")) {
-    const dir = (0, import_node_path11.dirname)(sourceFile.getFilePath());
+    const dir = (0, import_node_path13.dirname)(sourceFile.getFilePath());
     const noExt = moduleSpecifier.replace(/\.(js|ts)$/, "");
     return [
-      (0, import_node_path11.resolve)(dir, `${noExt}.ts`),
-      (0, import_node_path11.resolve)(dir, `${moduleSpecifier}.ts`),
-      (0, import_node_path11.resolve)(dir, moduleSpecifier, "index.ts")
+      (0, import_node_path13.resolve)(dir, `${noExt}.ts`),
+      (0, import_node_path13.resolve)(dir, `${moduleSpecifier}.ts`),
+      (0, import_node_path13.resolve)(dir, moduleSpecifier, "index.ts")
     ];
   }
   const ctx = _ctxFor(project);
@@ -1718,8 +2254,8 @@ function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
         const rest = moduleSpecifier.slice(prefix.length);
         const candidates = [];
         for (const mapping of mappings) {
-          const resolved = (0, import_node_path11.resolve)(baseUrl, mapping.replace("*", rest));
-          candidates.push(`${resolved}.ts`, (0, import_node_path11.resolve)(resolved, "index.ts"));
+          const resolved = (0, import_node_path13.resolve)(baseUrl, mapping.replace("*", rest));
+          candidates.push(`${resolved}.ts`, (0, import_node_path13.resolve)(resolved, "index.ts"));
         }
         dbg("  resolved candidates:", candidates);
         return candidates;
@@ -1800,7 +2336,73 @@ function followModuleForType(name, moduleSpecifier, fromFile, project, seen) {
   }
   return null;
 }
+function resolveImportedVariable(name, sourceFile, project) {
+  const local = sourceFile.getVariableDeclaration(name);
+  if (local) return { decl: local, file: sourceFile };
+  return resolveVariableViaImports(name, sourceFile, project, /* @__PURE__ */ new Set());
+}
+function resolveVariableViaImports(name, sourceFile, project, seen) {
+  for (const importDecl of sourceFile.getImportDeclarations()) {
+    const namedImport = importDecl.getNamedImports().find((n) => (n.getAliasNode()?.getText() ?? n.getName()) === name);
+    if (!namedImport) continue;
+    const sourceName = namedImport.getName();
+    const moduleSpecifier = importDecl.getModuleSpecifierValue();
+    const found = followModuleForVariable(sourceName, moduleSpecifier, sourceFile, project, seen);
+    if (found) return found;
+  }
+  return null;
+}
+function followModuleForVariable(name, moduleSpecifier, fromFile, project, seen) {
+  const candidates = resolveModuleSpecifier(moduleSpecifier, fromFile, project);
+  for (const candidate of candidates) {
+    let importedFile = project.getSourceFile(candidate);
+    if (!importedFile) {
+      try {
+        importedFile = project.addSourceFileAtPath(candidate);
+      } catch {
+        continue;
+      }
+    }
+    const found = resolveVariableInFile(name, importedFile, project, seen);
+    if (found) return found;
+  }
+  return null;
+}
+function resolveVariableInFile(name, file, project, seen) {
+  const filePath = file.getFilePath();
+  if (seen.has(filePath)) return null;
+  seen.add(filePath);
+  const local = file.getVariableDeclaration(name);
+  if (local) return { decl: local, file };
+  for (const exportDecl of file.getExportDeclarations()) {
+    const moduleSpecifier = exportDecl.getModuleSpecifierValue();
+    const namedExports = exportDecl.getNamedExports();
+    if (moduleSpecifier) {
+      const hasStar = namedExports.length === 0;
+      const reExport2 = namedExports.find(
+        (n) => (n.getAliasNode()?.getText() ?? n.getName()) === name
+      );
+      if (!hasStar && !reExport2) continue;
+      const sourceName2 = hasStar ? name : reExport2?.getName() ?? name;
+      const found = followModuleForVariable(sourceName2, moduleSpecifier, file, project, seen);
+      if (found) return found;
+      continue;
+    }
+    const reExport = namedExports.find(
+      (n) => (n.getAliasNode()?.getText() ?? n.getName()) === name
+    );
+    if (!reExport) continue;
+    const sourceName = reExport.getName();
+    const viaImports = resolveVariableViaImports(sourceName, file, project, seen);
+    if (viaImports) return viaImports;
+  }
+  return null;
+}
 var _findTypeCache = /* @__PURE__ */ new WeakMap();
+function clearTypeResolutionCaches(project) {
+  _findTypeCache.delete(project);
+  _resolveNamedRefCache.delete(project);
+}
 function findType(name, sourceFile, project) {
   let byKey = _findTypeCache.get(project);
   if (byKey === void 0) {
@@ -1941,9 +2543,11 @@ function extractSchemaFromDto(classDecl, sourceFile, project) {
     warnings: [],
     warnedDecorators: /* @__PURE__ */ new Set(),
     emittedClasses: /* @__PURE__ */ new Map(),
+    usedSchemaNames: /* @__PURE__ */ new Set(),
     visiting: /* @__PURE__ */ new Set(),
     recursiveSchemas: /* @__PURE__ */ new Set(),
-    depth: 0
+    depth: 0,
+    typeBindings: /* @__PURE__ */ new Map()
   };
   const root = buildObject(classDecl, sourceFile, ctx);
   return { root, named: ctx.named, warnings: ctx.warnings, recursive: ctx.recursiveSchemas };
@@ -1967,11 +2571,34 @@ function buildProperty(prop, classFile, ctx) {
   const typeNode = prop.getTypeNode();
   const typeText = typeNode?.getText() ?? "unknown";
   const isArrayType = !!typeNode && import_ts_morph4.Node.isArrayTypeNode(typeNode);
+  const discriminator = resolveDiscriminator(dec("Type"));
+  if (discriminator) {
+    const options = discriminator.subTypes.map(
+      (name) => buildNestedReference(name, classFile, ctx)
+    );
+    const unionNode = {
+      kind: "union",
+      options,
+      discriminator: discriminator.property
+    };
+    const wrapArray = has("IsArray") || isArrayType;
+    const node2 = wrapArray ? { kind: "array", element: unionNode } : unionNode;
+    return applyPresence(node2, decorators);
+  }
+  const propTypeParam = singularClassName(typeText);
+  if (propTypeParam && ctx.typeBindings.has(propTypeParam)) {
+    const bound = ctx.typeBindings.get(propTypeParam);
+    const childNode = buildNestedReference(bound, classFile, ctx);
+    const wrapArray = has("IsArray") || isArrayType;
+    const node2 = wrapArray ? { kind: "array", element: childNode } : childNode;
+    return applyPresence(node2, decorators);
+  }
   const typeRefName = resolveTypeFactoryName(dec("Type"));
   if (has("ValidateNested") || typeRefName) {
+    const typeArgs = genericTypeArgNames(typeNode);
     const childName = typeRefName ?? singularClassName(typeText);
     if (childName) {
-      const childNode = buildNestedReference(childName, classFile, ctx);
+      const childNode = buildNestedReference(childName, classFile, ctx, typeArgs);
       const wrapArray = has("IsArray") || isArrayType;
       const node2 = wrapArray ? { kind: "array", element: childNode } : childNode;
       return applyPresence(node2, decorators);
@@ -2096,10 +2723,13 @@ function baseFromType(typeText, isArrayType) {
       return { kind: "unknown" };
   }
 }
-function buildNestedReference(className, fromFile, ctx) {
-  if (ctx.visiting.has(className)) {
-    const reserved = ctx.emittedClasses.get(className) ?? aliasFor(className, ctx);
-    ctx.emittedClasses.set(className, reserved);
+function buildNestedReference(className, fromFile, ctx, typeArgs = []) {
+  const cacheKey = typeArgs.length > 0 ? `${className}<${typeArgs.join(",")}>` : className;
+  const schemaBase = typeArgs.length > 0 ? `${className}Of${typeArgs.join("")}` : className;
+  if (ctx.visiting.has(cacheKey)) {
+    const reserved = ctx.emittedClasses.get(cacheKey) ?? aliasFor(schemaBase, ctx);
+    ctx.emittedClasses.set(cacheKey, reserved);
+    ctx.usedSchemaNames.add(reserved);
     ctx.recursiveSchemas.add(reserved);
     if (!ctx.warnedDecorators.has(`recursive:${reserved}`)) {
       ctx.warnedDecorators.add(`recursive:${reserved}`);
@@ -2118,29 +2748,37 @@ function buildNestedReference(className, fromFile, ctx) {
     }
     return { kind: "unknown", note: "nesting too deep \u2014 not expanded" };
   }
-  const existing = ctx.emittedClasses.get(className);
+  const existing = ctx.emittedClasses.get(cacheKey);
   if (existing) return { kind: "ref", name: existing };
-  const schemaName = aliasFor(className, ctx);
+  const schemaName = aliasFor(schemaBase, ctx);
   const resolved = findType(className, fromFile, ctx.project);
   if (!resolved || resolved.kind !== "class") {
     return { kind: "object", fields: [], passthrough: true };
   }
-  ctx.emittedClasses.set(className, schemaName);
-  ctx.visiting.add(className);
+  const params = resolved.decl.getTypeParameters().map((p) => p.getName());
+  const newBindings = [];
+  params.forEach((param, i) => {
+    const arg = typeArgs[i];
+    if (arg) newBindings.push([param, arg]);
+  });
+  for (const [k, v] of newBindings) ctx.typeBindings.set(k, v);
+  ctx.emittedClasses.set(cacheKey, schemaName);
+  ctx.usedSchemaNames.add(schemaName);
+  ctx.visiting.add(cacheKey);
   ctx.depth += 1;
   const childNode = buildObject(resolved.decl, resolved.file, ctx);
   ctx.depth -= 1;
-  ctx.visiting.delete(className);
+  ctx.visiting.delete(cacheKey);
+  for (const [k] of newBindings) ctx.typeBindings.delete(k);
   ctx.named.set(schemaName, childNode);
+  ctx.usedSchemaNames.add(schemaName);
   return { kind: "ref", name: schemaName };
 }
 function aliasFor(className, ctx) {
   const baseName = `${className}Schema`;
   let candidate = baseName;
   let i = 1;
-  const used = new Set(ctx.named.keys());
-  for (const v of ctx.emittedClasses.values()) used.add(v);
-  while (used.has(candidate)) {
+  while (ctx.usedSchemaNames.has(candidate)) {
     candidate = `${baseName}_${i}`;
     i += 1;
   }
@@ -2177,6 +2815,39 @@ function messageRaw(decorator) {
   }
   return void 0;
 }
+function resolveDiscriminator(decorator) {
+  const optsArg = decorator?.getArguments()[1];
+  if (!optsArg || !import_ts_morph4.Node.isObjectLiteralExpression(optsArg)) return null;
+  let discProp;
+  for (const prop of optsArg.getProperties()) {
+    if (import_ts_morph4.Node.isPropertyAssignment(prop) && prop.getName() === "discriminator") {
+      discProp = prop.getInitializer();
+    }
+  }
+  if (!discProp || !import_ts_morph4.Node.isObjectLiteralExpression(discProp)) return null;
+  let property = null;
+  const subTypes = [];
+  for (const prop of discProp.getProperties()) {
+    if (!import_ts_morph4.Node.isPropertyAssignment(prop)) continue;
+    const name = prop.getName();
+    const init = prop.getInitializer();
+    if (!init) continue;
+    if (name === "property" && import_ts_morph4.Node.isStringLiteral(init)) {
+      property = init.getLiteralValue();
+    } else if (name === "subTypes" && import_ts_morph4.Node.isArrayLiteralExpression(init)) {
+      for (const el of init.getElements()) {
+        if (!import_ts_morph4.Node.isObjectLiteralExpression(el)) continue;
+        for (const p of el.getProperties()) {
+          if (!import_ts_morph4.Node.isPropertyAssignment(p) || p.getName() !== "name") continue;
+          const nameInit = p.getInitializer();
+          if (nameInit && import_ts_morph4.Node.isIdentifier(nameInit)) subTypes.push(nameInit.getText());
+        }
+      }
+    }
+  }
+  if (!property || subTypes.length === 0) return null;
+  return { property, subTypes };
+}
 function resolveTypeFactoryName(decorator) {
   const arg = firstArg(decorator);
   if (!arg) return null;
@@ -2190,6 +2861,17 @@ function singularClassName(typeText) {
   const inner = typeText.endsWith("[]") ? typeText.slice(0, -2).trim() : typeText;
   return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(inner) ? inner : null;
 }
+function genericTypeArgNames(typeNode) {
+  if (!typeNode || !import_ts_morph4.Node.isTypeReference(typeNode)) return [];
+  const names = [];
+  for (const arg of typeNode.getTypeArguments()) {
+    if (!import_ts_morph4.Node.isTypeReference(arg)) return [];
+    const tn = arg.getTypeName();
+    if (!import_ts_morph4.Node.isIdentifier(tn)) return [];
+    names.push(tn.getText());
+  }
+  return names;
+}
 function enumSchemaFromDecorator(decorator, classFile, ctx) {
   const arg = firstArg(decorator);
   if (!arg) return null;
@@ -2244,6 +2926,9 @@ var import_ts_morph5 = require("ts-morph");
 
 // src/discovery/enum-resolution.ts
 var _enumCache = /* @__PURE__ */ new WeakMap();
+function clearEnumCache(project) {
+  _enumCache.delete(project);
+}
 function resolveEnumValues(name, sourceFile, project) {
   let byKey = _enumCache.get(project);
   if (byKey === void 0) {
@@ -2712,24 +3397,26 @@ var PASSTHROUGH_UTILITY = /* @__PURE__ */ new Set([
   "Map",
   "Set"
 ]);
-function resolveTypeNodeToString(typeNode, sourceFile, project, depth) {
+function resolveTypeNodeToString(typeNode, sourceFile, project, depth, subst = /* @__PURE__ */ new Map()) {
   if (depth <= 0) return "unknown";
   if (import_ts_morph7.Node.isArrayTypeNode(typeNode)) {
     const elementType = typeNode.getElementTypeNode();
-    return `Array<${resolveTypeNodeToString(elementType, sourceFile, project, depth)}>`;
+    return `Array<${resolveTypeNodeToString(elementType, sourceFile, project, depth, subst)}>`;
   }
   if (import_ts_morph7.Node.isUnionTypeNode(typeNode)) {
-    return typeNode.getTypeNodes().map((t) => resolveTypeNodeToString(t, sourceFile, project, depth)).join(" | ");
+    return typeNode.getTypeNodes().map((t) => resolveTypeNodeToString(t, sourceFile, project, depth, subst)).join(" | ");
   }
   if (import_ts_morph7.Node.isIntersectionTypeNode(typeNode)) {
-    return typeNode.getTypeNodes().map((t) => resolveTypeNodeToString(t, sourceFile, project, depth)).join(" & ");
+    return typeNode.getTypeNodes().map((t) => resolveTypeNodeToString(t, sourceFile, project, depth, subst)).join(" & ");
   }
   if (import_ts_morph7.Node.isParenthesizedTypeNode(typeNode)) {
-    return `(${resolveTypeNodeToString(typeNode.getTypeNode(), sourceFile, project, depth)})`;
+    return `(${resolveTypeNodeToString(typeNode.getTypeNode(), sourceFile, project, depth, subst)})`;
   }
   if (import_ts_morph7.Node.isTypeReference(typeNode)) {
     const typeName = typeNode.getTypeName();
     const name = import_ts_morph7.Node.isIdentifier(typeName) ? typeName.getText() : typeNode.getText();
+    const bound = subst.get(name);
+    if (bound !== void 0) return bound;
     if (name === "string" || name === "number" || name === "boolean") return name;
     if (name === "Date") return "string";
     if (name === "unknown" || name === "any" || name === "void") return "unknown";
@@ -2737,14 +3424,15 @@ function resolveTypeNodeToString(typeNode, sourceFile, project, depth) {
       return "unknown";
     const wrapperMode = WRAPPER_TYPES[name];
     if (wrapperMode) {
-      return unwrapFirstTypeArg(typeNode, sourceFile, project, depth, wrapperMode);
+      return unwrapFirstTypeArg(typeNode, sourceFile, project, depth, wrapperMode, subst);
     }
     if (PASSTHROUGH_UTILITY.has(name)) {
       return typeNode.getText();
     }
     const resolved = findType(name, sourceFile, project);
     if (resolved) {
-      return expandTypeDecl(resolved, project, depth - 1);
+      const childSubst = buildSubst(resolved, typeNode, sourceFile, project, depth, subst);
+      return expandTypeDecl(resolved, project, depth - 1, childSubst);
     }
     dbg("unresolvable type:", name, "in", sourceFile.getFilePath());
     return "unknown";
@@ -2757,32 +3445,45 @@ function resolveTypeNodeToString(typeNode, sourceFile, project, depth) {
   if (kind === import_ts_morph7.SyntaxKind.AnyKeyword) return "unknown";
   return typeNode.getText();
 }
-function unwrapFirstTypeArg(typeNode, sourceFile, project, depth, mode) {
+function unwrapFirstTypeArg(typeNode, sourceFile, project, depth, mode, subst = /* @__PURE__ */ new Map()) {
   const typeArgs = typeNode.getTypeArguments();
   const firstTypeArg = typeArgs[0];
   if (typeArgs.length > 0 && firstTypeArg !== void 0) {
-    const inner = resolveTypeNodeToString(firstTypeArg, sourceFile, project, depth);
+    const inner = resolveTypeNodeToString(firstTypeArg, sourceFile, project, depth, subst);
     return mode === "arrayOf" ? `Array<${inner}>` : inner;
   }
   return mode === "arrayOf" ? "Array<unknown>" : "unknown";
 }
-function expandTypeDecl(result, project, depth) {
+function buildSubst(result, typeNode, sourceFile, project, depth, parentSubst) {
+  if (result.kind !== "class" && result.kind !== "interface") return /* @__PURE__ */ new Map();
+  const params = result.decl.getTypeParameters().map((p) => p.getName());
+  if (params.length === 0) return /* @__PURE__ */ new Map();
+  const args = typeNode.getTypeArguments();
+  const subst = /* @__PURE__ */ new Map();
+  params.forEach((param, i) => {
+    const arg = args[i];
+    if (arg)
+      subst.set(param, resolveTypeNodeToString(arg, sourceFile, project, depth, parentSubst));
+  });
+  return subst;
+}
+function expandTypeDecl(result, project, depth, subst = /* @__PURE__ */ new Map()) {
   if (depth < 0) return "unknown";
   switch (result.kind) {
     case "class":
-      return resolvePropertied(result.decl, result.file, project, depth);
+      return resolvePropertied(result.decl, result.file, project, depth, subst);
     case "interface":
-      return resolvePropertied(result.decl, result.file, project, depth);
+      return resolvePropertied(result.decl, result.file, project, depth, subst);
     case "typeAlias":
       if (result.typeNode) {
-        return resolveTypeNodeToString(result.typeNode, result.file, project, depth);
+        return resolveTypeNodeToString(result.typeNode, result.file, project, depth, subst);
       }
       return result.text;
     case "enum":
       return result.members.join(" | ");
   }
 }
-function resolvePropertied(decl, sourceFile, project, depth) {
+function resolvePropertied(decl, sourceFile, project, depth, subst = /* @__PURE__ */ new Map()) {
   if (depth < 0) return "unknown";
   const lines = [];
   for (const prop of decl.getProperties()) {
@@ -2791,7 +3492,7 @@ function resolvePropertied(decl, sourceFile, project, depth) {
     const propTypeNode = prop.getTypeNode();
     let propType = "unknown";
     if (propTypeNode) {
-      propType = resolveTypeNodeToString(propTypeNode, sourceFile, project, depth);
+      propType = resolveTypeNodeToString(propTypeNode, sourceFile, project, depth, subst);
     }
     lines.push(`${propName}${isOptional ? "?" : ""}: ${propType}`);
   }
@@ -2840,7 +3541,7 @@ function extractParamsType(method, sourceFile, project) {
   return entries.length > 0 ? `{ ${entries.join("; ")} }` : null;
 }
 function extractResponseType(method, sourceFile, project) {
-  const apiResponseDecorator = method.getDecorator("ApiResponse");
+  const apiResponseDecorator = method.getDecorators().find((d) => d.getName() === "ApiResponse" && (apiResponseStatus(d) ?? 0) < 400);
   if (apiResponseDecorator) {
     const args = apiResponseDecorator.getArguments();
     const optsArg = args[0];
@@ -2869,6 +3570,59 @@ function extractResponseType(method, sourceFile, project) {
   }
   return "unknown";
 }
+function apiResponseStatus(decorator) {
+  const optsArg = decorator.getArguments()[0];
+  if (!optsArg || !import_ts_morph7.Node.isObjectLiteralExpression(optsArg)) return null;
+  for (const prop of optsArg.getProperties()) {
+    if (!import_ts_morph7.Node.isPropertyAssignment(prop)) continue;
+    if (prop.getName() !== "status") continue;
+    const val = prop.getInitializer();
+    if (val && import_ts_morph7.Node.isNumericLiteral(val)) return Number(val.getLiteralValue());
+  }
+  return null;
+}
+function apiResponseTypeNode(decorator) {
+  const optsArg = decorator.getArguments()[0];
+  if (!optsArg || !import_ts_morph7.Node.isObjectLiteralExpression(optsArg)) return null;
+  for (const prop of optsArg.getProperties()) {
+    if (!import_ts_morph7.Node.isPropertyAssignment(prop)) continue;
+    if (prop.getName() !== "type") continue;
+    const val = prop.getInitializer();
+    if (!val) return null;
+    if (import_ts_morph7.Node.isArrayLiteralExpression(val)) {
+      const first = val.getElements()[0];
+      return first ? { node: first, isArray: true } : null;
+    }
+    return { node: val, isArray: false };
+  }
+  return null;
+}
+function extractErrorType(method, sourceFile, project) {
+  for (const decorator of method.getDecorators()) {
+    if (decorator.getName() !== "ApiResponse") continue;
+    const status = apiResponseStatus(decorator);
+    if (status === null || status < 400) continue;
+    const typeInfo = apiResponseTypeNode(decorator);
+    if (!typeInfo) continue;
+    const inner = resolveIdentifierToClassType(typeInfo.node, sourceFile, project, 3);
+    const type = typeInfo.isArray ? `Array<${inner}>` : inner;
+    let ref = null;
+    if (import_ts_morph7.Node.isIdentifier(typeInfo.node)) {
+      const name = typeInfo.node.getText();
+      const localDecl = sourceFile.getInterface(name) || sourceFile.getClass(name) || sourceFile.getTypeAlias(name);
+      if (localDecl?.isExported()) {
+        ref = { name, filePath: sourceFile.getFilePath(), isArray: typeInfo.isArray };
+      } else {
+        const resolved = resolveImportedType(name, sourceFile, project);
+        if (resolved && (resolved.kind === "class" || resolved.kind === "interface") && resolved.decl.isExported()) {
+          ref = { name, filePath: resolved.file.getFilePath(), isArray: typeInfo.isArray };
+        }
+      }
+    }
+    return { type, ref };
+  }
+  return null;
+}
 function resolveIdentifierToClassType(node, sourceFile, project, depth) {
   if (!import_ts_morph7.Node.isIdentifier(node)) return "unknown";
   const name = node.getText();
@@ -2884,17 +3638,52 @@ function resolveBodyQueryResponseRef(typeNode, sourceFile, project) {
     unwrapContainers: true
   });
 }
+var STREAM_CONTAINERS = /* @__PURE__ */ new Set(["Observable", "AsyncIterable", "AsyncIterableIterator"]);
+var STREAM_CONTAINERS_GENERATOR = /* @__PURE__ */ new Set(["AsyncGenerator"]);
+var STREAM_ENVELOPES = /* @__PURE__ */ new Set(["MessageEvent", "MessageEventLike"]);
+function detectStreamElement(method) {
+  const hasSse = method.getDecorators().some((d) => d.getName() === "Sse");
+  let node = method.getReturnTypeNode();
+  node = unwrapNamedContainer(node, /* @__PURE__ */ new Set(["Promise"]));
+  const containerEl = streamContainerElement(node);
+  if (containerEl) {
+    return unwrapNamedContainer(containerEl, STREAM_ENVELOPES) ?? containerEl;
+  }
+  if (hasSse) return node ?? null;
+  return null;
+}
+function streamContainerElement(node) {
+  if (!node || !import_ts_morph7.Node.isTypeReference(node)) return null;
+  const typeName = node.getTypeName();
+  const name = import_ts_morph7.Node.isIdentifier(typeName) ? typeName.getText() : "";
+  if (STREAM_CONTAINERS.has(name) || STREAM_CONTAINERS_GENERATOR.has(name)) {
+    return node.getTypeArguments()[0] ?? null;
+  }
+  return null;
+}
+function unwrapNamedContainer(node, names) {
+  if (!node || !import_ts_morph7.Node.isTypeReference(node)) return node;
+  const typeName = node.getTypeName();
+  const name = import_ts_morph7.Node.isIdentifier(typeName) ? typeName.getText() : "";
+  if (names.has(name)) {
+    return node.getTypeArguments()[0] ?? node;
+  }
+  return node;
+}
 function extractDtoContract(method, sourceFile, project) {
   let body = extractBodyType(method, sourceFile, project);
   const filterInfo = extractApplyFilterInfo(method, sourceFile, project);
   const query = extractQueryType(method, sourceFile, project);
+  const streamElement = detectStreamElement(method);
+  const isStream = streamElement !== null;
   if (filterInfo && filterInfo.source === "body") {
     const bodyType = "import('@dudousxd/nestjs-filter-client').FilterQueryResult";
     body = body ?? bodyType;
   }
   const paramsType = extractParamsType(method, sourceFile, project);
-  const response = extractResponseType(method, sourceFile, project);
-  if (body === null && query === null && paramsType === null && response === "unknown" && filterInfo === null) {
+  const response = isStream ? resolveTypeNodeToString(streamElement, sourceFile, project, 3) : extractResponseType(method, sourceFile, project);
+  const errorInfo = extractErrorType(method, sourceFile, project);
+  if (body === null && query === null && paramsType === null && response === "unknown" && errorInfo === null && filterInfo === null && !isStream) {
     return null;
   }
   let bodyRef = null;
@@ -2908,12 +3697,12 @@ function extractDtoContract(method, sourceFile, project) {
       queryRef = resolveBodyQueryResponseRef(param.getTypeNode(), sourceFile, project);
     }
   }
-  const returnTypeNode = method.getReturnTypeNode();
+  const returnTypeNode = isStream ? streamElement : method.getReturnTypeNode();
   if (returnTypeNode) {
     responseRef = resolveBodyQueryResponseRef(returnTypeNode, sourceFile, project);
   }
-  if (!responseRef) {
-    const apiResp = method.getDecorator("ApiResponse");
+  if (!responseRef && !isStream) {
+    const apiResp = method.getDecorators().find((d) => d.getName() === "ApiResponse" && (apiResponseStatus(d) ?? 0) < 400);
     if (apiResp) {
       const args = apiResp.getArguments();
       const optsArg = args[0];
@@ -2955,16 +3744,19 @@ function extractDtoContract(method, sourceFile, project) {
     query,
     body,
     response,
+    error: errorInfo?.type ?? null,
     params: paramsType,
     queryRef,
     bodyRef,
     responseRef,
+    errorRef: errorInfo?.ref ?? null,
     filterFields: filterInfo?.fieldNames ?? null,
     filterFieldTypes: filterInfo?.fieldTypes ?? null,
     filterSource: filterInfo?.source ?? null,
     formWarnings,
     bodySchema,
-    querySchema
+    querySchema,
+    stream: isStream
   };
 }
 function resolveParamClass(method, decoratorName, sourceFile, project) {
@@ -3082,6 +3874,7 @@ function parseDefineContractCall(callExpr) {
   let query = null;
   let body = null;
   let response = "unknown";
+  let error = null;
   let bodyZodText = null;
   let queryZodText = null;
   for (const prop of optsArg.getProperties()) {
@@ -3097,25 +3890,38 @@ function parseDefineContractCall(callExpr) {
       bodyZodText = val.getText();
     } else if (propName === "response") {
       response = zodAstToTs(val);
+    } else if (propName === "error") {
+      error = zodAstToTs(val);
     }
   }
-  return { query, body, response, bodyZodText, queryZodText };
+  return { query, body, response, error, bodyZodText, queryZodText };
 }
 
 // src/discovery/contracts-fast.ts
 async function discoverContractsFast(opts) {
   const { cwd, glob, tsconfig } = opts;
-  const tsconfigPath = tsconfig ? (0, import_node_path12.resolve)(tsconfig) : (0, import_node_path12.join)(cwd, "tsconfig.json");
-  let project;
+  const tsconfigPath = resolveTsconfigPath(cwd, tsconfig);
+  const project = createDiscoveryProject(tsconfigPath);
+  const files = await (0, import_fast_glob2.default)(glob, { cwd, absolute: true, onlyFiles: true });
+  for (const f of files) {
+    project.addSourceFileAtPath(f);
+  }
+  bindDiscoveryContext(project, cwd, tsconfigPath);
+  return extractAllRoutes(project);
+}
+function resolveTsconfigPath(cwd, tsconfig) {
+  return tsconfig ? (0, import_node_path14.resolve)(tsconfig) : (0, import_node_path14.join)(cwd, "tsconfig.json");
+}
+function createDiscoveryProject(tsconfigPath) {
   try {
-    project = new import_ts_morph9.Project({
+    return new import_ts_morph9.Project({
       tsConfigFilePath: tsconfigPath,
       skipAddingFilesFromTsConfig: true,
       skipLoadingLibFiles: true,
       skipFileDependencyResolution: true
     });
   } catch {
-    project = new import_ts_morph9.Project({
+    return new import_ts_morph9.Project({
       skipAddingFilesFromTsConfig: true,
       skipLoadingLibFiles: true,
       skipFileDependencyResolution: true,
@@ -3126,20 +3932,105 @@ async function discoverContractsFast(opts) {
       }
     });
   }
-  const files = await (0, import_fast_glob2.default)(glob, { cwd, absolute: true, onlyFiles: true });
-  for (const f of files) {
-    project.addSourceFileAtPath(f);
-  }
-  const routes = [];
+}
+function bindDiscoveryContext(project, cwd, tsconfigPath) {
   setDiscoveryContext(project, {
     projectRoot: cwd,
     tsconfigPaths: loadTsconfigPaths(tsconfigPath)
   });
+}
+function extractRoutesFrom(project, controllerPaths) {
+  const routes = [];
+  for (const path of controllerPaths) {
+    const sourceFile = project.getSourceFile(path);
+    if (sourceFile) routes.push(...extractFromSourceFile(sourceFile, project));
+  }
+  return routes;
+}
+function extractAllRoutes(project) {
+  const routes = [];
   for (const sourceFile of project.getSourceFiles()) {
     routes.push(...extractFromSourceFile(sourceFile, project));
   }
   return routes;
 }
+var PersistentDiscovery = class _PersistentDiscovery {
+  project;
+  cwd;
+  glob;
+  /** Absolute paths of the controllers currently loaded as extraction roots. */
+  controllerPaths = /* @__PURE__ */ new Set();
+  constructor(project, cwd, glob) {
+    this.project = project;
+    this.cwd = cwd;
+    this.glob = glob;
+  }
+  /**
+   * Build the initial persistent Project: create it, glob + add all controllers,
+   * bind the discovery context. Mirrors {@link discoverContractsFast}'s setup.
+   */
+  static async create(opts) {
+    const { cwd, glob, tsconfig } = opts;
+    const tsconfigPath = resolveTsconfigPath(cwd, tsconfig);
+    const project = createDiscoveryProject(tsconfigPath);
+    bindDiscoveryContext(project, cwd, tsconfigPath);
+    const instance = new _PersistentDiscovery(project, cwd, glob);
+    const files = await (0, import_fast_glob2.default)(glob, { cwd, absolute: true, onlyFiles: true });
+    for (const f of files) {
+      project.addSourceFileAtPath(f);
+      instance.controllerPaths.add(f);
+    }
+    return instance;
+  }
+  /** Run the initial extraction (equivalent to a first `discoverContractsFast`). */
+  discover() {
+    return this.runExtraction();
+  }
+  /**
+   * Re-discover after one or more files changed. Refreshes the changed file(s)
+   * from disk (controllers AND any lazily-loaded DTO/imported files), re-globs
+   * to pick up added/removed controllers, clears the per-Project caches, then
+   * re-extracts. `changedPaths` is a hint; correctness does not depend on it
+   * being exhaustive because re-globbing + refresh-on-presence covers the set.
+   */
+  async rediscover(changedPaths) {
+    if (changedPaths) {
+      for (const p of changedPaths) {
+        const abs = (0, import_node_path14.resolve)(p);
+        const sf = this.project.getSourceFile(abs);
+        if (sf) {
+          await sf.refreshFromFileSystem();
+        }
+      }
+    }
+    const globbed = new Set(
+      await (0, import_fast_glob2.default)(this.glob, { cwd: this.cwd, absolute: true, onlyFiles: true })
+    );
+    for (const f of globbed) {
+      if (!this.controllerPaths.has(f)) {
+        try {
+          this.project.addSourceFileAtPath(f);
+          this.controllerPaths.add(f);
+        } catch {
+        }
+      }
+    }
+    for (const f of this.controllerPaths) {
+      if (!globbed.has(f)) {
+        const sf = this.project.getSourceFile(f);
+        if (sf) this.project.removeSourceFile(sf);
+        this.controllerPaths.delete(f);
+      }
+    }
+    return this.runExtraction();
+  }
+  /** Clear stale per-Project caches, then extract over the controller set. */
+  runExtraction() {
+    clearTypeResolutionCaches(this.project);
+    clearEnumCache(this.project);
+    return extractRoutesFrom(this.project, this.controllerPaths);
+  }
+};
 function decoratorStringArg(decoratorExpr) {
   if (!decoratorExpr) return void 0;
   if (import_ts_morph9.Node.isStringLiteral(decoratorExpr)) return decoratorExpr.getLiteralValue();
@@ -3195,6 +4086,11 @@ function resolveVerb(method) {
       return { httpMethod: verb, handlerPath: decoratorStringArg(pathArg) ?? "" };
     }
   }
+  const sseDecorator = method.getDecorator("Sse");
+  if (sseDecorator) {
+    const pathArg = sseDecorator.getArguments()[0];
+    return { httpMethod: "GET", handlerPath: decoratorStringArg(pathArg) ?? "" };
+  }
   return null;
 }
 function readAsDecorator(node, label) {
@@ -3237,7 +4133,17 @@ function buildRoute(args) {
   };
 }
 function extractContractRoute(args) {
-  const { cls, method, applyContractDecorator, verb, prefix, className, sourceFile, seenNames } = args;
+  const {
+    cls,
+    method,
+    applyContractDecorator,
+    verb,
+    prefix,
+    className,
+    sourceFile,
+    project,
+    seenNames
+  } = args;
   const firstDecoratorArg = applyContractDecorator.getArguments()[0];
   if (!firstDecoratorArg) return null;
   let contractDef = null;
@@ -3247,18 +4153,19 @@ function extractContractRoute(args) {
     contractDef = parseDefineContractCall(firstDecoratorArg);
   } else if (import_ts_morph9.Node.isIdentifier(firstDecoratorArg)) {
     const identName = firstDecoratorArg.getText();
-    const varDecl = sourceFile.getVariableDeclaration(identName);
-    if (!varDecl) {
+    const resolvedVar = resolveImportedVariable(identName, sourceFile, project);
+    if (!resolvedVar) {
       console.warn(
-        `[nestjs-codegen/fast] Cannot resolve '${identName}' in ${sourceFile.getFilePath()} (cross-file imports are out-of-scope for v1) \u2014 skipping`
+        `[nestjs-codegen/fast] Cannot resolve contract identifier '${identName}' applied in ${sourceFile.getFilePath()} \u2014 the import could not be followed to a declaration; skipping`
       );
       return null;
     }
+    const { decl: varDecl, file: declFile } = resolvedVar;
     const initializer = varDecl.getInitializer();
     if (!initializer) return null;
     contractDef = parseDefineContractCall(initializer);
     if (contractDef && varDecl.isExported()) {
-      const filePath = sourceFile.getFilePath();
+      const filePath = declFile.getFilePath();
       if (contractDef.body !== null) {
         bodyZodRef = { name: `${identName}.body`, filePath };
       }
@@ -3291,6 +4198,7 @@ function extractContractRoute(args) {
       query: contractDef.query,
       body: contractDef.body,
       response: contractDef.response,
+      error: contractDef.error,
       // Path A: capture both the importable ref and the raw text. The emitter
       // prefers inlining the text (client-safe — re-exporting from a controller
       // would drag server-only deps into the client bundle).
@@ -3322,15 +4230,18 @@ function extractDtoRoute(args) {
       query: dtoContract?.query ?? null,
       body: dtoContract?.body ?? null,
       response: dtoContract?.response ?? "unknown",
+      error: dtoContract?.error ?? null,
       queryRef: dtoContract?.queryRef ?? null,
       bodyRef: dtoContract?.bodyRef ?? null,
       responseRef: dtoContract?.responseRef ?? null,
+      errorRef: dtoContract?.errorRef ?? null,
       filterFields: dtoContract?.filterFields ?? null,
       filterFieldTypes: dtoContract?.filterFieldTypes ?? null,
       filterSource: dtoContract?.filterSource ?? null,
       formWarnings: dtoContract?.formWarnings ?? [],
       bodySchema: dtoContract?.bodySchema ?? null,
-      querySchema: dtoContract?.querySchema ?? null
+      querySchema: dtoContract?.querySchema ?? null,
+      stream: dtoContract?.stream ?? false
     }
   });
 }
@@ -3354,6 +4265,7 @@ function extractFromSourceFile(sourceFile, project) {
         prefix,
         className,
         sourceFile,
+        project,
         seenNames
       }) : extractDtoRoute({
         cls,
@@ -3372,9 +4284,9 @@ function extractFromSourceFile(sourceFile, project) {
 }
 
 // src/watch/lock-file.ts
-var import_promises10 = require("fs/promises");
-var import_promises11 = require("fs/promises");
-var import_node_path13 = require("path");
+var import_promises12 = require("fs/promises");
+var import_promises13 = require("fs/promises");
+var import_node_path15 = require("path");
 var LOCK_FILE = ".watcher.lock";
 function isProcessAlive(pid) {
   try {
@@ -3385,21 +4297,21 @@ function isProcessAlive(pid) {
   }
 }
 async function acquireLock(outDir) {
-  await (0, import_promises11.mkdir)(outDir, { recursive: true });
-  const lockPath = (0, import_node_path13.join)(outDir, LOCK_FILE);
+  await (0, import_promises13.mkdir)(outDir, { recursive: true });
+  const lockPath = (0, import_node_path15.join)(outDir, LOCK_FILE);
   const lockData = { pid: process.pid, startedAt: (/* @__PURE__ */ new Date()).toISOString() };
   try {
-    const fd = await (0, import_promises10.open)(lockPath, "wx");
+    const fd = await (0, import_promises12.open)(lockPath, "wx");
     await fd.writeFile(`${JSON.stringify(lockData, null, 2)}
 `, "utf8");
     await fd.close();
   } catch (err) {
     if (err.code === "EEXIST") {
       try {
-        const raw = await (0, import_promises11.readFile)(lockPath, "utf8");
+        const raw = await (0, import_promises13.readFile)(lockPath, "utf8");
         const existing = JSON.parse(raw);
         if (isProcessAlive(existing.pid)) return null;
-        await (0, import_promises11.unlink)(lockPath);
+        await (0, import_promises13.unlink)(lockPath);
         return acquireLock(outDir);
       } catch {
         return null;
@@ -3410,7 +4322,7 @@ async function acquireLock(outDir) {
   return {
     release: async () => {
       try {
-        await (0, import_promises11.unlink)(lockPath);
+        await (0, import_promises13.unlink)(lockPath);
       } catch {
       }
     }
@@ -3426,7 +4338,7 @@ async function watch(config, onChange) {
   if (lock === null) {
     let holderPid = "unknown";
     try {
-      const raw = await (0, import_promises12.readFile)((0, import_node_path14.join)(config.codegen.outDir, ".watcher.lock"), "utf8");
+      const raw = await (0, import_promises14.readFile)((0, import_node_path16.join)(config.codegen.outDir, ".watcher.lock"), "utf8");
       const data = JSON.parse(raw);
       if (data.pid !== void 0) holderPid = String(data.pid);
     } catch {
@@ -3436,12 +4348,20 @@ async function watch(config, onChange) {
     );
     return NO_OP_WATCHER;
   }
+  let discovery = null;
+  async function getDiscovery() {
+    if (discovery === null) {
+      discovery = await PersistentDiscovery.create({
+        cwd: config.codegen.cwd,
+        glob: config.contracts.glob,
+        ...config.app?.tsconfig ? { tsconfig: config.app.tsconfig } : {}
+      });
+      return discovery;
+    }
+    return discovery;
+  }
   try {
-    const initialRoutes = await discoverContractsFast({
-      cwd: config.codegen.cwd,
-      glob: config.contracts.glob,
-      ...config.app?.tsconfig ? { tsconfig: config.app.tsconfig } : {}
-    });
+    const initialRoutes = (await getDiscovery()).discover();
     await generate(config, initialRoutes);
   } catch (err) {
     console.warn(
@@ -3454,7 +4374,7 @@ async function watch(config, onChange) {
   }
   let pagesDebounceTimer;
   const pagesGlob = config.pages?.glob ?? ".nestjs-codegen-no-pages";
-  const pagesWatcher = import_chokidar.default.watch((0, import_node_path14.join)(config.codegen.cwd, pagesGlob), {
+  const pagesWatcher = import_chokidar.default.watch((0, import_node_path16.join)(config.codegen.cwd, pagesGlob), {
     ignoreInitial: true,
     persistent: true,
     awaitWriteFinish: { stabilityThreshold: 80, pollInterval: 20 }
@@ -3480,23 +4400,23 @@ async function watch(config, onChange) {
   pagesWatcher.on("change", schedulePagesRegenerate);
   pagesWatcher.on("unlink", schedulePagesRegenerate);
   let contractsDebounceTimer;
-  const contractsWatcher = import_chokidar.default.watch((0, import_node_path14.join)(config.codegen.cwd, config.contracts.glob), {
+  const pendingChangedPaths = /* @__PURE__ */ new Set();
+  const contractsWatcher = import_chokidar.default.watch((0, import_node_path16.join)(config.codegen.cwd, config.contracts.glob), {
     ignoreInitial: true,
     persistent: true,
     awaitWriteFinish: { stabilityThreshold: 80, pollInterval: 20 }
   });
-  function scheduleContractsRegenerate() {
+  function scheduleContractsRegenerate(changedPath) {
+    if (typeof changedPath === "string") pendingChangedPaths.add(changedPath);
     if (contractsDebounceTimer !== void 0) {
       clearTimeout(contractsDebounceTimer);
     }
     contractsDebounceTimer = setTimeout(async () => {
       contractsDebounceTimer = void 0;
+      const changed = [...pendingChangedPaths];
+      pendingChangedPaths.clear();
       try {
-        const routes = await discoverContractsFast({
-          cwd: config.codegen.cwd,
-          glob: config.contracts.glob,
-          ...config.app?.tsconfig ? { tsconfig: config.app.tsconfig } : {}
-        });
+        const routes = await (await getDiscovery()).rediscover(changed);
         await generate(config, routes);
       } catch (err) {
         console.error(
@@ -3507,17 +4427,17 @@ async function watch(config, onChange) {
       onChange?.();
     }, config.contracts.debounceMs);
   }
-  contractsWatcher.on("add", scheduleContractsRegenerate);
-  contractsWatcher.on("change", scheduleContractsRegenerate);
-  contractsWatcher.on("unlink", scheduleContractsRegenerate);
-  const formsWatcher = import_chokidar.default.watch((0, import_node_path14.join)(config.codegen.cwd, config.forms.watch), {
+  contractsWatcher.on("add", (p) => scheduleContractsRegenerate(p));
+  contractsWatcher.on("change", (p) => scheduleContractsRegenerate(p));
+  contractsWatcher.on("unlink", (p) => scheduleContractsRegenerate(p));
+  const formsWatcher = import_chokidar.default.watch((0, import_node_path16.join)(config.codegen.cwd, config.forms.watch), {
     ignoreInitial: true,
     persistent: true,
     awaitWriteFinish: { stabilityThreshold: 80, pollInterval: 20 }
   });
-  formsWatcher.on("add", scheduleContractsRegenerate);
-  formsWatcher.on("change", scheduleContractsRegenerate);
-  formsWatcher.on("unlink", scheduleContractsRegenerate);
+  formsWatcher.on("add", (p) => scheduleContractsRegenerate(p));
+  formsWatcher.on("change", (p) => scheduleContractsRegenerate(p));
+  formsWatcher.on("unlink", (p) => scheduleContractsRegenerate(p));
   return {
     close: async () => {
       if (pagesDebounceTimer !== void 0) {
@@ -3537,7 +4457,7 @@ async function watch(config, onChange) {
 }
 
 // src/index.ts
-var VERSION = "0.4.1";
+var VERSION = "0.5.1";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {
@@ -3566,13 +4486,13 @@ async function runCodegen(opts = {}) {
 // src/cli/doctor.ts
 var import_node_child_process2 = require("child_process");
 var import_node_fs4 = require("fs");
-var import_node_path16 = require("path");
+var import_node_path18 = require("path");
 
 // src/cli/init.ts
 var import_node_child_process = require("child_process");
 var import_node_fs3 = require("fs");
-var import_promises13 = require("fs/promises");
-var import_node_path15 = require("path");
+var import_promises15 = require("fs/promises");
+var import_node_path17 = require("path");
 var import_node_readline = require("readline");
 
 // src/cli/patch-utils.ts
@@ -3634,7 +4554,7 @@ ${bold(title)}`);
 }
 async function readPackageJson(cwd) {
   try {
-    const raw = await (0, import_promises13.readFile)((0, import_node_path15.join)(cwd, "package.json"), "utf8");
+    const raw = await (0, import_promises15.readFile)((0, import_node_path17.join)(cwd, "package.json"), "utf8");
     return JSON.parse(raw);
   } catch {
     return {};
@@ -3665,7 +4585,7 @@ async function detectTemplateEngine(cwd) {
 async function detectPackageManager(cwd) {
   async function exists(file) {
     try {
-      await (0, import_promises13.access)((0, import_node_path15.join)(cwd, file));
+      await (0, import_promises15.access)((0, import_node_path17.join)(cwd, file));
       return true;
     } catch {
       return false;
@@ -3693,7 +4613,7 @@ async function promptFramework() {
 }
 async function fileExists2(filePath) {
   try {
-    await (0, import_promises13.access)(filePath);
+    await (0, import_promises15.access)(filePath);
     return true;
   } catch {
     return false;
@@ -3706,15 +4626,15 @@ async function writeIfNotExists(filePath, content, label) {
   }
   const dir = filePath.substring(0, filePath.lastIndexOf("/"));
   if (dir) {
-    await (0, import_promises13.mkdir)(dir, { recursive: true });
+    await (0, import_promises15.mkdir)(dir, { recursive: true });
   }
-  await (0, import_promises13.writeFile)(filePath, content, "utf8");
+  await (0, import_promises15.writeFile)(filePath, content, "utf8");
   logCreated(label);
 }
 async function handleViteConfig(cwd, framework) {
-  const filePath = (0, import_node_path15.join)(cwd, "vite.config.ts");
+  const filePath = (0, import_node_path17.join)(cwd, "vite.config.ts");
   if (await fileExists2(filePath)) {
-    const existing = await (0, import_promises13.readFile)(filePath, "utf8");
+    const existing = await (0, import_promises15.readFile)(filePath, "utf8");
     const hasPlugin = existing.includes("nestInertia") || existing.includes("nestjs-inertia-vite/plugin");
     if (!hasPlugin) {
       logSkipped("vite.config.ts");
@@ -3730,15 +4650,15 @@ async function handleViteConfig(cwd, framework) {
   }
   const dir = filePath.substring(0, filePath.lastIndexOf("/"));
   if (dir) {
-    await (0, import_promises13.mkdir)(dir, { recursive: true });
+    await (0, import_promises15.mkdir)(dir, { recursive: true });
   }
-  await (0, import_promises13.writeFile)(filePath, viteConfigTemplate(framework), "utf8");
+  await (0, import_promises15.writeFile)(filePath, viteConfigTemplate(framework), "utf8");
   logCreated("vite.config.ts");
 }
 async function patchGitignore(gitignorePath) {
   let existing = "";
   if (await fileExists2(gitignorePath)) {
-    existing = await (0, import_promises13.readFile)(gitignorePath, "utf8");
+    existing = await (0, import_promises15.readFile)(gitignorePath, "utf8");
   }
   if (existing.split("\n").some((line) => line.trim() === GITIGNORE_ENTRY)) {
     console.log(`  ${cyan("\u2192")} .gitignore ${dim("(already contains .nestjs-inertia/, skipped)")}`);
@@ -3748,7 +4668,7 @@ async function patchGitignore(gitignorePath) {
 ` : `${existing}
 ${GITIGNORE_ENTRY}
 `;
-  await (0, import_promises13.writeFile)(gitignorePath, newContent, "utf8");
+  await (0, import_promises15.writeFile)(gitignorePath, newContent, "utf8");
   logPatched(".gitignore", "added .nestjs-inertia/");
 }
 function installDeps(pkgManager, deps, dev) {
@@ -3770,10 +4690,10 @@ function installDeps(pkgManager, deps, dev) {
   }
 }
 async function patchPackageJsonScripts(cwd, scripts) {
-  const pkgPath = (0, import_node_path15.join)(cwd, "package.json");
+  const pkgPath = (0, import_node_path17.join)(cwd, "package.json");
   let pkg = {};
   try {
-    pkg = JSON.parse(await (0, import_promises13.readFile)(pkgPath, "utf8"));
+    pkg = JSON.parse(await (0, import_promises15.readFile)(pkgPath, "utf8"));
   } catch {
     return;
   }
@@ -3792,7 +4712,7 @@ async function patchPackageJsonScripts(cwd, scripts) {
     return;
   }
   pkg.scripts = existing;
-  await (0, import_promises13.writeFile)(pkgPath, `${JSON.stringify(pkg, null, 2)}
+  await (0, import_promises15.writeFile)(pkgPath, `${JSON.stringify(pkg, null, 2)}
 `, "utf8");
 }
 function patchAppModule(filePath, rootView) {
@@ -4087,7 +5007,7 @@ export class HomeController {
 }
 `;
 function patchTsconfigExclude(cwd, dir, filename = "tsconfig.json") {
-  const filePath = (0, import_node_path15.join)(cwd, filename);
+  const filePath = (0, import_node_path17.join)(cwd, filename);
   return patchJsonFile(
     filePath,
     (json) => {
@@ -4102,7 +5022,7 @@ function patchTsconfigExclude(cwd, dir, filename = "tsconfig.json") {
   );
 }
 function patchNestCliJson(cwd, shellDir) {
-  const filePath = (0, import_node_path15.join)(cwd, "nest-cli.json");
+  const filePath = (0, import_node_path17.join)(cwd, "nest-cli.json");
   return patchJsonFile(filePath, (json) => {
     const compiler = json.compilerOptions ?? {};
     const assets = compiler.assets ?? [];
@@ -4125,46 +5045,46 @@ async function scaffoldFiles(ctx) {
   const { cwd, framework, engine, shellFileName, entryExt, pageExt } = ctx;
   logSection("Scaffold files");
   await writeIfNotExists(
-    (0, import_node_path15.join)(cwd, "nestjs-inertia.config.ts"),
+    (0, import_node_path17.join)(cwd, "nestjs-inertia.config.ts"),
     configTemplate(framework),
     "nestjs-inertia.config.ts"
   );
-  await writeIfNotExists((0, import_node_path15.join)(cwd, "nestjs-inertia.d.ts"), DTS_TEMPLATE, "nestjs-inertia.d.ts");
+  await writeIfNotExists((0, import_node_path17.join)(cwd, "nestjs-inertia.d.ts"), DTS_TEMPLATE, "nestjs-inertia.d.ts");
   await writeIfNotExists(
-    (0, import_node_path15.join)(cwd, "tsconfig.inertia.json"),
+    (0, import_node_path17.join)(cwd, "tsconfig.inertia.json"),
     TSCONFIG_INERTIA_TEMPLATE,
     "tsconfig.inertia.json"
   );
   await writeIfNotExists(
-    (0, import_node_path15.join)(cwd, "inertia", "tsconfig.json"),
+    (0, import_node_path17.join)(cwd, "inertia", "tsconfig.json"),
     INERTIA_TSCONFIG_TEMPLATE,
     "inertia/tsconfig.json"
   );
   await writeIfNotExists(
-    (0, import_node_path15.join)(cwd, "inertia", shellFileName),
+    (0, import_node_path17.join)(cwd, "inertia", shellFileName),
     htmlShellTemplate(framework, engine),
     `inertia/${shellFileName}`
   );
   await handleViteConfig(cwd, framework);
   await writeIfNotExists(
-    (0, import_node_path15.join)(cwd, "inertia", "app", `client.${entryExt}`),
+    (0, import_node_path17.join)(cwd, "inertia", "app", `client.${entryExt}`),
     entryPointTemplate(framework),
     `inertia/app/client.${entryExt}`
   );
   await writeIfNotExists(
-    (0, import_node_path15.join)(cwd, "inertia", "pages", `Home.${pageExt}`),
+    (0, import_node_path17.join)(cwd, "inertia", "pages", `Home.${pageExt}`),
     samplePageTemplate(framework),
     `inertia/pages/Home.${pageExt}`
   );
   await writeIfNotExists(
-    (0, import_node_path15.join)(cwd, "src", "home.controller.ts"),
+    (0, import_node_path17.join)(cwd, "src", "home.controller.ts"),
     SAMPLE_CONTROLLER,
     "src/home.controller.ts"
   );
 }
 function patchServerAppModule(ctx) {
   const { cwd, rootView } = ctx;
-  const appModulePath = (0, import_node_path15.join)(cwd, "src", "app.module.ts");
+  const appModulePath = (0, import_node_path17.join)(cwd, "src", "app.module.ts");
   const appModuleResult = patchAppModule(appModulePath, rootView);
   if (appModuleResult === "patched") {
     logPatched("src/app.module.ts", "added InertiaModule.forRoot");
@@ -4178,7 +5098,7 @@ function patchServerAppModule(ctx) {
   }
 }
 function patchServerMainTs(ctx) {
-  const mainTsPath = (0, import_node_path15.join)(ctx.cwd, "src", "main.ts");
+  const mainTsPath = (0, import_node_path17.join)(ctx.cwd, "src", "main.ts");
   const mainTsResult = patchMainTs(mainTsPath);
   if (mainTsResult === "patched") {
     logPatched("src/main.ts", "added setupInertiaVite after NestFactory.create");
@@ -4213,7 +5133,7 @@ function patchBuildConfigs(ctx) {
 }
 async function patchGitignoreAndDist(ctx) {
   const { cwd } = ctx;
-  await patchGitignore((0, import_node_path15.join)(cwd, ".gitignore"));
+  await patchGitignore((0, import_node_path17.join)(cwd, ".gitignore"));
   const tsconfigDistResult = patchTsconfigExclude(cwd, "dist", "tsconfig.json");
   if (tsconfigDistResult === "patched") {
     logPatched("tsconfig.json", "excluded dist/ from server compilation");
@@ -4319,7 +5239,7 @@ ${green("\u2713")} Setup complete! Run: ${bold("nest start --watch")}
 
 // src/cli/doctor.ts
 function checkFileExists(cwd, file) {
-  return (0, import_node_fs4.existsSync)((0, import_node_path16.join)(cwd, file));
+  return (0, import_node_fs4.existsSync)((0, import_node_path18.join)(cwd, file));
 }
 function readJson(path) {
   try {
@@ -4355,15 +5275,15 @@ function writeJsonField(filePath, dotPath, value) {
 }
 function getPackageVersion(cwd, pkg) {
   try {
-    const pkgJson = readJson((0, import_node_path16.join)(cwd, "node_modules", pkg, "package.json"));
+    const pkgJson = readJson((0, import_node_path18.join)(cwd, "node_modules", pkg, "package.json"));
     return pkgJson?.version ?? null;
   } catch {
     return null;
   }
 }
 function detectPkgManager(cwd) {
-  if ((0, import_node_fs4.existsSync)((0, import_node_path16.join)(cwd, "pnpm-lock.yaml"))) return "pnpm";
-  if ((0, import_node_fs4.existsSync)((0, import_node_path16.join)(cwd, "yarn.lock"))) return "yarn";
+  if ((0, import_node_fs4.existsSync)((0, import_node_path18.join)(cwd, "pnpm-lock.yaml"))) return "pnpm";
+  if ((0, import_node_fs4.existsSync)((0, import_node_path18.join)(cwd, "yarn.lock"))) return "yarn";
   return "npm";
 }
 async function runDoctor(opts) {
@@ -4401,7 +5321,7 @@ async function runDoctor(opts) {
     autoFix: () => runInit({ cwd })
   });
   if (foundShellDir) {
-    const nestCliPath = (0, import_node_path16.join)(cwd, "nest-cli.json");
+    const nestCliPath = (0, import_node_path18.join)(cwd, "nest-cli.json");
     const nestCli = readJson(nestCliPath);
     const compiler = nestCli?.compilerOptions ?? {};
     const assets = compiler.assets ?? [];
@@ -4440,7 +5360,7 @@ async function runDoctor(opts) {
     fix: "Run: nestjs-codegen codegen",
     autoFix: () => runCodegen({ cwd })
   });
-  const tsconfigPath = (0, import_node_path16.join)(cwd, "tsconfig.json");
+  const tsconfigPath = (0, import_node_path18.join)(cwd, "tsconfig.json");
   const tsconfig = readJson(tsconfigPath);
   const paths = tsconfig?.compilerOptions?.paths;
   checks.push({
@@ -4451,7 +5371,7 @@ async function runDoctor(opts) {
   });
   const inertiaDir = foundShellDir ?? "inertia";
   for (const tsconfigFile of ["tsconfig.json", "tsconfig.build.json"]) {
-    const tsc = readJson((0, import_node_path16.join)(cwd, tsconfigFile));
+    const tsc = readJson((0, import_node_path18.join)(cwd, tsconfigFile));
     if (!tsc) continue;
     const excl = tsc.exclude ?? [];
     const excludesIt = excl.includes(inertiaDir);
@@ -4477,7 +5397,7 @@ async function runDoctor(opts) {
       }
     });
   }
-  const inertiaTsconfigPath = (0, import_node_path16.join)(cwd, "tsconfig.inertia.json");
+  const inertiaTsconfigPath = (0, import_node_path18.join)(cwd, "tsconfig.inertia.json");
   const inertiaTsconfig = readJson(inertiaTsconfigPath);
   checks.push({
     name: "tsconfig.inertia.json exists",
@@ -4529,7 +5449,7 @@ async function runDoctor(opts) {
       fix: 'Add "nestjs-inertia.d.ts" to include array (resolves InertiaRegistry augmentation)'
     });
   }
-  const innerTsconfigPath = (0, import_node_path16.join)(cwd, "inertia", "tsconfig.json");
+  const innerTsconfigPath = (0, import_node_path18.join)(cwd, "inertia", "tsconfig.json");
   checks.push({
     name: "inertia/tsconfig.json exists (VSCode picks up ~codegen alias)",
     pass: (0, import_node_fs4.existsSync)(innerTsconfigPath),
@@ -4539,7 +5459,7 @@ async function runDoctor(opts) {
     }
   });
   if (checkFileExists(cwd, "vite.config.ts")) {
-    const viteContent = (0, import_node_fs4.readFileSync)((0, import_node_path16.join)(cwd, "vite.config.ts"), "utf8");
+    const viteContent = (0, import_node_fs4.readFileSync)((0, import_node_path18.join)(cwd, "vite.config.ts"), "utf8");
     checks.push({
       name: "vite.config.ts has resolve.alias",
       pass: viteContent.includes("resolve") && viteContent.includes("alias"),
@@ -4604,7 +5524,7 @@ async function runDoctor(opts) {
     });
   }
   if (checkFileExists(cwd, ".gitignore")) {
-    const gitignorePath = (0, import_node_path16.join)(cwd, ".gitignore");
+    const gitignorePath = (0, import_node_path18.join)(cwd, ".gitignore");
     const gitignore = (0, import_node_fs4.readFileSync)(gitignorePath, "utf8");
     checks.push({
       name: ".gitignore includes .nestjs-inertia/",
@@ -4613,7 +5533,7 @@ async function runDoctor(opts) {
       autoFix: () => (0, import_node_fs4.appendFileSync)(gitignorePath, "\n.nestjs-inertia/\n")
     });
   }
-  const pkgJsonPath = (0, import_node_path16.join)(cwd, "package.json");
+  const pkgJsonPath = (0, import_node_path18.join)(cwd, "package.json");
   const pkgJson = readJson(pkgJsonPath);
   const scripts = pkgJson?.scripts ?? {};
   checks.push({