ESlint

.eslintignore

@@ -0,0 +1,2 @@
+dist
+node_modules

Makefile

@@ -9,14 +9,14 @@ coverage: build  # measures test coverage
 	${CURDIR}/node_modules/.bin/nyc report --reporter=text-lcov | node_modules/.bin/coveralls
 
 fix:  # runs the fixers
-	tslint --project . --fix
+	${CURDIR}/node_modules/.bin/eslint . --fix --ext .ts --ignore-path .eslintignore
 	${CURDIR}/node_modules/.bin/prettier --write .
 
 help:   # prints all make targets
 	cat Makefile | grep '^[^ ]*:' | grep -v '.PHONY' | grep -v help | sed 's/:.*#/#/' | column -s "#" -t
 
 lint: # runs the linters
-	${CURDIR}/node_modules/.bin/tslint --project .
+	${CURDIR}/node_modules/.bin/eslint . --ext .ts --ignore-path .eslintignore
 	${CURDIR}/node_modules/.bin/prettier -l .
 
 setup:   # sets up the installation on this machine

src/observable-process.ts

@@ -1,8 +1,9 @@
 import * as childProcess from "child_process"
 import mergeStream = require("merge-stream")
-import { createSearchableStream, SearchableStream } from "./searchable-stream"
 import * as util from "util"
+
 import { Result } from "./result"
+import { createSearchableStream, SearchableStream } from "./searchable-stream"
 const delay = util.promisify(setTimeout)
 
 /** a long-running process whose behavior can be observed at runtime */
@@ -28,7 +29,7 @@ export class ObservableProcess {
   /** functions to call when this process ends  */
   private endedCallbacks: Array<(result: Result) => void>
 
-  constructor(args: { runnable: string; params: string[]; cwd: string; env: NodeJS.ProcessEnv }) {
+  constructor(args: { cwd: string; env: NodeJS.ProcessEnv; params: string[]; runnable: string }) {
     this.endedCallbacks = []
     this.process = childProcess.spawn(args.runnable, args.params, {
       cwd: args.cwd,
@@ -66,7 +67,7 @@ export class ObservableProcess {
   }
 
   /** returns the process ID of the underlying ChildProcess */
-  pid() {
+  pid(): number {
     return this.process.pid
   }
 

src/result.ts

@@ -1,5 +1,11 @@
 /** Provides the results of running the process */
 export interface Result {
+  /** combined output from STDOUT and STDERR */
+  combinedText: string
+
+  /** full output on the STDERR stream */
+  errText: string
+
   /** the code with which the process has ended */
   exitCode: number
 
@@ -8,10 +14,4 @@ export interface Result {
 
   /** full output on the STDOUT stream */
   stdText: string
-
-  /** full output on the STDERR stream */
-  errText: string
-
-  /** combined output from STDOUT and STDERR */
-  combinedText: string
 }

src/searchable-stream.ts

@@ -5,8 +5,8 @@ import { TextStreamSearch } from "text-stream-search"
  */
 export interface TextStreamSearcher {
   fullText(): string
-  waitForText(text: string, timeout?: number): Promise<string>
   waitForRegex(regex: RegExp, timeout?: number): Promise<string>
+  waitForText(text: string, timeout?: number): Promise<string>
 }
 
 /**

src/start.ts

@@ -1,4 +1,5 @@
 import stringArgv from "string-argv"
+
 import { ObservableProcess } from "./observable-process"
 
 /** The options that can be provided to Spawn */

test/input-test.ts

@@ -1,4 +1,5 @@
 import { strict as assert } from "assert"
+
 import { startNodeProcess } from "./helpers/start-node-process"
 
 test("ObservableProcess.stdin", async function () {

test/kill-test.ts

@@ -1,6 +1,7 @@
 import { strict as assert } from "assert"
 import got from "got"
 import * as portFinder from "portfinder"
+
 import { startNodeProcess } from "./helpers/start-node-process"
 
 test("ObservableProcess.kill()", async function () {
@@ -13,7 +14,7 @@ test("ObservableProcess.kill()", async function () {
       http.createServer(function(_, res) { res.end('hello') }).listen(${port}, 'localhost');\
       console.log('online')`
   )
-  longRunningProcess.stdout.waitForText("online")
+  await longRunningProcess.stdout.waitForText("online")
   await assertIsRunning(port)
 
   // kill the process

test/output-test.ts

@@ -1,4 +1,5 @@
 import { strict as assert } from "assert"
+
 import { startNodeProcess } from "./helpers/start-node-process"
 
 suite("ObservableProcess.output")

test/pid-test.ts

@@ -1,4 +1,5 @@
 import { strict as assert } from "assert"
+
 import { startNodeProcess } from "./helpers/start-node-process"
 
 test("ObservableProcess.pid()", async function () {

test/start-test.ts

@@ -1,4 +1,5 @@
 import { strict as assert } from "assert"
+
 import { start } from "../src/start"
 
 suite("ObservableProcess.spawn()")

test/stderr-test.ts

@@ -1,4 +1,5 @@
 import { strict as assert } from "assert"
+
 import { startNodeProcess } from "./helpers/start-node-process"
 
 suite("ObservableProcess.stderr")

test/stdout-test.ts

@@ -1,4 +1,5 @@
 import { strict as assert } from "assert"
+
 import { startNodeProcess } from "./helpers/start-node-process"
 
 suite("ObservableProcess.stdout")

test/wait-for-end-test.ts

@@ -1,6 +1,7 @@
 import { strict as assert } from "assert"
-import { start } from "../src/start"
 import * as util from "util"
+
+import { start } from "../src/start"
 const delay = util.promisify(setTimeout)
 
 suite("ObservableProcess.waitForEnd()")