@dudousxd/nestjs-inertia-codegen 1.0.7 → 1.3.0

package/dist/index.d.cts

@@ -62,14 +62,27 @@ declare class CodegenError extends Error {
     constructor(message: string, options?: ErrorOptions);
 }
 
+interface TypeRef {
+    name: string;
+    filePath: string;
+    isArray?: boolean;
+}
 interface ContractSource {
     query: string | null;
     body: string | null;
     response: string;
+    queryRef?: TypeRef | null;
+    bodyRef?: TypeRef | null;
+    responseRef?: TypeRef | null;
 }
 interface ContractDescriptor {
     contractSource: ContractSource;
 }
+interface ControllerRef {
+    className: string;
+    methodName: string;
+    filePath: string;
+}
 interface RouteDescriptor {
     method: string;
     path: string;
@@ -79,6 +92,7 @@ interface RouteDescriptor {
         source: 'path' | 'query' | 'body' | 'header';
     }>;
     contract?: ContractDescriptor;
+    controllerRef?: ControllerRef;
 }
 
 /**
@@ -120,6 +134,6 @@ declare function acquireLock(outDir: string): Promise<{
     release: () => Promise<void>;
 } | null>;
 
-declare const VERSION = "1.0.7";
+declare const VERSION = "1.3.0";
 
 export { CodegenError, ConfigError, type ResolvedConfig, type ScopeConfig, type UserConfig, VERSION, type Watcher, acquireLock, defineConfig, generate, loadConfig, watch };

package/dist/index.d.ts

@@ -62,14 +62,27 @@ declare class CodegenError extends Error {
     constructor(message: string, options?: ErrorOptions);
 }
 
+interface TypeRef {
+    name: string;
+    filePath: string;
+    isArray?: boolean;
+}
 interface ContractSource {
     query: string | null;
     body: string | null;
     response: string;
+    queryRef?: TypeRef | null;
+    bodyRef?: TypeRef | null;
+    responseRef?: TypeRef | null;
 }
 interface ContractDescriptor {
     contractSource: ContractSource;
 }
+interface ControllerRef {
+    className: string;
+    methodName: string;
+    filePath: string;
+}
 interface RouteDescriptor {
     method: string;
     path: string;
@@ -79,6 +92,7 @@ interface RouteDescriptor {
         source: 'path' | 'query' | 'body' | 'header';
     }>;
     contract?: ContractDescriptor;
+    controllerRef?: ControllerRef;
 }
 
 /**
@@ -120,6 +134,6 @@ declare function acquireLock(outDir: string): Promise<{
     release: () => Promise<void>;
 } | null>;
 
-declare const VERSION = "1.0.7";
+declare const VERSION = "1.3.0";
 
 export { CodegenError, ConfigError, type ResolvedConfig, type ScopeConfig, type UserConfig, VERSION, type Watcher, acquireLock, defineConfig, generate, loadConfig, watch };

package/dist/index.js

@@ -197,12 +197,12 @@ __name(extractPropsSource, "extractPropsSource");
 
 // src/emit/emit-api.ts
 import { mkdir, writeFile } from "fs/promises";
-import { join as join2 } from "path";
+import { join as join2, relative as relative3 } from "path";
 async function emitApi(routes, outDir) {
   await mkdir(outDir, {
     recursive: true
   });
-  const content = buildApiFile(routes);
+  const content = buildApiFile(routes, outDir);
   await writeFile(join2(outDir, "api.ts"), content, "utf8");
 }
 __name(emitApi, "emitApi");
@@ -267,7 +267,20 @@ function insertIntoTree(tree, segments, leaf, fullName) {
   }
 }
 __name(insertIntoTree, "insertIntoTree");
-function emitRouterTypeBlock(tree, indent) {
+function buildResponseType(c, outDir) {
+  if (c.controllerRef) {
+    let relPath = relative3(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;
+}
+__name(buildResponseType, "buildResponseType");
+function emitRouterTypeBlock(tree, indent, outDir) {
   const pad = " ".repeat(indent);
   const lines = [];
   for (const [key, node] of tree) {
@@ -275,15 +288,17 @@ function emitRouterTypeBlock(tree, indent) {
     if (node.kind === "leaf") {
       const c = node;
       const method = c.method.toUpperCase();
-      const query = c.contractSource.query ?? "never";
-      const body = method === "GET" ? "never" : c.contractSource.body ?? "never";
-      const response = c.contractSource.response;
+      const queryRef = c.contractSource.queryRef;
+      const query = queryRef ? queryRef.isArray ? `Array<${queryRef.name}>` : queryRef.name : c.contractSource.query ?? "never";
+      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 safeMethod = JSON.stringify(method);
       const safeUrl = JSON.stringify(c.path);
       lines.push(`${pad}${objKey}: { method: ${safeMethod}; url: ${safeUrl}; query: ${query}; body: ${body}; response: ${response} };`);
     } else {
       lines.push(`${pad}${objKey}: {`);
-      lines.push(...emitRouterTypeBlock(node.children, indent + 2));
+      lines.push(...emitRouterTypeBlock(node.children, indent + 2, outDir));
       lines.push(`${pad}};`);
     }
   }
@@ -304,18 +319,21 @@ function emitApiObjectBlock(tree, indent) {
       if (method === "GET") {
         const typeAccess = buildRouterTypeAccess(c.name);
         lines.push(`${pad}${objKey}: {`);
+        lines.push(`${pad}  queryKey: (query?: ${typeAccess}['query']) => query !== undefined ? [${flatName}, query] as const : [${flatName}] as const,`);
         lines.push(`${pad}  queryOptions: (query?: ${typeAccess}['query']) =>`);
-        lines.push(`${pad}    queryOptions({`);
-        lines.push(`${pad}      queryKey: [${flatName}, query],`);
+        lines.push(`${pad}    _queryOptions({`);
+        lines.push(`${pad}      queryKey: query !== undefined ? [${flatName}, query] as const : [${flatName}] as const,`);
         lines.push(`${pad}      queryFn: () => fetcher.get<${typeAccess}['response']>(route(${flatName} as never) || ${safePath}, { query }),`);
         lines.push(`${pad}    }),`);
         lines.push(`${pad}},`);
       } else {
         const typeAccess = buildRouterTypeAccess(c.name);
         lines.push(`${pad}${objKey}: {`);
-        lines.push(`${pad}  mutationOptions: () => ({`);
-        lines.push(`${pad}    mutationFn: (body: ${typeAccess}['body']) => fetcher.${fetcherMethod}<${typeAccess}['response']>(route(${flatName} as never) || ${safePath}, { body }),`);
-        lines.push(`${pad}  }),`);
+        lines.push(`${pad}  queryKey: () => [${flatName}] as const,`);
+        lines.push(`${pad}  mutationOptions: () =>`);
+        lines.push(`${pad}    _mutationOptions({`);
+        lines.push(`${pad}      mutationFn: (body: ${typeAccess}['body']) => fetcher.${fetcherMethod}<${typeAccess}['response']>(route(${flatName} as never) || ${safePath}, { body }),`);
+        lines.push(`${pad}    }),`);
         lines.push(`${pad}},`);
       }
     } else {
@@ -332,18 +350,55 @@ function buildRouterTypeAccess(name) {
   return `ApiRouter${segments.map((s) => `[${JSON.stringify(s)}]`).join("")}`;
 }
 __name(buildRouterTypeAccess, "buildRouterTypeAccess");
-function buildApiFile(routes) {
+function buildApiFile(routes, outDir) {
   const contracted = routes.filter((r) => r.contract);
+  const importsByFile = /* @__PURE__ */ new Map();
+  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
+    ];
+    for (const ref of refs) {
+      if (!ref) continue;
+      let names = importsByFile.get(ref.filePath);
+      if (!names) {
+        names = /* @__PURE__ */ new Set();
+        importsByFile.set(ref.filePath, names);
+      }
+      names.add(ref.name);
+    }
+  }
   const hasGetRoutes = contracted.some((r) => r.method === "GET");
+  const hasMutationRoutes = contracted.some((r) => r.method !== "GET");
   const lines = [
     "// Generated by @dudousxd/nestjs-inertia-codegen. Do not edit.",
     ""
   ];
-  if (hasGetRoutes) {
-    lines.push("import { queryOptions } from '@tanstack/query-core';");
+  const tqImports = [];
+  if (hasGetRoutes) tqImports.push("queryOptions as _queryOptions");
+  if (hasMutationRoutes) tqImports.push("mutationOptions as _mutationOptions");
+  if (tqImports.length > 0) {
+    lines.push(`import { ${tqImports.join(", ")} } from '@tanstack/react-query';`);
   }
   lines.push("import { route } from './routes.js';");
   lines.push("import { createFetcher } from '@dudousxd/nestjs-inertia-client';");
+  if (importsByFile.size > 0 && outDir) {
+    lines.push("");
+    for (const [filePath, names] of importsByFile) {
+      let relPath = relative3(outDir, filePath).replace(/\.ts$/, "");
+      if (!relPath.startsWith(".")) relPath = `./${relPath}`;
+      const sortedNames = [
+        ...names
+      ].sort();
+      lines.push(`import type { ${sortedNames.join(", ")} } from '${relPath}';`);
+    }
+  }
   lines.push("");
   lines.push("export const fetcher = createFetcher();");
   lines.push("");
@@ -384,13 +439,14 @@ function buildApiFile(routes) {
       method: r.method,
       name,
       path: r.path,
+      controllerRef: r.controllerRef,
       contractSource: c.contractSource
     };
     insertIntoTree(tree, segments, leaf, name);
   }
   void detectCollisions;
   lines.push("export type ApiRouter = {");
-  lines.push(...emitRouterTypeBlock(tree, 2));
+  lines.push(...emitRouterTypeBlock(tree, 2, outDir ?? ""));
   lines.push("};");
   lines.push("");
   lines.push("export const api = {");
@@ -660,9 +716,28 @@ import { join as join9 } from "path";
 import chokidar from "chokidar";
 
 // src/discovery/contracts-fast.ts
+import { readFileSync } from "fs";
 import { dirname, join as join7, resolve as resolve2 } from "path";
 import fg2 from "fast-glob";
 import { Node, Project, SyntaxKind } from "ts-morph";
+var _projectRoot = "";
+var _tsconfigPaths = null;
+var _debug = process.env.NESTJS_INERTIA_DEBUG === "1";
+function dbg(...args) {
+  if (_debug) console.log("[codegen:debug]", ...args);
+}
+__name(dbg, "dbg");
+function loadTsconfigPaths(tsconfigPath) {
+  try {
+    const raw = readFileSync(tsconfigPath, "utf8");
+    const stripped = raw.replace(/\/\/.*$/gm, "");
+    const parsed = JSON.parse(stripped);
+    return parsed.compilerOptions?.paths ?? null;
+  } catch {
+    return null;
+  }
+}
+__name(loadTsconfigPaths, "loadTsconfigPaths");
 async function discoverContractsFast(opts) {
   const { cwd, glob, tsconfig } = opts;
   const tsconfigPath = tsconfig ? resolve2(tsconfig) : join7(cwd, "tsconfig.json");
@@ -695,6 +770,8 @@ async function discoverContractsFast(opts) {
     project.addSourceFileAtPath(f);
   }
   const routes = [];
+  _projectRoot = cwd;
+  _tsconfigPaths = loadTsconfigPaths(tsconfigPath);
   for (const sourceFile of project.getSourceFiles()) {
     routes.push(...extractFromSourceFile(sourceFile, project));
   }
@@ -896,17 +973,41 @@ function findTypeInFile(name, file) {
   return null;
 }
 __name(findTypeInFile, "findTypeInFile");
+function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
+  if (moduleSpecifier.startsWith(".")) {
+    const dir = dirname(sourceFile.getFilePath());
+    return [
+      resolve2(dir, `${moduleSpecifier}.ts`),
+      resolve2(dir, moduleSpecifier, "index.ts")
+    ];
+  }
+  const baseUrl = _projectRoot;
+  dbg("resolveModuleSpecifier", moduleSpecifier, "paths:", JSON.stringify(_tsconfigPaths), "baseUrl:", baseUrl);
+  if (_tsconfigPaths) {
+    for (const [pattern, mappings] of Object.entries(_tsconfigPaths)) {
+      const prefix = pattern.replace("*", "");
+      if (moduleSpecifier.startsWith(prefix)) {
+        const rest = moduleSpecifier.slice(prefix.length);
+        const candidates = [];
+        for (const mapping of mappings) {
+          const resolved = resolve2(baseUrl, mapping.replace("*", rest));
+          candidates.push(`${resolved}.ts`, resolve2(resolved, "index.ts"));
+        }
+        dbg("  resolved candidates:", candidates);
+        return candidates;
+      }
+    }
+  }
+  return [];
+}
+__name(resolveModuleSpecifier, "resolveModuleSpecifier");
 function resolveImportedType(name, sourceFile, project) {
   for (const importDecl of sourceFile.getImportDeclarations()) {
     const namedImport = importDecl.getNamedImports().find((n) => n.getName() === name);
     if (!namedImport) continue;
     const moduleSpecifier = importDecl.getModuleSpecifierValue();
-    if (!moduleSpecifier.startsWith(".")) return null;
-    const dir = dirname(sourceFile.getFilePath());
-    const candidates = [
-      resolve2(dir, `${moduleSpecifier}.ts`),
-      resolve2(dir, moduleSpecifier, "index.ts")
-    ];
+    const candidates = resolveModuleSpecifier(moduleSpecifier, sourceFile, project);
+    if (candidates.length === 0) continue;
     for (const candidate of candidates) {
       let importedFile = project.getSourceFile(candidate);
       if (!importedFile) {
@@ -940,7 +1041,8 @@ function resolveTypeNodeToString(typeNode, sourceFile, project, depth) {
     const name = Node.isIdentifier(typeName) ? typeName.getText() : typeNode.getText();
     if (name === "string" || name === "number" || name === "boolean") return name;
     if (name === "Date") return "string";
-    if (name === "unknown" || name === "any") return "unknown";
+    if (name === "unknown" || name === "any" || name === "void") return "unknown";
+    if (name === "StreamableFile" || name === "Observable" || name === "ReadableStream") return "unknown";
     if (name === "Array") {
       const typeArgs = typeNode.getTypeArguments();
       const firstTypeArg = typeArgs[0];
@@ -949,6 +1051,18 @@ function resolveTypeNodeToString(typeNode, sourceFile, project, depth) {
       }
       return "Array<unknown>";
     }
+    if ([
+      "Record",
+      "Omit",
+      "Pick",
+      "Partial",
+      "Required",
+      "Readonly",
+      "Map",
+      "Set"
+    ].includes(name)) {
+      return typeNode.getText();
+    }
     if (name === "Promise") {
       const typeArgs = typeNode.getTypeArguments();
       const firstTypeArg = typeArgs[0];
@@ -961,7 +1075,8 @@ function resolveTypeNodeToString(typeNode, sourceFile, project, depth) {
     if (resolved) {
       return expandTypeDecl(resolved, project, depth - 1);
     }
-    return name;
+    dbg("unresolvable type:", name, "in", sourceFile.getFilePath());
+    return "unknown";
   }
   const kind = typeNode.getKind();
   if (kind === SyntaxKind.StringKeyword) return "string";
@@ -1088,6 +1203,68 @@ function resolveIdentifierToClassType(node, sourceFile, project, depth) {
   return name;
 }
 __name(resolveIdentifierToClassType, "resolveIdentifierToClassType");
+function tryResolveTypeRef(typeNode, sourceFile, project) {
+  if (Node.isTypeReference(typeNode)) {
+    const typeName = typeNode.getTypeName();
+    const name = Node.isIdentifier(typeName) ? typeName.getText() : null;
+    if (!name) return null;
+    if (name === "Promise") {
+      const typeArgs = typeNode.getTypeArguments();
+      const first = typeArgs[0];
+      if (first) return tryResolveTypeRef(first, sourceFile, project);
+      return null;
+    }
+    if (name === "Array") {
+      const typeArgs = typeNode.getTypeArguments();
+      const first = typeArgs[0];
+      if (first) {
+        const inner = tryResolveTypeRef(first, sourceFile, project);
+        if (inner) return {
+          ...inner,
+          isArray: true
+        };
+      }
+      return null;
+    }
+    if ([
+      "string",
+      "number",
+      "boolean",
+      "void",
+      "unknown",
+      "any",
+      "Date"
+    ].includes(name)) {
+      return null;
+    }
+    const localDecl = sourceFile.getInterface(name) || sourceFile.getClass(name) || sourceFile.getTypeAlias(name);
+    if (localDecl?.isExported()) {
+      return {
+        name,
+        filePath: sourceFile.getFilePath()
+      };
+    }
+    const resolved = resolveImportedType(name, sourceFile, project);
+    if (resolved && (resolved.kind === "class" || resolved.kind === "interface")) {
+      const decl = resolved.decl;
+      if (decl.isExported()) {
+        return {
+          name,
+          filePath: resolved.file.getFilePath()
+        };
+      }
+    }
+  }
+  if (Node.isArrayTypeNode(typeNode)) {
+    const inner = tryResolveTypeRef(typeNode.getElementTypeNode(), sourceFile, project);
+    if (inner) return {
+      ...inner,
+      isArray: true
+    };
+  }
+  return null;
+}
+__name(tryResolveTypeRef, "tryResolveTypeRef");
 function extractDtoContract(method, sourceFile, project) {
   const body = extractBodyType(method, sourceFile, project);
   const query = extractQueryType(method, sourceFile, project);
@@ -1096,11 +1273,61 @@ function extractDtoContract(method, sourceFile, project) {
   if (body === null && query === null && paramsType === null && response === "unknown") {
     return null;
   }
+  let bodyRef = null;
+  let queryRef = null;
+  let responseRef = null;
+  for (const param of method.getParameters()) {
+    if (param.getDecorators().some((d) => d.getName() === "Body") && param.getTypeNode()) {
+      bodyRef = tryResolveTypeRef(param.getTypeNode(), sourceFile, project);
+    }
+    if (param.getDecorators().some((d) => d.getName() === "Query") && param.getTypeNode()) {
+      queryRef = tryResolveTypeRef(param.getTypeNode(), sourceFile, project);
+    }
+  }
+  const returnTypeNode = method.getReturnTypeNode();
+  if (returnTypeNode) {
+    responseRef = tryResolveTypeRef(returnTypeNode, sourceFile, project);
+  }
+  if (!responseRef) {
+    const apiResp = method.getDecorator("ApiResponse");
+    if (apiResp) {
+      const args = apiResp.getArguments();
+      const optsArg = args[0];
+      if (optsArg && Node.isObjectLiteralExpression(optsArg)) {
+        for (const prop of optsArg.getProperties()) {
+          if (Node.isPropertyAssignment(prop) && prop.getName() === "type") {
+            const val = prop.getInitializer();
+            if (val && Node.isIdentifier(val)) {
+              const name = val.getText();
+              const localDecl = sourceFile.getInterface(name) || sourceFile.getClass(name) || sourceFile.getTypeAlias(name);
+              if (localDecl?.isExported()) {
+                responseRef = {
+                  name,
+                  filePath: sourceFile.getFilePath()
+                };
+              } else {
+                const resolved = resolveImportedType(name, sourceFile, project);
+                if (resolved && (resolved.kind === "class" || resolved.kind === "interface") && resolved.decl.isExported()) {
+                  responseRef = {
+                    name,
+                    filePath: resolved.file.getFilePath()
+                  };
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
   return {
     query,
     body,
     response,
-    params: paramsType
+    params: paramsType,
+    queryRef,
+    bodyRef,
+    responseRef
   };
 }
 __name(extractDtoContract, "extractDtoContract");
@@ -1199,6 +1426,11 @@ function extractFromSourceFile(sourceFile, project) {
           path: combined,
           name: routeName,
           params,
+          controllerRef: {
+            className,
+            methodName,
+            filePath: sourceFile.getFilePath()
+          },
           contract: {
             contractSource: {
               query: contractDef.query,
@@ -1233,13 +1465,20 @@ function extractFromSourceFile(sourceFile, project) {
           path: combined,
           name: routeName,
           params,
-          // Attach contract if DTO extraction produced useful type info
+          controllerRef: {
+            className,
+            methodName,
+            filePath: sourceFile.getFilePath()
+          },
           ...dtoContract ? {
             contract: {
               contractSource: {
                 query: dtoContract.query,
                 body: dtoContract.body,
-                response: dtoContract.response
+                response: dtoContract.response,
+                queryRef: dtoContract.queryRef,
+                bodyRef: dtoContract.bodyRef,
+                responseRef: dtoContract.responseRef
               }
             }
           } : {}
@@ -1412,7 +1651,7 @@ async function watch(config, onChange) {
 __name(watch, "watch");
 
 // src/index.ts
-var VERSION = "1.0.7";
+var VERSION = "1.3.0";
 export {
   CodegenError,
   ConfigError,