diff options
| -rw-r--r-- | src/common-util/sugar.js | 29 | ||||
| -rw-r--r-- | src/node-utils.js | 7 |
2 files changed, 1 insertions, 35 deletions
diff --git a/src/common-util/sugar.js b/src/common-util/sugar.js index fba06d76..354cf5cc 100644 --- a/src/common-util/sugar.js +++ b/src/common-util/sugar.js @@ -395,35 +395,6 @@ export function queue(functionList, queueSize = 50) { return promiseList; } -export function wrapQueue(fn, queueSize = 50) { - if (queueSize === 0) return fn; - - let running = 0; - let resume = []; - - let proceed = (...args) => { - running++; - return Promise.try(fn, ...args).finally(() => { - running--; - if (resume.length) { - resume.shift()(); - } - }); - }; - - return (...args) => { - if (running === queueSize) { - return new Promise(resolve => { - resume.push(resolve); - }).then(() => { - return proceed(...args); - }); - } else { - return proceed(...args); - } - }; -} - export function delay(ms) { return new Promise((res) => setTimeout(res, ms)); } diff --git a/src/node-utils.js b/src/node-utils.js index d2e29b2f..345d10aa 100644 --- a/src/node-utils.js +++ b/src/node-utils.js @@ -6,8 +6,6 @@ import {fileURLToPath} from 'node:url'; import _commandExists from 'command-exists'; -import {wrapQueue} from '#sugar'; - // This package throws an error instead of returning false when the command // doesn't exist, for some reason. Yay for making logic more difficult! // Here's a straightforward workaround. @@ -70,7 +68,6 @@ export async function traverse(rootPath, { filterFile = () => true, filterDir = () => true, prefixPath = rootPath, - queueSize = 8, } = {}) { const pathJoinDevice = path.join; const pathJoinStyle = { @@ -83,8 +80,6 @@ export async function traverse(rootPath, { throw new Error(`Expected pathStyle to be device, posix, or win32`); } - const q_readdir = wrapQueue(readdir, queueSize); - const recursive = (names, ...subdirectories) => Promise.all(names.map(async name => { const devicePath = pathJoinDevice(rootPath, ...subdirectories, name); @@ -95,7 +90,7 @@ export async function traverse(rootPath, { else if (!stats.isDirectory() && !stats.isFile()) return []; if (stats.isDirectory()) { - return recursive(await q_readdir(devicePath), ...subdirectories, name); + return recursive(await readdir(devicePath), ...subdirectories, name); } else { return pathJoinStyle(prefixPath, ...subdirectories, name); } |