fix: typescript-eslint v6 compatibility (#385)

* fix: typescript-eslint v6 compatibility * Create lazy-cups-fry.md * fix test * fix testcase * fix ci
sveltejs · Jul 20, 2023 · 71db4ec · 71db4ec
1 parent df45c22
commit 71db4ec
Show file tree

Hide file tree

Showing 15 changed files with 907 additions and 833 deletions.
diff --git a/.changeset/lazy-cups-fry.md b/.changeset/lazy-cups-fry.md
@@ -0,0 +1,5 @@
+---
+"svelte-eslint-parser": patch
+---
+
+fix: typescript-eslint v6 compatibility
diff --git a/.github/workflows/NodeCI.yml b/.github/workflows/NodeCI.yml
@@ -49,7 +49,27 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - name: Install Svelte v3
         run: |+
-          pnpm install -D svelte@3
+          pnpm install -D svelte@3 @typescript-eslint/parser@5 @typescript-eslint/eslint-plugin@5
+          rm -rf node_modules
+      - name: Install Packages
+        run: pnpm install
+      - name: Test
+        run: pnpm run test
+  test-for-ts-eslint-v5:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [18.x]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install @typescript-eslint v5
+        run: |+
+          pnpm install -D @typescript-eslint/parser@5 @typescript-eslint/eslint-plugin@5
           rm -rf node_modules
       - name: Install Packages
         run: pnpm install
@@ -89,7 +109,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - name: Install eslint v7
         run: |+
-          pnpm install -D eslint@7 svelte@3
+          pnpm install -D eslint@7 svelte@3 @typescript-eslint/parser@5 @typescript-eslint/eslint-plugin@5
           rm -rf node_modules
       - name: Install Packages
         run: pnpm install

diff --git a/package.json b/package.json
@@ -73,9 +73,9 @@
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.16.16",
     "@types/semver": "^7.5.0",
-    "@typescript-eslint/eslint-plugin": "^5.59.9",
-    "@typescript-eslint/parser": "~5.62.0",
-    "@typescript-eslint/types": "^5.59.9",
+    "@typescript-eslint/eslint-plugin": "^6.1.0",
+    "@typescript-eslint/parser": "~6.1.0",
+    "@typescript-eslint/types": "^6.1.0",
     "benchmark": "^2.1.4",
     "chai": "^4.3.7",
     "env-cmd": "^10.1.0",

diff --git a/src/parser/parser-object.ts b/src/parser/parser-object.ts
@@ -64,8 +64,7 @@ export function isTSESLintParserObject(
     return Boolean(
       services &&
         services.esTreeNodeToTSNodeMap &&
-        services.tsNodeToESTreeNodeMap &&
-        services.program,
+        services.tsNodeToESTreeNodeMap,
     );
   } catch {
     return false;

diff --git a/src/parser/typescript/analyze/index.ts b/src/parser/typescript/analyze/index.ts
@@ -505,6 +505,7 @@ function transformForDeclareReactiveVar(
     const newBody: TSESTree.ExpressionStatement = {
       type: "ExpressionStatement" as TSESTree.ExpressionStatement["type"],
       expression: assignment,
+      directive: undefined,
       loc: statement.body.loc,
       range: statement.body.range,
       parent: reactiveStatement,

diff --git a/tests/fixtures/parser/ast/issue325-eslint-plugin-svelte-output.json b/tests/fixtures/parser/ast/issue325-eslint-plugin-svelte-output.json
@@ -540,25 +540,7 @@
                     "type": "TSTypeAnnotation",
                     "typeAnnotation": {
                       "type": "TSTypeReference",
-                      "typeName": {
-                        "type": "Identifier",
-                        "name": "Promise",
-                        "range": [
-                          119,
-                          126
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 3,
-                            "column": 58
-                          },
-                          "end": {
-                            "line": 3,
-                            "column": 65
-                          }
-                        }
-                      },
-                      "typeParameters": {
+                      "typeArguments": {
                         "type": "TSTypeParameterInstantiation",
                         "params": [
                           {
@@ -594,6 +576,24 @@
                           }
                         }
                       },
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "Promise",
+                        "range": [
+                          119,
+                          126
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 58
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 65
+                          }
+                        }
+                      },
                       "range": [
                         119,
                         134

diff --git a/tests/fixtures/parser/ast/issue325-eslint-plugin-svelte-scope-output.json b/tests/fixtures/parser/ast/issue325-eslint-plugin-svelte-scope-output.json
@@ -9656,25 +9656,7 @@
                     "type": "TSTypeAnnotation",
                     "typeAnnotation": {
                       "type": "TSTypeReference",
-                      "typeName": {
-                        "type": "Identifier",
-                        "name": "Promise",
-                        "range": [
-                          119,
-                          126
-                        ],
-                        "loc": {
-                          "start": {
-                            "line": 3,
-                            "column": 58
-                          },
-                          "end": {
-                            "line": 3,
-                            "column": 65
-                          }
-                        }
-                      },
-                      "typeParameters": {
+                      "typeArguments": {
                         "type": "TSTypeParameterInstantiation",
                         "params": [
                           {
@@ -9710,6 +9692,24 @@
                           }
                         }
                       },
+                      "typeName": {
+                        "type": "Identifier",
+                        "name": "Promise",
+                        "range": [
+                          119,
+                          126
+                        ],
+                        "loc": {
+                          "start": {
+                            "line": 3,
+                            "column": 58
+                          },
+                          "end": {
+                            "line": 3,
+                            "column": 65
+                          }
+                        }
+                      },
                       "range": [
                         119,
                         134
@@ -10433,25 +10433,7 @@
                       "type": "TSTypeAnnotation",
                       "typeAnnotation": {
                         "type": "TSTypeReference",
-                        "typeName": {
-                          "type": "Identifier",
-                          "name": "Promise",
-                          "range": [
-                            119,
-                            126
-                          ],
-                          "loc": {
-                            "start": {
-                              "line": 3,
-                              "column": 58
-                            },
-                            "end": {
-                              "line": 3,
-                              "column": 65
-                            }
-                          }
-                        },
-                        "typeParameters": {
+                        "typeArguments": {
                           "type": "TSTypeParameterInstantiation",
                           "params": [
                             {
@@ -10487,6 +10469,24 @@
                             }
                           }
                         },
+                        "typeName": {
+                          "type": "Identifier",
+                          "name": "Promise",
+                          "range": [
+                            119,
+                            126
+                          ],
+                          "loc": {
+                            "start": {
+                              "line": 3,
+                              "column": 58
+                            },
+                            "end": {
+                              "line": 3,
+                              "column": 65
+                            }
+                          }
+                        },
                         "range": [
                           119,
                           134

diff --git a/tests/fixtures/parser/ast/ts-event03-output.json b/tests/fixtures/parser/ast/ts-event03-output.json
@@ -237,7 +237,7 @@
                   }
                 },
                 "optional": false,
-                "typeParameters": {
+                "typeArguments": {
                   "type": "TSTypeParameterInstantiation",
                   "params": [
                     {

diff --git a/tests/fixtures/parser/ast/ts-event03-scope-output.json b/tests/fixtures/parser/ast/ts-event03-scope-output.json
@@ -8832,7 +8832,7 @@
                     }
                   },
                   "optional": false,
-                  "typeParameters": {
+                  "typeArguments": {
                     "type": "TSTypeParameterInstantiation",
                     "params": [
                       {

diff --git a/tests/fixtures/parser/ast/ts-promise01-output.json b/tests/fixtures/parser/ast/ts-promise01-output.json
@@ -111,25 +111,7 @@
                   "type": "TSTypeAnnotation",
                   "typeAnnotation": {
                     "type": "TSTypeReference",
-                    "typeName": {
-                      "type": "Identifier",
-                      "name": "Promise",
-                      "range": [
-                        32,
-                        39
-                      ],
-                      "loc": {
-                        "start": {
-                          "line": 2,
-                          "column": 13
-                        },
-                        "end": {
-                          "line": 2,
-                          "column": 20
-                        }
-                      }
-                    },
-                    "typeParameters": {
+                    "typeArguments": {
                       "type": "TSTypeParameterInstantiation",
                       "params": [
                         {
@@ -237,6 +219,24 @@
                         }
                       }
                     },
+                    "typeName": {
+                      "type": "Identifier",
+                      "name": "Promise",
+                      "range": [
+                        32,
+                        39
+                      ],
+                      "loc": {
+                        "start": {
+                          "line": 2,
+                          "column": 13
+                        },
+                        "end": {
+                          "line": 2,
+                          "column": 20
+                        }
+                      }
+                    },
                     "range": [
                       32,
                       51