eslint-plugin-svelte 2.22.0 → 2.23.1

package/lib/rules/indent-helpers/commons.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isBeginningOfElement = exports.isBeginningOfLine = exports.getFirstAndLastTokens = void 0;
-const eslint_utils_1 = require("eslint-utils");
+const eslint_utils_1 = require("@eslint-community/eslint-utils");
 const ast_1 = require("./ast");
 function getFirstAndLastTokens(sourceCode, node, borderOffset = 0) {
     let firstToken = sourceCode.getFirstToken(node);
@@ -47,8 +47,7 @@ function isBeginningOfElement(node) {
     if (node.parent.type === "Program") {
         return node.parent.body[0] === node;
     }
-    assertNever(node.parent);
-    return false;
+    return assertNever(node.parent);
 }
 exports.isBeginningOfElement = isBeginningOfElement;
 function assertNever(value) {

package/lib/rules/indent-helpers/es.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineVisitor = void 0;
 const commons_1 = require("./commons");
-const eslint_utils_1 = require("eslint-utils");
+const eslint_utils_1 = require("@eslint-community/eslint-utils");
 const ast_utils_1 = require("../../utils/ast-utils");
 function defineVisitor(context) {
     const { sourceCode, offsets, options } = context;

package/lib/rules/indent-helpers/index.js

@@ -28,7 +28,7 @@ const SV = __importStar(require("./svelte"));
 const ES = __importStar(require("./es"));
 const TS = __importStar(require("./ts"));
 const ast_1 = require("./ast");
-const eslint_utils_1 = require("eslint-utils");
+const eslint_utils_1 = require("@eslint-community/eslint-utils");
 const offset_context_1 = require("./offset-context");
 function parseOptions(options, defaultOptions) {
     const ret = {

package/lib/rules/indent-helpers/svelte.js

@@ -16,17 +16,21 @@ function defineVisitor(context) {
             node.children.forEach((n) => offsets.ignore(n));
         },
         SvelteElement(node) {
-            if ((node.name.type !== "Identifier" && node.name.type !== "SvelteName") ||
-                !PREFORMATTED_ELEMENT_NAMES.includes(node.name.name)) {
-                if (node.endTag) {
-                    offsets.setOffsetElementList(node.children.filter(isNotEmptyTextNode), node.startTag, node.endTag, 1);
+            if (node.name.type === "Identifier" || node.name.type === "SvelteName") {
+                if (PREFORMATTED_ELEMENT_NAMES.includes(node.name.name)) {
+                    const startTagToken = sourceCode.getFirstToken(node);
+                    const endTagToken = node.endTag && sourceCode.getFirstToken(node.endTag);
+                    offsets.setOffsetToken(endTagToken, 0, startTagToken);
+                    node.children.forEach((n) => offsets.ignore(n));
+                    return;
+                }
+                if (node.name.name === "style") {
+                    node.children.forEach((n) => offsets.ignore(n));
+                    return;
                 }
             }
-            else {
-                const startTagToken = sourceCode.getFirstToken(node);
-                const endTagToken = node.endTag && sourceCode.getFirstToken(node.endTag);
-                offsets.setOffsetToken(endTagToken, 0, startTagToken);
-                node.children.forEach((n) => offsets.ignore(n));
+            if (node.endTag) {
+                offsets.setOffsetElementList(node.children.filter(isNotEmptyTextNode), node.startTag, node.endTag, 1);
             }
         },
         SvelteStartTag(node) {

package/lib/rules/indent-helpers/ts.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineVisitor = void 0;
-const eslint_utils_1 = require("eslint-utils");
+const eslint_utils_1 = require("@eslint-community/eslint-utils");
 const commons_1 = require("./commons");
 const commons_2 = require("./commons");
 function defineVisitor(context) {

package/lib/rules/infinite-reactive-loop.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const eslint_utils_1 = require("eslint-utils");
+const eslint_utils_1 = require("@eslint-community/eslint-utils");
 const utils_1 = require("../utils");
 const ast_utils_1 = require("../utils/ast-utils");
 const svelte_eslint_parser_1 = require("svelte-eslint-parser");
@@ -166,73 +166,81 @@ function isInsideOfFunction(node) {
     return false;
 }
 function doLint(context, ast, callFuncIdentifiers, tickCallExpressions, taskReferences, reactiveVariableNames, reactiveVariableReferences, pIsSameTask) {
-    let isSameMicroTask = pIsSameTask;
-    const differentMicroTaskEnterNodes = [];
-    (0, svelte_eslint_parser_1.traverseNodes)(ast, {
-        enterNode(node) {
-            if (isPromiseThenOrCatchBody(node)) {
-                differentMicroTaskEnterNodes.push(node);
-                isSameMicroTask = false;
-            }
-            for (const { node: callExpression } of [
-                ...tickCallExpressions,
-                ...taskReferences,
-            ]) {
-                if (isChildNode(callExpression, node)) {
+    const processed = new Set();
+    verifyInternal(ast, callFuncIdentifiers, pIsSameTask);
+    function verifyInternal(ast, callFuncIdentifiers, pIsSameTask) {
+        if (processed.has(ast)) {
+            return;
+        }
+        processed.add(ast);
+        let isSameMicroTask = pIsSameTask;
+        const differentMicroTaskEnterNodes = [];
+        (0, svelte_eslint_parser_1.traverseNodes)(ast, {
+            enterNode(node) {
+                if (isPromiseThenOrCatchBody(node)) {
                     differentMicroTaskEnterNodes.push(node);
                     isSameMicroTask = false;
                 }
-            }
-            if (node.parent?.type === "AssignmentExpression" &&
-                node.parent?.right.type === "AwaitExpression" &&
-                node.parent?.left === node) {
-                differentMicroTaskEnterNodes.push(node);
-                isSameMicroTask = false;
-            }
-            if (node.type === "Identifier" && isFunctionCall(node)) {
-                const functionDeclarationNode = getFunctionDeclarationNode(context, node);
-                if (functionDeclarationNode) {
-                    doLint(context, functionDeclarationNode, [...callFuncIdentifiers, node], tickCallExpressions, taskReferences, reactiveVariableNames, reactiveVariableReferences, isSameMicroTask);
+                for (const { node: callExpression } of [
+                    ...tickCallExpressions,
+                    ...taskReferences,
+                ]) {
+                    if (isChildNode(callExpression, node)) {
+                        differentMicroTaskEnterNodes.push(node);
+                        isSameMicroTask = false;
+                    }
                 }
-            }
-            if (!isSameMicroTask) {
-                if (isReactiveVariableNode(reactiveVariableReferences, node) &&
-                    reactiveVariableNames.includes(node.name) &&
-                    isNodeForAssign(node)) {
-                    context.report({
-                        node,
-                        loc: node.loc,
-                        messageId: "unexpected",
-                    });
-                    callFuncIdentifiers.forEach((callFuncIdentifier) => {
+                if (node.parent?.type === "AssignmentExpression" &&
+                    node.parent?.right.type === "AwaitExpression" &&
+                    node.parent?.left === node) {
+                    differentMicroTaskEnterNodes.push(node);
+                    isSameMicroTask = false;
+                }
+                if (node.type === "Identifier" && isFunctionCall(node)) {
+                    const functionDeclarationNode = getFunctionDeclarationNode(context, node);
+                    if (functionDeclarationNode) {
+                        verifyInternal(functionDeclarationNode, [...callFuncIdentifiers, node], isSameMicroTask);
+                    }
+                }
+                if (!isSameMicroTask) {
+                    if (isReactiveVariableNode(reactiveVariableReferences, node) &&
+                        reactiveVariableNames.includes(node.name) &&
+                        isNodeForAssign(node)) {
                         context.report({
-                            node: callFuncIdentifier,
-                            loc: callFuncIdentifier.loc,
-                            messageId: "unexpectedCall",
-                            data: {
-                                variableName: node.name,
-                            },
+                            node,
+                            loc: node.loc,
+                            messageId: "unexpected",
+                        });
+                        callFuncIdentifiers.forEach((callFuncIdentifier) => {
+                            context.report({
+                                node: callFuncIdentifier,
+                                loc: callFuncIdentifier.loc,
+                                messageId: "unexpectedCall",
+                                data: {
+                                    variableName: node.name,
+                                },
+                            });
                         });
-                    });
+                    }
                 }
-            }
-        },
-        leaveNode(node) {
-            if (node.type === "AwaitExpression") {
-                if (ast.parent?.type === "SvelteReactiveStatement") {
-                    if (!isInsideOfFunction(node)) {
+            },
+            leaveNode(node) {
+                if (node.type === "AwaitExpression") {
+                    if (ast.parent?.type === "SvelteReactiveStatement") {
+                        if (!isInsideOfFunction(node)) {
+                            isSameMicroTask = false;
+                        }
+                    }
+                    else {
                         isSameMicroTask = false;
                     }
                 }
-                else {
-                    isSameMicroTask = false;
+                if (differentMicroTaskEnterNodes.includes(node)) {
+                    isSameMicroTask = true;
                 }
-            }
-            if (differentMicroTaskEnterNodes.includes(node)) {
-                isSameMicroTask = true;
-            }
-        },
-    });
+            },
+        });
+    }
 }
 exports.default = (0, utils_1.createRule)("infinite-reactive-loop", {
     meta: {

package/lib/rules/mustache-spacing.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const eslint_utils_1 = require("eslint-utils");
+const eslint_utils_1 = require("@eslint-community/eslint-utils");
 const utils_1 = require("../utils");
 const ast_utils_1 = require("../utils/ast-utils");
 const VALUE_SCHEMA = { enum: ["never", "always"] };

package/lib/rules/no-dom-manipulating.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../utils");
 const ast_utils_1 = require("../utils/ast-utils");
-const eslint_utils_1 = require("eslint-utils");
+const eslint_utils_1 = require("@eslint-community/eslint-utils");
 const DOM_MANIPULATING_METHODS = new Set([
     "appendChild",
     "insertBefore",

package/lib/rules/prefer-destructured-store-props.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const eslint_utils_1 = require("eslint-utils");
+const eslint_utils_1 = require("@eslint-community/eslint-utils");
 const esutils_1 = require("esutils");
 const utils_1 = require("../utils");
 const ast_utils_1 = require("../utils/ast-utils");

package/lib/rules/reference-helpers/svelte-store.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStoreChecker = exports.extractStoreReferences = void 0;
-const eslint_utils_1 = require("eslint-utils");
+const eslint_utils_1 = require("@eslint-community/eslint-utils");
 const ts_utils_1 = require("../../utils/ts-utils");
 const ast_utils_1 = require("../../utils/ast-utils");
 function* extractStoreReferences(context, storeNames = ["writable", "readable", "derived"]) {

package/lib/rules/require-event-dispatcher-types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const eslint_utils_1 = require("eslint-utils");
+const eslint_utils_1 = require("@eslint-community/eslint-utils");
 const utils_1 = require("../utils");
 const ast_utils_1 = require("../utils/ast-utils");
 exports.default = (0, utils_1.createRule)("require-event-dispatcher-types", {

package/lib/shared/svelte-compile-warns/extract-leading-comments.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.extractLeadingComments = void 0;
-const eslint_utils_1 = require("eslint-utils");
+const eslint_utils_1 = require("@eslint-community/eslint-utils");
 function extractLeadingComments(context, node) {
     const sourceCode = context.getSourceCode();
     const beforeToken = sourceCode.getTokenBefore(node, {
@@ -12,7 +12,7 @@ function extractLeadingComments(context, node) {
             }
             const astToken = token;
             if (astToken.type === "HTMLText") {
-                return Boolean(astToken.value.trim());
+                return false;
             }
             return astToken.type !== "HTMLComment";
         },

package/lib/shared/svelte-compile-warns/index.js

@@ -327,17 +327,17 @@ function processIgnore(warnings, kind, stripStyleElements, ignoreComments, conte
         if (!warning.code) {
             continue;
         }
-        const node = getWarningNode(warning);
-        if (!node) {
-            continue;
-        }
-        for (const comment of (0, extract_leading_comments_1.extractLeadingComments)(context, node).reverse()) {
-            const ignoreItem = ignoreComments.find((item) => item.token === comment && item.code === warning.code);
-            if (ignoreItem) {
-                unusedIgnores.delete(ignoreItem);
-                remainingWarning.delete(warning);
-                break;
+        let node = getWarningNode(warning);
+        while (node) {
+            for (const comment of (0, extract_leading_comments_1.extractLeadingComments)(context, node).reverse()) {
+                const ignoreItem = ignoreComments.find((item) => item.token === comment && item.code === warning.code);
+                if (ignoreItem) {
+                    unusedIgnores.delete(ignoreItem);
+                    remainingWarning.delete(warning);
+                    break;
+                }
             }
+            node = getIgnoreParent(node);
         }
     }
     for (const node of stripStyleElements) {
@@ -353,6 +353,31 @@ function processIgnore(warnings, kind, stripStyleElements, ignoreComments, conte
         warnings: [...remainingWarning],
         unusedIgnores: [...unusedIgnores],
     };
+    function getIgnoreParent(node) {
+        if (node.type !== "SvelteElement" &&
+            node.type !== "SvelteIfBlock" &&
+            node.type !== "SvelteKeyBlock" &&
+            node.type !== "SvelteEachBlock" &&
+            node.type !== "SvelteAwaitBlock") {
+            return null;
+        }
+        const parent = node.parent;
+        if (parent.type === "SvelteElseBlock") {
+            return parent.parent;
+        }
+        if (parent.type === "SvelteAwaitPendingBlock" ||
+            parent.type === "SvelteAwaitThenBlock" ||
+            parent.type === "SvelteAwaitCatchBlock") {
+            return parent.parent;
+        }
+        if (parent.type !== "SvelteElement" &&
+            parent.type !== "SvelteIfBlock" &&
+            parent.type !== "SvelteKeyBlock" &&
+            parent.type !== "SvelteEachBlock") {
+            return null;
+        }
+        return parent;
+    }
     function getWarningNode(warning) {
         const indexes = getWarningIndexes(warning);
         if (indexes.start != null) {

package/lib/utils/ast-utils.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isExpressionIdentifier = exports.isVoidHtmlElement = exports.getNodeName = exports.getDirectiveName = exports.getAttributeKeyText = exports.getMustacheTokens = exports.getAttributeValueQuoteAndRange = exports.getParent = exports.getScope = exports.findVariable = exports.getLangValue = exports.getStaticAttributeValue = exports.findBindDirective = exports.findShorthandAttribute = exports.findAttribute = exports.isHTMLElementLike = exports.needParentheses = exports.getStringIfConstant = exports.equalTokens = void 0;
-const eslintUtils = __importStar(require("eslint-utils"));
+const eslintUtils = __importStar(require("@eslint-community/eslint-utils"));
 const void_elements_1 = __importDefault(require("./void-elements"));
 function equalTokens(left, right, sourceCode) {
     const tokensL = sourceCode.getTokens(left);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-svelte",
-  "version": "2.22.0",
+  "version": "2.23.1",
   "description": "ESLint plugin for Svelte using AST",
   "repository": "git+https://github.com/ota-meshi/eslint-plugin-svelte.git",
   "homepage": "https://ota-meshi.github.io/eslint-plugin-svelte",
@@ -65,9 +65,9 @@
     }
   },
   "dependencies": {
+    "@eslint-community/eslint-utils": "^4.2.0",
     "@jridgewell/sourcemap-codec": "^1.4.14",
     "debug": "^4.3.1",
-    "eslint-utils": "^3.0.0",
     "esutils": "^2.0.3",
     "known-css-properties": "^0.27.0",
     "postcss": "^8.4.5",