@dudousxd/nestjs-codegen 0.23.0 → 0.25.0

package/dist/cli/main.js

@@ -1485,12 +1485,19 @@ function classifyFromColumnDecorator(prop, sourceFile, project) {
             return { kind: "string" };
           }
         }
-        const typeProp = arg.getProperty("type");
-        if (typeProp && Node4.isPropertyAssignment(typeProp)) {
+        for (const key of ["columnType", "type"]) {
+          const typeProp = arg.getProperty(key);
+          if (!typeProp || !Node4.isPropertyAssignment(typeProp)) continue;
           const init = typeProp.getInitializer();
-          if (init && Node4.isStringLiteral(init)) {
+          if (!init) continue;
+          if (Node4.isStringLiteral(init)) {
             const kind = classifyTypeKeyword(init.getLiteralValue());
             if (kind) return { kind };
+            continue;
+          }
+          if (Node4.isIdentifier(init)) {
+            const kind = classifyTypeKeyword(init.getText());
+            if (kind) return { kind };
           }
         }
       }
@@ -1502,12 +1509,18 @@ function classifyFromColumnDecorator(prop, sourceFile, project) {
 function classifyFieldType(prop, sourceFile, project) {
   let nullable = prop.hasQuestionToken();
   const typeNode = prop.getTypeNode();
+  const fromDecorator = classifyFromColumnDecorator(prop, sourceFile, project);
   if (typeNode) {
     const r = classifyTypeNode(typeNode, sourceFile, project);
     if (r.nullable) nullable = true;
-    if (r.kind !== "unknown") return markNullable(r, nullable);
+    if (r.kind !== "unknown") {
+      const conflicts = fromDecorator !== null && fromDecorator.kind !== "unknown" && fromDecorator.kind !== r.kind;
+      if (conflicts) {
+        return markNullable({ ...fromDecorator, valueKind: r.kind }, nullable);
+      }
+      return markNullable(r, nullable);
+    }
   }
-  const fromDecorator = classifyFromColumnDecorator(prop, sourceFile, project);
   if (fromDecorator) {
     return markNullable(fromDecorator, nullable || fromDecorator.nullable === true);
   }
@@ -1515,6 +1528,7 @@ function classifyFieldType(prop, sourceFile, project) {
 }
 function toFilterFieldType(name, r) {
   const ft = { name, kind: r.kind };
+  if (r.valueKind && r.valueKind !== r.kind) ft.valueKind = r.valueKind;
   if (r.enumValues && r.enumValues.length > 0) ft.enumValues = r.enumValues;
   if (r.nullable) ft.nullable = true;
   if (r.numericEnum) ft.numericEnum = true;
@@ -1621,6 +1635,32 @@ function resolveFactoryStaticClass(node) {
   if (!Node5.isIdentifier(inner)) return void 0;
   return inner.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => n !== void 0 && Node5.isClassDeclaration(n));
 }
+function resolveBaseClass(cls) {
+  const heritage = cls.getExtends()?.getExpression();
+  if (!heritage) return void 0;
+  const call = resolveHeritageCall(heritage);
+  if (call) {
+    const factoryDecl = resolveFactoryDeclaration(call);
+    return factoryDecl ? resolveReturnedClass(factoryDecl) : void 0;
+  }
+  const expr = unwrapExpression(heritage);
+  if (!Node5.isIdentifier(expr)) return void 0;
+  return expr.getDefinitions().map((d) => d.getDeclarationNode()).find((n) => n !== void 0 && Node5.isClassDeclaration(n));
+}
+function collectMethodsThroughChain(returnedClass) {
+  const byName = /* @__PURE__ */ new Map();
+  const seen = /* @__PURE__ */ new Set();
+  let current = returnedClass;
+  while (current && !seen.has(current)) {
+    seen.add(current);
+    for (const method of current.getMethods()) {
+      const name = method.getName();
+      if (!byName.has(name)) byName.set(name, method);
+    }
+    current = resolveBaseClass(current);
+  }
+  return [...byName.values()];
+}
 function resolveInheritedMethods(cls) {
   const expr = resolveHeritageCall(cls.getExtends()?.getExpression());
   if (!expr) return void 0;
@@ -1660,7 +1700,7 @@ function resolveInheritedMethods(cls) {
     }
   }
   return {
-    methods: returnedClass.getMethods(),
+    methods: collectMethodsThroughChain(returnedClass),
     // The DECLARATION's name, not the call-site text: consumers look the factory
     // back up by name inside `factoryFilePath`, which a qualified
     // `tables.createTableController` would never match. For a bare identifier
@@ -3034,7 +3074,7 @@ function extractDtoRoute(args) {
   const methodName = method.getName();
   const classAs = readAsDecorator(cls, `class ${className}`);
   const methodAs = readAsDecorator(method, `${className}.${methodName}`);
-  const dtoContract = extractDtoContract(method, sourceFile, project, mixin, cls);
+  const dtoContract = extractDtoContract(method, method.getSourceFile(), project, mixin, cls);
   const mixinResponse = mixin ? resolveInstantiatedReturnType(cls, methodName) : void 0;
   return buildRoute({
     className,
@@ -3320,7 +3360,7 @@ function kindToTs(kind, enumValues, numericEnum) {
 }
 function emitFieldTypesLiteral(fts) {
   const entries = fts.map((f) => {
-    let t = f.typeRef ? f.typeRef.name : kindToTs(f.kind, f.enumValues, f.numericEnum);
+    let t = f.typeRef ? f.typeRef.name : kindToTs(f.valueKind ?? f.kind, f.enumValues, f.numericEnum);
     if (f.nullable) t = `${t} | null`;
     return `${JSON.stringify(f.name)}: ${t}`;
   });
@@ -5241,7 +5281,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.23.0";
+var VERSION = "0.25.0";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {