spawn-rx 4.0.0 → 5.0.0

package/CODE_OF_CONDUCT.md

@@ -1,50 +1,133 @@
-# Contributor Code of Conduct
 
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
+# Contributor Covenant Code of Conduct
 
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
+## Our Pledge
 
-Examples of unacceptable behavior by participants include:
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
 
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing other's private information, such as physical or electronic
-  addresses, without explicit permission
-* Other unethical or unprofessional conduct
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
-By adopting this Code of Conduct, project maintainers commit themselves to
-fairly and consistently applying these principles to every aspect of managing
-this project. Project maintainers who do not follow or enforce the Code of
-Conduct may be permanently removed from the project team.
+## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official email address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer at paul@paulbetts.org. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Maintainers are
-obligated to maintain confidentiality with regard to the reporter of an
-incident.
+reported to the community leaders responsible for enforcement at
+anais@anaisbetts.org.  All complaints will be reviewed and investigated promptly
+and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
 
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.3.0, available at
-[http://contributor-covenant.org/version/1/3/0/][version]
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/3/0/
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

package/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2016 Paul Betts
+Copyright (c) 2016 Anaïs Betts
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/lib/src/index.d.ts

@@ -1,4 +1,5 @@
 import { Observable } from "rxjs";
+import { SpawnOptions } from "child_process";
 /**
  * Finds the actual executable and parameters to run on Windows. This method
  * mimics the POSIX behavior of being able to run scripts as executables by
@@ -9,15 +10,25 @@ import { Observable } from "rxjs";
  * also doesn't do, unlike on POSIX.
  *
  * @param  {string} exe           The executable to run
- * @param  {Array<string>} args   The arguments to run
+ * @param  {string[]} args   The arguments to run
  *
  * @return {Object}               The cmd and args to run
  * @property {string} cmd         The command to pass to spawn
- * @property {Array<string>} args The arguments to pass to spawn
+ * @property {string[]} args The arguments to pass to spawn
  */
-export declare function findActualExecutable(exe: string, args: Array<string>): {
+export declare function findActualExecutable(exe: string, args: string[]): {
     cmd: string;
-    args: Array<string>;
+    args: string[];
+};
+export type SpawnRxExtras = {
+    stdin?: Observable<string>;
+    split?: boolean;
+    jobber?: boolean;
+    encoding?: BufferEncoding;
+};
+export type OutputLine = {
+    source: "stdout" | "stderr";
+    text: string;
 };
 /**
  * Spawns a process but detached from the current process. The process is put
@@ -25,8 +36,28 @@ export declare function findActualExecutable(exe: string, args: Array<string>):
  * return Observable.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
- * @param  {Object} opts              Options to pass to spawn.
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Observable<OutputLine>}       Returns an Observable that when subscribed
+ *                                    to, will create a detached process. The
+ *                                    process output will be streamed to this
+ *                                    Observable, and if unsubscribed from, the
+ *                                    process will be terminated early. If the
+ *                                    process terminates with a non-zero value,
+ *                                    the Observable will terminate with onError.
+ */
+export declare function spawnDetached(exe: string, params: string[], opts: SpawnOptions & SpawnRxExtras & {
+    split: true;
+}): Observable<OutputLine>;
+/**
+ * Spawns a process but detached from the current process. The process is put
+ * into its own Process Group that can be killed by unsubscribing from the
+ * return Observable.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
  *
  * @return {Observable<string>}       Returns an Observable that when subscribed
  *                                    to, will create a detached process. The
@@ -36,13 +67,33 @@ export declare function findActualExecutable(exe: string, args: Array<string>):
  *                                    process terminates with a non-zero value,
  *                                    the Observable will terminate with onError.
  */
-export declare function spawnDetached(exe: string, params: Array<string>, opts?: any): Observable<string>;
+export declare function spawnDetached(exe: string, params: string[], opts?: SpawnOptions & SpawnRxExtras & {
+    split: false | undefined;
+}): Observable<string>;
 /**
  * Spawns a process attached as a child of the current process.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
- * @param  {Object} opts              Options to pass to spawn.
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Observable<OutputLine>}       Returns an Observable that when subscribed
+ *                                    to, will create a child process. The
+ *                                    process output will be streamed to this
+ *                                    Observable, and if unsubscribed from, the
+ *                                    process will be terminated early. If the
+ *                                    process terminates with a non-zero value,
+ *                                    the Observable will terminate with onError.
+ */
+export declare function spawn(exe: string, params: string[], opts: SpawnOptions & SpawnRxExtras & {
+    split: true;
+}): Observable<OutputLine>;
+/**
+ * Spawns a process attached as a child of the current process.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
  *
  * @return {Observable<string>}       Returns an Observable that when subscribed
  *                                    to, will create a child process. The
@@ -52,14 +103,33 @@ export declare function spawnDetached(exe: string, params: Array<string>, opts?:
  *                                    process terminates with a non-zero value,
  *                                    the Observable will terminate with onError.
  */
-export declare function spawn<T = string>(exe: string, params?: Array<string>, opts?: any): Observable<T>;
+export declare function spawn(exe: string, params: string[], opts?: SpawnOptions & SpawnRxExtras & {
+    split: false | undefined;
+}): Observable<string>;
+/**
+ * Spawns a process but detached from the current process. The process is put
+ * into its own Process Group.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Promise<[string, string]>}       Returns an Promise that represents a detached
+ *                                 process. The value returned is the process
+ *                                 output. If the process terminates with a
+ *                                 non-zero value, the Promise will resolve with
+ *                                 an Error.
+ */
+export declare function spawnDetachedPromise(exe: string, params: string[], opts: SpawnOptions & SpawnRxExtras & {
+    split: true;
+}): Promise<[string, string]>;
 /**
  * Spawns a process but detached from the current process. The process is put
  * into its own Process Group.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
- * @param  {Object} opts              Options to pass to spawn.
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
  *
  * @return {Promise<string>}       Returns an Promise that represents a detached
  *                                 process. The value returned is the process
@@ -67,13 +137,31 @@ export declare function spawn<T = string>(exe: string, params?: Array<string>, o
  *                                 non-zero value, the Promise will resolve with
  *                                 an Error.
  */
-export declare function spawnDetachedPromise(exe: string, params: Array<string>, opts?: any): Promise<string>;
+export declare function spawnDetachedPromise(exe: string, params: string[], opts?: SpawnOptions & SpawnRxExtras & {
+    split: false | undefined;
+}): Promise<string>;
+/**
+ * Spawns a process as a child process.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Promise<[string, string]>}       Returns an Promise that represents a child
+ *                                 process. The value returned is the process
+ *                                 output. If the process terminates with a
+ *                                 non-zero value, the Promise will resolve with
+ *                                 an Error.
+ */
+export declare function spawnPromise(exe: string, params: string[], opts: SpawnOptions & SpawnRxExtras & {
+    split: true;
+}): Promise<[string, string]>;
 /**
  * Spawns a process as a child process.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
- * @param  {Object} opts              Options to pass to spawn.
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
  *
  * @return {Promise<string>}       Returns an Promise that represents a child
  *                                 process. The value returned is the process
@@ -81,4 +169,4 @@ export declare function spawnDetachedPromise(exe: string, params: Array<string>,
  *                                 non-zero value, the Promise will resolve with
  *                                 an Error.
  */
-export declare function spawnPromise(exe: string, params: Array<string>, opts?: any): Promise<string>;
+export declare function spawnPromise(exe: string, params: string[], opts?: SpawnOptions & SpawnRxExtras): Promise<string>;

package/lib/src/index.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -95,11 +106,11 @@ function runDownPath(exe) {
  * also doesn't do, unlike on POSIX.
  *
  * @param  {string} exe           The executable to run
- * @param  {Array<string>} args   The arguments to run
+ * @param  {string[]} args   The arguments to run
  *
  * @return {Object}               The cmd and args to run
  * @property {string} cmd         The command to pass to spawn
- * @property {Array<string>} args The arguments to pass to spawn
+ * @property {string[]} args The arguments to pass to spawn
  */
 function findActualExecutable(exe, args) {
     // POSIX can just execute scripts directly, no need for silly goosery
@@ -150,8 +161,8 @@ function findActualExecutable(exe, args) {
  * return Observable.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
- * @param  {Object} opts              Options to pass to spawn.
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
  *
  * @return {Observable<string>}       Returns an Observable that when subscribed
  *                                    to, will create a detached process. The
@@ -162,8 +173,7 @@ function findActualExecutable(exe, args) {
  *                                    the Observable will terminate with onError.
  */
 function spawnDetached(exe, params, opts) {
-    if (opts === void 0) { opts = null; }
-    var _a = findActualExecutable(exe, params), cmd = _a.cmd, args = _a.args;
+    var _a = findActualExecutable(exe, params !== null && params !== void 0 ? params : []), cmd = _a.cmd, args = _a.args;
     if (!isWindows) {
         return spawn(cmd, args, assign({}, opts || {}, { detached: true }));
     }
@@ -177,8 +187,8 @@ function spawnDetached(exe, params, opts) {
  * Spawns a process attached as a child of the current process.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
- * @param  {Object} opts              Options to pass to spawn.
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
  *
  * @return {Observable<string>}       Returns an Observable that when subscribed
  *                                    to, will create a child process. The
@@ -189,22 +199,13 @@ function spawnDetached(exe, params, opts) {
  *                                    the Observable will terminate with onError.
  */
 function spawn(exe, params, opts) {
-    if (params === void 0) { params = []; }
-    if (opts === void 0) { opts = null; }
-    opts = opts || {};
-    var spawnObs = rxjs_1.Observable.create(function (subj) {
+    opts = opts !== null && opts !== void 0 ? opts : {};
+    var spawnObs = new rxjs_1.Observable(function (subj) {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        var _ = opts._, optsWithoutStdIn = __rest(opts, ["_"]);
+        var stdin = opts.stdin, jobber = opts.jobber, split = opts.split, encoding = opts.encoding, spawnOpts = __rest(opts, ["stdin", "jobber", "split", "encoding"]);
         var _a = findActualExecutable(exe, params), cmd = _a.cmd, args = _a.args;
-        d("spawning process: ".concat(cmd, " ").concat(args.join(), ", ").concat(JSON.stringify(optsWithoutStdIn)));
-        var origOpts = assign({}, optsWithoutStdIn);
-        if ("jobber" in origOpts) {
-            delete origOpts.jobber;
-        }
-        if ("split" in origOpts) {
-            delete origOpts.split;
-        }
-        var proc = (0, child_process_1.spawn)(cmd, args, origOpts);
+        d("spawning process: ".concat(cmd, " ").concat(args.join(), ", ").concat(JSON.stringify(spawnOpts)));
+        var proc = (0, child_process_1.spawn)(cmd, args, spawnOpts);
         var bufHandler = function (source) { return function (b) {
             if (b.length < 1) {
                 return;
@@ -215,7 +216,7 @@ function spawn(exe, params, opts) {
                     chunk = b.toString();
                 }
                 else {
-                    chunk = b.toString(origOpts.encoding || "utf8");
+                    chunk = b.toString(encoding || "utf8");
                 }
             }
             catch (_a) {
@@ -226,7 +227,11 @@ function spawn(exe, params, opts) {
         var ret = new rxjs_1.Subscription();
         if (opts.stdin) {
             if (proc.stdin) {
-                ret.add(opts.stdin.subscribe(function (x) { return proc.stdin.write(x); }, subj.error.bind(subj), function () { return proc.stdin.end(); }));
+                ret.add(opts.stdin.subscribe({
+                    next: function (x) { return proc.stdin.write(x); },
+                    error: subj.error.bind(subj),
+                    complete: function () { return proc.stdin.end(); },
+                }));
             }
             else {
                 subj.error(new Error("opts.stdio conflicts with provided spawn opts.stdin observable, 'pipe' is required"));
@@ -296,7 +301,22 @@ function spawn(exe, params, opts) {
 function wrapObservableInPromise(obs) {
     return new Promise(function (res, rej) {
         var out = "";
-        obs.subscribe(function (x) { return (out += x); }, function (e) { return rej(new Error("".concat(out, "\n").concat(e.message))); }, function () { return res(out); });
+        obs.subscribe({
+            next: function (x) { return (out += x); },
+            error: function (e) { return rej(new Error("".concat(out, "\n").concat(e.message))); },
+            complete: function () { return res(out); },
+        });
+    });
+}
+function wrapObservableInSplitPromise(obs) {
+    return new Promise(function (res, rej) {
+        var out = "";
+        var err = "";
+        obs.subscribe({
+            next: function (x) { return (x.source === "stdout" ? (out += x.text) : (err += x.text)); },
+            error: function (e) { return rej(new Error("".concat(out, "\n").concat(e.message))); },
+            complete: function () { return res([out, err]); },
+        });
     });
 }
 /**
@@ -304,7 +324,7 @@ function wrapObservableInPromise(obs) {
  * into its own Process Group.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
+ * @param  {string[]} params     The parameters to pass to the child
  * @param  {Object} opts              Options to pass to spawn.
  *
  * @return {Promise<string>}       Returns an Promise that represents a detached
@@ -314,14 +334,18 @@ function wrapObservableInPromise(obs) {
  *                                 an Error.
  */
 function spawnDetachedPromise(exe, params, opts) {
-    if (opts === void 0) { opts = null; }
-    return wrapObservableInPromise(spawnDetached(exe, params, opts));
+    if (opts === null || opts === void 0 ? void 0 : opts.split) {
+        return wrapObservableInSplitPromise(spawnDetached(exe, params, __assign(__assign({}, (opts !== null && opts !== void 0 ? opts : {})), { split: true })));
+    }
+    else {
+        return wrapObservableInPromise(spawnDetached(exe, params, __assign(__assign({}, (opts !== null && opts !== void 0 ? opts : {})), { split: false })));
+    }
 }
 /**
  * Spawns a process as a child process.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
+ * @param  {string[]} params     The parameters to pass to the child
  * @param  {Object} opts              Options to pass to spawn.
  *
  * @return {Promise<string>}       Returns an Promise that represents a child
@@ -331,7 +355,11 @@ function spawnDetachedPromise(exe, params, opts) {
  *                                 an Error.
  */
 function spawnPromise(exe, params, opts) {
-    if (opts === void 0) { opts = null; }
-    return wrapObservableInPromise(spawn(exe, params, opts));
+    if (opts === null || opts === void 0 ? void 0 : opts.split) {
+        return wrapObservableInSplitPromise(spawn(exe, params, __assign(__assign({}, (opts !== null && opts !== void 0 ? opts : {})), { split: true })));
+    }
+    else {
+        return wrapObservableInPromise(spawn(exe, params, __assign(__assign({}, (opts !== null && opts !== void 0 ? opts : {})), { split: false })));
+    }
 }
 //# sourceMappingURL=index.js.map

package/lib/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spawn-rx",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "description": "An Rx-version of child_process.spawn",
   "scripts": {
     "doc": "echo \"esdoc may not work correctly\" && esdoc -c ./esdoc.json",
@@ -57,4 +57,4 @@
     "typescript-eslint": "^8.14.0",
     "uuid": "3.0.1"
   }
-}
+}

package/src/index.ts

@@ -7,7 +7,7 @@ import * as assign from "lodash.assign";
 import type { Observer, Subject } from "rxjs";
 import { Observable, Subscription, AsyncSubject, of, merge } from "rxjs";
 import { map, reduce } from "rxjs/operators";
-import { spawn as spawnOg } from "child_process";
+import { spawn as spawnOg, SpawnOptions } from "child_process";
 import Debug from "debug";
 
 const isWindows = process.platform === "win32";
@@ -77,18 +77,18 @@ function runDownPath(exe: string): string {
  * also doesn't do, unlike on POSIX.
  *
  * @param  {string} exe           The executable to run
- * @param  {Array<string>} args   The arguments to run
+ * @param  {string[]} args   The arguments to run
  *
  * @return {Object}               The cmd and args to run
  * @property {string} cmd         The command to pass to spawn
- * @property {Array<string>} args The arguments to pass to spawn
+ * @property {string[]} args The arguments to pass to spawn
  */
 export function findActualExecutable(
   exe: string,
-  args: Array<string>,
+  args: string[],
 ): {
   cmd: string;
-  args: Array<string>;
+  args: string[];
 } {
   // POSIX can just execute scripts directly, no need for silly goosery
   if (process.platform !== "win32") {
@@ -147,14 +147,73 @@ export function findActualExecutable(
   return { cmd: exe, args: args };
 }
 
+export type SpawnRxExtras = {
+  stdin?: Observable<string>;
+  split?: boolean;
+  jobber?: boolean;
+  encoding?: BufferEncoding;
+};
+
+export type OutputLine = {
+  source: "stdout" | "stderr";
+  text: string;
+};
+
+
 /**
  * Spawns a process but detached from the current process. The process is put
  * into its own Process Group that can be killed by unsubscribing from the
  * return Observable.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
- * @param  {Object} opts              Options to pass to spawn.
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Observable<OutputLine>}       Returns an Observable that when subscribed
+ *                                    to, will create a detached process. The
+ *                                    process output will be streamed to this
+ *                                    Observable, and if unsubscribed from, the
+ *                                    process will be terminated early. If the
+ *                                    process terminates with a non-zero value,
+ *                                    the Observable will terminate with onError.
+ */
+export function spawnDetached(
+  exe: string,
+  params: string[],
+  opts: SpawnOptions & SpawnRxExtras & { split: true },
+): Observable<OutputLine>;
+
+/**
+ * Spawns a process but detached from the current process. The process is put
+ * into its own Process Group that can be killed by unsubscribing from the
+ * return Observable.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Observable<string>}       Returns an Observable that when subscribed
+ *                                    to, will create a detached process. The
+ *                                    process output will be streamed to this
+ *                                    Observable, and if unsubscribed from, the
+ *                                    process will be terminated early. If the
+ *                                    process terminates with a non-zero value,
+ *                                    the Observable will terminate with onError.
+ */
+export function spawnDetached(
+  exe: string,
+  params: string[],
+  opts?: SpawnOptions & SpawnRxExtras & { split: false | undefined },
+): Observable<string>;
+
+/**
+ * Spawns a process but detached from the current process. The process is put
+ * into its own Process Group that can be killed by unsubscribing from the
+ * return Observable.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
  *
  * @return {Observable<string>}       Returns an Observable that when subscribed
  *                                    to, will create a detached process. The
@@ -166,10 +225,10 @@ export function findActualExecutable(
  */
 export function spawnDetached(
   exe: string,
-  params: Array<string>,
-  opts: any = null,
-): Observable<string> {
-  const { cmd, args } = findActualExecutable(exe, params);
+  params: string[],
+  opts?: SpawnOptions & SpawnRxExtras,
+): Observable<string> | Observable<OutputLine> {
+  const { cmd, args } = findActualExecutable(exe, params ?? []);
 
   if (!isWindows) {
     return spawn(cmd, args, assign({}, opts || {}, { detached: true }));
@@ -195,8 +254,29 @@ export function spawnDetached(
  * Spawns a process attached as a child of the current process.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
- * @param  {Object} opts              Options to pass to spawn.
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Observable<OutputLine>}       Returns an Observable that when subscribed
+ *                                    to, will create a child process. The
+ *                                    process output will be streamed to this
+ *                                    Observable, and if unsubscribed from, the
+ *                                    process will be terminated early. If the
+ *                                    process terminates with a non-zero value,
+ *                                    the Observable will terminate with onError.
+ */
+export function spawn(
+  exe: string,
+  params: string[],
+  opts: SpawnOptions & SpawnRxExtras & { split: true },
+): Observable<OutputLine>;
+
+/**
+ * Spawns a process attached as a child of the current process.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
  *
  * @return {Observable<string>}       Returns an Observable that when subscribed
  *                                    to, will create a child process. The
@@ -206,66 +286,73 @@ export function spawnDetached(
  *                                    process terminates with a non-zero value,
  *                                    the Observable will terminate with onError.
  */
+export function spawn(
+  exe: string,
+  params: string[],
+  opts?: SpawnOptions & SpawnRxExtras & { split: false | undefined },
+): Observable<string>;
 
-export function spawn<T = string>(
+/**
+ * Spawns a process attached as a child of the current process.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Observable<string>}       Returns an Observable that when subscribed
+ *                                    to, will create a child process. The
+ *                                    process output will be streamed to this
+ *                                    Observable, and if unsubscribed from, the
+ *                                    process will be terminated early. If the
+ *                                    process terminates with a non-zero value,
+ *                                    the Observable will terminate with onError.
+ */
+export function spawn(
   exe: string,
-  params: Array<string> = [],
-  opts: any = null,
-): Observable<T> {
-  opts = opts || {};
-  const spawnObs = Observable.create(
-    (
-      subj: Observer<{
-        source: any;
-        text: any;
-      }>,
-    ) => {
+  params: string[],
+  opts?: SpawnOptions & SpawnRxExtras,
+): Observable<string> | Observable<OutputLine> {
+  opts = opts ?? {};
+  const spawnObs: Observable<OutputLine> = new Observable(
+    (subj: Observer<OutputLine>) => {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { _, ...optsWithoutStdIn } = opts;
+      const { stdin, jobber, split, encoding, ...spawnOpts } = opts;
       const { cmd, args } = findActualExecutable(exe, params);
       d(
-        `spawning process: ${cmd} ${args.join()}, ${JSON.stringify(
-          optsWithoutStdIn,
-        )}`,
+        `spawning process: ${cmd} ${args.join()}, ${JSON.stringify(spawnOpts)}`,
       );
-      const origOpts = assign({}, optsWithoutStdIn);
-      if ("jobber" in origOpts) {
-        delete origOpts.jobber;
-      }
-      if ("split" in origOpts) {
-        delete origOpts.split;
-      }
 
-      const proc = spawnOg(cmd, args, origOpts);
+      const proc = spawnOg(cmd, args, spawnOpts);
 
-      const bufHandler = (source: string) => (b: string | Buffer) => {
-        if (b.length < 1) {
-          return;
-        }
-        let chunk = "<< String sent back was too long >>";
-        try {
-          if (typeof b === "string") {
-            chunk = b.toString();
-          } else {
-            chunk = b.toString(origOpts.encoding || "utf8");
+      const bufHandler =
+        (source: "stdout" | "stderr") => (b: string | Buffer) => {
+          if (b.length < 1) {
+            return;
+          }
+          let chunk = "<< String sent back was too long >>";
+          try {
+            if (typeof b === "string") {
+              chunk = b.toString();
+            } else {
+              chunk = b.toString(encoding || "utf8");
+            }
+          } catch {
+            chunk = `<< Lost chunk of process output for ${exe} - length was ${b.length}>>`;
           }
-        } catch {
-          chunk = `<< Lost chunk of process output for ${exe} - length was ${b.length}>>`;
-        }
 
-        subj.next({ source: source, text: chunk });
-      };
+          subj.next({ source: source, text: chunk });
+        };
 
       const ret = new Subscription();
 
       if (opts.stdin) {
         if (proc.stdin) {
           ret.add(
-            opts.stdin.subscribe(
-              (x: any) => proc.stdin.write(x),
-              subj.error.bind(subj),
-              () => proc.stdin.end(),
-            ),
+            opts.stdin.subscribe({
+              next: (x: any) => proc.stdin.write(x),
+              error: subj.error.bind(subj),
+              complete: () => proc.stdin.end(),
+            }),
           );
         } else {
           subj.error(
@@ -349,15 +436,28 @@ export function spawn<T = string>(
   return opts.split ? spawnObs : spawnObs.pipe(map((x: any) => x?.text));
 }
 
-function wrapObservableInPromise<T>(obs: Observable<T>) {
+function wrapObservableInPromise(obs: Observable<string>) {
   return new Promise<string>((res, rej) => {
     let out = "";
 
-    obs.subscribe(
-      (x) => (out += x),
-      (e) => rej(new Error(`${out}\n${e.message}`)),
-      () => res(out),
-    );
+    obs.subscribe({
+      next: (x) => (out += x),
+      error: (e) => rej(new Error(`${out}\n${e.message}`)),
+      complete: () => res(out),
+    });
+  });
+}
+
+function wrapObservableInSplitPromise(obs: Observable<OutputLine>) {
+  return new Promise<[string, string]>((res, rej) => {
+    let out = "";
+    let err = "";
+
+    obs.subscribe({
+      next: (x) => (x.source === "stdout" ? (out += x.text) : (err += x.text)),
+      error: (e) => rej(new Error(`${out}\n${e.message}`)),
+      complete: () => res([out, err]),
+    });
   });
 }
 
@@ -366,7 +466,47 @@ function wrapObservableInPromise<T>(obs: Observable<T>) {
  * into its own Process Group.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Promise<[string, string]>}       Returns an Promise that represents a detached
+ *                                 process. The value returned is the process
+ *                                 output. If the process terminates with a
+ *                                 non-zero value, the Promise will resolve with
+ *                                 an Error.
+ */
+export function spawnDetachedPromise(
+  exe: string,
+  params: string[],
+  opts: SpawnOptions & SpawnRxExtras & { split: true },
+): Promise<[string, string]>;
+
+/**
+ * Spawns a process but detached from the current process. The process is put
+ * into its own Process Group.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Promise<string>}       Returns an Promise that represents a detached
+ *                                 process. The value returned is the process
+ *                                 output. If the process terminates with a
+ *                                 non-zero value, the Promise will resolve with
+ *                                 an Error.
+ */
+export function spawnDetachedPromise(
+  exe: string,
+  params: string[],
+  opts?: SpawnOptions & SpawnRxExtras & { split: false | undefined },
+): Promise<string>;
+
+/**
+ * Spawns a process but detached from the current process. The process is put
+ * into its own Process Group.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
  * @param  {Object} opts              Options to pass to spawn.
  *
  * @return {Promise<string>}       Returns an Promise that represents a detached
@@ -377,17 +517,63 @@ function wrapObservableInPromise<T>(obs: Observable<T>) {
  */
 export function spawnDetachedPromise(
   exe: string,
-  params: Array<string>,
-  opts: any = null,
-): Promise<string> {
-  return wrapObservableInPromise<string>(spawnDetached(exe, params, opts));
+  params: string[],
+  opts?: SpawnOptions & SpawnRxExtras,
+): Promise<string> | Promise<[string, string]> {
+  if (opts?.split) {
+    return wrapObservableInSplitPromise(
+      spawnDetached(exe, params, { ...(opts ?? {}), split: true }),
+    );
+  } else {
+    return wrapObservableInPromise(
+      spawnDetached(exe, params, { ...(opts ?? {}), split: false }),
+    );
+  }
 }
 
 /**
  * Spawns a process as a child process.
  *
  * @param  {string} exe               The executable to run
- * @param  {Array<string>} params     The parameters to pass to the child
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Promise<[string, string]>}       Returns an Promise that represents a child
+ *                                 process. The value returned is the process
+ *                                 output. If the process terminates with a
+ *                                 non-zero value, the Promise will resolve with
+ *                                 an Error.
+ */
+export function spawnPromise(
+  exe: string,
+  params: string[],
+  opts: SpawnOptions & SpawnRxExtras & { split: true },
+): Promise<[string, string]>;
+
+/**
+ * Spawns a process as a child process.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
+ * @param  {SpawnOptions & SpawnRxExtras} opts              Options to pass to spawn.
+ *
+ * @return {Promise<string>}       Returns an Promise that represents a child
+ *                                 process. The value returned is the process
+ *                                 output. If the process terminates with a
+ *                                 non-zero value, the Promise will resolve with
+ *                                 an Error.
+ */
+export function spawnPromise(
+  exe: string,
+  params: string[],
+  opts?: SpawnOptions & SpawnRxExtras,
+): Promise<string>;
+
+/**
+ * Spawns a process as a child process.
+ *
+ * @param  {string} exe               The executable to run
+ * @param  {string[]} params     The parameters to pass to the child
  * @param  {Object} opts              Options to pass to spawn.
  *
  * @return {Promise<string>}       Returns an Promise that represents a child
@@ -398,8 +584,16 @@ export function spawnDetachedPromise(
  */
 export function spawnPromise(
   exe: string,
-  params: Array<string>,
-  opts: any = null,
-): Promise<string> {
-  return wrapObservableInPromise<string>(spawn(exe, params, opts));
+  params: string[],
+  opts?: SpawnOptions & SpawnRxExtras,
+): Promise<string> | Promise<[string, string]> {
+  if (opts?.split) {
+    return wrapObservableInSplitPromise(
+      spawn(exe, params, { ...(opts ?? {}), split: true }),
+    );
+  } else {
+    return wrapObservableInPromise(
+      spawn(exe, params, { ...(opts ?? {}), split: false }),
+    );
+  }
 }

package/test/spawn.ts

@@ -18,6 +18,20 @@ describe("The spawnPromise method", function () {
     const result = await spawnPromise("uuid", []);
     expect(result.match(uuidRegex)).to.be.ok;
   });
+
+  it("should split stdout and stderr when we call uuid", async function () {
+    // NB: Since we get run via npm run test, we know that npm bins are in our
+    // PATH.
+    const result = await spawnPromise("uuid", [], { split: true});
+    expect(result[0].match(uuidRegex)).to.be.ok;
+  });
+
+  it("should not stdout and stderr when we call uuid with split false", async function () {
+    // NB: Since we get run via npm run test, we know that npm bins are in our
+    // PATH.
+    const result = await spawnPromise("uuid", [], { split: false});
+    expect(result.match(uuidRegex)).to.be.ok;
+  });
 });
 
 describe("The spawnDetachedPromise method", function () {