@dudousxd/nestjs-inertia-codegen 1.0.7 → 1.2.0

package/dist/cli/main.js

@@ -185,12 +185,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");
@@ -263,9 +263,12 @@ 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 respRef = c.contractSource.responseRef;
+      const response = respRef ? respRef.isArray ? `Array<${respRef.name}>` : respRef.name : c.contractSource.response;
       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} };`);
@@ -292,15 +295,16 @@ function emitApiObjectBlock(tree, indent) {
       if (method === "GET") {
         const typeAccess = buildRouterTypeAccess(c.name);
         lines.push(`${pad}${objKey}: {`);
-        lines.push(`${pad}  queryOptions: (query?: ${typeAccess}['query']) =>`);
-        lines.push(`${pad}    queryOptions({`);
-        lines.push(`${pad}      queryKey: [${flatName}, query],`);
-        lines.push(`${pad}      queryFn: () => fetcher.get<${typeAccess}['response']>(route(${flatName} as never) || ${safePath}, { query }),`);
-        lines.push(`${pad}    }),`);
+        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}},`);
       } 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}  }),`);
@@ -320,18 +324,43 @@ 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 hasGetRoutes = contracted.some((r) => r.method === "GET");
+  const importsByFile = /* @__PURE__ */ new Map();
+  for (const r of contracted) {
+    const cs = r.contract?.contractSource;
+    if (!cs) continue;
+    for (const ref of [
+      cs.queryRef,
+      cs.bodyRef,
+      cs.responseRef
+    ]) {
+      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 lines = [
     "// Generated by @dudousxd/nestjs-inertia-codegen. Do not edit.",
     ""
   ];
-  if (hasGetRoutes) {
-    lines.push("import { queryOptions } from '@tanstack/query-core';");
-  }
   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("");
@@ -928,7 +957,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];
@@ -1076,6 +1106,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 && 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);
@@ -1084,11 +1176,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 && 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");
@@ -1227,7 +1369,10 @@ function extractFromSourceFile(sourceFile, project) {
               contractSource: {
                 query: dtoContract.query,
                 body: dtoContract.body,
-                response: dtoContract.response
+                response: dtoContract.response,
+                queryRef: dtoContract.queryRef,
+                bodyRef: dtoContract.bodyRef,
+                responseRef: dtoContract.responseRef
               }
             }
           } : {}
@@ -1400,7 +1545,7 @@ async function watch(config, onChange) {
 __name(watch, "watch");
 
 // src/index.ts
-var VERSION = "1.0.7";
+var VERSION = "1.2.0";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {