added a new '--no-path-rewrite' option, decoupled from prefixing

Author: wh4everest

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wsrun",
-  "version": "3.6.6",
+  "version": "3.7.0",
   "description": "executes commands on packages in parallel, but is aware of the dependencies between them",
   "main": "./build/index.js",
   "author": "hfour",

src/cmd-process.ts

@@ -3,14 +3,15 @@ import * as Bromise from 'bluebird'
 
 import originalSplit = require('split')
 
-import { Result, ResultSpecialValues } from './enums';
+import { Result, ResultSpecialValues } from './enums'
 import { defer } from './utils'
 
 export interface CmdOptions {
   rejectOnNonZeroExit: boolean
   silent?: boolean
   collectLogs: boolean
   prefixer?: (basePath: string, pkg: string, line: string) => string
+  pathRewriter?: (basePath: string, pkg: string, line: string) => string
   doneCriteria?: string
   path: string
 }
@@ -47,7 +48,7 @@ export class CmdProcess {
   }
 
   get result() {
-    return Bromise.race([this._exitCode.promise, this._cancelled.promise]);
+    return Bromise.race([this._exitCode.promise, this._cancelled.promise])
   }
 
   /**
@@ -82,14 +83,14 @@ export class CmdProcess {
     this.exitCode.then(code => {
       if (code > 0) {
         const msg = '`' + this.cmdString + '` failed with exit code ' + code
-        if (!this.opts.silent) console.error(this.autoPrefix(msg))
+        if (!this.opts.silent) console.error(this.autoAugmentLine(msg))
         if (this.opts.rejectOnNonZeroExit) return this._finished.reject(new Error(msg))
       }
       this._finished.resolve()
     })
 
     // ignore if unhandled
-    this._finished.promise.catch(() => { })
+    this._finished.promise.catch(() => {})
   }
 
   stop() {
@@ -98,13 +99,25 @@ export class CmdProcess {
       this.cp.removeAllListeners('exit')
       this.cp.kill('SIGINT')
     }
-    this._cancelled.resolve(ResultSpecialValues.Cancelled);
+    this._cancelled.resolve(ResultSpecialValues.Cancelled)
   }
 
   private autoPrefix(line: string) {
     return this.opts.prefixer ? this.opts.prefixer(this.opts.path, this.pkgName, line) : line
   }
 
+  private autoPathRewrite(line: string) {
+    return this.opts.pathRewriter
+      ? this.opts.pathRewriter(this.opts.path, this.pkgName, line)
+      : line
+  }
+
+  private autoAugmentLine(line: string) {
+    line = this.autoPathRewrite(line)
+    line = this.autoPrefix(line)
+    return line
+  }
+
   private _start(cmd: string[]) {
     let sh: string
     let args: string[]
@@ -137,21 +150,21 @@ export class CmdProcess {
     if (this.cp.stdout)
       this.cp.stdout.pipe(split()).on('data', (line: string) => {
         if (this.opts.collectLogs) stdOutBuffer.push(line)
-        else console.log(this.autoPrefix(line))
+        else console.log(this.autoAugmentLine(line))
         if (this.doneCriteria && this.doneCriteria.test(line)) this._finished.resolve()
       })
     if (this.cp.stderr)
       this.cp.stderr.pipe(split()).on('data', (line: string) => {
         if (this.opts.collectLogs) stdErrBuffer.push(line)
-        else console.error(this.autoPrefix(line))
+        else console.error(this.autoAugmentLine(line))
         if (this.doneCriteria && this.doneCriteria.test(line)) this._finished.resolve()
       })
     if (this.opts.collectLogs)
       this._closed.promise.then(() => {
         if (stdOutBuffer.length)
-          console.log(stdOutBuffer.map(line => this.autoPrefix(line)).join('\n'))
+          console.log(stdOutBuffer.map(line => this.autoAugmentLine(line)).join('\n'))
         if (stdErrBuffer.length)
-          console.error(stdErrBuffer.map(line => this.autoPrefix(line)).join('\n'))
+          console.error(stdErrBuffer.map(line => this.autoAugmentLine(line)).join('\n'))
       })
   }
 }

src/index.ts

@@ -69,6 +69,7 @@ let yargsParser = yargs
       'fast-exit',
       'collect-logs',
       'no-prefix',
+      'no-path-rewrite',
       'bin',
       'done-criteria',
       'exclude',
@@ -100,6 +101,11 @@ let yargsParser = yargs
       boolean: true,
       describe: "Don't prefix output"
     },
+    'no-path-rewrite': {
+      boolean: true,
+      describe:
+        "Don't rewrite relative paths in the standard output, leaving them relative to the package folder"
+    },
     bin: {
       default: 'yarn',
       describe: 'The program to pass the command to',
@@ -156,6 +162,7 @@ const recursive: boolean = argv.recursive || argv.r || false
 const fastExit: boolean = argv.fastExit || false
 const collectLogs: boolean = argv.collectLogs || false
 const addPrefix: boolean = argv.prefix === undefined ? true : false
+const rewritePaths: boolean = argv.rewritePaths === undefined ? true : false
 const doneCriteria: string = argv.doneCriteria
 const exclude: string[] =
   (argv.exclude && (Array.isArray(argv.exclude) ? argv.exclude : [argv.exclude])) || []
@@ -190,6 +197,7 @@ let runner = new RunGraph(
     fastExit,
     collectLogs,
     addPrefix,
+    rewritePaths,
     mode: mode as any,
     recursive,
     doneCriteria,

src/run-graph.ts

@@ -2,7 +2,7 @@ import * as Bromise from 'bluebird'
 import chalk from 'chalk'
 
 import { PkgJson, Dict } from './workspace'
-import { ResultSpecialValues, Result, ProcResolution } from './enums';
+import { ResultSpecialValues, Result, ProcResolution } from './enums'
 import { uniq } from 'lodash'
 import { CmdProcess } from './cmd-process'
 import minimatch = require('minimatch')
@@ -35,6 +35,7 @@ export interface GraphOptions {
   fastExit: boolean
   collectLogs: boolean
   addPrefix: boolean
+  rewritePaths: boolean
   mode: 'parallel' | 'serial' | 'stages'
   recursive: boolean
   doneCriteria: string | undefined
@@ -56,6 +57,7 @@ export class RunGraph {
   private resultMap = new Map<string, Result>()
   private throat: PromiseFnRunner = passThrough
   prefixer = new Prefixer(this.opts.workspacePath).prefixer
+  pathRewriter = fixPaths
 
   constructor(
     public pkgJsons: PkgJson[],
@@ -187,6 +189,7 @@ export class RunGraph {
           rejectOnNonZeroExit: this.opts.fastExit,
           collectLogs: this.opts.collectLogs,
           prefixer: this.opts.addPrefix ? this.prefixer : undefined,
+          pathRewriter: this.opts.rewritePaths ? this.pathRewriter : undefined,
           doneCriteria: this.opts.doneCriteria,
           path: this.pkgPaths[pkg]
         })