@dudousxd/nestjs-codegen 0.27.0 → 0.27.2

package/dist/cli/main.js

@@ -685,12 +685,18 @@ function findTypeInFile(name, file) {
 function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
   if (moduleSpecifier.startsWith(".")) {
     const dir = dirname(sourceFile.getFilePath());
-    const noExt = moduleSpecifier.replace(/\.(js|ts)$/, "");
-    return [
-      resolve2(dir, `${noExt}.ts`),
+    const ext = /\.(c|m)?(j|t)sx?$/.exec(moduleSpecifier)?.[0];
+    const base = ext ? moduleSpecifier.slice(0, -ext.length) : moduleSpecifier;
+    const flavour = ext?.startsWith(".c") ? "c" : ext?.startsWith(".m") ? "m" : "";
+    const candidates = [
+      resolve2(dir, `${base}.${flavour}ts`),
+      ...flavour === "" ? [resolve2(dir, `${base}.tsx`)] : [],
       resolve2(dir, `${moduleSpecifier}.ts`),
-      resolve2(dir, moduleSpecifier, "index.ts")
+      resolve2(dir, moduleSpecifier, "index.ts"),
+      resolve2(dir, `${base}.d.${flavour}ts`),
+      ...ext === void 0 ? [resolve2(dir, moduleSpecifier, "index.d.ts")] : []
     ];
+    return [...new Set(candidates)];
   }
   const ctx = _ctxFor(project);
   const baseUrl = ctx.pathsBase ?? ctx.projectRoot;
@@ -720,10 +726,11 @@ function resolveModuleSpecifier(moduleSpecifier, sourceFile, project) {
   }
   return [];
 }
-function resolveImportedType(name, sourceFile, project) {
+function resolveImportedType(name, sourceFile, project, seen = /* @__PURE__ */ new Set()) {
   for (const importDecl of sourceFile.getImportDeclarations()) {
-    const namedImport = importDecl.getNamedImports().find((n) => n.getName() === name);
+    const namedImport = importDecl.getNamedImports().find((n) => (n.getAliasNode()?.getText() ?? n.getName()) === name);
     if (!namedImport) continue;
+    const sourceName = namedImport.getName();
     const moduleSpecifier = importDecl.getModuleSpecifierValue();
     const candidates = resolveModuleSpecifier(moduleSpecifier, sourceFile, project);
     for (const candidate of candidates) {
@@ -735,17 +742,17 @@ function resolveImportedType(name, sourceFile, project) {
           continue;
         }
       }
-      const result = findTypeInFile(name, importedFile);
+      const result = findTypeInFile(sourceName, importedFile);
       if (result) return result;
-      const viaReExport = resolveReExportedType(name, importedFile, project, /* @__PURE__ */ new Set());
+      const viaReExport = resolveReExportedType(sourceName, importedFile, project, /* @__PURE__ */ new Set());
       if (viaReExport) return viaReExport;
     }
     if (candidates.length === 0) {
-      const viaCompiler = resolveBareSpecifierType(name, importDecl, project);
+      const viaCompiler = resolveBareSpecifierType(sourceName, importDecl, project);
       if (viaCompiler) return viaCompiler;
     }
   }
-  return resolveReExportedType(name, sourceFile, project, /* @__PURE__ */ new Set());
+  return resolveReExportedType(name, sourceFile, project, seen);
 }
 function resolveBareSpecifierType(name, importDecl, project) {
   let target;
@@ -760,9 +767,9 @@ function resolveBareSpecifierType(name, importDecl, project) {
   return resolveReExportedType(name, target, project, /* @__PURE__ */ new Set());
 }
 function resolveReExportedType(name, file, project, seen) {
-  const filePath = file.getFilePath();
-  if (seen.has(filePath)) return null;
-  seen.add(filePath);
+  const visit = `${file.getFilePath()}#${name}`;
+  if (seen.has(visit)) return null;
+  seen.add(visit);
   for (const exportDecl of file.getExportDeclarations()) {
     const moduleSpecifier = exportDecl.getModuleSpecifierValue();
     const namedExports = exportDecl.getNamedExports();
@@ -784,7 +791,7 @@ function resolveReExportedType(name, file, project, seen) {
     const sourceName = namedExports.find((n) => (n.getAliasNode()?.getText() ?? n.getName()) === name)?.getName() ?? name;
     const local = findTypeInFile(sourceName, file);
     if (local) return local;
-    const imported = resolveImportedType(sourceName, file, project);
+    const imported = resolveImportedType(sourceName, file, project, seen);
     if (imported) return imported;
   }
   return null;
@@ -6004,7 +6011,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.27.0";
+var VERSION = "0.27.2";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {