@dudousxd/nestjs-inertia-codegen 1.0.3 → 1.0.4

package/dist/cli/main.js

@@ -645,7 +645,7 @@ import { join as join9 } from "path";
 import chokidar from "chokidar";
 
 // src/discovery/contracts-fast.ts
-import { join as join7, resolve as resolve2 } from "path";
+import { dirname, join as join7, resolve as resolve2 } from "path";
 import fg2 from "fast-glob";
 import { Node, Project, SyntaxKind } from "ts-morph";
 async function discoverContractsFast(opts) {
@@ -681,7 +681,7 @@ async function discoverContractsFast(opts) {
   }
   const routes = [];
   for (const sourceFile of project.getSourceFiles()) {
-    routes.push(...extractFromSourceFile(sourceFile));
+    routes.push(...extractFromSourceFile(sourceFile, project));
   }
   return routes;
 }
@@ -846,11 +846,50 @@ function extractParams(path) {
   }));
 }
 __name(extractParams, "extractParams");
-function resolveTypeNodeToString(typeNode, sourceFile, depth) {
+function resolveImportedClass(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")
+    ];
+    for (const candidate of candidates) {
+      let importedFile = project.getSourceFile(candidate);
+      if (!importedFile) {
+        try {
+          importedFile = project.addSourceFileAtPath(candidate);
+        } catch {
+          continue;
+        }
+      }
+      const cls = importedFile.getClass(name);
+      if (cls) return {
+        cls,
+        file: importedFile
+      };
+    }
+  }
+  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(findClass, "findClass");
+function resolveTypeNodeToString(typeNode, sourceFile, project, depth) {
   if (depth <= 0) return "unknown";
   if (Node.isArrayTypeNode(typeNode)) {
     const elementType = typeNode.getElementTypeNode();
-    return `Array<${resolveTypeNodeToString(elementType, sourceFile, depth)}>`;
+    return `Array<${resolveTypeNodeToString(elementType, sourceFile, project, depth)}>`;
   }
   if (Node.isTypeReference(typeNode)) {
     const typeName = typeNode.getTypeName();
@@ -862,7 +901,7 @@ function resolveTypeNodeToString(typeNode, sourceFile, depth) {
       const typeArgs = typeNode.getTypeArguments();
       const firstTypeArg = typeArgs[0];
       if (typeArgs.length > 0 && firstTypeArg !== void 0) {
-        return `Array<${resolveTypeNodeToString(firstTypeArg, sourceFile, depth)}>`;
+        return `Array<${resolveTypeNodeToString(firstTypeArg, sourceFile, project, depth)}>`;
       }
       return "Array<unknown>";
     }
@@ -870,13 +909,13 @@ function resolveTypeNodeToString(typeNode, sourceFile, depth) {
       const typeArgs = typeNode.getTypeArguments();
       const firstTypeArg = typeArgs[0];
       if (typeArgs.length > 0 && firstTypeArg !== void 0) {
-        return resolveTypeNodeToString(firstTypeArg, sourceFile, depth);
+        return resolveTypeNodeToString(firstTypeArg, sourceFile, project, depth);
       }
       return "unknown";
     }
-    const classDec = sourceFile.getClass(name);
-    if (classDec) {
-      return resolveClassDeclaration(classDec, sourceFile, depth - 1);
+    const resolved = findClass(name, sourceFile, project);
+    if (resolved) {
+      return resolveClassDeclaration(resolved.cls, resolved.file, project, depth - 1);
     }
     return name;
   }
@@ -889,7 +928,7 @@ function resolveTypeNodeToString(typeNode, sourceFile, depth) {
   return typeNode.getText();
 }
 __name(resolveTypeNodeToString, "resolveTypeNodeToString");
-function resolveClassDeclaration(cls, sourceFile, depth) {
+function resolveClassDeclaration(cls, sourceFile, project, depth) {
   if (depth < 0) return "unknown";
   const lines = [];
   for (const prop of cls.getProperties()) {
@@ -898,14 +937,14 @@ function resolveClassDeclaration(cls, sourceFile, depth) {
     const propTypeNode = prop.getTypeNode();
     let propType = "unknown";
     if (propTypeNode) {
-      propType = resolveTypeNodeToString(propTypeNode, sourceFile, depth);
+      propType = resolveTypeNodeToString(propTypeNode, sourceFile, project, depth);
     }
     lines.push(`${propName}${isOptional ? "?" : ""}: ${propType}`);
   }
   return `{ ${lines.join("; ")} }`;
 }
 __name(resolveClassDeclaration, "resolveClassDeclaration");
-function extractBodyType(method, sourceFile) {
+function extractBodyType(method, sourceFile, project) {
   for (const param of method.getParameters()) {
     const bodyDecorator = param.getDecorators().find((d) => d.getName() === "Body");
     if (!bodyDecorator) continue;
@@ -913,13 +952,13 @@ function extractBodyType(method, sourceFile) {
     if (bodyArgs.length > 0) continue;
     const typeNode = param.getTypeNode();
     if (typeNode) {
-      return resolveTypeNodeToString(typeNode, sourceFile, 3);
+      return resolveTypeNodeToString(typeNode, sourceFile, project, 3);
     }
   }
   return null;
 }
 __name(extractBodyType, "extractBodyType");
-function extractQueryType(method, sourceFile) {
+function extractQueryType(method, sourceFile, project) {
   for (const param of method.getParameters()) {
     const queryDecorator = param.getDecorators().find((d) => d.getName() === "Query");
     if (!queryDecorator) continue;
@@ -927,13 +966,13 @@ function extractQueryType(method, sourceFile) {
     if (queryArgs.length > 0) continue;
     const typeNode = param.getTypeNode();
     if (typeNode) {
-      return resolveTypeNodeToString(typeNode, sourceFile, 3);
+      return resolveTypeNodeToString(typeNode, sourceFile, project, 3);
     }
   }
   return null;
 }
 __name(extractQueryType, "extractQueryType");
-function extractParamsType(method, sourceFile) {
+function extractParamsType(method, sourceFile, project) {
   const entries = [];
   for (const param of method.getParameters()) {
     const paramDecorator = param.getDecorators().find((d) => d.getName() === "Param");
@@ -944,13 +983,13 @@ function extractParamsType(method, sourceFile) {
     if (!Node.isStringLiteral(nameArg)) continue;
     const paramName = nameArg.getLiteralValue();
     const typeNode = param.getTypeNode();
-    const paramType = typeNode ? resolveTypeNodeToString(typeNode, sourceFile, 3) : "string";
+    const paramType = typeNode ? resolveTypeNodeToString(typeNode, sourceFile, project, 3) : "string";
     entries.push(`${paramName}: ${paramType}`);
   }
   return entries.length > 0 ? `{ ${entries.join("; ")} }` : null;
 }
 __name(extractParamsType, "extractParamsType");
-function extractResponseType(method, sourceFile) {
+function extractResponseType(method, sourceFile, project) {
   const apiResponseDecorator = method.getDecorator("ApiResponse");
   if (apiResponseDecorator) {
     const args = apiResponseDecorator.getArguments();
@@ -965,37 +1004,37 @@ function extractResponseType(method, sourceFile) {
           const elements = val.getElements();
           const firstEl = elements[0];
           if (elements.length > 0 && firstEl !== void 0) {
-            const innerType = resolveIdentifierToClassType(firstEl, sourceFile, 3);
+            const innerType = resolveIdentifierToClassType(firstEl, sourceFile, project, 3);
             return `Array<${innerType}>`;
           }
           return "Array<unknown>";
         }
-        return resolveIdentifierToClassType(val, sourceFile, 3);
+        return resolveIdentifierToClassType(val, sourceFile, project, 3);
       }
     }
   }
   const returnTypeNode = method.getReturnTypeNode();
   if (returnTypeNode) {
-    return resolveTypeNodeToString(returnTypeNode, sourceFile, 3);
+    return resolveTypeNodeToString(returnTypeNode, sourceFile, project, 3);
   }
   return "unknown";
 }
 __name(extractResponseType, "extractResponseType");
-function resolveIdentifierToClassType(node, sourceFile, depth) {
+function resolveIdentifierToClassType(node, sourceFile, project, depth) {
   if (!Node.isIdentifier(node)) return "unknown";
   const name = node.getText();
-  const classDec = sourceFile.getClass(name);
-  if (classDec) {
-    return resolveClassDeclaration(classDec, sourceFile, depth - 1);
+  const resolved = findClass(name, sourceFile, project);
+  if (resolved) {
+    return resolveClassDeclaration(resolved.cls, resolved.file, project, depth - 1);
   }
   return name;
 }
 __name(resolveIdentifierToClassType, "resolveIdentifierToClassType");
-function extractDtoContract(method, sourceFile) {
-  const body = extractBodyType(method, sourceFile);
-  const query = extractQueryType(method, sourceFile);
-  const paramsType = extractParamsType(method, sourceFile);
-  const response = extractResponseType(method, sourceFile);
+function extractDtoContract(method, sourceFile, project) {
+  const body = extractBodyType(method, sourceFile, project);
+  const query = extractQueryType(method, sourceFile, project);
+  const paramsType = extractParamsType(method, sourceFile, project);
+  const response = extractResponseType(method, sourceFile, project);
   if (body === null && query === null && paramsType === null && response === "unknown") {
     return null;
   }
@@ -1017,7 +1056,7 @@ var HTTP_METHOD_DECORATORS = {
   Head: "HEAD",
   All: "ALL"
 };
-function extractFromSourceFile(sourceFile) {
+function extractFromSourceFile(sourceFile, project) {
   const routes = [];
   const seenNames = /* @__PURE__ */ new Map();
   const classes = sourceFile.getClasses();
@@ -1116,7 +1155,7 @@ function extractFromSourceFile(sourceFile) {
         const params = extractParams(combined);
         const methodName = method.getName();
         const routeName = `${className}.${methodName}`;
-        const dtoContract = extractDtoContract(method, sourceFile);
+        const dtoContract = extractDtoContract(method, sourceFile, project);
         routes.push({
           method: httpMethod,
           path: combined,
@@ -1301,7 +1340,7 @@ async function watch(config, onChange) {
 __name(watch, "watch");
 
 // src/index.ts
-var VERSION = "1.0.3";
+var VERSION = "1.0.4";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {