@dudousxd/nestjs-inertia-codegen 1.2.0 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog — @dudousxd/nestjs-inertia-codegen
 
+## 2.0.0
+
+### Minor Changes
+
+- feat(codegen): ReturnType<import(...)> for response types, queryKey helper, TanStack helpers, type ref imports, path alias resolution, debug mode
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @dudousxd/nestjs-inertia@2.0.0
+
 ## 3.0.0
 
 ### Minor Changes

package/dist/cli/main.cjs

@@ -287,7 +287,20 @@ function insertIntoTree(tree, segments, leaf, fullName) {
   }
 }
 __name(insertIntoTree, "insertIntoTree");
-function emitRouterTypeBlock(tree, indent) {
+function buildResponseType(c, outDir) {
+  if (c.controllerRef) {
+    let relPath = (0, import_node_path3.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;
+}
+__name(buildResponseType, "buildResponseType");
+function emitRouterTypeBlock(tree, indent, outDir) {
   const pad = " ".repeat(indent);
   const lines = [];
   for (const [key, node] of tree) {
@@ -299,14 +312,13 @@ function emitRouterTypeBlock(tree, indent) {
       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 respRef = c.contractSource.responseRef;
-      const response = respRef ? respRef.isArray ? `Array<${respRef.name}>` : respRef.name : c.contractSource.response;
+      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}};`);
     }
   }
@@ -328,18 +340,20 @@ function emitApiObjectBlock(tree, indent) {
         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}    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}  queryOptions: (query?: ${typeAccess}['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}  queryKey: () => [${flatName}] as const,`);
-        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}  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 {
@@ -362,11 +376,15 @@ function buildApiFile(routes, outDir) {
   for (const r of contracted) {
     const cs = r.contract?.contractSource;
     if (!cs) continue;
-    for (const ref of [
+    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) {
@@ -376,10 +394,18 @@ function buildApiFile(routes, outDir) {
       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.",
     ""
   ];
+  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) {
@@ -433,13 +459,14 @@ function buildApiFile(routes, outDir) {
       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 = {");
@@ -709,9 +736,28 @@ var import_node_path10 = require("path");
 var import_chokidar = __toESM(require("chokidar"), 1);
 
 // src/discovery/contracts-fast.ts
+var import_node_fs = require("fs");
 var import_node_path8 = require("path");
 var import_fast_glob2 = __toESM(require("fast-glob"), 1);
 var import_ts_morph = require("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 = (0, import_node_fs.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 ? (0, import_node_path8.resolve)(tsconfig) : (0, import_node_path8.join)(cwd, "tsconfig.json");
@@ -744,6 +790,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));
   }
@@ -945,17 +993,41 @@ function findTypeInFile(name, file) {
   return null;
 }
 __name(findTypeInFile, "findTypeInFile");
+function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
+  if (moduleSpecifier.startsWith(".")) {
+    const dir = (0, import_node_path8.dirname)(sourceFile.getFilePath());
+    return [
+      (0, import_node_path8.resolve)(dir, `${moduleSpecifier}.ts`),
+      (0, import_node_path8.resolve)(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 = (0, import_node_path8.resolve)(baseUrl, mapping.replace("*", rest));
+          candidates.push(`${resolved}.ts`, (0, import_node_path8.resolve)(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 = (0, import_node_path8.dirname)(sourceFile.getFilePath());
-    const candidates = [
-      (0, import_node_path8.resolve)(dir, `${moduleSpecifier}.ts`),
-      (0, import_node_path8.resolve)(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) {
@@ -999,6 +1071,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];
@@ -1011,7 +1095,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 === import_ts_morph.SyntaxKind.StringKeyword) return "string";
@@ -1173,7 +1258,7 @@ function tryResolveTypeRef(typeNode, sourceFile, project) {
       return null;
     }
     const localDecl = sourceFile.getInterface(name) || sourceFile.getClass(name) || sourceFile.getTypeAlias(name);
-    if (localDecl && localDecl.isExported()) {
+    if (localDecl?.isExported()) {
       return {
         name,
         filePath: sourceFile.getFilePath()
@@ -1235,7 +1320,7 @@ function extractDtoContract(method, sourceFile, project) {
             if (val && import_ts_morph.Node.isIdentifier(val)) {
               const name = val.getText();
               const localDecl = sourceFile.getInterface(name) || sourceFile.getClass(name) || sourceFile.getTypeAlias(name);
-              if (localDecl && localDecl.isExported()) {
+              if (localDecl?.isExported()) {
                 responseRef = {
                   name,
                   filePath: sourceFile.getFilePath()
@@ -1361,6 +1446,11 @@ function extractFromSourceFile(sourceFile, project) {
           path: combined,
           name: routeName,
           params,
+          controllerRef: {
+            className,
+            methodName,
+            filePath: sourceFile.getFilePath()
+          },
           contract: {
             contractSource: {
               query: contractDef.query,
@@ -1395,7 +1485,11 @@ 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: {
@@ -1577,7 +1671,7 @@ async function watch(config, onChange) {
 __name(watch, "watch");
 
 // src/index.ts
-var VERSION = "1.2.0";
+var VERSION = "1.3.0";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {
@@ -1609,7 +1703,7 @@ __name(runCodegen, "runCodegen");
 
 // src/cli/init.ts
 var import_node_child_process = require("child_process");
-var import_node_fs = require("fs");
+var import_node_fs2 = require("fs");
 var import_promises10 = require("fs/promises");
 var import_node_path11 = require("path");
 var import_node_readline = require("readline");
@@ -1833,7 +1927,7 @@ __name(findAfterLastImport, "findAfterLastImport");
 function patchAppModule(filePath, rootView) {
   let content;
   try {
-    content = (0, import_node_fs.readFileSync)(filePath, "utf8");
+    content = (0, import_node_fs2.readFileSync)(filePath, "utf8");
   } catch {
     return "skipped";
   }
@@ -1871,14 +1965,14 @@ ${indent}HomeController,${content.slice(bracketPos)}`;
     }
   }
   if (!changed) return "already";
-  (0, import_node_fs.writeFileSync)(filePath, content, "utf8");
+  (0, import_node_fs2.writeFileSync)(filePath, content, "utf8");
   return "patched";
 }
 __name(patchAppModule, "patchAppModule");
 function patchMainTs(filePath) {
   let content;
   try {
-    content = (0, import_node_fs.readFileSync)(filePath, "utf8");
+    content = (0, import_node_fs2.readFileSync)(filePath, "utf8");
   } catch {
     return "skipped";
   }
@@ -1902,7 +1996,7 @@ ${content.slice(insertAt)}`;
   });`;
   content = `${content.slice(0, insertAfterPos)}
 ${viteSetup}${content.slice(insertAfterPos)}`;
-  (0, import_node_fs.writeFileSync)(filePath, content, "utf8");
+  (0, import_node_fs2.writeFileSync)(filePath, content, "utf8");
   return "patched";
 }
 __name(patchMainTs, "patchMainTs");
@@ -1951,11 +2045,19 @@ function htmlShellTemplate(framework, _engine) {
 __name(htmlShellTemplate, "htmlShellTemplate");
 function viteConfigTemplate(framework) {
   const pluginOption = `{ ${framework}: true }`;
-  return `import { defineConfig } from 'vite';
+  return `import { resolve } from 'node:path';
+import { defineConfig } from 'vite';
 import nestInertia from '@dudousxd/nestjs-inertia-vite/plugin';
 
 export default defineConfig({
   plugins: [nestInertia(${pluginOption})],
+  resolve: {
+    alias: {
+      '@': resolve(__dirname, 'src'),
+      '~': resolve(__dirname, 'inertia'),
+      '~codegen': resolve(__dirname, '.nestjs-inertia'),
+    },
+  },
 });
 `;
 }