update

Author: ota-meshi

lib/rules/no-restricted-component-options.js

@@ -50,9 +50,13 @@ function parseOption(option) {
   }
 
   /**
-   * @typedef {object} Step
-   * @property {Matcher} [test]
-   * @property {boolean} [wildcard]
+   * @typedef {object} StepForTest
+   * @property {Matcher} test
+   * @property {undefined} [wildcard]
+   * @typedef {object} StepForWildcard
+   * @property {undefined} [test]
+   * @property {true} wildcard
+   * @typedef {StepForTest | StepForWildcard} Step
    */
 
   /** @type {Step[]} */
@@ -76,28 +80,28 @@ function parseOption(option) {
    * @returns {Tester}
    */
   function buildTester(index) {
-    const { wildcard, test } = steps[index]
+    const step = steps[index]
     const next = index + 1
     const needNext = steps.length > next
     return (node) => {
       /** @type {string} */
       let keyName
-      if (wildcard) {
+      if (step.wildcard) {
         keyName = '*'
       } else {
         if (node.type !== 'Property') {
           return null
         }
         const name = utils.getStaticPropertyName(node)
-        if (!name || !test(name)) {
+        if (!name || !step.test(name)) {
           return null
         }
         keyName = name
       }
 
       return {
         next: needNext ? buildTester(next) : undefined,
-        wildcard,
+        wildcard: step.wildcard,
         keyName
       }
     }

lib/rules/order-in-components.js

@@ -156,6 +156,7 @@ function isNotSideEffectsNode(node, visitorKeys) {
   let skipNode = null
   traverseNodes(node, {
     visitorKeys,
+    /** @param {ASTNode} node */
     enterNode(node) {
       if (!result || skipNode) {
         return
@@ -193,6 +194,7 @@ function isNotSideEffectsNode(node, visitorKeys) {
         result = false
       }
     },
+    /** @param {ASTNode} node */
     leaveNode(node) {
       if (skipNode === node) {
         skipNode = null

lib/rules/sort-keys.js

@@ -206,8 +206,8 @@ module.exports = {
                   ''
                 chainLevel = 1
               } else {
-                propName = upperVueState.propName
-                chainLevel = upperVueState.chainLevel + 1
+                propName = upperVueState.propName || ''
+                chainLevel = (upperVueState.chainLevel || 0) + 1
               }
               vueState.propName = propName
               vueState.chainLevel = chainLevel

lib/utils/html-comments.js

@@ -110,8 +110,8 @@ function defineParser(sourceCode, config) {
 
   /**
    * Parse HTMLComment.
-   * @param {ASTToken} node a comment token
-   * @returns {HTMLComment | null} the result of HTMLComment tokens.
+   * @param {Token} node a comment token
+   * @returns {ParsedHTMLComment | null} the result of HTMLComment tokens.
    */
   return function parseHTMLComment(node) {
     if (node.type !== 'HTMLComment') {

lib/utils/indent-common.js

@@ -32,6 +32,11 @@ const {
 } = require('./indent-utils')
 const { defineVisitor: tsDefineVisitor } = require('./indent-ts')
 
+/**
+ * @typedef {import('../../typings/eslint-plugin-vue/util-types/node').HasLocation} HasLocation
+ * @typedef { { type: string } & HasLocation } MaybeNode
+ */
+
 // ------------------------------------------------------------------------------
 // Helpers
 // ------------------------------------------------------------------------------
@@ -103,10 +108,10 @@ function parseOptions(type, options, defaultOptions) {
     ret.indentSize = 1
   }
 
-  if (Number.isSafeInteger(options.baseIndent)) {
+  if (options.baseIndent != null && Number.isSafeInteger(options.baseIndent)) {
     ret.baseIndent = options.baseIndent
   }
-  if (Number.isSafeInteger(options.attribute)) {
+  if (options.attribute != null && Number.isSafeInteger(options.attribute)) {
     ret.attribute = options.attribute
   }
   if (Number.isSafeInteger(options.closeBracket)) {
@@ -126,7 +131,7 @@ function parseOptions(type, options, defaultOptions) {
       options.closeBracket
     )
   }
-  if (Number.isSafeInteger(options.switchCase)) {
+  if (options.switchCase != null && Number.isSafeInteger(options.switchCase)) {
     ret.switchCase = options.switchCase
   }
 
@@ -142,9 +147,9 @@ function parseOptions(type, options, defaultOptions) {
 
 /**
  * Check whether the node is at the beginning of line.
- * @param {ASTNode|null} node The node to check.
+ * @param {MaybeNode|null} node The node to check.
  * @param {number} index The index of the node in the nodes.
- * @param {(ASTNode|null)[]} nodes The array of nodes.
+ * @param {(MaybeNode|null)[]} nodes The array of nodes.
  * @returns {boolean} `true` if the node is at the beginning of line.
  */
 function isBeginningOfLine(node, index, nodes) {
@@ -307,7 +312,7 @@ module.exports.defineVisitor = function create(
   /**
    * Get the first and last tokens of the given node.
    * If the node is parenthesized, this gets the outermost parentheses.
-   * @param {ASTNode} node The node to get.
+   * @param {MaybeNode} node The node to get.
    * @param {number} [borderOffset] The least offset of the first token. Defailt is 0. This value is used to prevent false positive in the following case: `(a) => {}` The parentheses are enclosing the whole parameter part rather than the first parameter, but this offset parameter is needed to distinguish.
    * @returns {{firstToken:Token,lastToken:Token}} The gotten tokens.
    */
@@ -337,9 +342,9 @@ module.exports.defineVisitor = function create(
    * Process the given node list.
    * The first node is offsetted from the given left token.
    * Rest nodes are adjusted to the first node.
-   * @param {(ASTNode|null)[]} nodeList The node to process.
-   * @param {ASTNode|Token|null} left The left parenthesis token.
-   * @param {ASTNode|Token|null} right The right parenthesis token.
+   * @param {(MaybeNode|null)[]} nodeList The node to process.
+   * @param {MaybeNode|Token|null} left The left parenthesis token.
+   * @param {MaybeNode|Token|null} right The right parenthesis token.
    * @param {number} offset The offset to set.
    * @param {boolean} [alignVertically=true] The flag to align vertically. If `false`, this doesn't align vertically even if the first node is not at beginning of line.
    * @returns {void}
@@ -450,7 +455,7 @@ module.exports.defineVisitor = function create(
 
   /**
    * Process semicolons of the given statement node.
-   * @param {ASTNode} node The statement node to process.
+   * @param {MaybeNode} node The statement node to process.
    * @returns {void}
    */
   function processSemicolons(node) {
@@ -476,30 +481,6 @@ module.exports.defineVisitor = function create(
     }
   }
 
-  /**
-   * Collect prefix tokens of the given property.
-   * The prefix includes `async`, `get`, `set`, `static`, and `*`.
-   * @param {Property|MethodDefinition|PropertyDefinition} node The property node to collect prefix tokens.
-   */
-  function getPrefixTokens(node, keyNode) {
-    const prefixes = []
-
-    /** @type {Token|null} */
-    let token = tokenStore.getFirstToken(node)
-    while (token != null && token.range[1] <= keyNode.range[0]) {
-      prefixes.push(token)
-      token = tokenStore.getTokenAfter(token)
-    }
-    while (
-      isOpeningParenToken(prefixes[prefixes.length - 1]) ||
-      isOpeningBracketToken(prefixes[prefixes.length - 1])
-    ) {
-      prefixes.pop()
-    }
-
-    return prefixes
-  }
-
   /**
    * Find the head of chaining nodes.
    * @param {ASTNode} node The start node to find the head.
@@ -1848,7 +1829,6 @@ module.exports.defineVisitor = function create(
         tokenStore,
         setOffset,
         copyOffset,
-        getPrefixTokens,
         processSemicolons,
         getFirstAndLastTokens
       })
@@ -1892,9 +1872,10 @@ module.exports.defineVisitor = function create(
 
       // Validate indentation of tokens.
       for (const token of tokenStore.getTokens(node, ITERATION_OPTS)) {
+        const tokenStartLine = token.loc.start.line
         if (
           tokensOnSameLine.length === 0 ||
-          tokensOnSameLine[0].loc.start.line === token.loc.start.line
+          tokensOnSameLine[0].loc.start.line === tokenStartLine
         ) {
           // This is on the same line (or the first token).
           tokensOnSameLine.push(token)
@@ -1904,7 +1885,7 @@ module.exports.defineVisitor = function create(
           comments.push(tokensOnSameLine[0])
           isBesideMultilineToken =
             /** @type {Token} */ (last(tokensOnSameLine)).loc.end.line ===
-            token.loc.start.line
+            tokenStartLine
           tokensOnSameLine = [token]
         } else {
           // New line is detected, so validate the tokens.
@@ -1914,7 +1895,7 @@ module.exports.defineVisitor = function create(
           }
           isBesideMultilineToken =
             /** @type {Token} */ (last(tokensOnSameLine)).loc.end.line ===
-            token.loc.start.line
+            tokenStartLine
           tokensOnSameLine = [token]
           comments = []
         }