Simplify passing options

sindresorhus · Aug 18, 2024 · beffce6 · beffce6
1 parent b354022
commit beffce6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -2,12 +2,12 @@ import {spawn} from 'node:child_process';
 import {once} from 'node:events';
 import {lineIterator, combineAsyncIterators} from './utilities.js';
 
-export default function nanoSpawn(command, rawArguments = [], rawOptions = {}) {
-	const [commandArguments, {signal, timeout, nativeOptions}] = Array.isArray(rawArguments)
-		? [rawArguments, rawOptions]
-		: [[], rawArguments];
+export default function nanoSpawn(command, commandArguments = [], options = {}) {
+	[commandArguments, options] = Array.isArray(commandArguments)
+		? [commandArguments, options]
+		: [[], commandArguments];
 
-	const subprocess = spawn(command, commandArguments, {...nativeOptions, signal, timeout});
+	const subprocess = spawn(command, commandArguments, options);
 
 	const promise = getResult(subprocess);
 

diff --git a/test.js b/test.js
@@ -11,6 +11,13 @@ const arrayFromAsync = async asyncIterable => {
 	return chunks;
 };
 
+const testString = 'test';
+
+test('can pass options.argv0', async t => {
+	const {stdout} = await nanoSpawn('node', ['-p', 'process.argv0'], {argv0: testString});
+	t.is(stdout, testString);
+});
+
 test('can pass options object without any arguments', async t => {
 	const {exitCode} = await nanoSpawn('node', {timeout: 1});
 	t.is(exitCode, null);