@dudousxd/nestjs-codegen 0.5.1 → 0.6.0

package/dist/nest/index.cjs

@@ -283,7 +283,6 @@ function resolveImportedType(name, sourceFile, project) {
     if (!namedImport) continue;
     const moduleSpecifier = importDecl.getModuleSpecifierValue();
     const candidates = resolveModuleSpecifier(moduleSpecifier, sourceFile, project);
-    if (candidates.length === 0) continue;
     for (const candidate of candidates) {
       let importedFile = project.getSourceFile(candidate);
       if (!importedFile) {
@@ -298,9 +297,25 @@ function resolveImportedType(name, sourceFile, project) {
       const viaReExport = resolveReExportedType(name, importedFile, project, /* @__PURE__ */ new Set());
       if (viaReExport) return viaReExport;
     }
+    if (candidates.length === 0) {
+      const viaCompiler = resolveBareSpecifierType(name, importDecl, project);
+      if (viaCompiler) return viaCompiler;
+    }
   }
   return resolveReExportedType(name, sourceFile, project, /* @__PURE__ */ new Set());
 }
+function resolveBareSpecifierType(name, importDecl, project) {
+  let target;
+  try {
+    target = importDecl.getModuleSpecifierSourceFile();
+  } catch {
+    return null;
+  }
+  if (!target) return null;
+  const direct = findTypeInFile(name, target);
+  if (direct) return direct;
+  return resolveReExportedType(name, target, project, /* @__PURE__ */ new Set());
+}
 function resolveReExportedType(name, file, project, seen) {
   const filePath = file.getFilePath();
   if (seen.has(filePath)) return null;
@@ -584,37 +599,28 @@ function buildProperty(prop, classFile, ctx) {
   const typeNode = prop.getTypeNode();
   const typeText = typeNode?.getText() ?? "unknown";
   const isArrayType = !!typeNode && import_ts_morph2.Node.isArrayTypeNode(typeNode);
+  const asField = (child) => applyPresence(
+    has("IsArray") || isArrayType ? { kind: "array", element: child } : child,
+    decorators
+  );
   const discriminator = resolveDiscriminator(dec("Type"));
   if (discriminator) {
     const options = discriminator.subTypes.map(
       (name) => buildNestedReference(name, classFile, ctx)
     );
-    const unionNode = {
-      kind: "union",
-      options,
-      discriminator: discriminator.property
-    };
-    const wrapArray = has("IsArray") || isArrayType;
-    const node2 = wrapArray ? { kind: "array", element: unionNode } : unionNode;
-    return applyPresence(node2, decorators);
+    return asField({ kind: "union", options, discriminator: discriminator.property });
   }
   const propTypeParam = singularClassName(typeText);
   if (propTypeParam && ctx.typeBindings.has(propTypeParam)) {
     const bound = ctx.typeBindings.get(propTypeParam);
-    const childNode = buildNestedReference(bound, classFile, ctx);
-    const wrapArray = has("IsArray") || isArrayType;
-    const node2 = wrapArray ? { kind: "array", element: childNode } : childNode;
-    return applyPresence(node2, decorators);
+    return asField(buildNestedReference(bound, classFile, ctx));
   }
   const typeRefName = resolveTypeFactoryName(dec("Type"));
   if (has("ValidateNested") || typeRefName) {
     const typeArgs = genericTypeArgNames(typeNode);
     const childName = typeRefName ?? singularClassName(typeText);
     if (childName) {
-      const childNode = buildNestedReference(childName, classFile, ctx, typeArgs);
-      const wrapArray = has("IsArray") || isArrayType;
-      const node2 = wrapArray ? { kind: "array", element: childNode } : childNode;
-      return applyPresence(node2, decorators);
+      return asField(buildNestedReference(childName, classFile, ctx, typeArgs));
     }
   }
   let base = baseFromType(typeText, isArrayType);