diff options
author | Liam Murphy <43807659+Liamolucko@users.noreply.github.com> | 2021-01-26 23:34:40 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-26 13:34:40 +0100 |
commit | 06bd692e5c4a8f66960d3919e7087530b60c20dd (patch) | |
tree | 54da22655c71341c0e1e750d5197623e4fa0e286 /std/node/_fs/_fs_readdir.ts | |
parent | f9949a31707dcaa5a8786bfe4f84ed202be91607 (diff) |
fix(std/node): Stop callbacks being called twice when callback throws error (#8867)
Diffstat (limited to 'std/node/_fs/_fs_readdir.ts')
-rw-r--r-- | std/node/_fs/_fs_readdir.ts | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/std/node/_fs/_fs_readdir.ts b/std/node/_fs/_fs_readdir.ts index 9034eccf8..e36bf5ecf 100644 --- a/std/node/_fs/_fs_readdir.ts +++ b/std/node/_fs/_fs_readdir.ts @@ -11,13 +11,12 @@ type readDirOptions = { withFileTypes?: boolean; }; -type readDirCallback = (err: Error | undefined, files: string[]) => void; +type readDirCallback = (err: Error | null, files: string[]) => void; -type readDirCallbackDirent = (err: Error | undefined, files: Dirent[]) => void; +type readDirCallbackDirent = (err: Error | null, files: Dirent[]) => void; type readDirBoth = ( - err: Error | undefined, - files: string[] | Dirent[] | Array<string | Dirent>, + ...args: [Error] | [null, string[] | Dirent[] | Array<string | Dirent>] ) => void; export function readdir( @@ -62,7 +61,7 @@ export function readdir( asyncIterableToCallback(Deno.readDir(path), (val, done) => { if (typeof path !== "string") return; if (done) { - callback(undefined, result); + callback(null, result); return; } if (options?.withFileTypes) { @@ -70,7 +69,7 @@ export function readdir( } else result.push(decode(val.name)); }); } catch (error) { - callback(error, result); + callback(error); } } |