eslint-plugin-svelte 3.8.2 → 3.9.0

package/lib/main.d.ts

@@ -14,7 +14,7 @@ export declare const configs: {
 export declare const rules: Record<string, Rule.RuleModule>;
 export declare const meta: {
     name: "eslint-plugin-svelte";
-    version: "3.8.2";
+    version: "3.9.0";
 };
 export declare const processors: {
     '.svelte': typeof processor;

package/lib/meta.d.ts

@@ -1,2 +1,2 @@
 export declare const name: "eslint-plugin-svelte";
-export declare const version: "3.8.2";
+export declare const version: "3.9.0";

package/lib/meta.js

@@ -2,4 +2,4 @@
 // This file has been automatically generated,
 // in order to update its content execute "pnpm run update"
 export const name = 'eslint-plugin-svelte';
-export const version = '3.8.2';
+export const version = '3.9.0';

package/lib/shared/svelte-compile-warns/ignore-comment.js

@@ -1,4 +1,4 @@
-const SVELTE_IGNORE_PATTERN = /^\s*svelte-ignore/m;
+const SVELTE_IGNORE_PATTERN = /^\s*svelte-ignore\s+/;
 /**
  * Map of legacy code -> new code
  * See https://github.com/sveltejs/svelte/blob/c9202a889612df3c2fcb369096a5573668be99d6/packages/svelte/src/compiler/utils/extract_svelte_ignore.js#L6
@@ -19,72 +19,84 @@ export function getSvelteIgnoreItems(context) {
     const sourceCode = context.sourceCode;
     const ignoreComments = [];
     for (const comment of sourceCode.getAllComments()) {
-        const ignores = extractSvelteIgnore(comment.value, comment.range[0] + 2, comment);
-        if (ignores) {
-            ignoreComments.push(...ignores);
+        const match = SVELTE_IGNORE_PATTERN.exec(comment.value);
+        if (!match) {
+            continue;
         }
-        else if (hasMissingCodeIgnore(comment.value)) {
+        const codeListStart = match.index + match[0].length;
+        const codeList = comment.value.slice(codeListStart);
+        if (hasMissingCodeIgnore(codeList)) {
             ignoreComments.push({
                 range: comment.range,
                 code: null,
                 token: comment
             });
         }
+        else {
+            const ignores = extractSvelteIgnore(comment.range[0] + 2, comment, codeList, codeListStart);
+            if (ignores) {
+                ignoreComments.push(...ignores);
+            }
+        }
     }
     for (const token of sourceCode.ast.tokens) {
         if (token.type === 'HTMLComment') {
             const text = token.value.slice(4, -3);
-            const ignores = extractSvelteIgnore(text, token.range[0] + 4, token);
-            if (ignores) {
-                ignoreComments.push(...ignores);
+            const match = SVELTE_IGNORE_PATTERN.exec(text);
+            if (!match) {
+                continue;
             }
-            else if (hasMissingCodeIgnore(text)) {
+            const codeListStart = match.index + match[0].length;
+            const codeList = text.slice(codeListStart);
+            if (hasMissingCodeIgnore(codeList)) {
                 ignoreComments.push({
                     range: token.range,
                     code: null,
                     token
                 });
             }
+            else {
+                const ignores = extractSvelteIgnore(token.range[0] + 4, token, codeList, codeListStart);
+                if (ignores) {
+                    ignoreComments.push(...ignores);
+                }
+            }
         }
     }
     ignoreComments.sort((a, b) => b.range[0] - a.range[0]);
     return ignoreComments;
 }
 /** Extract svelte-ignore rule names */
-function extractSvelteIgnore(text, startIndex, token) {
-    const m1 = SVELTE_IGNORE_PATTERN.exec(text);
-    if (!m1) {
-        return null;
-    }
-    const ignoreStart = m1.index + m1[0].length;
-    const beforeText = text.slice(ignoreStart);
-    if (!/^\s/.test(beforeText) || !beforeText.trim()) {
-        return null;
-    }
-    let start = startIndex + ignoreStart;
+function extractSvelteIgnore(startIndex, token, codeList, ignoreStart) {
+    const start = startIndex + ignoreStart;
     const results = [];
-    for (const code of beforeText.split(/\s/)) {
-        const end = start + code.length;
-        const trimmed = code.trim();
-        if (trimmed) {
+    const separatorPattern = /\s*[\s,]\s*/g;
+    const separators = codeList.matchAll(separatorPattern);
+    let lastSeparatorEnd = 0;
+    for (const separator of separators) {
+        const code = codeList.slice(lastSeparatorEnd, separator.index);
+        if (code) {
             results.push({
-                code: trimmed,
-                codeForV5: V5_REPLACEMENTS[trimmed] || trimmed.replace(/-/gu, '_'),
-                range: [start, end],
+                code,
+                codeForV5: V5_REPLACEMENTS[code] || code.replace(/-/gu, '_'),
+                range: [start + lastSeparatorEnd, start + separator.index],
                 token
             });
         }
-        start = end + 1; /* space */
+        lastSeparatorEnd = separator.index + separator[0].length;
+    }
+    if (results.length === 0) {
+        const code = codeList;
+        results.push({
+            code,
+            codeForV5: V5_REPLACEMENTS[code] || code.replace(/-/gu, '_'),
+            range: [start, start + code.length],
+            token
+        });
     }
     return results;
 }
 /** Checks whether given comment has missing code svelte-ignore */
-function hasMissingCodeIgnore(text) {
-    const m1 = SVELTE_IGNORE_PATTERN.exec(text);
-    if (!m1) {
-        return false;
-    }
-    const ignoreStart = m1.index + m1[0].length;
-    const beforeText = text.slice(ignoreStart);
-    return !beforeText.trim();
+function hasMissingCodeIgnore(codeList) {
+    return !codeList.trim();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-svelte",
-  "version": "3.8.2",
+  "version": "3.9.0",
   "description": "ESLint plugin for Svelte using AST",
   "repository": "git+https://github.com/sveltejs/eslint-plugin-svelte.git",
   "homepage": "https://sveltejs.github.io/eslint-plugin-svelte",