fix: fix preset not being applied when custom rules are provided

Author: stackia

README.md

@@ -50,6 +50,7 @@ or with options:
         "lintStringLiterals": true,
         "zhlint": {
           "rules": {
+            "halfWidthPunctuation": "",
             "fullWidthPunctuation": "，。：；？！“”‘’（）",
             "unifiedPunctuation": "traditional"
           }
@@ -64,7 +65,7 @@ or with options:
 
 - `lintComments` (boolean, default `true`): `true` to enable zhlint in `//` or `/* ... */` comments
 - `lintStringLiterals` (boolean, default `true`): `true` to enable zhlint in string literals (single-quoted / double-quoted strings, and template literals)
-- `zhlint` (object): options passed down to [zhlint](https://github.com/Jinjiang/zhlint#other-type-defs-and-advanced-usage)
+- `zhlint` (object): options passed down to [zhlint](https://github.com/Jinjiang/zhlint#options)
 
 ## Supported rules
 

lib/rules/zhlint.js

@@ -74,12 +74,12 @@ module.exports = {
       lintStringLiterals: true,
       ...context.options[0],
       zhlint: {
+        ...context.options[0]?.zhlint,
         rules: {
           preset: "default",
           trimSpace: false, // disabled by default because of false positives
           ...context.options[0]?.zhlint?.rules,
         },
-        ...context.options[0]?.zhlint,
       },
     };
     return {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-zhlint",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "ESLint plugin for Chinese typographies (中文排版) with zhlint",
   "keywords": [
     "eslint",

tests/lib/rules/zhlint.js

@@ -10,7 +10,7 @@ ruleTester.run("zhlint", rule, {
     '"../../constants/config"',
     {
       code: `"你好（世界）"`,
-      options: [{ zhlint: { rules: { fullWidthPunctuation: "（）" } } }],
+      options: [{ zhlint: { rules: { halfWidthPunctuation: "" } } }],
     },
   ],
   invalid: [
@@ -59,5 +59,21 @@ ruleTester.run("zhlint", rule, {
       ],
       output: `// 你好 abc`,
     },
+    {
+      code: `"你好， （世界）"`,
+      errors: [
+        {
+          messageId: "zhlint",
+        },
+        {
+          messageId: "zhlint",
+        },
+        {
+          messageId: "zhlint",
+        },
+      ],
+      options: [{ zhlint: { rules: { halfWidthPunctuation: ",()" } } }],
+      output: `"你好, (世界)"`,
+    },
   ],
 });