@@ -61,7 +61,7 @@ export function loadTestCases(
6161 valid ?: ( RuleTester . ValidTestCase | string ) [ ]
6262 invalid ?: RuleTester . InvalidTestCase [ ]
6363 }
64- filter : ( file : string ) => boolean
64+ filter ? : ( file : string ) => boolean
6565 } ,
6666) : {
6767 valid : RuleTester . ValidTestCase [ ]
@@ -88,8 +88,8 @@ export function loadTestCases(
8888 . filter ( filter )
8989 . map ( ( inputFile ) => {
9090 const config = getConfig ( ruleName , inputFile )
91- const errorFile = inputFile . replace ( / i n p u t \. s v e l t e $ / u, "errors.json" )
92- const outputFile = inputFile . replace ( / i n p u t \. s v e l t e $ / u, "output.svelte" )
91+ const errorFile = inputFile . replace ( / i n p u t \. [ a - z ] + $ / u, "errors.json" )
92+ const outputFile = inputFile . replace ( / i n p u t \. [ a - z ] + $ / u, "output.svelte" )
9393 let errors
9494 try {
9595 errors = fs . readFileSync ( errorFile , "utf8" )
@@ -147,7 +147,7 @@ function* itrListupInput(rootDir: string): IterableIterator<string> {
147147 continue
148148 }
149149 const abs = path . join ( rootDir , filename )
150- if ( filename . endsWith ( "input.svelte " ) ) {
150+ if ( path . basename ( filename , path . extname ( filename ) ) . endsWith ( "input" ) ) {
151151 yield abs
152152 } else if ( fs . statSync ( abs ) . isDirectory ( ) ) {
153153 yield * itrListupInput ( abs )
@@ -161,8 +161,8 @@ function writeFixtures(
161161 { force } : { force ?: boolean } = { } ,
162162) {
163163 const linter = getLinter ( ruleName )
164- const errorFile = inputFile . replace ( / i n p u t \. s v e l t e $ / u, "errors.json" )
165- const outputFile = inputFile . replace ( / i n p u t \. s v e l t e $ / u, "output.svelte" )
164+ const errorFile = inputFile . replace ( / i n p u t \. [ a - z ] + $ / u, "errors.json" )
165+ const outputFile = inputFile . replace ( / i n p u t \. [ a - z ] + $ / u, "output.svelte" )
166166
167167 const config = getConfig ( ruleName , inputFile )
168168
@@ -222,23 +222,17 @@ function getConfig(ruleName: string, inputFile: string) {
222222 const filename = inputFile . slice ( inputFile . indexOf ( ruleName ) )
223223 const code = fs . readFileSync ( inputFile , "utf8" )
224224 let config
225- let configFile : string = inputFile . replace ( / i n p u t \. s v e l t e $ / u, "config.json" )
225+ let configFile : string = inputFile . replace ( / i n p u t \. [ a - z ] + $ / u, "config.json" )
226226 if ( ! fs . existsSync ( configFile ) ) {
227227 configFile = path . join ( path . dirname ( inputFile ) , "_config.json" )
228228 }
229229 if ( fs . existsSync ( configFile ) ) {
230230 config = JSON . parse ( fs . readFileSync ( configFile , "utf8" ) )
231231 }
232- if ( config && typeof config === "object" ) {
233- return Object . assign (
234- { parser : require . resolve ( "svelte-eslint-parser" ) } ,
235- config ,
236- { code, filename } ,
237- )
238- }
239- // default
240- return Object . assign (
241- { parser : require . resolve ( "svelte-eslint-parser" ) } ,
242- { code, filename } ,
243- )
232+ const parser =
233+ path . extname ( filename ) === ".svelte"
234+ ? require . resolve ( "svelte-eslint-parser" )
235+ : undefined
236+
237+ return Object . assign ( { parser } , config , { code, filename } )
244238}
0 commit comments