fix: use esutils

Author: ota-meshi

docs-svelte-kit/src/lib/eslint/ESLintEditor.svelte

@@ -219,10 +219,11 @@
         edits: [
           {
             resource: model.uri,
-            edit: {
+            textEdit: {
               range: editRange,
               text: fix.text,
             },
+            versionId: model.getVersionId(),
           },
         ],
       },

docs-svelte-kit/src/lib/eslint/MonacoEditor.svelte

@@ -58,7 +58,7 @@
           monaco.languages.registerCodeActionProvider(language, {
             provideCodeActions(model, range, context) {
               const editor = getLeftEditor?.()
-              if (editor?.getModel().url !== model.url) {
+              if (editor?.getModel().uri !== model.uri) {
                 return {
                   actions: [],
                   dispose() {

docs/rules/prefer-destructured-store-props.md

@@ -25,6 +25,7 @@ An example of the improvements can be see in this [REPL](https://svelte.dev/repl
 ```svelte
 <script>
   /* eslint svelte/prefer-destructured-store-props: "error" */
+  import store from "./store.js"
   $: ({ foo } = $store)
 </script>
 

package.json

@@ -67,6 +67,7 @@
   "dependencies": {
     "debug": "^4.3.1",
     "eslint-utils": "^3.0.0",
+    "esutils": "^2.0.3",
     "known-css-properties": "^0.25.0",
     "postcss": "^8.4.5",
     "postcss-load-config": "^3.1.4",
@@ -100,6 +101,7 @@
     "@types/eslint-utils": "^3.0.1",
     "@types/eslint-visitor-keys": "^1.0.0",
     "@types/estree": "^1.0.0",
+    "@types/esutils": "^2.0.0",
     "@types/less": "^3.0.3",
     "@types/markdown-it": "^12.2.3",
     "@types/markdown-it-container": "^2.0.5",
@@ -172,7 +174,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 98.69,
+    "atLeast": 98.71,
     "cache": true,
     "detail": true,
     "ignoreAsAssertion": true,

src/rules/prefer-destructured-store-props.ts

@@ -1,6 +1,7 @@
 import type { TSESTree } from "@typescript-eslint/types"
 import { getPropertyName } from "eslint-utils"
 import type { AST } from "svelte-eslint-parser"
+import { keyword } from "esutils"
 import type { SuggestionReportDescriptor } from "../types"
 import { createRule } from "../utils"
 import {
@@ -13,71 +14,6 @@ type StoreMemberExpression = TSESTree.MemberExpression & {
   object: TSESTree.Identifier & { name: string }
 }
 
-const keywords = new Set([
-  "abstract",
-  "arguments",
-  "boolean",
-  "break",
-  "byte",
-  "case",
-  "catch",
-  "char",
-  "class",
-  "const",
-  "continue",
-  "debugger",
-  "default",
-  "delete",
-  "do",
-  "double",
-  "else",
-  "enum",
-  "eval",
-  "export",
-  "extends",
-  "false",
-  "final",
-  "finally",
-  "float",
-  "for",
-  "function",
-  "goto",
-  "if",
-  "implements",
-  "import",
-  "in",
-  "instanceof",
-  "int",
-  "interface",
-  "let",
-  "long",
-  "native",
-  "new",
-  "null",
-  "package",
-  "private",
-  "protected",
-  "public",
-  "return",
-  "short",
-  "static",
-  "super",
-  "switch",
-  "synchronized",
-  "this",
-  "throw",
-  "throws",
-  "transient",
-  "true",
-  "try",
-  "typeof",
-  "var",
-  "void",
-  "volatile",
-  "while",
-  "with",
-  "yield",
-])
 export default createRule("prefer-destructured-store-props", {
   meta: {
     docs: {
@@ -134,6 +70,7 @@ export default createRule("prefer-destructured-store-props", {
               getPropertyName(prop) === propName,
           )
           if (prop) {
+            // $: ({prop: target} = $store)
             yield prop.value
           }
         }
@@ -297,7 +234,10 @@ export default createRule("prefer-destructured-store-props", {
                   }
                   const baseName = varName
                   let suffix = 0
-                  if (keywords.has(varName)) {
+                  if (
+                    keyword.isReservedWordES6(varName, true) ||
+                    keyword.isRestrictedWord(varName)
+                  ) {
                     varName = `${baseName}${++suffix}`
                   }
                   while (hasTopLevelVariable(varName)) {