@dudousxd/nestjs-inertia-codegen 1.0.4 → 1.0.6

package/dist/cli/main.js

@@ -322,16 +322,19 @@ function buildRouterTypeAccess(name) {
 __name(buildRouterTypeAccess, "buildRouterTypeAccess");
 function buildApiFile(routes) {
   const contracted = routes.filter((r) => r.contract);
+  const hasGetRoutes = contracted.some((r) => r.method === "GET");
   const lines = [
     "// Generated by @dudousxd/nestjs-inertia-codegen. Do not edit.",
-    "",
-    "import { queryOptions } from '@tanstack/query-core';",
-    "import { route } from './routes.js';",
-    "import { createFetcher } from '@dudousxd/nestjs-inertia-client';",
-    "",
-    "export const fetcher = createFetcher();",
     ""
   ];
+  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';");
+  lines.push("");
+  lines.push("export const fetcher = createFetcher();");
+  lines.push("");
   if (contracted.length === 0) {
     lines.push("export type ApiRouter = Record<string, never>;");
     lines.push("");
@@ -846,7 +849,42 @@ function extractParams(path) {
   }));
 }
 __name(extractParams, "extractParams");
-function resolveImportedClass(name, sourceFile, project) {
+function findTypeInFile(name, file) {
+  const cls = file.getClass(name);
+  if (cls) return {
+    kind: "class",
+    decl: cls,
+    file
+  };
+  const iface = file.getInterface(name);
+  if (iface) return {
+    kind: "interface",
+    decl: iface,
+    file
+  };
+  const alias = file.getTypeAlias(name);
+  if (alias) {
+    const typeNode = alias.getTypeNode();
+    return {
+      kind: "typeAlias",
+      text: typeNode ? typeNode.getText() : "unknown"
+    };
+  }
+  const enumDecl = file.getEnum(name);
+  if (enumDecl) {
+    const members = enumDecl.getMembers().map((m) => {
+      const val = m.getValue();
+      return typeof val === "string" ? JSON.stringify(val) : JSON.stringify(m.getName());
+    });
+    return {
+      kind: "enum",
+      members
+    };
+  }
+  return null;
+}
+__name(findTypeInFile, "findTypeInFile");
+function resolveImportedType(name, sourceFile, project) {
   for (const importDecl of sourceFile.getImportDeclarations()) {
     const namedImport = importDecl.getNamedImports().find((n) => n.getName() === name);
     if (!namedImport) continue;
@@ -866,25 +904,19 @@ function resolveImportedClass(name, sourceFile, project) {
           continue;
         }
       }
-      const cls = importedFile.getClass(name);
-      if (cls) return {
-        cls,
-        file: importedFile
-      };
+      const result = findTypeInFile(name, importedFile);
+      if (result) return result;
     }
   }
   return null;
 }
-__name(resolveImportedClass, "resolveImportedClass");
-function findClass(name, sourceFile, project) {
-  const local = sourceFile.getClass(name);
-  if (local) return {
-    cls: local,
-    file: sourceFile
-  };
-  return resolveImportedClass(name, sourceFile, project);
+__name(resolveImportedType, "resolveImportedType");
+function findType(name, sourceFile, project) {
+  const local = findTypeInFile(name, sourceFile);
+  if (local) return local;
+  return resolveImportedType(name, sourceFile, project);
 }
-__name(findClass, "findClass");
+__name(findType, "findType");
 function resolveTypeNodeToString(typeNode, sourceFile, project, depth) {
   if (depth <= 0) return "unknown";
   if (Node.isArrayTypeNode(typeNode)) {
@@ -913,9 +945,9 @@ function resolveTypeNodeToString(typeNode, sourceFile, project, depth) {
       }
       return "unknown";
     }
-    const resolved = findClass(name, sourceFile, project);
+    const resolved = findType(name, sourceFile, project);
     if (resolved) {
-      return resolveClassDeclaration(resolved.cls, resolved.file, project, depth - 1);
+      return expandTypeDecl(resolved, project, depth - 1);
     }
     return name;
   }
@@ -928,10 +960,24 @@ function resolveTypeNodeToString(typeNode, sourceFile, project, depth) {
   return typeNode.getText();
 }
 __name(resolveTypeNodeToString, "resolveTypeNodeToString");
-function resolveClassDeclaration(cls, sourceFile, project, depth) {
+function expandTypeDecl(result, project, depth) {
+  if (depth < 0) return "unknown";
+  switch (result.kind) {
+    case "class":
+      return resolvePropertied(result.decl, result.file, project, depth);
+    case "interface":
+      return resolvePropertied(result.decl, result.file, project, depth);
+    case "typeAlias":
+      return result.text;
+    case "enum":
+      return result.members.join(" | ");
+  }
+}
+__name(expandTypeDecl, "expandTypeDecl");
+function resolvePropertied(decl, sourceFile, project, depth) {
   if (depth < 0) return "unknown";
   const lines = [];
-  for (const prop of cls.getProperties()) {
+  for (const prop of decl.getProperties()) {
     const propName = prop.getName();
     const isOptional = prop.hasQuestionToken();
     const propTypeNode = prop.getTypeNode();
@@ -943,7 +989,7 @@ function resolveClassDeclaration(cls, sourceFile, project, depth) {
   }
   return `{ ${lines.join("; ")} }`;
 }
-__name(resolveClassDeclaration, "resolveClassDeclaration");
+__name(resolvePropertied, "resolvePropertied");
 function extractBodyType(method, sourceFile, project) {
   for (const param of method.getParameters()) {
     const bodyDecorator = param.getDecorators().find((d) => d.getName() === "Body");
@@ -1023,9 +1069,9 @@ __name(extractResponseType, "extractResponseType");
 function resolveIdentifierToClassType(node, sourceFile, project, depth) {
   if (!Node.isIdentifier(node)) return "unknown";
   const name = node.getText();
-  const resolved = findClass(name, sourceFile, project);
+  const resolved = findType(name, sourceFile, project);
   if (resolved) {
-    return resolveClassDeclaration(resolved.cls, resolved.file, project, depth - 1);
+    return expandTypeDecl(resolved, project, depth - 1);
   }
   return name;
 }
@@ -1154,7 +1200,21 @@ function extractFromSourceFile(sourceFile, project) {
         const combined = joinPaths(prefix, handlerPath);
         const params = extractParams(combined);
         const methodName = method.getName();
-        const routeName = `${className}.${methodName}`;
+        const classAsDecorator = cls.getDecorator("As");
+        let classAs;
+        if (classAsDecorator) {
+          const classAsArgs = classAsDecorator.getArguments();
+          const classAsName = decoratorStringArg(classAsArgs[0]);
+          if (classAsName) classAs = classAsName;
+        }
+        const methodAsDecorator = method.getDecorator("As");
+        let methodAs;
+        if (methodAsDecorator) {
+          const methodAsArgs = methodAsDecorator.getArguments();
+          const methodAsName = decoratorStringArg(methodAsArgs[0]);
+          if (methodAsName) methodAs = methodAsName;
+        }
+        const routeName = resolveRouteName(className, methodName, classAs, methodAs);
         const dtoContract = extractDtoContract(method, sourceFile, project);
         routes.push({
           method: httpMethod,
@@ -1340,7 +1400,7 @@ async function watch(config, onChange) {
 __name(watch, "watch");
 
 // src/index.ts
-var VERSION = "1.0.4";
+var VERSION = "1.0.6";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {