fix: resolve bug and change npm config

wxmlfile · Oct 20, 2021 · e82fff6 · e82fff6
1 parent 4c1ff7f
commit e82fff6
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 30 deletions.
diff --git a/.npmignore b/.npmignore
@@ -9,4 +9,6 @@ tests
 .eslintignore
 .eslintrc.js
 .gitignore
-CODE_OF_CONDUCT.md
+package-lock.json
+CODE_OF_CONDUCT.md
+CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.1.0] - 2021-10-19
+## [0.0.4] - 2021-10-20
 ### Added
-- Add base wxml eslint support
+- Add basic feature
diff --git a/lib/index.js b/lib/index.js
@@ -8,9 +8,10 @@ module.exports = {
     "no-duplicate-attributes": require("./rules/no-duplicate-attributes"),
     "no-index-in-wx-key": require("./rules/no-index-in-wx-key"),
     "no-unexpected-string-bool": require("./rules/no-unexpected-string-bool"),
-    'no-vue-directive"': require("./rules/no-vue-directive"),
+    "no-vue-directive": require("./rules/no-vue-directive"),
     "required-attributes": require("./rules/required-attributes"),
     "report-wxs-syntax-error": require("./rules/report-wxs-syntax-error"),
+    "report-wxml-syntax-error": require("./rules/report-wxml-syntax-error"),
   },
   configs: {},
   processors: {

diff --git a/lib/rules/required-attributes.js b/lib/rules/required-attributes.js
@@ -11,33 +11,38 @@ module.exports = {
     messages: {
       missingAttributes: "<{{tag}}> missing these attributes -> [{{attrs}}]",
     },
-    schema: [
-      {
-        type: "object",
-        properties: {
-          tag: { type: "string" },
-          attrs: {
-            type: "array",
-            items: {
-              anyOf: [
-                { type: "string" },
-                {
-                  type: "object",
-                  properties: {
-                    key: { type: "string" },
-                    value: { type: "string" },
-                  },
-                  required: ["key"],
-                  additionalProperties: false,
+    schema: {
+      type: "array",
+      items: {
+        anyOf: [
+          {
+            type: "object",
+            properties: {
+              tag: { type: "string" },
+              attrs: {
+                type: "array",
+                items: {
+                  anyOf: [
+                    { type: "string" },
+                    {
+                      type: "object",
+                      properties: {
+                        key: { type: "string" },
+                        value: { type: "string" },
+                      },
+                      required: ["key"],
+                      additionalProperties: false,
+                    },
+                  ],
                 },
-              ],
+              },
             },
+            required: ["tag", "attrs"],
+            additionalProperties: false,
           },
-        },
-        required: ["tag", "attrs"],
-        additionalProperties: false,
+        ],
       },
-    ],
+    },
   },
 
   /** @param {import('eslint').Rule.RuleContext} context */

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-wxml",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "eslint plugin for wxml",
   "main": "lib/index.js",
   "type": "commonjs",

diff --git a/tests/rules/required-attributes.js b/tests/rules/required-attributes.js
@@ -18,6 +18,10 @@ tester.run("required-attributes", rule, {
           tag: "popup",
           attrs: [{ key: "wx:if", value: "{{$popupVisiable}}" }],
         },
+        {
+          tag: "modal",
+          attrs: ["showMask"],
+        },
       ],
     },
   ],
@@ -51,7 +55,7 @@ tester.run("required-attributes", rule, {
       ],
     },
     {
-      code: `<mall a b="config" c="entry" b="trouble" />`,
+      code: `<mall a b="config" c="entry" b="trouble" /> <modal />`,
       options: [
         {
           tag: "mall",
@@ -61,6 +65,10 @@ tester.run("required-attributes", rule, {
             { key: "b", value: "config" },
           ],
         },
+        {
+          tag: "modal",
+          attrs: ["showMask"],
+        },
       ],
       errors: [
         {
@@ -70,6 +78,13 @@ tester.run("required-attributes", rule, {
             attrs: '"d","a=you"',
           },
         },
+        {
+          messageId: "missingAttributes",
+          data: {
+            tag: "modal",
+            attrs: '"showMask"',
+          },
+        },
       ],
     },
   ],