Commitd824eb7

authored

fix: escape special characters in glob patterns (#858)

1 parent881f82d commitd824eb7Copy full SHA for d824eb7

File tree

+16

-3

lines changed

+16

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import { join, resolve } from 'node:path'`
`3`	`3`	`import{slash,toArray}from'@antfu/utils'`
`4`	`4`	`import{getPackageInfoSync,isPackageExists}from'local-pkg'`
`5`	`5`	`import{detectTypeImports}from'./type-imports/detect'`
	`6`	`+import{escapeSpecialChars}from'./utils'`
`6`	`7`
`7`	`8`	`exportconstdefaultOptions:Omit<Required<Options>,'include'\|'exclude'\|'excludeNames'\|'transformer'\|'globs'\|'globsExclude'\|'directives'\|'types'\|'version'>={`
`8`	`9`	`dirs:'src/components',`
`@@ -63,8 +64,8 @@ export function resolveOptions(options: Options, root: string): ResolvedOptions`
`63`	`64`	`i=i.slice(1)`
`64`	`65`	`}`
`65`	`66`	`returnresolved.deep`
`66`		- ?prefix+slash(join(i,`*/.${extsGlob}`))
`67`		- :prefix+slash(join(i,`*.${extsGlob}`))
	`67`	+ ?prefix+escapeSpecialChars(slash(join(i,`*/.${extsGlob}`)))
	`68`	+ :prefix+escapeSpecialChars(slash(join(i,`*.${extsGlob}`)))
`68`	`69`	`})`
`69`	`70`
`70`	`71`	`if(!resolved.extensions.length)`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -242,3 +242,9 @@ export function isExclude(name: string, exclude?: FilterPattern): boolean {`
`242`	`242`	`}`
`243`	`243`	`returnfalse`
`244`	`244`	`}`
	`245`	`+`
	`246`	`+constESCAPE_PARENTHESES_REGEX=/[()]/g`
	`247`	`+`
	`248`	`+exportfunctionescapeSpecialChars(str:string):string{`
	`249`	`+returnstr.replace(ESCAPE_PARENTHESES_REGEX,'\\$&')`
	`250`	`+}`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`importtype{ResolvedOptions}from'../src'`
`2`	`2`	`import{describe,expect,it}from'vitest'`
`3`		`-import{getNameFromFilePath}from'../src/core/utils'`
	`3`	`+import{escapeSpecialChars,getNameFromFilePath}from'../src/core/utils'`
`4`	`4`
`5`	`5`	`describe('getNameFromFilePath',()=>{`
`6`	`6`	`constoptions:Partial<ResolvedOptions>={`
`@@ -20,3 +20,9 @@ describe('getNameFromFilePath', () => {`
`20`	`20`	`expect(getNameFromFilePath(inComponentFilePath,optionsasResolvedOptions)).toBe('a1-b2-c3-d4-ef-ghi')`
`21`	`21`	`})`
`22`	`22`	`})`
	`23`	`+`
	`24`	`+describe('escapeSpecialChars',()=>{`
	`25`	`+it('should escape parentheses',()=>{`
	`26`	`+expect(escapeSpecialChars('component()')).toBe('component\$\$')`
	`27`	`+})`
	`28`	`+})`

Comments

(0)