eslint-plugin-svelte 2.23.0 → 2.24.0

package/README.md

@@ -184,6 +184,17 @@ module.exports = {
 
 See also <https://github.com/ota-meshi/svelte-eslint-parser#readme>.
 
+::: warning ❗ Attention
+
+The TypeScript parser uses a singleton internally and it will only use the
+options given to it when it was first initialized. If trying to change the
+options for a different file or override, the parser will simply ignore the new
+options (which may result in an error). See
+[typescript-eslint/typescript-eslint#6778](https://github.com/typescript-eslint/typescript-eslint/issues/6778)
+for some context.
+
+:::
+
 #### settings.svelte
 
 You can change the behavior of this plugin with some settings.

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

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-svelte",
-  "version": "2.23.0",
+  "version": "2.24.0",
   "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",
@@ -73,7 +73,7 @@
     "postcss": "^8.4.5",
     "postcss-load-config": "^3.1.4",
     "postcss-safe-parser": "^6.0.0",
-    "svelte-eslint-parser": "^0.24.0"
+    "svelte-eslint-parser": "^0.25.0"
   },
   "devDependencies": {
     "@1stg/browserslist-config": "^1.2.3",