Skip to content

Commit bbfae0e

Browse files
committed
-> svelteFileType
1 parent a36d935 commit bbfae0e

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

packages/eslint-plugin-svelte/src/utils/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function satisfiesCondition(
1515
): boolean {
1616
if (
1717
doesNotSatisfy(svelteContext.svelteVersion, condition.svelteVersions) ||
18-
doesNotSatisfy(svelteContext.fileType, condition.fileTypes) ||
18+
doesNotSatisfy(svelteContext.svelteFileType, condition.fileTypes) ||
1919
doesNotSatisfy(svelteContext.runes, condition.runes) ||
2020
doesNotSatisfy(svelteContext.svelteKitVersion, condition.svelteKitVersions) ||
2121
doesNotSatisfy(svelteContext.svelteKitFileType, condition.svelteKitFileTypes)

packages/eslint-plugin-svelte/src/utils/svelte-context.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const isRunInBrowser = !fs.readFileSync;
88

99
export type SvelteContext = {
1010
svelteVersion: '3/4' | '5';
11-
fileType: '.svelte' | '.svelte.[js|ts]';
11+
svelteFileType: '.svelte' | '.svelte.[js|ts]';
1212
runes: boolean;
1313
svelteKitVersion: '1-next' | '1' | '2' | null;
1414
svelteKitFileType:
@@ -23,7 +23,7 @@ export type SvelteContext = {
2323
| null;
2424
};
2525

26-
function getFileType(filePath: string): SvelteContext['fileType'] | null {
26+
function getFileType(filePath: string): SvelteContext['svelteFileType'] | null {
2727
if (filePath.endsWith('.svelte')) {
2828
return '.svelte';
2929
}
@@ -194,7 +194,7 @@ export function getSvelteContext(context: RuleContext): SvelteContext | null {
194194
return {
195195
svelteVersion: getSvelteVersion(compilerVersion),
196196
runes,
197-
fileType,
197+
svelteFileType: fileType,
198198
svelteKitVersion: svelteKitContext.svelteKitVersion,
199199
svelteKitFileType: svelteKitContext.svelteKitFileType
200200
};

packages/eslint-plugin-svelte/tests/src/index.spec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,39 @@ import { shouldRun } from '../../src/utils/index.js';
33

44
const actualSvelte3: Parameters<typeof shouldRun>[0] = {
55
svelteVersion: '3/4',
6-
fileType: '.svelte',
6+
svelteFileType: '.svelte',
77
runes: false,
88
svelteKitVersion: null,
99
svelteKitFileType: null
1010
};
1111

1212
const actualSvelte5: Parameters<typeof shouldRun>[0] = {
1313
svelteVersion: '5',
14-
fileType: '.svelte',
14+
svelteFileType: '.svelte',
1515
runes: true,
1616
svelteKitVersion: null,
1717
svelteKitFileType: null
1818
};
1919

2020
const actualSvelte5Script: Parameters<typeof shouldRun>[0] = {
2121
svelteVersion: '5',
22-
fileType: '.svelte.[js|ts]',
22+
svelteFileType: '.svelte.[js|ts]',
2323
runes: true,
2424
svelteKitVersion: null,
2525
svelteKitFileType: null
2626
};
2727

2828
const actualSvelteKit: Parameters<typeof shouldRun>[0] = {
2929
svelteVersion: '5',
30-
fileType: '.svelte',
30+
svelteFileType: '.svelte',
3131
runes: true,
3232
svelteKitVersion: '2',
3333
svelteKitFileType: '+page.svelte'
3434
};
3535

3636
const actualSvelteKitNotRoute: Parameters<typeof shouldRun>[0] = {
3737
svelteVersion: '5',
38-
fileType: '.svelte',
38+
svelteFileType: '.svelte',
3939
runes: true,
4040
svelteKitVersion: '2',
4141
svelteKitFileType: null

0 commit comments

Comments
 (0)