microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-03-06 02:00:01 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Pass throwIfNoEntry to fs.statSync (#41604)

Browse Source 
Future versions of node will be able to return undefined, rather than
allocating and throwing an exception, when a file is not found.

See https://github.com/nodejs/node/pull/33716
This commit is contained in:
Andrew Casey 2020-11-23 12:43:00 -08:00 committed by GitHub
parent 54f8d38535
commit 669305b914
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/compiler/sys.ts
View File

@ -1271,8 +1271,8 @@ namespace ts {
},
getFileSize(path) {
try {
const stat = _fs.statSync(path);
if (stat.isFile()) {
const stat = statSync(path);
if (stat?.isFile()) {
return stat.size;
}
}
@ -1319,6 +1319,16 @@ namespace ts {
};
return nodeSystem;
/**
* `throwIfNoEntry` was added so recently that it's not in the node types.
* This helper encapsulates the mitigating usage of `any`.
* See https://github.com/nodejs/node/pull/33716
*/
function statSync(path: string): import("fs").Stats | undefined {
// throwIfNoEntry will be ignored by older versions of node
return (_fs as any).statSync(path, { throwIfNoEntry: false });
}
/**
* Uses the builtin inspector APIs to capture a CPU profile
* See https://nodejs.org/api/inspector.html#inspector_example_usage for details
@ -1377,7 +1387,7 @@ namespace ts {
activeSession.post("Profiler.stop", (err, { profile }) => {
if (!err) {
try {
if (_fs.statSync(profilePath).isDirectory()) {
if (statSync(profilePath)?.isDirectory()) {
profilePath = _path.join(profilePath, `${(new Date()).toISOString().replace(/:/g, "-")}+P${process.pid}.cpuprofile`);
}
}
@ -1667,7 +1677,10 @@ namespace ts {
const name = combinePaths(path, entry);
try {
stat = _fs.statSync(name);
stat = statSync(name);
if (!stat) {
continue;
}
}
catch (e) {
continue;
@ -1704,7 +1717,10 @@ namespace ts {
Error.stackTraceLimit = 0;
try {
const stat = _fs.statSync(path);
const stat = statSync(path);
if (!stat) {
return false;
}
switch (entryKind) {
case FileSystemEntryKind.File: return stat.isFile();
case FileSystemEntryKind.Directory: return stat.isDirectory();
@ -1742,7 +1758,7 @@ namespace ts {
function getModifiedTime(path: string) {
try {
return _fs.statSync(path).mtime;
return statSync(path)?.mtime;
}
catch (e) {
return undefined;

1
src/tsserver/server.ts
View File

@ -678,6 +678,7 @@ namespace ts.server {
return { getModifiedTime, poll, startWatchTimer, addFile, removeFile };
function getModifiedTime(fileName: string): Date {
// Caller guarantees that `fileName` exists, so there'd be no benefit from throwIfNoEntry
return fs.statSync(fileName).mtime;
}