From 3c97ab6afc9e1182be74674c8621ba70f1b1a32c Mon Sep 17 00:00:00 2001 From: ehmicky Date: Sun, 18 Aug 2024 11:55:00 +0100 Subject: [PATCH] Reduce code size --- index.js | 4 ++-- utilities.js | 11 +---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/index.js b/index.js index 9793d8e..90df5bf 100644 --- a/index.js +++ b/index.js @@ -1,5 +1,5 @@ import {spawn} from 'node:child_process'; -import {lineIterator, combineAsyncIterables} from './utilities.js'; +import {lineIterator, combineAsyncIterators} from './utilities.js'; export default function nanoSpawn(command, rawArguments = [], rawOptions = {}) { const [commandArguments, {signal, timeout, nativeOptions}] = Array.isArray(rawArguments) @@ -31,7 +31,7 @@ export default function nanoSpawn(command, rawArguments = [], rawOptions = {}) { return Object.assign(promise, { subprocess, - [Symbol.asyncIterator]: () => combineAsyncIterables(stdoutLines, stderrLines), + [Symbol.asyncIterator]: () => combineAsyncIterators(stdoutLines, stderrLines), stdout: stdoutLines, stderr: stderrLines, }); diff --git a/utilities.js b/utilities.js index 54e751d..b1486ce 100644 --- a/utilities.js +++ b/utilities.js @@ -1,13 +1,4 @@ -export function streamToIterable(stream) { - return { - [Symbol.asyncIterator]: stream[Symbol.asyncIterator].bind(stream), - }; -} - -export async function * combineAsyncIterables(iterable1, iterable2) { - const iterator1 = iterable1[Symbol.asyncIterator](); - const iterator2 = iterable2[Symbol.asyncIterator](); - +export async function * combineAsyncIterators(iterator1, iterator2) { while (true) { // eslint-disable-next-line no-await-in-loop const [result1, result2] = await Promise.all([