eslint-plugin-mpx 0.2.13 → 0.2.15

package/lib/configs/mpx-essential.js

@@ -22,8 +22,7 @@ module.exports = {
     'mpx/valid-swiper-item-style': 'error',
     'mpx/valid-wx-key': 'error',
     'mpx/valid-attribute-value': 'error',
-    'mpx/valid-template-quote': 'error'
-
-    // 'mpx/valid-component-range': 'error' 默认不开
+    'mpx/valid-template-quote': 'error',
+    'mpx/valid-component-range': 'error'
   }
 }

package/lib/rules/valid-component-range.js

@@ -32,33 +32,43 @@ module.exports = {
     return utils.defineTemplateBodyVisitor(context, {
       /** @param {VElement} node */
       "VElement[name='component']"(node) {
-        if (!utils.hasAttribute(node, 'is')) {
-          context.report({
+        const isNode = utils.getAttribute(node, 'is')
+        const rangeNode = utils.getAttributeAll(node, /^range(@[\w-|:]+)?$/)
+        if (!isNode) {
+          return context.report({
             node,
             loc: node.loc,
             message: "'component' element require 'is' attribute."
           })
-        } else if (!utils.hasAttribute(node, 'range')) {
+        } else if (!rangeNode.length) {
           context.report({
             node,
             loc: node.loc,
             message:
               "'component' element require 'range' attribute to set the scope."
           })
+        } else {
+          // 最好有个兜底range
+          if (!utils.getAttribute(node, 'range')) {
+            context.report({
+              node,
+              loc: node.loc,
+              message: "'component' element require 'range' for backup."
+            })
+          }
         }
-        // 暂时不判空了
-        // [isNode, rangeNode].forEach((keyNode) => {
-        //   if (keyNode && utils.isEmptyValueDirective(keyNode, context)) {
-        //     context.report({
-        //       node,
-        //       loc: node.loc,
-        //       message: "'component' attribute '{{key}}' require valid value.",
-        //       data: {
-        //         key: keyNode.key.name
-        //       }
-        //     })
-        //   }
-        // })
+        ;[isNode, ...rangeNode].forEach((keyNode) => {
+          if (keyNode && (!keyNode.value || !keyNode.value.value)) {
+            context.report({
+              node,
+              loc: node.loc,
+              message: "'component' attribute '{{key}}' require valid value.",
+              data: {
+                key: keyNode.key.name
+              }
+            })
+          }
+        })
       }
     })
   }

package/lib/rules/valid-initdata.js

@@ -231,7 +231,9 @@ module.exports = {
                   hasInitData = 2
                 }
               } else {
-                hasInitData = 2
+                if (hasInitData === 0) {
+                  hasInitData = 2
+                }
               }
             })
           }

package/lib/utils/index.js

@@ -282,6 +282,10 @@ function wrapContextToOverrideTokenMethods(context, tokenStore, options) {
     getSourceCode() {
       return sourceCode
     },
+    // @ts-expect-error -- Added in ESLint v8.40
+    get sourceCode() {
+      return sourceCode
+    },
     getDeclaredVariables(node) {
       const scope = getContainerScope(node)
       if (scope) {
@@ -668,6 +672,7 @@ module.exports = {
    * @returns {VAttribute | null} The found attribute.
    */
   getAttribute,
+  getAttributeAll,
 
   /**
    * Get the directive list which has the given name.
@@ -1880,8 +1885,8 @@ function getScriptSetupElement(context) {
 /**
  * Check whether the given start tag has specific directive.
  * @param {VElement} node The start tag node to check.
- * @param {string} name The attribute name to check.
- * @param {string} [value] The attribute value to check.
+ * @param {string | RegExp} name The attribute name to check.
+ * @param {string | RegExp} [value] The attribute value to check.
  * @returns {boolean} `true` if the start tag has the attribute.
  */
 function hasAttribute(node, name, value) {
@@ -1890,8 +1895,8 @@ function hasAttribute(node, name, value) {
 /**
  * Get the attribute which has the given name.
  * @param {VElement} node The start tag node to check.
- * @param {string} name The attribute name to check.
- * @param {string} [value] The attribute value to check.
+ * @param {string | RegExp} name The attribute name to check.
+ * @param {string | RegExp} [value] The attribute value to check.
  * @returns {VAttribute | null} The found attribute.
  */
 function getAttribute(node, name, value) {
@@ -1902,16 +1907,57 @@ function getAttribute(node, name, value) {
        * @returns {node is VAttribute}
        */
       (node) => {
-        return (
-          !node.directive &&
-          node.key.name === name &&
-          (value === undefined ||
-            (node.value != null && node.value.value === value))
-        )
+        return checkAttributes(node, name, value)
       }
     ) || null
   )
 }
+/**
+ * Check attribute which has the given name.
+ * @param {VAttribute | VDirective} node The start tag node to check.
+ * @param {string | RegExp} name The attribute name to check.
+ * @param {string | RegExp} [value] The attribute value to check.
+ * @returns {boolean}
+ */
+function checkAttributes(node, name, value) {
+  return (
+    !node.directive &&
+    validEqual(name, node.key.name) &&
+    (value === undefined ||
+      (node.value != null && validEqual(value, node.value.value)))
+  )
+}
+/**
+ * Get all Attribute which has the given name.
+ * @param {VElement} node The start tag node to check.
+ * @param {string | RegExp} name The attribute name to check.
+ * @param {string | RegExp} [value] The attribute value to check.
+ * @returns {VAttribute[]} The found attribute.
+ */
+function getAttributeAll(node, name, value) {
+  return node.startTag.attributes.filter(
+    /**
+     * @param {VAttribute | VDirective} node
+     * @returns {node is VAttribute}
+     */
+    (node) => {
+      return checkAttributes(node, name, value)
+    }
+  )
+}
+
+/**
+ * Verify if the value meets expectations
+ * @param {any} expectedValue Expected value, which can be RegExp
+ * @param {any} value Value to be verified
+ * @returns
+ */
+function validEqual(expectedValue, value) {
+  if (Object.prototype.toString.call(expectedValue) === '[object RegExp]')
+    return expectedValue.test(value)
+  return expectedValue === value
+}
+
 /** @param {CallExpression} node */
 function isObjectArgument(node) {
   return (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-mpx",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "description": "Official ESLint plugin for Mpx.js",
   "main": "lib/index.js",
   "scripts": {