@nest-boot/eslint-plugin 7.0.0 → 7.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-boot/eslint-plugin",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "license": "MIT",
   "main": "./dist/index.js",
   "exports": "./dist/index.js",

package/src/rules/mikro-orm/entity-field-definite-assignment.spec.ts

@@ -49,6 +49,46 @@ tester.run("entity-field-definite-assignment", rule, {
         field: string;
       }
     `,
+    // @Enum 装饰器 - 有 !
+    /* typescript */ `
+      @Entity()
+      class User {
+        @Enum()
+        role!: UserRole;
+      }
+    `,
+    // @OneToOne 装饰器 - 使用 Ref
+    /* typescript */ `
+      @Entity()
+      class User {
+        @OneToOne()
+        profile!: Ref<Profile>;
+      }
+    `,
+    // @OneToMany 装饰器 - 使用 Collection 初始化
+    /* typescript */ `
+      @Entity()
+      class User {
+        @OneToMany()
+        posts = new Collection<Post>(this);
+      }
+    `,
+    // @ManyToOne 装饰器 - 使用 Ref
+    /* typescript */ `
+      @Entity()
+      class Post {
+        @ManyToOne()
+        author!: Ref<User>;
+      }
+    `,
+    // @ManyToMany 装饰器 - 使用 Collection 初始化
+    /* typescript */ `
+      @Entity()
+      class User {
+        @ManyToMany()
+        tags = new Collection<Tag>(this);
+      }
+    `,
   ],
   invalid: [
     // 没有初始化值，也没有 !
@@ -87,5 +127,95 @@ tester.run("entity-field-definite-assignment", rule, {
       `,
       errors: [{ messageId: "removeDefiniteAssignment" }],
     },
+    // @Enum 装饰器 - 没有初始化值,也没有 !
+    {
+      code: /* typescript */ `
+        @Entity()
+        class User {
+          @Enum()
+          role: UserRole;
+        }
+      `,
+      output: /* typescript */ `
+        @Entity()
+        class User {
+          @Enum()
+          role!: UserRole;
+        }
+      `,
+      errors: [{ messageId: "addDefiniteAssignment" }],
+    },
+    // @OneToOne 装饰器 - 没有初始化值,也没有 ! (使用 Ref)
+    {
+      code: /* typescript */ `
+        @Entity()
+        class User {
+          @OneToOne()
+          profile: Ref<Profile>;
+        }
+      `,
+      output: /* typescript */ `
+        @Entity()
+        class User {
+          @OneToOne()
+          profile!: Ref<Profile>;
+        }
+      `,
+      errors: [{ messageId: "addDefiniteAssignment" }],
+    },
+    // @OneToMany 装饰器 - 有初始化值,但也有 ! (使用 Collection)
+    {
+      code: /* typescript */ `
+        @Entity()
+        class User {
+          @OneToMany()
+          posts!: Collection<Post> = new Collection<Post>(this);
+        }
+      `,
+      output: /* typescript */ `
+        @Entity()
+        class User {
+          @OneToMany()
+          posts: Collection<Post> = new Collection<Post>(this);
+        }
+      `,
+      errors: [{ messageId: "removeDefiniteAssignment" }],
+    },
+    // @ManyToOne 装饰器 - 没有初始化值,也没有 ! (使用 Ref)
+    {
+      code: /* typescript */ `
+        @Entity()
+        class Post {
+          @ManyToOne()
+          author: Ref<User>;
+        }
+      `,
+      output: /* typescript */ `
+        @Entity()
+        class Post {
+          @ManyToOne()
+          author!: Ref<User>;
+        }
+      `,
+      errors: [{ messageId: "addDefiniteAssignment" }],
+    },
+    // @ManyToMany 装饰器 - 有初始化值,但也有 ! (使用 Collection)
+    {
+      code: /* typescript */ `
+        @Entity()
+        class User {
+          @ManyToMany()
+          tags!: Collection<Tag> = new Collection<Tag>(this);
+        }
+      `,
+      output: /* typescript */ `
+        @Entity()
+        class User {
+          @ManyToMany()
+          tags: Collection<Tag> = new Collection<Tag>(this);
+        }
+      `,
+      errors: [{ messageId: "removeDefiniteAssignment" }],
+    },
   ],
 });

package/src/rules/mikro-orm/entity-field-definite-assignment.ts

@@ -70,7 +70,17 @@ export default createRule({
 
         node.body.body.forEach((member: TSESTree.ClassElement) => {
           if (member.type !== AST_NODE_TYPES.PropertyDefinition) return;
-          if (!hasPropertyDecorator(member, "Property")) return;
+          if (
+            !hasPropertyDecorator(member, [
+              "Property",
+              "Enum",
+              "OneToOne",
+              "OneToMany",
+              "ManyToOne",
+              "ManyToMany",
+            ])
+          )
+            return;
 
           const propertyName = getPropertyName(member);
           if (!propertyName) return;

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" &&