Skip to content

Commit 409780f

Browse files
ota-meshiota-meshi
committed
fix: test
1 parent 811a010 commit 409780f

19 files changed

+38
-50
lines changed

Diff for: ‎tests/fixtures/integrations/parser-object-tests/ts-multiple-parser-setup.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
2-
import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
2+
import { generateParserOptions } from "../../../src/parser/test-utils";
33
import * as ts from "@typescript-eslint/parser";
44

55
export function getConfig() {
66
return {
77
parser: "svelte-eslint-parser",
8-
parserOptions: {
9-
...BASIC_PARSER_OPTIONS,
10-
parser: { ts },
11-
},
8+
parserOptions: generateParserOptions({ parser: { ts } }),
129
env: {
1310
browser: true,
1411
es2021: true,

Diff for: ‎tests/fixtures/integrations/parser-object-tests/ts-single-parser-setup.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
2-
import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
2+
import { generateParserOptions } from "../../../src/parser/test-utils";
33
import * as parser from "@typescript-eslint/parser";
44

55
export function getConfig() {
66
return {
77
parser: "svelte-eslint-parser",
8-
parserOptions: {
9-
...BASIC_PARSER_OPTIONS,
10-
parser,
11-
},
8+
parserOptions: generateParserOptions({ parser }),
129
env: {
1310
browser: true,
1411
es2021: true,

Diff for: ‎tests/fixtures/integrations/type-info-tests/await-setup.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
22
import type { Linter } from "eslint";
3-
import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
3+
import { generateParserOptions } from "../../../src/parser/test-utils";
44
import { rules } from "@typescript-eslint/eslint-plugin";
55
export function setupLinter(linter: Linter) {
66
linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
1212
export function getConfig() {
1313
return {
1414
parser: "svelte-eslint-parser",
15-
parserOptions: BASIC_PARSER_OPTIONS,
15+
parserOptions: generateParserOptions(),
1616
rules: {
1717
"@typescript-eslint/no-unsafe-call": "error",
1818
},

Diff for: ‎tests/fixtures/integrations/type-info-tests/i18n-setup.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
22
import type { Linter } from "eslint";
3-
import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
3+
import { generateParserOptions } from "../../../src/parser/test-utils";
44
import { rules } from "@typescript-eslint/eslint-plugin";
55
export function setupLinter(linter: Linter) {
66
linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
1212
export function getConfig() {
1313
return {
1414
parser: "svelte-eslint-parser",
15-
parserOptions: BASIC_PARSER_OPTIONS,
15+
parserOptions: generateParserOptions(),
1616
rules: {
1717
"@typescript-eslint/no-unsafe-call": "error",
1818
},

Diff for: ‎tests/fixtures/integrations/type-info-tests/issue226-setup.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
22
import type { Linter } from "eslint";
3-
import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
3+
import { generateParserOptions } from "../../../src/parser/test-utils";
44
import { rules } from "@typescript-eslint/eslint-plugin";
55
export function setupLinter(linter: Linter) {
66
linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
1212
export function getConfig() {
1313
return {
1414
parser: "svelte-eslint-parser",
15-
parserOptions: BASIC_PARSER_OPTIONS,
15+
parserOptions: generateParserOptions,
1616
rules: {
1717
"@typescript-eslint/no-unsafe-argument": "error",
1818
},

Diff for: ‎tests/fixtures/integrations/type-info-tests/no-unnecessary-condition01-setup.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
22
import type { Linter } from "eslint";
3-
import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
3+
import { generateParserOptions } from "../../../src/parser/test-utils";
44
import { rules } from "@typescript-eslint/eslint-plugin";
55
export function setupLinter(linter: Linter) {
66
linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
1212
export function getConfig() {
1313
return {
1414
parser: "svelte-eslint-parser",
15-
parserOptions: BASIC_PARSER_OPTIONS,
15+
parserOptions: generateParserOptions(),
1616
rules: {
1717
"@typescript-eslint/no-unnecessary-condition": "error",
1818
},

Diff for: ‎tests/fixtures/integrations/type-info-tests/plugin-issue254-setup.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
22
import type { Linter } from "eslint";
3-
import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
3+
import { generateParserOptions } from "../../../src/parser/test-utils";
44
import { rules } from "@typescript-eslint/eslint-plugin";
55
export function setupLinter(linter: Linter) {
66
linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
1212
export function getConfig() {
1313
return {
1414
parser: "svelte-eslint-parser",
15-
parserOptions: BASIC_PARSER_OPTIONS,
15+
parserOptions: generateParserOptions(),
1616
rules: {
1717
"@typescript-eslint/no-unnecessary-condition": "error",
1818
},

Diff for: ‎tests/fixtures/integrations/type-info-tests/reactive-setup.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
22
import type { Linter } from "eslint";
3-
import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
3+
import { generateParserOptions } from "../../../src/parser/test-utils";
44
import { rules } from "@typescript-eslint/eslint-plugin";
55
export function setupLinter(linter: Linter) {
66
linter.defineRule(
@@ -28,7 +28,7 @@ export function setupLinter(linter: Linter) {
2828
export function getConfig() {
2929
return {
3030
parser: "svelte-eslint-parser",
31-
parserOptions: BASIC_PARSER_OPTIONS,
31+
parserOptions: generateParserOptions(),
3232
rules: {
3333
"@typescript-eslint/no-unsafe-argument": "error",
3434
"@typescript-eslint/no-unsafe-assignment": "error",

Diff for: ‎tests/fixtures/integrations/type-info-tests/reactive2-setup.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
22
import type { Linter } from "eslint";
3-
import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
3+
import { generateParserOptions } from "../../../src/parser/test-utils";
44
import { rules } from "@typescript-eslint/eslint-plugin";
55
export function setupLinter(linter: Linter) {
66
linter.defineRule(
@@ -16,7 +16,7 @@ export function setupLinter(linter: Linter) {
1616
export function getConfig() {
1717
return {
1818
parser: "svelte-eslint-parser",
19-
parserOptions: BASIC_PARSER_OPTIONS,
19+
parserOptions: generateParserOptions(),
2020
rules: {
2121
"@typescript-eslint/no-unsafe-assignment": "error",
2222
"@typescript-eslint/no-unsafe-member-access": "error",

Diff for: ‎tests/fixtures/integrations/type-info-tests/ts-newline-setup.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
22
import type { Linter } from "eslint";
3-
import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
3+
import { generateParserOptions } from "../../../src/parser/test-utils";
44
import { rules } from "@typescript-eslint/eslint-plugin";
55
export function setupLinter(linter: Linter) {
66
linter.defineRule(
@@ -16,7 +16,7 @@ export function setupLinter(linter: Linter) {
1616
export function getConfig() {
1717
return {
1818
parser: "svelte-eslint-parser",
19-
parserOptions: BASIC_PARSER_OPTIONS,
19+
parserOptions: generateParserOptions(),
2020
rules: {
2121
"@typescript-eslint/no-confusing-void-expression": "error",
2222
"@typescript-eslint/explicit-function-return-type": "error",

Diff for: ‎tests/fixtures/integrations/type-info-tests/ts-no-misused-promises-setup.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint eslint-comments/require-description: 0, @typescript-eslint/explicit-module-boundary-types: 0 */
22
import type { Linter } from "eslint";
3-
import { BASIC_PARSER_OPTIONS } from "../../../src/parser/test-utils";
3+
import { generateParserOptions } from "../../../src/parser/test-utils";
44
import { rules } from "@typescript-eslint/eslint-plugin";
55
export function setupLinter(linter: Linter) {
66
linter.defineRule(
@@ -12,7 +12,7 @@ export function setupLinter(linter: Linter) {
1212
export function getConfig() {
1313
return {
1414
parser: "svelte-eslint-parser",
15-
parserOptions: BASIC_PARSER_OPTIONS,
15+
parserOptions: generateParserOptions(),
1616
rules: {
1717
"@typescript-eslint/no-misused-promises": "error",
1818
},

Diff for: ‎tests/src/integrations.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe("Integration tests.", () => {
3939
input,
4040
setup?.getConfig?.() ?? {
4141
parser: "svelte-eslint-parser",
42-
parserOptions: generateParserOptions(inputFileName, config),
42+
parserOptions: generateParserOptions(config),
4343
env: {
4444
browser: true,
4545
es2021: true,

Diff for: ‎tests/src/parser/error.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const ERROR_FIXTURE_ROOT = path.resolve(
1515
);
1616

1717
function parse(code: string, filePath: string, config: any) {
18-
return parseForESLint(code, generateParserOptions(filePath, config));
18+
return parseForESLint(code, generateParserOptions({ filePath }, config));
1919
}
2020

2121
describe("Check for Error.", () => {

Diff for: ‎tests/src/parser/eslint-rules.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe("svelte-eslint-parser with ESLint rules", () => {
5151
input,
5252
{
5353
parser: "svelte-eslint-parser",
54-
parserOptions: generateParserOptions(inputFileName, config),
54+
parserOptions: generateParserOptions(config),
5555
rules: {
5656
[rule]: "error",
5757
},

Diff for: ‎tests/src/parser/eslint.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Linter } from "eslint";
22
import assert from "assert";
33
import semver from "semver";
44
import * as parser from "../../../src/index";
5-
import { BASIC_PARSER_OPTIONS } from "./test-utils";
5+
import { generateParserOptions } from "./test-utils";
66

77
function createLinter() {
88
const linter = new Linter();
@@ -246,10 +246,7 @@ describe("eslint custom parser", () => {
246246
const linter = createLinter();
247247
const result = linter.verifyAndFix(code, {
248248
parser: "svelte-eslint-parser",
249-
parserOptions: {
250-
...BASIC_PARSER_OPTIONS,
251-
...(parserOptions ? parserOptions : {}),
252-
},
249+
parserOptions: generateParserOptions(parserOptions),
253250
rules: {
254251
"no-unused-labels": "error",
255252
"no-extra-label": "error",

Diff for: ‎tests/src/parser/parser.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import type { Comment, SvelteProgram, Token } from "../../../src/ast";
1515
import { sortNodes } from "../../../src/parser/sort";
1616

1717
function parse(code: string, filePath: string, config: any) {
18-
return parseForESLint(code, generateParserOptions(filePath, config));
18+
return parseForESLint(code, generateParserOptions({ filePath }, config));
1919
}
2020

2121
describe("Check for AST.", () => {

Diff for: ‎tests/src/parser/test-utils.ts

+6-7
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ const BASIC_PARSER_OPTIONS: Linter.ParserOptions = {
1919
extraFileExtensions: [".svelte"],
2020
};
2121
export function generateParserOptions(
22-
filePath: string,
23-
options: Linter.ParserOptions
22+
...options: Linter.ParserOptions[]
2423
): Linter.ParserOptions {
25-
return {
26-
...BASIC_PARSER_OPTIONS,
27-
filePath,
28-
...options,
29-
};
24+
let result = { ...BASIC_PARSER_OPTIONS };
25+
for (const option of options) {
26+
result = { ...result, ...option };
27+
}
28+
return result;
3029
}
3130
export function* listupFixtures(dir?: string): Iterable<{
3231
input: string;

Diff for: ‎tests/src/parser/typescript/index.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ describe("Check for typescript analyze result.", () => {
1616
continue;
1717
}
1818
describe(inputFileName, () => {
19-
const parserOptions = {
20-
...generateParserOptions(inputFileName, config),
19+
const parserOptions = generateParserOptions(config, {
2120
ecmaVersion: 2020,
2221
sourceType: "module",
2322
loc: true,
@@ -28,8 +27,7 @@ describe("Check for typescript analyze result.", () => {
2827
eslintVisitorKeys: true,
2928
eslintScopeManager: true,
3029
filePath: inputFileName,
31-
};
32-
30+
});
3331
const ctx = new Context(input, parserOptions);
3432
parseTemplate(ctx.sourceCode.template, ctx, parserOptions);
3533

Diff for: ‎tools/update-fixtures.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const RULES = [
3838
* Parse
3939
*/
4040
function parse(code: string, filePath: string, config: any) {
41-
return parseForESLint(code, generateParserOptions(filePath, config));
41+
return parseForESLint(code, generateParserOptions({ filePath }, config));
4242
}
4343

4444
for (const {
@@ -76,7 +76,7 @@ for (const {
7676
input,
7777
{
7878
parser: "svelte-eslint-parser",
79-
parserOptions: generateParserOptions(inputFileName, config),
79+
parserOptions: generateParserOptions(config),
8080
rules: {
8181
[rule]: "error",
8282
},

0 commit comments

Comments
 (0)