Commit37f6e09

authored

Avoid closing files multiple times ingetInterpreter(#17665)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>Co-authored-by: fisker Cheung <lionkay@gmail.com>

1 parent0e6ec98 commit37f6e09Copy full SHA for 37f6e09

File tree

+19

-18

lines changed

+19

-18

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,8 @@`
	`1`	`+####Avoid closing files multiple times (#17665 by@43081j)`
	`2`	`+`
	`3`	`+When reading a file to infer the interpreter from a shebang, we use the`
	`4`	+`n-readlines` library to read the first line in order to get the shebang.
	`5`	`+`
	`6`	`+This library closes files when it reaches EOF, and we later try close the same`
	`7`	+files again. We now close files only if`n-readlines` did not already close
	`8`	`+them.`

Lines changed: 11 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,21 @@`
`1`		`-importfsfrom"node:fs";`
`2`	`1`	`importreadlinesfrom"n-readlines";`
`3`	`2`
`4`	`3`	`/**`
`5`	`4`	`*@param {string \| URL} file`
`6`	`5`	`*@returns {string \| undefined}`
`7`	`6`	`*/`
`8`	`7`	`functiongetInterpreter(file){`
`9`		`-letfd;`
`10`	`8`	`try{`
`11`		`-fd=fs.openSync(file,"r");`
`12`		`-}catch{`
`13`		`-/* c8 ignore next */`
`14`		`-return;`
`15`		`-}`
	`9`	`+constliner=newreadlines(file);`
	`10`	`+constfirstLineBuffer=liner.next();`
`16`	`11`
`17`		`-try{`
`18`		`-constliner=newreadlines(fd);`
`19`		`-constfirstLine=liner.next().toString("utf8");`
	`12`	`+if(firstLineBuffer===false){`
	`13`	`+return;`
	`14`	`+}`
	`15`	`+`
	`16`	`+liner.close();`
	`17`	`+`
	`18`	`+constfirstLine=firstLineBuffer.toString("utf8");`
`20`	`19`
`21`	`20`	`// #!/bin/env node, #!/usr/bin/env node`
`22`	`21`	`constm1=firstLine.match(/^#!\/(?:usr\/)?bin\/env\s+(\S+)/u);`
`@@ -29,14 +28,8 @@ function getInterpreter(file) {`
`29`	`28`	`if(m2){`
`30`	`29`	`returnm2[1];`
`31`	`30`	`}`
`32`		`-}finally{`
`33`		`-try{`
`34`		`-// There are some weird cases where paths are missing, causing Jest`
`35`		`-// failures. It's unclear what these correspond to in the real world.`
`36`		`-fs.closeSync(fd);`
`37`		`-}catch{`
`38`		`-// noop`
`39`		`-}`
	`31`	`+}catch{`
	`32`	`+// couldn't open the file`
`40`	`33`	`}`
`41`	`34`	`}`
`42`	`35`

Comments

(0)