@nest-boot/eslint-plugin 7.0.1 → 7.0.3

package/package.json

@@ -1,18 +1,23 @@
 {
   "name": "@nest-boot/eslint-plugin",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "license": "MIT",
   "main": "./dist/index.js",
   "exports": "./dist/index.js",
   "dependencies": {
     "@typescript-eslint/utils": "^8.44.1"
   },
+  "peerDependencies": {
+    "@typescript-eslint/parser": "^8.0.0",
+    "eslint": "^9.0.0",
+    "typescript": "^5.0.0"
+  },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",
     "@eslint/js": "^9.36.0",
     "@jest/globals": "^30.2.0",
-    "@nest-boot/tsconfig": "^7.0.0",
     "@types/node": "^22.18.6",
+    "@typescript-eslint/parser": "^8.44.1",
     "@typescript-eslint/rule-tester": "^8.44.1",
     "eslint": "^9.36.0",
     "eslint-config-prettier": "^10.1.8",
@@ -20,7 +25,8 @@
     "jest": "^29.7.0",
     "ts-jest": "^29.4.4",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.46.2"
+    "typescript-eslint": "^8.46.2",
+    "@nest-boot/tsconfig": "^7.0.1"
   },
   "publishConfig": {
     "access": "public"

package/src/rules/mikro-orm/entity-property-config-from-types.spec.ts

@@ -88,6 +88,36 @@ tester.run("entity-property-config-from-types", rule, {
         isActive!: boolean;
       }
     `,
+    // Date 类型使用 t.datetime
+    /* typescript */ `
+      import { Entity, Property, Opt } from "@mikro-orm/core";
+
+      @Entity()
+      class User {
+        @Property({ type: t.datetime, defaultRaw: 'now()' })
+        createdAt: Opt<Date> = new Date();
+      }
+    `,
+    // Date 类型使用 t.date（有效的 Date 类型配置）
+    /* typescript */ `
+      import { Entity, Property } from "@mikro-orm/core";
+
+      @Entity()
+      class User {
+        @Property({ type: t.date })
+        birthDate!: Date;
+      }
+    `,
+    // Date 类型使用 t.time（有效的 Date 类型配置）
+    /* typescript */ `
+      import { Entity, Property } from "@mikro-orm/core";
+
+      @Entity()
+      class User {
+        @Property({ type: t.time })
+        workTime!: Date;
+      }
+    `,
     // 使用 t.text 代替 t.string（有效的 string 类型配置）
     /* typescript */ `
       import { Entity, Property } from "@mikro-orm/core";
@@ -258,5 +288,71 @@ tester.run("entity-property-config-from-types", rule, {
       `,
       errors: [{ messageId: "alignPropertyDecoratorWithTsType" }],
     },
+    // 空的 @Property() 应该添加 type: t.boolean
+    {
+      code: /* typescript */ `
+        import { Entity, Property } from "@mikro-orm/core";
+
+        @Entity()
+        class User {
+          @Property()
+          published!: boolean;
+        }
+      `,
+      output: /* typescript */ `
+        import { Entity, Property } from "@mikro-orm/core";
+
+        @Entity()
+        class User {
+          @Property({ type: t.boolean })
+          published!: boolean;
+        }
+      `,
+      errors: [{ messageId: "alignPropertyDecoratorWithTsType" }],
+    },
+    // 空的 @Property() 应该添加 type: t.datetime（Date 类型）
+    {
+      code: /* typescript */ `
+        import { Entity, Property } from "@mikro-orm/core";
+
+        @Entity()
+        class User {
+          @Property()
+          createdAt!: Date;
+        }
+      `,
+      output: /* typescript */ `
+        import { Entity, Property } from "@mikro-orm/core";
+
+        @Entity()
+        class User {
+          @Property({ type: t.datetime })
+          createdAt!: Date;
+        }
+      `,
+      errors: [{ messageId: "alignPropertyDecoratorWithTsType" }],
+    },
+    // Date 类型配置错误应该修正为 t.datetime
+    {
+      code: /* typescript */ `
+        import { Entity, Property } from "@mikro-orm/core";
+
+        @Entity()
+        class User {
+          @Property({ type: t.string })
+          createdAt!: Date;
+        }
+      `,
+      output: /* typescript */ `
+        import { Entity, Property } from "@mikro-orm/core";
+
+        @Entity()
+        class User {
+          @Property({ type: t.datetime })
+          createdAt!: Date;
+        }
+      `,
+      errors: [{ messageId: "alignPropertyDecoratorWithTsType" }],
+    },
   ],
 });

package/src/rules/mikro-orm/entity-property-config-from-types.ts

@@ -100,7 +100,7 @@ export default createRule<
         case "boolean":
           return "t.boolean"; // 默认使用 t.boolean
         case "Date":
-          return null; // Date 类型不需要指定
+          return "t.datetime"; // 默认使用 t.datetime
         case "GraphQLJSONObject":
         case "Record":
           return "t.json";
@@ -206,6 +206,21 @@ export default createRule<
       return false;
     };
 
+    const isValidDateType = (typeConfig: string | null): boolean => {
+      if (!typeConfig) return false;
+
+      // 接受 t.datetime, t.date, t.time
+      if (
+        typeConfig === "t.datetime" ||
+        typeConfig === "t.date" ||
+        typeConfig === "t.time"
+      ) {
+        return true;
+      }
+
+      return false;
+    };
+
     const getIdentifierName = (node: TSESTree.TypeNode): string | null => {
       if (
         node.type === AST_NODE_TYPES.TSTypeReference &&
@@ -624,6 +639,12 @@ export default createRule<
       ) {
         // 保留有效的 number 类型配置
         finalInfo.propertyType = currentConfig.type;
+      } else if (
+        info.propertyType === "t.datetime" &&
+        isValidDateType(currentConfig.type)
+      ) {
+        // 保留有效的 Date 类型配置
+        finalInfo.propertyType = currentConfig.type;
       } else if (
         info.isArray &&
         info.arrayElementTypeName === "number" &&
@@ -1063,6 +1084,11 @@ export default createRule<
               isValidNumberType(currentConfig.type)
             ) {
               // 当前配置是有效的 number 类型配置，不需要修改
+            } else if (
+              expectedType === "t.datetime" &&
+              isValidDateType(currentConfig.type)
+            ) {
+              // 当前配置是有效的 Date 类型配置，不需要修改
             } else if (
               expectedType === "t.array" &&
               typeInfo.arrayElementTypeName === "number" &&