Skip to content

Commit 531911a

Browse files
committed
number to string
1 parent f1a1cca commit 531911a

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import { getFilename, getSourceCode } from './compat.js';
77
const isRunInBrowser = !fs.readFileSync;
88

99
export type SvelteContext = {
10-
svelteVersion: '3/4' | 5;
10+
svelteVersion: '3/4' | '5';
1111
fileType: '.svelte' | '.svelte.[js|ts]';
1212
runes: boolean;
13-
svelteKitVersion: '1-next' | 1 | 2 | null;
13+
svelteKitVersion: '1-next' | '1' | '2' | null;
1414
svelteKitFileType:
1515
| '+page.svelte'
1616
| '+page.js'
@@ -122,14 +122,14 @@ function getSvelteKitContext(
122122
*/
123123
function getSvelteKitVersion(filePath: string): SvelteContext['svelteKitVersion'] {
124124
// Hack: if it runs in browser, it regards as SvelteKit project.
125-
if (isRunInBrowser) return 2;
125+
if (isRunInBrowser) return '2';
126126
try {
127127
const packageJson = getPackageJson(filePath);
128128
if (!packageJson) return null;
129129
if (packageJson.name === 'eslint-plugin-svelte')
130130
// Hack: CI removes `@sveltejs/kit` and it returns false and test failed.
131131
// So always it returns true if it runs on the package.
132-
return 2;
132+
return '2';
133133

134134
const version =
135135
packageJson.dependencies?.['@sveltejs/kit'] ?? packageJson.devDependencies?.['@sveltejs/kit'];
@@ -139,12 +139,12 @@ function getSvelteKitVersion(filePath: string): SvelteContext['svelteKitVersion'
139139
if (version.startsWith('1.0.0-next.')) {
140140
return '1-next';
141141
} else if (version.startsWith('1.')) {
142-
return 1;
142+
return '1';
143143
} else if (version.startsWith('2.')) {
144-
return 2;
144+
return '2';
145145
}
146146
// If unknown version, it recognize as v2.
147-
return 2;
147+
return '2';
148148
} catch {
149149
return null;
150150
}
@@ -155,7 +155,7 @@ function getSvelteVersion(compilerVersion: string): SvelteContext['svelteVersion
155155
if (version === 3 || version === 4) {
156156
return '3/4';
157157
}
158-
return 5;
158+
return '5';
159159
}
160160

161161
/**

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,34 @@ const actualSvelte3: Parameters<typeof shouldRun>[0] = {
1010
};
1111

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

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

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

3636
const actualSvelteKitNotRoute: Parameters<typeof shouldRun>[0] = {
37-
svelteVersion: 5,
37+
svelteVersion: '5',
3838
fileType: '.svelte',
3939
runes: true,
40-
svelteKitVersion: 2,
40+
svelteKitVersion: '2',
4141
svelteKitFileType: null
4242
};
4343

@@ -84,7 +84,7 @@ describe('shouldRun', () => {
8484
assert.strictEqual(
8585
shouldRun(actualSvelte3, [
8686
{
87-
svelteVersions: [5]
87+
svelteVersions: ['5']
8888
}
8989
]),
9090
false
@@ -98,7 +98,7 @@ describe('shouldRun', () => {
9898
svelteVersions: ['3/4']
9999
},
100100
{
101-
svelteVersions: [5]
101+
svelteVersions: ['5']
102102
}
103103
]),
104104
true
@@ -123,7 +123,7 @@ describe('shouldRun', () => {
123123
assert.strictEqual(
124124
shouldRun(actualSvelte5, [
125125
{
126-
svelteVersions: [5],
126+
svelteVersions: ['5'],
127127
runes: [true]
128128
}
129129
]),
@@ -135,7 +135,7 @@ describe('shouldRun', () => {
135135
assert.strictEqual(
136136
shouldRun(actualSvelte5, [
137137
{
138-
svelteVersions: [5],
138+
svelteVersions: ['5'],
139139
runes: [false]
140140
}
141141
]),
@@ -158,7 +158,7 @@ describe('shouldRun', () => {
158158
assert.strictEqual(
159159
shouldRun(actualSvelte5, [
160160
{
161-
svelteVersions: [5],
161+
svelteVersions: ['5'],
162162
fileTypes: ['.svelte'],
163163
runes: [true]
164164
}
@@ -171,7 +171,7 @@ describe('shouldRun', () => {
171171
assert.strictEqual(
172172
shouldRun(actualSvelte5, [
173173
{
174-
svelteVersions: [5],
174+
svelteVersions: ['5'],
175175
fileTypes: ['.svelte'],
176176
runes: [false]
177177
}
@@ -184,7 +184,7 @@ describe('shouldRun', () => {
184184
assert.strictEqual(
185185
shouldRun(actualSvelte5Script, [
186186
{
187-
svelteVersions: [5],
187+
svelteVersions: ['5'],
188188
fileTypes: ['.svelte.[js|ts]'],
189189
runes: [true]
190190
}
@@ -197,7 +197,7 @@ describe('shouldRun', () => {
197197
assert.strictEqual(
198198
shouldRun(actualSvelteKit, [
199199
{
200-
svelteKitVersions: [2],
200+
svelteKitVersions: ['2'],
201201
svelteKitFileTypes: ['+page.svelte']
202202
}
203203
]),
@@ -220,7 +220,7 @@ describe('shouldRun', () => {
220220
assert.strictEqual(
221221
shouldRun(actualSvelteKit, [
222222
{
223-
svelteKitVersions: [2],
223+
svelteKitVersions: ['2'],
224224
svelteKitFileTypes: [null]
225225
}
226226
]),
@@ -232,7 +232,7 @@ describe('shouldRun', () => {
232232
assert.strictEqual(
233233
shouldRun(actualSvelteKitNotRoute, [
234234
{
235-
svelteKitVersions: [2],
235+
svelteKitVersions: ['2'],
236236
svelteKitFileTypes: [null]
237237
}
238238
]),
@@ -244,7 +244,7 @@ describe('shouldRun', () => {
244244
assert.strictEqual(
245245
shouldRun(actualSvelteKitNotRoute, [
246246
{
247-
svelteKitVersions: [2],
247+
svelteKitVersions: ['2'],
248248
svelteKitFileTypes: ['+page.svelte']
249249
}
250250
]),

0 commit comments

Comments
 (0)