@nest-boot/eslint-plugin 5.1.1 → 5.1.2

package/lib/rules/entity-property-no-optional-or-non-null-assertion.js

@@ -1,24 +1,24 @@
 /**
  * @fileoverview 实体字段不能使用可选属性和非空断言
- * @author 实体字段不能使用可选属性和非空断言
+ * @author D4rkCr0w
  */
 "use strict";
 
-//------------------------------------------------------------------------------
-// Rule Definition
-//------------------------------------------------------------------------------
-
 /** @type {import('eslint').Rule.RuleModule} */
 module.exports = {
   meta: {
-    type: null, // `problem`, `suggestion`, or `layout`
+    type: "problem",
     docs: {
       description: "实体字段不能使用可选属性和非空断言",
       recommended: false,
-      url: null, // URL to the documentation page for this rule
+      url: null,
+    },
+    fixable: "code",
+    schema: [],
+    messages: {
+      entityPropertyNoOptionalOrNonNullAssertion:
+        "实体字段不能使用可选属性和非空断言。",
     },
-    fixable: null, // Or `code` or `whitespace`
-    schema: [], // Add a schema if the rule has options
   },
 
   create(context) {
@@ -46,7 +46,28 @@ module.exports = {
               if (property.optional || property.definite) {
                 context.report({
                   node: property,
-                  message: "实体属性不能有 ? 或 ! 断言。",
+                  messageId: "entityPropertyNoOptionalOrNonNullAssertion",
+                  fix: (fixer) => {
+                    const tokenBefore = context.sourceCode.getTokenBefore(
+                      property.key,
+                    );
+                    const propertyStart =
+                      tokenBefore && tokenBefore.range[1] < property.range[0]
+                        ? tokenBefore.range[1]
+                        : property.range[0];
+                    const propertyEnd = property.range[1];
+
+                    // 从属性中移除 ? 或 ! 符号
+                    const fixedPropertyText = context.sourceCode
+                      .getText()
+                      .slice(propertyStart, propertyEnd)
+                      .replace(/\?|!/, "");
+
+                    return fixer.replaceTextRange(
+                      [propertyStart, propertyEnd],
+                      fixedPropertyText,
+                    );
+                  },
                 });
               }
             }

package/lib/rules/{entity-property-nullable-type.js → entity-property-nullable.js}

@@ -1,39 +1,27 @@
 /**
  * @fileoverview 实体字段可为空时属性类型
- * @author 实体字段可为空时属性类型
+ * @author D4rkCr0w
  */
 "use strict";
 
-//------------------------------------------------------------------------------
-// Rule Definition
-//------------------------------------------------------------------------------
-
 /** @type {import('eslint').Rule.RuleModule} */
 module.exports = {
   meta: {
-    type: null, // `problem`, `suggestion`, or `layout`
+    type: "problem",
     docs: {
       description: "实体字段可为空时属性类型",
       recommended: false,
-      url: null, // URL to the documentation page for this rule
+      url: null,
+    },
+    fixable: "code",
+    schema: [],
+    messages: {
+      entityPropertyNullable:
+        "@Property({ nullable: true }) 属性类型需包含 null。",
     },
-    fixable: null, // Or `code` or `whitespace`
-    schema: [], // Add a schema if the rule has options
   },
 
   create(context) {
-    // variables should be defined here
-
-    //----------------------------------------------------------------------
-    // Helpers
-    //----------------------------------------------------------------------
-
-    // any helper functions should go here or else delete this section
-
-    //----------------------------------------------------------------------
-    // Public
-    //----------------------------------------------------------------------
-
     return {
       ClassDeclaration(node) {
         // 检查是否有 @Entity 装饰器
@@ -45,13 +33,13 @@ module.exports = {
         ) {
           // 遍历类属性
           node.body.body.forEach((property) => {
-            // 检查是否有 @Property 装饰器
+            // 检查是否有 @Property() 装饰器
             if (property.type === "PropertyDefinition" && property.decorators) {
               const propertyDecorator = property.decorators.find(
                 (decorator) => decorator.expression.callee.name === "Property",
               );
 
-              // 检查是否有 @Property(nullable: true) 装饰器
+              // 检查 @Property() 装饰器 nullable 参数是否为 true
               if (
                 propertyDecorator &&
                 propertyDecorator.expression.arguments[0] &&
@@ -74,8 +62,23 @@ module.exports = {
                 ) {
                   context.report({
                     node: property,
-                    message:
-                      "@Property({ nullable: true }) 属性类型需包含 null。",
+                    messageId: "entityPropertyNullable",
+                    fix: (fixer) => {
+                      const typeAnnotationStart =
+                        property.typeAnnotation.range[0];
+                      const typeAnnotationEnd =
+                        property.typeAnnotation.range[1];
+                      const originalType = context.sourceCode.getText(
+                        property.typeAnnotation,
+                      );
+
+                      return fixer.replaceTextRange(
+                        [typeAnnotationStart, typeAnnotationEnd],
+                        `${originalType} | null${
+                          property.value ? "" : " = null"
+                        }`,
+                      );
+                    },
                   });
                 }
               }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-boot/eslint-plugin",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "license": "MIT",
   "main": "./lib/index.js",
   "exports": "./lib/index.js",

package/tests/lib/rules/{entity-property-nullable-type.js → entity-property-nullable.js}

@@ -8,16 +8,15 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-const rule = require("../../../lib/rules/entity-property-nullable-type"),
+const rule = require("../../../lib/rules/entity-property-nullable"),
   RuleTester = require("eslint").RuleTester;
 
-
 //------------------------------------------------------------------------------
 // Tests
 //------------------------------------------------------------------------------
 
 const ruleTester = new RuleTester();
-ruleTester.run("entity-property-nullable-type", rule, {
+ruleTester.run("entity-property-nullable", rule, {
   valid: [
     // give me some code that won't trigger a warning
   ],