fix: test

ota-meshi · ota-meshi · commit 409780f1d545 · 2023-04-08T13:41:43.000+09:00
diff --git a/tests/fixtures/integrations/parser-object-tests/ts-multiple-parser-setup.ts b/tests/fixtures/integrations/parser-object-tests/ts-multiple-parser-setup.ts
@@ -1,14 +1,11 @@
 /* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
-import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
+import { generateParserOptions } from "../../../src/parser/test-utils";
 import * as ts from "@typescript-eslint/parser";
 
 export function getConfig() {
   return {
     parser: "svelte-eslint-parser",
-    parserOptions: {
-      ...BASIC_PARSER_OPTIONS,
-      parser: { ts },
-    },
+    parserOptions: generateParserOptions({ parser: { ts } }),
     env: {
       browser: true,
       es2021: true,
diff --git a/tests/fixtures/integrations/parser-object-tests/ts-single-parser-setup.ts b/tests/fixtures/integrations/parser-object-tests/ts-single-parser-setup.ts
@@ -1,14 +1,11 @@
 /* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
-import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
+import { generateParserOptions } from "../../../src/parser/test-utils";
 import * as parser from "@typescript-eslint/parser";
 
 export function getConfig() {
   return {
     parser: "svelte-eslint-parser",
-    parserOptions: {
-      ...BASIC_PARSER_OPTIONS,
-      parser,
-    },
+    parserOptions: generateParserOptions({ parser }),
     env: {
       browser: true,
       es2021: true,
diff --git a/tests/fixtures/integrations/type-info-tests/await-setup.ts b/tests/fixtures/integrations/type-info-tests/await-setup.ts
@@ -1,6 +1,6 @@
 /* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
 import type { Linter } from "eslint";
-import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
+import { generateParserOptions } from "../../../src/parser/test-utils";
 import { rules } from "@typescript-eslint/eslint-plugin";
 export function setupLinter(linter: Linter) {
   linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
 export function getConfig() {
   return {
     parser: "svelte-eslint-parser",
-    parserOptions: BASIC_PARSER_OPTIONS,
+    parserOptions: generateParserOptions(),
     rules: {
       "@typescript-eslint/no-unsafe-call": "error",
     },
diff --git a/tests/fixtures/integrations/type-info-tests/i18n-setup.ts b/tests/fixtures/integrations/type-info-tests/i18n-setup.ts
@@ -1,6 +1,6 @@
 /* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
 import type { Linter } from "eslint";
-import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
+import { generateParserOptions } from "../../../src/parser/test-utils";
 import { rules } from "@typescript-eslint/eslint-plugin";
 export function setupLinter(linter: Linter) {
   linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
 export function getConfig() {
   return {
     parser: "svelte-eslint-parser",
-    parserOptions: BASIC_PARSER_OPTIONS,
+    parserOptions: generateParserOptions(),
     rules: {
       "@typescript-eslint/no-unsafe-call": "error",
     },
diff --git a/tests/fixtures/integrations/type-info-tests/issue226-setup.ts b/tests/fixtures/integrations/type-info-tests/issue226-setup.ts
@@ -1,6 +1,6 @@
 /* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
 import type { Linter } from "eslint";
-import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
+import { generateParserOptions } from "../../../src/parser/test-utils";
 import { rules } from "@typescript-eslint/eslint-plugin";
 export function setupLinter(linter: Linter) {
   linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
 export function getConfig() {
   return {
     parser: "svelte-eslint-parser",
-    parserOptions: BASIC_PARSER_OPTIONS,
+    parserOptions: generateParserOptions,
     rules: {
       "@typescript-eslint/no-unsafe-argument": "error",
     },
diff --git a/tests/fixtures/integrations/type-info-tests/no-unnecessary-condition01-setup.ts b/tests/fixtures/integrations/type-info-tests/no-unnecessary-condition01-setup.ts
@@ -1,6 +1,6 @@
 /* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
 import type { Linter } from "eslint";
-import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
+import { generateParserOptions } from "../../../src/parser/test-utils";
 import { rules } from "@typescript-eslint/eslint-plugin";
 export function setupLinter(linter: Linter) {
   linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
 export function getConfig() {
   return {
     parser: "svelte-eslint-parser",
-    parserOptions: BASIC_PARSER_OPTIONS,
+    parserOptions: generateParserOptions(),
     rules: {
       "@typescript-eslint/no-unnecessary-condition": "error",
     },
diff --git a/tests/fixtures/integrations/type-info-tests/plugin-issue254-setup.ts b/tests/fixtures/integrations/type-info-tests/plugin-issue254-setup.ts
@@ -1,6 +1,6 @@
 /* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
 import type { Linter } from "eslint";
-import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
+import { generateParserOptions } from "../../../src/parser/test-utils";
 import { rules } from "@typescript-eslint/eslint-plugin";
 export function setupLinter(linter: Linter) {
   linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
 export function getConfig() {
   return {
     parser: "svelte-eslint-parser",
-    parserOptions: BASIC_PARSER_OPTIONS,
+    parserOptions: generateParserOptions(),
     rules: {
       "@typescript-eslint/no-unnecessary-condition": "error",
     },
diff --git a/tests/fixtures/integrations/type-info-tests/reactive-setup.ts b/tests/fixtures/integrations/type-info-tests/reactive-setup.ts
@@ -1,6 +1,6 @@
 /* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
 import type { Linter } from "eslint";
-import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
+import { generateParserOptions } from "../../../src/parser/test-utils";
 import { rules } from "@typescript-eslint/eslint-plugin";
 export function setupLinter(linter: Linter) {
   linter.defineRule(
@@ -28,7 +28,7 @@ export function setupLinter(linter: Linter) {
 export function getConfig() {
   return {
     parser: "svelte-eslint-parser",
-    parserOptions: BASIC_PARSER_OPTIONS,
+    parserOptions: generateParserOptions(),
     rules: {
       "@typescript-eslint/no-unsafe-argument": "error",
       "@typescript-eslint/no-unsafe-assignment": "error",
diff --git a/tests/fixtures/integrations/type-info-tests/reactive2-setup.ts b/tests/fixtures/integrations/type-info-tests/reactive2-setup.ts
@@ -1,6 +1,6 @@
 /* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
 import type { Linter } from "eslint";
-import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
+import { generateParserOptions } from "../../../src/parser/test-utils";
 import { rules } from "@typescript-eslint/eslint-plugin";
 export function setupLinter(linter: Linter) {
   linter.defineRule(
@@ -16,7 +16,7 @@ export function setupLinter(linter: Linter) {
 export function getConfig() {
   return {
     parser: "svelte-eslint-parser",
-    parserOptions: BASIC_PARSER_OPTIONS,
+    parserOptions: generateParserOptions(),
     rules: {
       "@typescript-eslint/no-unsafe-assignment": "error",
       "@typescript-eslint/no-unsafe-member-access": "error",
diff --git a/tests/fixtures/integrations/type-info-tests/ts-newline-setup.ts b/tests/fixtures/integrations/type-info-tests/ts-newline-setup.ts
@@ -1,6 +1,6 @@
 /* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
 import type { Linter } from "eslint";
-import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
+import { generateParserOptions } from "../../../src/parser/test-utils";
 import { rules } from "@typescript-eslint/eslint-plugin";
 export function setupLinter(linter: Linter) {
   linter.defineRule(
@@ -16,7 +16,7 @@ export function setupLinter(linter: Linter) {
 export function getConfig() {
   return {
     parser: "svelte-eslint-parser",
-    parserOptions: BASIC_PARSER_OPTIONS,
+    parserOptions: generateParserOptions(),
     rules: {
       "@typescript-eslint/no-confusing-void-expression": "error",
       "@typescript-eslint/explicit-function-return-type": "error",
diff --git a/tests/fixtures/integrations/type-info-tests/ts-no-misused-promises-setup.ts b/tests/fixtures/integrations/type-info-tests/ts-no-misused-promises-setup.ts
@@ -1,6 +1,6 @@
 /* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
 import type { Linter } from "eslint";
-import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
+import { generateParserOptions } from "../../../src/parser/test-utils";
 import { rules } from "@typescript-eslint/eslint-plugin";
 export function setupLinter(linter: Linter) {
   linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
 export function getConfig() {
   return {
     parser: "svelte-eslint-parser",
-    parserOptions: BASIC_PARSER_OPTIONS,
+    parserOptions: generateParserOptions(),
     rules: {
       "@typescript-eslint/no-misused-promises": "error",
     },
diff --git a/tests/src/integrations.ts b/tests/src/integrations.ts
@@ -39,7 +39,7 @@ describe("Integration tests.", () => {
         input,
         setup?.getConfig?.() ?? {
           parser: "svelte-eslint-parser",
-          parserOptions: generateParserOptions(inputFileName, config),
+          parserOptions: generateParserOptions(config),
           env: {
             browser: true,
             es2021: true,
diff --git a/tests/src/parser/error.ts b/tests/src/parser/error.ts
@@ -15,7 +15,7 @@ const ERROR_FIXTURE_ROOT = path.resolve(
 );
 
 function parse(code: string, filePath: string, config: any) {
-  return parseForESLint(code, generateParserOptions(filePath, config));
+  return parseForESLint(code, generateParserOptions({ filePath }, config));
 }
 
 describe("Check for Error.", () => {
diff --git a/tests/src/parser/eslint-rules.ts b/tests/src/parser/eslint-rules.ts
@@ -51,7 +51,7 @@ describe("svelte-eslint-parser with ESLint rules", () => {
             input,
             {
               parser: "svelte-eslint-parser",
-              parserOptions: generateParserOptions(inputFileName, config),
+              parserOptions: generateParserOptions(config),
               rules: {
                 [rule]: "error",
               },
diff --git a/tests/src/parser/eslint.ts b/tests/src/parser/eslint.ts
@@ -2,7 +2,7 @@ import { Linter } from "eslint";
 import assert from "assert";
 import semver from "semver";
 import * as parser from "../../../src/index";
-import { BASIC_PARSER_OPTIONS } from "./test-utils";
+import { generateParserOptions } from "./test-utils";
 
 function createLinter() {
   const linter = new Linter();
@@ -246,10 +246,7 @@ describe("eslint custom parser", () => {
         const linter = createLinter();
         const result = linter.verifyAndFix(code, {
           parser: "svelte-eslint-parser",
-          parserOptions: {
-            ...BASIC_PARSER_OPTIONS,
-            ...(parserOptions ? parserOptions : {}),
-          },
+          parserOptions: generateParserOptions(parserOptions),
           rules: {
             "no-unused-labels": "error",
             "no-extra-label": "error",
diff --git a/tests/src/parser/parser.ts b/tests/src/parser/parser.ts
@@ -15,7 +15,7 @@ import type { Comment, SvelteProgram, Token } from "../../../src/ast";
 import { sortNodes } from "../../../src/parser/sort";
 
 function parse(code: string, filePath: string, config: any) {
-  return parseForESLint(code, generateParserOptions(filePath, config));
+  return parseForESLint(code, generateParserOptions({ filePath }, config));
 }
 
 describe("Check for AST.", () => {
diff --git a/tests/src/parser/test-utils.ts b/tests/src/parser/test-utils.ts
@@ -19,14 +19,13 @@ const BASIC_PARSER_OPTIONS: Linter.ParserOptions = {
   extraFileExtensions: [".svelte"],
 };
 export function generateParserOptions(
-  filePath: string,
-  options: Linter.ParserOptions
+  ...options: Linter.ParserOptions[]
 ): Linter.ParserOptions {
-  return {
-    ...BASIC_PARSER_OPTIONS,
-    filePath,
-    ...options,
-  };
+  let result = { ...BASIC_PARSER_OPTIONS };
+  for (const option of options) {
+    result = { ...result, ...option };
+  }
+  return result;
 }
 export function* listupFixtures(dir?: string): Iterable<{
   input: string;
diff --git a/tests/src/parser/typescript/index.ts b/tests/src/parser/typescript/index.ts
@@ -16,8 +16,7 @@ describe("Check for typescript analyze result.", () => {
       continue;
     }
     describe(inputFileName, () => {
-      const parserOptions = {
-        ...generateParserOptions(inputFileName, config),
+      const parserOptions = generateParserOptions(config, {
         ecmaVersion: 2020,
         sourceType: "module",
         loc: true,
@@ -28,8 +27,7 @@ describe("Check for typescript analyze result.", () => {
         eslintVisitorKeys: true,
         eslintScopeManager: true,
         filePath: inputFileName,
-      };
-
+      });
       const ctx = new Context(input, parserOptions);
       parseTemplate(ctx.sourceCode.template, ctx, parserOptions);
 
diff --git a/tools/update-fixtures.ts b/tools/update-fixtures.ts
@@ -38,7 +38,7 @@ const RULES = [
  * Parse
  */
 function parse(code: string, filePath: string, config: any) {
-  return parseForESLint(code, generateParserOptions(filePath, config));
+  return parseForESLint(code, generateParserOptions({ filePath }, config));
 }
 
 for (const {
@@ -76,7 +76,7 @@ for (const {
       input,
       {
         parser: "svelte-eslint-parser",
-        parserOptions: generateParserOptions(inputFileName, config),
+        parserOptions: generateParserOptions(config),
         rules: {
           [rule]: "error",
         },
