spawn-rx 2.0.8 → 2.0.12

package/.npmignore

@@ -1,2 +1,3 @@
 vendor/jobber/Jobber
 vendor/jobber/Jobber.sln
+lib/test

package/.travis.yml

@@ -3,8 +3,22 @@ dist: trusty
 os:
   - linux
   - osx
+cache:
+  directories:
+    - node_modules
+notifications:
+  email: false
 language: node_js
 node_js:
-  - "6"
-  - "5"
-  - "4"
+  - 7
+  - 6
+  - 4
+install:
+  - npm install
+branches:
+  only:
+    - master
+before_script:
+  - npm prune
+script:
+  - npm run build

package/appveyor.yml

@@ -2,10 +2,13 @@
 platform:
   - x64
 
+cache:
+  - node_modules
+
 environment:
   matrix:
+    - nodejs_version: "7"
     - nodejs_version: "6"
-    - nodejs_version: "5"
     - nodejs_version: "4"
 
 install:
@@ -13,7 +16,6 @@ install:
   - npm install
 
 test_script:
-  # run tests
-  - npm test
+  - npm run build
 
 build: off

package/lib/index.js

@@ -136,7 +136,7 @@ function findActualExecutable(exe, args) {
 
   if (exe.match(/\.(bat|cmd)$/i)) {
     let cmd = _path2.default.join(process.env.SYSTEMROOT, 'System32', 'cmd.exe');
-    let cmdArgs = ['/C', exe, ...args];
+    let cmdArgs = ['/C', `${ exe } ${ args.join(' ') }`];
 
     return { cmd: cmd, args: cmdArgs };
   }

package/lib/src/index.d.ts

@@ -0,0 +1,88 @@
+import 'rxjs/add/observable/of';
+import 'rxjs/add/observable/merge';
+import 'rxjs/add/operator/pluck';
+import 'rxjs/add/operator/reduce';
+import { Observable } from 'rxjs/Observable';
+/**
+ * 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
+ * replacing the passed-in executable with the script runner, for PowerShell,
+ * CMD, and node scripts.
+ *
+ * This method also does the work of running down PATH, which spawn on Windows
+ * also doesn't do, unlike on POSIX.
+ *
+ * @param  {string} exe           The executable to run
+ * @param  {Array<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
+ */
+export declare function findActualExecutable(exe: string, args: Array<string>): {
+    cmd: string;
+    args: Array<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.
+ *
+ * @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 declare function spawnDetached(exe: string, params: Array<string>, opts?: any): 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.
+ *
+ * @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 declare function spawn<T = string>(exe: string, params?: Array<string>, opts?: any): Observable<T>;
+/**
+ * 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.
+ *
+ * @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 declare function spawnDetachedPromise(exe: string, params: Array<string>, opts?: any): Promise<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.
+ *
+ * @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 declare function spawnPromise(exe: string, params: Array<string>, opts?: any): Promise<string>;

package/lib/src/index.js

@@ -0,0 +1,317 @@
+"use strict";
+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)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var path = require("path");
+var net = require("net");
+var sfs = require("fs");
+var assign = require("lodash.assign");
+require("rxjs/add/observable/of");
+require("rxjs/add/observable/merge");
+require("rxjs/add/operator/pluck");
+require("rxjs/add/operator/reduce");
+var Observable_1 = require("rxjs/Observable");
+var Subscription_1 = require("rxjs/Subscription");
+var AsyncSubject_1 = require("rxjs/AsyncSubject");
+var spawnOg = require('child_process').spawn; //tslint:disable-line:no-var-requires
+var isWindows = process.platform === 'win32';
+var d = require('debug')('spawn-rx'); //tslint:disable-line:no-var-requires
+/**
+ * stat a file but don't throw if it doesn't exist
+ *
+ * @param  {string} file The path to a file
+ * @return {Stats}       The stats structure
+ *
+ * @private
+ */
+function statSyncNoException(file) {
+    try {
+        return sfs.statSync(file);
+    }
+    catch (e) {
+        return null;
+    }
+}
+/**
+ * Search PATH to see if a file exists in any of the path folders.
+ *
+ * @param  {string} exe The file to search for
+ * @return {string}     A fully qualified path, or the original path if nothing
+ *                      is found
+ *
+ * @private
+ */
+function runDownPath(exe) {
+    // NB: Windows won't search PATH looking for executables in spawn like
+    // Posix does
+    // Files with any directory path don't get this applied
+    if (exe.match(/[\\\/]/)) {
+        d('Path has slash in directory, bailing');
+        return exe;
+    }
+    var target = path.join('.', exe);
+    if (statSyncNoException(target)) {
+        d("Found executable in currect directory: " + target);
+        return target;
+    }
+    var haystack = process.env.PATH.split(isWindows ? ';' : ':');
+    for (var _i = 0, haystack_1 = haystack; _i < haystack_1.length; _i++) {
+        var p = haystack_1[_i];
+        var needle = path.join(p, exe);
+        if (statSyncNoException(needle)) {
+            return needle;
+        }
+        ;
+    }
+    d('Failed to find executable anywhere in path');
+    return exe;
+}
+/**
+ * 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
+ * replacing the passed-in executable with the script runner, for PowerShell,
+ * CMD, and node scripts.
+ *
+ * This method also does the work of running down PATH, which spawn on Windows
+ * also doesn't do, unlike on POSIX.
+ *
+ * @param  {string} exe           The executable to run
+ * @param  {Array<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
+ */
+function findActualExecutable(exe, args) {
+    // POSIX can just execute scripts directly, no need for silly goosery
+    if (process.platform !== 'win32') {
+        return { cmd: runDownPath(exe), args: args };
+    }
+    if (!sfs.existsSync(exe)) {
+        // NB: When you write something like `surf-client ... -- surf-build` on Windows,
+        // a shell would normally convert that to surf-build.cmd, but since it's passed
+        // in as an argument, it doesn't happen
+        var possibleExts = ['.exe', '.bat', '.cmd', '.ps1'];
+        for (var _i = 0, possibleExts_1 = possibleExts; _i < possibleExts_1.length; _i++) {
+            var ext = possibleExts_1[_i];
+            var possibleFullPath = runDownPath("" + exe + ext);
+            if (sfs.existsSync(possibleFullPath)) {
+                return findActualExecutable(possibleFullPath, args);
+            }
+        }
+    }
+    if (exe.match(/\.ps1$/i)) {
+        var cmd = path.join(process.env.SYSTEMROOT, 'System32', 'WindowsPowerShell', 'v1.0', 'PowerShell.exe');
+        var psargs = ['-ExecutionPolicy', 'Unrestricted', '-NoLogo', '-NonInteractive', '-File', exe];
+        return { cmd: cmd, args: psargs.concat(args) };
+    }
+    if (exe.match(/\.(bat|cmd)$/i)) {
+        var cmd = path.join(process.env.SYSTEMROOT, 'System32', 'cmd.exe');
+        var cmdArgs = ['/C', exe].concat(args);
+        return { cmd: cmd, args: cmdArgs };
+    }
+    if (exe.match(/\.(js)$/i)) {
+        var cmd = process.execPath;
+        var nodeArgs = [exe];
+        return { cmd: cmd, args: nodeArgs.concat(args) };
+    }
+    // Dunno lol
+    return { cmd: exe, args: args };
+}
+exports.findActualExecutable = findActualExecutable;
+/**
+ * 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.
+ *
+ * @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.
+ */
+function spawnDetached(exe, params, opts) {
+    if (opts === void 0) { opts = null; }
+    var _a = findActualExecutable(exe, params), cmd = _a.cmd, args = _a.args;
+    if (!isWindows) {
+        return spawn(cmd, args, assign({}, opts || {}, { detached: true }));
+    }
+    ;
+    var newParams = [cmd].concat(args);
+    var target = path.join(__dirname, '..', '..', 'vendor', 'jobber', 'Jobber.exe');
+    var options = assign({}, opts || {}, { detached: true, jobber: true });
+    d("spawnDetached: " + target + ", " + newParams);
+    return spawn(target, newParams, options);
+}
+exports.spawnDetached = 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.
+ *
+ * @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.
+ */
+function spawn(exe, params, opts) {
+    if (params === void 0) { params = []; }
+    if (opts === void 0) { opts = null; }
+    opts = opts || {};
+    var spawnObs = Observable_1.Observable.create(function (subj) {
+        var stdin = opts.stdin, optsWithoutStdIn = __rest(opts, ["stdin"]);
+        var _a = findActualExecutable(exe, params), cmd = _a.cmd, args = _a.args;
+        d("spawning process: " + cmd + " " + args.join() + ", " + JSON.stringify(optsWithoutStdIn));
+        var origOpts = assign({}, optsWithoutStdIn);
+        if ('jobber' in origOpts) {
+            delete origOpts.jobber;
+        }
+        if ('split' in origOpts) {
+            delete origOpts.split;
+        }
+        ;
+        var proc = spawnOg(cmd, args, origOpts);
+        var bufHandler = function (source) { return function (b) {
+            if (b.length < 1) {
+                return;
+            }
+            ;
+            var chunk = '<< String sent back was too long >>';
+            try {
+                if (typeof b === 'string') {
+                    chunk = b.toString();
+                }
+                else {
+                    chunk = b.toString(origOpts.encoding || 'utf8');
+                }
+            }
+            catch (e) {
+                chunk = "<< Lost chunk of process output for " + exe + " - length was " + b.length + ">>";
+            }
+            subj.next({ source: source, text: chunk });
+        }; };
+        var ret = new Subscription_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(); }));
+            }
+            else {
+                subj.error(new Error("opts.stdio conflicts with provided spawn opts.stdin observable, 'pipe' is required"));
+            }
+        }
+        var stderrCompleted = null;
+        var stdoutCompleted = null;
+        var noClose = false;
+        if (proc.stdout) {
+            stdoutCompleted = new AsyncSubject_1.AsyncSubject();
+            proc.stdout.on('data', bufHandler('stdout'));
+            proc.stdout.on('close', function () { stdoutCompleted.next(true); stdoutCompleted.complete(); });
+        }
+        else {
+            stdoutCompleted = Observable_1.Observable.of(true);
+        }
+        if (proc.stderr) {
+            stderrCompleted = new AsyncSubject_1.AsyncSubject();
+            proc.stderr.on('data', bufHandler('stderr'));
+            proc.stderr.on('close', function () { stderrCompleted.next(true); stderrCompleted.complete(); });
+        }
+        else {
+            stderrCompleted = Observable_1.Observable.of(true);
+        }
+        proc.on('error', function (e) {
+            noClose = true;
+            subj.error(e);
+        });
+        proc.on('close', function (code) {
+            noClose = true;
+            var pipesClosed = Observable_1.Observable.merge(stdoutCompleted, stderrCompleted)
+                .reduce(function (acc) { return acc; }, true);
+            if (code === 0) {
+                pipesClosed.subscribe(function () { return subj.complete(); });
+            }
+            else {
+                pipesClosed.subscribe(function () { return subj.error(new Error("Failed with exit code: " + code)); });
+            }
+        });
+        ret.add(new Subscription_1.Subscription(function () {
+            if (noClose) {
+                return;
+            }
+            ;
+            d("Killing process: " + cmd + " " + args.join());
+            if (opts.jobber) {
+                // NB: Connecting to Jobber's named pipe will kill it
+                net.connect("\\\\.\\pipe\\jobber-" + proc.pid);
+                setTimeout(function () { return proc.kill(); }, 5 * 1000);
+            }
+            else {
+                proc.kill();
+            }
+        }));
+        return ret;
+    });
+    return opts.split ? spawnObs : spawnObs.pluck('text');
+}
+exports.spawn = spawn;
+function wrapObservableInPromise(obs) {
+    return new Promise(function (res, rej) {
+        var out = '';
+        obs.subscribe(function (x) { return out += x; }, function (e) { return rej(new Error(out + "\n" + e.message)); }, function () { return res(out); });
+    });
+}
+/**
+ * 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.
+ *
+ * @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.
+ */
+function spawnDetachedPromise(exe, params, opts) {
+    if (opts === void 0) { opts = null; }
+    return wrapObservableInPromise(spawnDetached(exe, params, opts));
+}
+exports.spawnDetachedPromise = spawnDetachedPromise;
+/**
+ * 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.
+ *
+ * @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.
+ */
+function spawnPromise(exe, params, opts) {
+    if (opts === void 0) { opts = null; }
+    return wrapObservableInPromise(spawn(exe, params, opts));
+}
+exports.spawnPromise = spawnPromise;
+//# sourceMappingURL=index.js.map

package/lib/src/index.js.map

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

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "spawn-rx",
-  "version": "2.0.8",
+  "version": "2.0.12",
   "description": "An Rx-version of child_process.spawn",
   "scripts": {
-    "doc": "esdoc -c ./esdoc.json",
-    "compile": "babel -d lib/ src/",
+    "doc": "echo \"esdoc may not work correctly\" && esdoc -c ./esdoc.json",
+    "compile": "tsc",
     "prepublish": "npm run compile",
-    "test": "mocha --compilers js:babel-register ./test/*"
+    "lint": "tslint \"src/**/*.ts\" \"test/**/*.ts\"",
+    "test": "mocha --compilers ts:ts-node/register ./test/*",
+    "build": "npm-run-all compile lint test"
   },
   "repository": {
     "type": "git",
@@ -21,24 +23,31 @@
   "bugs": {
     "url": "https://github.com/paulcbetts/spawn-rx/issues"
   },
-  "main": "lib/index.js",
+  "main": "lib/src/index.js",
+  "typings": "lib/src/index.d.ts",
   "homepage": "https://github.com/paulcbetts/spawn-rx",
   "dependencies": {
     "debug": "^2.5.1",
-    "rxjs": "^5.0.0-rc.5"
+    "lodash.assign": "^4.2.0",
+    "rxjs": "^5.1.1"
   },
   "devDependencies": {
-    "babel-cli": "^6.18.0",
-    "babel-eslint": "^7.1.1",
-    "babel-plugin-transform-async-to-generator": "^6.16.0",
-    "babel-preset-es2016-node5": "^1.1.2",
-    "babel-register": "^6.18.0",
-    "chai": "^3.5.0",
-    "chai-as-promised": "^6.0.0",
-    "esdoc": "^0.4.8",
+    "@types/chai": "^4.0.4",
+    "@types/chai-as-promised": "^7.1.0",
+    "@types/mocha": "^2.2.39",
+    "@types/node": "^8.0.32",
+    "babel-register": "^6.23.0",
+    "chai": "^4.1.2",
+    "chai-as-promised": "^7.1.1",
+    "esdoc": "^0.5.2",
     "esdoc-es7-plugin": "0.0.3",
     "esdoc-plugin-async-to-sync": "^0.5.0",
-    "eslint": "^3.11.1",
-    "mocha": "^3.2.0"
+    "marked": "^0.3.6",
+    "mocha": "^4.0.0",
+    "npm-run-all": "^4.0.2",
+    "ts-node": "^3.3.0",
+    "tslint": "^5.7.0",
+    "typescript": "^2.5.3",
+    "uuid": "3.0.1"
   }
 }

package/src/ambient.d.ts

@@ -0,0 +1 @@
+declare module 'lodash.assign';

package/src/{index.js → index.ts}

@@ -1,19 +1,23 @@
-import path from 'path';
-import net from 'net';
-import sfs from 'fs';
+import * as path from 'path';
+import * as net from 'net';
+import * as sfs from 'fs';
+import * as assign from 'lodash.assign';
 
 import 'rxjs/add/observable/of';
 import 'rxjs/add/observable/merge';
 import 'rxjs/add/operator/pluck';
 import 'rxjs/add/operator/reduce';
 import { Observable } from 'rxjs/Observable';
+import { Observer } from 'rxjs/Observer';
 import { Subscription } from 'rxjs/Subscription';
 import { AsyncSubject } from 'rxjs/AsyncSubject';
+import { Subject } from 'rxjs/Subject';
+import * as childProcess from 'child_process';
 
-const spawnOg = require('child_process').spawn;
+const spawnOg: typeof childProcess.spawn = require('child_process').spawn; //tslint:disable-line:no-var-requires
 const isWindows = process.platform === 'win32';
 
-const d = require('debug')('spawn-rx');
+const d = require('debug')('spawn-rx'); //tslint:disable-line:no-var-requires
 
 /**
  * stat a file but don't throw if it doesn't exist
@@ -23,7 +27,7 @@ const d = require('debug')('spawn-rx');
  *
  * @private
  */
-function statSyncNoException(file) {
+function statSyncNoException(file: string): sfs.Stats | null {
   try {
     return sfs.statSync(file);
   } catch (e) {
@@ -40,7 +44,7 @@ function statSyncNoException(file) {
  *
  * @private
  */
-function runDownPath(exe) {
+function runDownPath(exe: string): string {
   // NB: Windows won't search PATH looking for executables in spawn like
   // Posix does
 
@@ -56,10 +60,12 @@ function runDownPath(exe) {
     return target;
   }
 
-  let haystack = process.env.PATH.split(isWindows ? ';' : ':');
+  let haystack = process.env.PATH!.split(isWindows ? ';' : ':');
   for (let p of haystack) {
     let needle = path.join(p, exe);
-    if (statSyncNoException(needle)) return needle;
+    if (statSyncNoException(needle)) {
+      return needle;
+    };
   }
 
   d('Failed to find executable anywhere in path');
@@ -82,9 +88,14 @@ function runDownPath(exe) {
  * @property {string} cmd         The command to pass to spawn
  * @property {Array<string>} args The arguments to pass to spawn
  */
-export function findActualExecutable(exe, args) {
+export function findActualExecutable(exe: string, args: Array<string>): {
+  cmd: string;
+  args: Array<string>
+} {
   // POSIX can just execute scripts directly, no need for silly goosery
-  if (process.platform !== 'win32') return { cmd: runDownPath(exe), args: args };
+  if (process.platform !== 'win32') {
+    return { cmd: runDownPath(exe), args: args };
+  }
 
   if (!sfs.existsSync(exe)) {
     // NB: When you write something like `surf-client ... -- surf-build` on Windows,
@@ -101,14 +112,14 @@ export function findActualExecutable(exe, args) {
   }
 
   if (exe.match(/\.ps1$/i)) {
-    let cmd = path.join(process.env.SYSTEMROOT, 'System32', 'WindowsPowerShell', 'v1.0', 'PowerShell.exe');
+    let cmd = path.join(process.env.SYSTEMROOT!, 'System32', 'WindowsPowerShell', 'v1.0', 'PowerShell.exe');
     let psargs = ['-ExecutionPolicy', 'Unrestricted', '-NoLogo', '-NonInteractive', '-File', exe];
 
     return { cmd: cmd, args: psargs.concat(args) };
   }
 
   if (exe.match(/\.(bat|cmd)$/i)) {
-    let cmd = path.join(process.env.SYSTEMROOT, 'System32', 'cmd.exe');
+    let cmd = path.join(process.env.SYSTEMROOT!, 'System32', 'cmd.exe');
     let cmdArgs = ['/C', exe, ...args];
 
     return { cmd: cmd, args: cmdArgs };
@@ -142,20 +153,22 @@ export function findActualExecutable(exe, args) {
  *                                    process terminates with a non-zero value,
  *                                    the Observable will terminate with onError.
  */
-export function spawnDetached(exe, params, opts=null) {
-  let { cmd, args } = findActualExecutable(exe, params);
+export function spawnDetached(exe: string, params: Array<string>, opts: any = null): Observable<string> {
+  const { cmd, args } = findActualExecutable(exe, params);
+
+  if (!isWindows) {
+    return spawn(cmd, args, assign({}, opts || {}, { detached: true }));
+  };
 
-  if (!isWindows) return spawn(cmd, args, Object.assign({}, opts || {}, {detached: true }));
   const newParams = [cmd].concat(args);
 
-  let target = path.join(__dirname, '..', 'vendor', 'jobber', 'jobber.exe');
-  let options = Object.assign({}, opts || {}, { detached: true, jobber: true });
+  let target = path.join(__dirname, '..', '..', 'vendor', 'jobber', 'Jobber.exe');
+  let options = assign({}, opts || {}, { detached: true, jobber: true });
 
   d(`spawnDetached: ${target}, ${newParams}`);
   return spawn(target, newParams, options);
 }
 
-
 /**
  * Spawns a process attached as a child of the current process.
  *
@@ -171,30 +184,42 @@ export function spawnDetached(exe, params, opts=null) {
  *                                    process terminates with a non-zero value,
  *                                    the Observable will terminate with onError.
  */
-export function spawn(exe, params=[], opts=null) {
-  opts = opts || {};
-  let spawnObs = Observable.create((subj) => {
-    let proc = null;
 
+export function spawn<T = string>(exe: string, params: Array<string> = [], opts: any = null): Observable<T> {
+  opts = opts || {};
+  let spawnObs = Observable.create((subj: Observer<{
+    source: any,
+    text: any
+    }>) => {
+    let { stdin, ...optsWithoutStdIn } = opts;
     let { cmd, args } = findActualExecutable(exe, params);
-    d(`spawning process: ${cmd} ${args.join()}, ${JSON.stringify(opts)}`);
-    let origOpts = Object.assign({}, opts);
-    if ('jobber' in origOpts) delete origOpts.jobber;
-    if ('split' in origOpts) delete origOpts.split;
-
+    d(`spawning process: ${cmd} ${args.join()}, ${JSON.stringify(optsWithoutStdIn)}`);
+    let origOpts = assign({}, optsWithoutStdIn);
+    if ('jobber' in origOpts) {
+      delete origOpts.jobber;
+    }
+    if ('split' in origOpts) {
+      delete origOpts.split;
+    };
 
-    proc = spawnOg(cmd, args, origOpts);
+    const proc = spawnOg(cmd, args, origOpts);
 
-    let bufHandler = (source) => (b) => {
-      if (b.length < 1) return;
-      let chunk = "<< String sent back was too long >>";
+    let bufHandler = (source: string) => (b: string | Buffer) => {
+      if (b.length < 1) {
+        return;
+      };
+      let chunk = '<< String sent back was too long >>';
       try {
-        chunk = b.toString();
+        if (typeof b === 'string') {
+          chunk = b.toString();
+        } else {
+          chunk = b.toString(origOpts.encoding || 'utf8');
+        }
       } catch (e) {
         chunk = `<< Lost chunk of process output for ${exe} - length was ${b.length}>>`;
       }
 
-      subj.next({source: source, text: chunk});
+      subj.next({ source: source, text: chunk });
     };
 
     let ret = new Subscription();
@@ -202,8 +227,8 @@ export function spawn(exe, params=[], opts=null) {
     if (opts.stdin) {
       if (proc.stdin) {
         ret.add(opts.stdin.subscribe(
-          (x) => proc.stdin.write(x),
-          subj.error,
+          (x: any) => proc.stdin.write(x),
+          subj.error.bind(subj),
           () => proc.stdin.end()
         ));
       } else {
@@ -211,34 +236,34 @@ export function spawn(exe, params=[], opts=null) {
       }
     }
 
-    let stderrCompleted = null;
-    let stdoutCompleted = null;
+    let stderrCompleted: Subject<boolean> | Observable<boolean> | null = null;
+    let stdoutCompleted: Subject<boolean> | Observable<boolean> | null = null;
     let noClose = false;
 
     if (proc.stdout) {
-      stdoutCompleted = new AsyncSubject();
+      stdoutCompleted = new AsyncSubject<boolean>();
       proc.stdout.on('data', bufHandler('stdout'));
-      proc.stdout.on('close', () => { stdoutCompleted.next(true); stdoutCompleted.complete(); });
+      proc.stdout.on('close', () => { (stdoutCompleted! as Subject<boolean>).next(true); (stdoutCompleted! as Subject<boolean>).complete(); });
     } else {
       stdoutCompleted = Observable.of(true);
     }
 
     if (proc.stderr) {
-      stderrCompleted = new AsyncSubject();
+      stderrCompleted = new AsyncSubject<boolean>();
       proc.stderr.on('data', bufHandler('stderr'));
-      proc.stderr.on('close', () => { stderrCompleted.next(true); stderrCompleted.complete(); });
+      proc.stderr.on('close', () => { (stderrCompleted! as Subject<boolean>).next(true); (stderrCompleted! as Subject<boolean>).complete(); });
     } else {
       stderrCompleted = Observable.of(true);
     }
 
-    proc.on('error', (e) => {
+    proc.on('error', (e: Error) => {
       noClose = true;
       subj.error(e);
     });
 
-    proc.on('close', (code) => {
+    proc.on('close', (code: number) => {
       noClose = true;
-      let pipesClosed = Observable.merge(stdoutCompleted, stderrCompleted)
+      let pipesClosed = Observable.merge(stdoutCompleted!, stderrCompleted!)
         .reduce((acc) => acc, true);
 
       if (code === 0) {
@@ -249,13 +274,15 @@ export function spawn(exe, params=[], opts=null) {
     });
 
     ret.add(new Subscription(() => {
-      if (noClose) return;
+      if (noClose) {
+        return;
+      };
 
       d(`Killing process: ${cmd} ${args.join()}`);
       if (opts.jobber) {
         // NB: Connecting to Jobber's named pipe will kill it
         net.connect(`\\\\.\\pipe\\jobber-${proc.pid}`);
-        setTimeout(() => proc.kill(), 5*1000);
+        setTimeout(() => proc.kill(), 5 * 1000);
       } else {
         proc.kill();
       }
@@ -267,8 +294,8 @@ export function spawn(exe, params=[], opts=null) {
   return opts.split ? spawnObs : spawnObs.pluck('text');
 }
 
-function wrapObservableInPromise(obs) {
-  return new Promise((res, rej) => {
+function wrapObservableInPromise<T>(obs: Observable<T>) {
+  return new Promise<string>((res, rej) => {
     let out = '';
 
     obs.subscribe(
@@ -292,11 +319,10 @@ function wrapObservableInPromise(obs) {
  *                                 non-zero value, the Promise will resolve with
  *                                 an Error.
  */
-export function spawnDetachedPromise(exe, params, opts=null) {
-  return wrapObservableInPromise(spawnDetached(exe, params, opts));
+export function spawnDetachedPromise(exe: string, params: Array<string>, opts: any = null): Promise<string> {
+  return wrapObservableInPromise<string>(spawnDetached(exe, params, opts));
 }
 
-
 /**
  * Spawns a process as a child process.
  *
@@ -310,6 +336,6 @@ export function spawnDetachedPromise(exe, params, opts=null) {
  *                                 non-zero value, the Promise will resolve with
  *                                 an Error.
  */
-export function spawnPromise(exe, params, opts=null) {
-  return wrapObservableInPromise(spawn(exe, params, opts));
+export function spawnPromise(exe: string, params: Array<string>, opts: any = null): Promise<string> {
+  return wrapObservableInPromise<string>(spawn(exe, params, opts));
 }

package/test/asserttest.ts

@@ -0,0 +1,15 @@
+import { expect } from 'chai';
+import './support';
+
+function delay(ms: number) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
+describe('The test runner', function () {
+  it('should pass this test', async function () {
+    await delay(1000);
+    expect(true).to.be.ok;
+  });
+});

package/test/{spawn.js → spawn.ts}

@@ -1,3 +1,4 @@
+import { expect } from 'chai';
 import './support';
 
 import { spawn, spawnPromise, spawnDetachedPromise } from '../src/index';
@@ -24,17 +25,24 @@ describe('The spawnDetachedPromise method', function() {
   });
 });
 
-
-function wrapSplitObservableInPromise(obs) {
+function wrapSplitObservableInPromise(obs: Observable<{
+  source: any,
+  text: any
+}>): Promise<{
+  stderr: string,
+  stdout: string,
+  error: Error | undefined
+}> {
   return new Promise((res) => {
-    let out = {stderr: '', stdout: ''};
+    let out = {stderr: '', stdout: '', error: undefined };
 
     obs.subscribe(
       (x) => {
-        if (x.source === 'stdout')
+        if (x.source === 'stdout') {
           out.stdout += x.text;
-        else
+        } else {
           out.stderr += x.text;
+        }
       },
       (e) => { out.error = e; res(out); },
       () => res(out));
@@ -50,7 +58,7 @@ describe('The spawn method', function() {
 
   it('should return split stderr in a inner tag when called with split', async function() {
     // provide an invalid param to uuid so it complains on stderr
-    let rxSpawn = spawn('uuid', ['foo'], {split: true});
+    let rxSpawn: Observable<{ source: any, text: any }> = spawn('uuid', ['foo'], {split: true}) as any;
     let result = await wrapSplitObservableInPromise(rxSpawn);
     expect(result.stderr.length > 10).to.be.ok;
     expect(result.stdout).to.be.empty;
@@ -58,7 +66,7 @@ describe('The spawn method', function() {
   });
 
   it('should return split stdout in a inner tag when called with split', async function() {
-    let rxSpawn = spawn('uuid', [], {split: true});
+    let rxSpawn: Observable<{ source: any, text: any }> = spawn('uuid', [], {split: true});
     let result = await wrapSplitObservableInPromise(rxSpawn);
     expect(result.stdout.match(uuidRegex)).to.be.ok;
     expect(result.stderr).to.be.empty;
@@ -66,27 +74,27 @@ describe('The spawn method', function() {
   });
 
   it('should ignore stderr if options.stdio = ignore', async function() {
-    let rxSpawn = spawn('uuid', ['foo'], {split: true, stdio: [null, null, 'ignore']});
+    let rxSpawn: Observable<{ source: any, text: any }> = spawn('uuid', ['foo'], {split: true, stdio: [null, null, 'ignore']});
     let result = await wrapSplitObservableInPromise(rxSpawn);
     expect(result.stderr).to.be.empty;
   });
 
   it('should ignore stdout if options.stdio = inherit', async function() {
-    let rxSpawn = spawn('uuid', [], {split: true, stdio: [null, 'inherit', null]});
+    let rxSpawn: Observable<{ source: any, text: any }> = spawn('uuid', [], {split: true, stdio: [null, 'inherit', null]});
     let result = await wrapSplitObservableInPromise(rxSpawn);
     expect(result.stdout).to.be.empty;
   });
-  
+
   it('should croak if stdin is provided but stdio.stdin is disabled', async function() {
     let stdin = Observable.of('a');
-    let rxSpawn = spawn('marked', [], {split: true, stdin: stdin, stdio: ['ignore', null, null]});
+    let rxSpawn: Observable<{ source: any, text: any }>  = spawn('marked', [], {split: true, stdin: stdin, stdio: ['ignore', null, null]});
     let result = await wrapSplitObservableInPromise(rxSpawn);
     expect(result.error).to.be.an('error');
   });
-  
+
   it('should subscribe to provided stdin', async function() {
     let stdin = Observable.of('a');
-    let rxSpawn = spawn('marked', [], {split: true, stdin: stdin});
+    let rxSpawn: Observable<{ source: any, text: any }> = spawn('marked', [], {split: true, stdin: stdin});
     let result = await wrapSplitObservableInPromise(rxSpawn);
     expect(result.stdout.trim()).to.be.equal('<p>a</p>');
   });

package/test/{support.js → support.ts}

@@ -1,5 +1,7 @@
-let chai = require("chai");
-let chaiAsPromised = require("chai-as-promised");
+import * as chai from 'chai';
+import * as chaiAsPromised from 'chai-as-promised';
+
+declare const global: any;
 
 chai.should();
 chai.use(chaiAsPromised);
@@ -8,5 +10,5 @@ global.chai = chai;
 global.chaiAsPromised = chaiAsPromised;
 global.expect = chai.expect;
 global.AssertionError = chai.AssertionError;
-global.Assertion = chai.Assertion;
 global.assert = chai.assert;
+global.Assertion = (chai as any).Assertion; //'Assertion' is not existing?

package/tsconfig.json

@@ -0,0 +1,29 @@
+{
+  "compilerOptions": {
+    "removeComments": false,
+    "preserveConstEnums": true,
+    "sourceMap": true,
+    "declaration": true,
+    "noImplicitAny": true,
+    "noImplicitReturns": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "strictNullChecks": true,
+    "noUnusedLocals": true,
+    "noImplicitThis": true,
+    "noUnusedParameters": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "pretty": true,
+    "target": "es5",
+    "outDir": "lib",
+    "lib": ["dom", "es2015"]
+  },
+  "formatCodeOptions": {
+    "indentSize": 2,
+    "tabSize": 2
+  },
+  "exclude": [
+    "node_modules",
+    "lib"
+  ]
+}

package/tslint.json

@@ -0,0 +1,38 @@
+{
+  "rules": {
+    "curly": true,
+    "eofline": false,
+    "align": [true, "parameters"],
+    "class-name": true,
+    "indent": [true, "spaces"],
+    "max-line-length": [true, 150],
+    "no-consecutive-blank-lines": [true],
+    "no-trailing-whitespace": true,
+    "no-duplicate-variable": true,
+    "no-var-keyword": true,
+    "no-empty": true,
+    "no-unused-expression": true,
+    "no-use-before-declare": true,
+    "no-var-requires": true,
+    "one-line": [true,
+      "check-else",
+      "check-whitespace",
+      "check-open-brace"],
+    "quotemark": [true,
+      "single",
+      "avoid-escape"],
+    "semicolon": [true, "always"],
+    "typedef-whitespace": [true, {
+      "call-signature": "nospace",
+      "index-signature": "nospace",
+      "parameter": "nospace",
+      "property-declaration": "nospace",
+      "variable-declaration": "nospace"
+    }],
+    "whitespace": [true,
+      "check-branch",
+      "check-decl",
+      "check-operator",
+      "check-type"]
+  }
+}

package/.babelrc

@@ -1,4 +0,0 @@
-{
-  "presets": ["es2016-node5"],
-  "plugins": ["transform-async-to-generator"]
-}

package/.eslintrc

@@ -1,20 +0,0 @@
-{
-    "parser": "babel-eslint",
-    "rules": {
-        "strict": 0,
-        "indent": [
-            2,
-            2
-        ],
-        "semi": [
-            2,
-            "always"
-        ],
-        "no-console": 0
-    },
-    "env": {
-        "es6": true,
-        "node": true
-    },
-    "extends": "eslint:recommended"
-}

package/lib/babel-maybefill.js

@@ -1,5 +0,0 @@
-'use strict';
-
-if (!('regeneratorRuntime' in global)) {
-  require('babel-polyfill');
-}

package/test/.eslintrc

@@ -1,26 +0,0 @@
-{
-    "parser": "babel-eslint",
-    "rules": {
-        "strict": 0,
-        "indent": [
-            2,
-            2
-        ],
-        "semi": [
-            2,
-            "always"
-        ],
-        "no-console": 0
-    },
-    "env": {
-        "es6": true,
-        "node": true,
-        "browser": true,
-        "mocha": true
-    },
-    "globals": {
-      "expect": true,
-      "chai": true,
-    },
-    "extends": "eslint:recommended"
-}

package/test/asserttest.js

@@ -1,14 +0,0 @@
-import './support';
-
-function delay(ms) {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms);
-  });
-}
-
-describe('The test runner', function() {
-  it('should pass this test', async function() {
-    await delay(1000);
-    expect(true).to.be.ok;
-  });
-});