Commit5e10fd0

authored

[ATA] Remove duplicate modules from getReferencesForModule (#3391)

1 parent3977b08 commit5e10fd0Copy full SHA for 5e10fd0

File tree

+24

-12

lines changed

+24

-12

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,5 @@`
	`1`	`+---`
	`2`	`+"@typescript/ata":patch`
	`3`	`+---`
	`4`	`+`
	`5`	`+Remove duplicate modules from getReferencesForModule`

Lines changed: 14 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -173,19 +173,21 @@ export const getReferencesForModule = (ts: typeof import("typescript"), code: st`
`173`	`173`	`.filter(f=>!isDtsFile(f.fileName))`
`174`	`174`	`.filter(d=>!libMap.has(d.fileName))`
`175`	`175`
`176`		`-returnreferences.map(r=>{`
`177`		`-letversion=undefined`
`178`		`-if(!r.fileName.startsWith(".")){`
`179`		`-version="latest"`
`180`		`-constline=code.slice(r.end).split("\n")[0]!`
`181`		`-if(line.includes("// types:"))version=line.split("// types: ")[1]!.trim()`
`182`		`-}`
	`176`	`+returnreferences`
	`177`	`+.map(r=>{`
	`178`	`+letversion=undefined`
	`179`	`+if(!r.fileName.startsWith(".")){`
	`180`	`+version="latest"`
	`181`	`+constline=code.slice(r.end).split("\n")[0]!`
	`182`	`+if(line.includes("// types:"))version=line.split("// types: ")[1]!.trim()`
	`183`	`+}`
`183`	`184`
`184`		`-return{`
`185`		`-module:r.fileName,`
`186`		`- version,`
`187`		`-}`
`188`		`-})`
	`185`	`+return{`
	`186`	`+module:r.fileName,`
	`187`	`+ version,`
	`188`	`+}`
	`189`	`+})`
	`190`	`+.filter((r,index,self)=>self.findIndex(m=>m.module===r.module&&m.version===r.version)===index)`
`189`	`191`	`}`
`190`	`192`
`191`	`193`	`/** A list of modules from the current sourcefile which we don't have existing files for */`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,11 @@ describe(getReferencesForModule, () => {`
`16`	`16`	`constcode="import {asda} from '123' // types: 1.2.3"`
`17`	`17`	`expect(getReferencesForModule(ts,code)[0]).toEqual({module:"123",version:"1.2.3"})`
`18`	`18`	`})`
	`19`	`+`
	`20`	`+it("removes duplicate imports",()=>{`
	`21`	`+constcode="import 'abc'; import {asda} from 'abc'"`
	`22`	`+expect(getReferencesForModule(ts,code).map(m=>m.module)).toEqual(["abc"])`
	`23`	`+})`
`19`	`24`	`})`
`20`	`25`
`21`	`26`	`describe("ignores lib references",()=>{`

Comments

(0)