Merge branch 'main' into fix--infinite-loop

sveltejs · Oct 3, 2023 · 75b71d4 · 75b71d4
2 parents 7fbb9e9 + f92689e
commit 75b71d4
Show file tree

Hide file tree

Showing 39 changed files with 20 additions and 344,959 deletions.
diff --git a/tests/fixtures/parser/ast/await04-scope-output.json b/tests/fixtures/parser/ast/await04-scope-output.json
diff --git a/...r/ast/docs/template-syntax/11-element-directives/07-transition-fn/05-ts-scope-output.json b/...r/ast/docs/template-syntax/11-element-directives/07-transition-fn/05-ts-scope-output.json
diff --git a/tests/fixtures/parser/ast/i18n-test-scope-output.json b/tests/fixtures/parser/ast/i18n-test-scope-output.json
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
diff --git a/tests/fixtures/parser/ast/issue338-eslint-plugin-svelte-scope-output.json b/tests/fixtures/parser/ast/issue338-eslint-plugin-svelte-scope-output.json
diff --git a/tests/fixtures/parser/ast/reactive-with-var04-ts-scope-output.json b/tests/fixtures/parser/ast/reactive-with-var04-ts-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-$$props01-scope-output.json b/tests/fixtures/parser/ast/ts-$$props01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-$$slots01-scope-output.json b/tests/fixtures/parser/ast/ts-$$slots01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-$$slots02-no-slot-scope-output.json b/tests/fixtures/parser/ast/ts-$$slots02-no-slot-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-$$slots03-named-scope-output.json b/tests/fixtures/parser/ast/ts-$$slots03-named-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-$$slots04-named-scope-output.json b/tests/fixtures/parser/ast/ts-$$slots04-named-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-await-non-promise01-scope-output.json b/tests/fixtures/parser/ast/ts-await-non-promise01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-each01-scope-output.json b/tests/fixtures/parser/ast/ts-each01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-event01-scope-output.json b/tests/fixtures/parser/ast/ts-event01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-event02-scope-output.json b/tests/fixtures/parser/ast/ts-event02-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-event03-scope-output.json b/tests/fixtures/parser/ast/ts-event03-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-event04-scope-output.json b/tests/fixtures/parser/ast/ts-event04-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-event05-scope-output.json b/tests/fixtures/parser/ast/ts-event05-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-event06-scope-output.json b/tests/fixtures/parser/ast/ts-event06-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-issue226-scope-output.json b/tests/fixtures/parser/ast/ts-issue226-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-let/ts-let01-scope-output.json b/tests/fixtures/parser/ast/ts-let/ts-let01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-newline-scope-output.json b/tests/fixtures/parser/ast/ts-newline-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-not-reactive01-scope-output.json b/tests/fixtures/parser/ast/ts-not-reactive01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-promise01-scope-output.json b/tests/fixtures/parser/ast/ts-promise01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-promise02-scope-output.json b/tests/fixtures/parser/ast/ts-promise02-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-reactive01-scope-output.json b/tests/fixtures/parser/ast/ts-reactive01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-reactive02-scope-output.json b/tests/fixtures/parser/ast/ts-reactive02-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-reactive03-scope-output.json b/tests/fixtures/parser/ast/ts-reactive03-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-reactive04-scope-output.json b/tests/fixtures/parser/ast/ts-reactive04-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-reactive05-scope-output.json b/tests/fixtures/parser/ast/ts-reactive05-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-reactive06-scope-output.json b/tests/fixtures/parser/ast/ts-reactive06-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-scope-issue01-scope-output.json b/tests/fixtures/parser/ast/ts-scope-issue01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-shorthand-attr01-scope-output.json b/tests/fixtures/parser/ast/ts-shorthand-attr01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-store01-scope-output.json b/tests/fixtures/parser/ast/ts-store01-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-store02-scope-output.json b/tests/fixtures/parser/ast/ts-store02-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-store03-scope-output.json b/tests/fixtures/parser/ast/ts-store03-scope-output.json
diff --git a/tests/fixtures/parser/ast/ts-use01-scope-output.json b/tests/fixtures/parser/ast/ts-use01-scope-output.json
diff --git a/tests/src/parser/test-utils.ts b/tests/src/parser/test-utils.ts
@@ -8,6 +8,7 @@ import type { Reference, Scope, ScopeManager, Variable } from "eslint-scope";
 import type * as TSESScopes from "@typescript-eslint/scope-manager";
 import type { SvelteNode } from "../../../src/ast";
 import type { StyleContext } from "../../../src";
+import { TS_GLOBALS } from "./ts-vars";
 
 const AST_FIXTURE_ROOT = path.resolve(__dirname, "../../fixtures/parser/ast");
 const BASIC_PARSER_OPTIONS: Linter.ParserOptions = {
@@ -290,9 +291,14 @@ export function styleContextToJson(styleContext: StyleContext): string {
 }
 
 function normalizeScope(scope: Scope | TSESScopes.Scope): any {
+  let variables = scope.variables as TSESScopes.Variable[];
+  if (scope.type === "global") {
+    // Exclude well-known variables as they do not need to be tested.
+    variables = variables.filter((v) => !TS_GLOBALS.includes(v.name));
+  }
   return {
     type: scope.type,
-    variables: scope.variables.map(normalizeVar),
+    variables: variables.map(normalizeVar),
     references: scope.references.map(normalizeReference),
     childScopes: scope.childScopes.map(normalizeScope),
     through: scope.through.map(normalizeReference),

diff --git a/tests/src/parser/ts-vars.ts b/tests/src/parser/ts-vars.ts
@@ -0,0 +1,13 @@
+import * as parser from "@typescript-eslint/parser";
+import * as scope from "@typescript-eslint/scope-manager";
+
+const result = parser.parseForESLint("", { lib: ["lib", "esnext", "dom"] });
+const scopeManager =
+  result.scopeManager ??
+  scope.analyze(result.ast as any, {
+    lib: ["lib", "esnext", "dom"],
+  });
+
+export const TS_GLOBALS = scopeManager
+  .globalScope!.variables.map((v) => v.name)
+  .sort();