@dudousxd/nestjs-codegen 0.23.0 → 0.24.0

package/dist/nest/index.cjs

@@ -1132,12 +1132,19 @@ function classifyFromColumnDecorator(prop, sourceFile, project) {
             return { kind: "string" };
           }
         }
-        const typeProp = arg.getProperty("type");
-        if (typeProp && import_ts_morph3.Node.isPropertyAssignment(typeProp)) {
+        for (const key of ["columnType", "type"]) {
+          const typeProp = arg.getProperty(key);
+          if (!typeProp || !import_ts_morph3.Node.isPropertyAssignment(typeProp)) continue;
           const init = typeProp.getInitializer();
-          if (init && import_ts_morph3.Node.isStringLiteral(init)) {
+          if (!init) continue;
+          if (import_ts_morph3.Node.isStringLiteral(init)) {
             const kind = classifyTypeKeyword(init.getLiteralValue());
             if (kind) return { kind };
+            continue;
+          }
+          if (import_ts_morph3.Node.isIdentifier(init)) {
+            const kind = classifyTypeKeyword(init.getText());
+            if (kind) return { kind };
           }
         }
       }
@@ -1149,12 +1156,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);
   }
@@ -1162,6 +1175,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;
@@ -3282,7 +3296,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}`;
   });
@@ -5045,7 +5059,7 @@ async function watch(config, onChange, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.23.0";
+var VERSION = "0.24.0";
 
 // src/generate-manifest.ts
 var MANIFEST_FILE = ".codegen-manifest.json";