refactor(run): Ensure lexical execution respects concurrency and stre…

…aming options
lerna · May 11, 2019 · 98e77cf · 98e77cf
1 parent ea7c20d
commit 98e77cf
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/commands/run/__tests__/run-command.test.js b/commands/run/__tests__/run-command.test.js
@@ -187,6 +187,25 @@ describe("RunCommand", () => {
         "package-standalone",
       ]);
     });
+
+    it("optionally streams output", async () => {
+      const testDir = await initFixture("toposort");
+
+      await lernaRun(testDir)("env", "--no-sort", "--stream");
+
+      expect(ranInPackagesStreaming(testDir)).toMatchInlineSnapshot(`
+        Array [
+          "packages/package-cycle-1 npm run env (prefixed: true)",
+          "packages/package-cycle-2 npm run env (prefixed: true)",
+          "packages/package-cycle-extraneous npm run env (prefixed: true)",
+          "packages/package-dag-1 npm run env (prefixed: true)",
+          "packages/package-dag-2a npm run env (prefixed: true)",
+          "packages/package-dag-2b npm run env (prefixed: true)",
+          "packages/package-dag-3 npm run env (prefixed: true)",
+          "packages/package-standalone npm run env (prefixed: true)",
+        ]
+      `);
+    });
   });
 
   describe("in a cyclical repo", () => {

diff --git a/commands/run/index.js b/commands/run/index.js
@@ -73,10 +73,12 @@ class RunCommand extends Command {
     let chain = Promise.resolve();
     const getElapsed = timer();
 
-    if (this.options.parallel || !this.toposort) {
+    if (this.options.parallel) {
       chain = chain.then(() => this.runScriptInPackagesParallel());
-    } else {
+    } else if (this.toposort) {
       chain = chain.then(() => this.runScriptInPackagesTopological());
+    } else {
+      chain = chain.then(() => this.runScriptInPackagesLexical());
     }
 
     if (this.bail) {
@@ -158,12 +160,15 @@ class RunCommand extends Command {
   }
 
   runScriptInPackagesParallel() {
-    const runner =
-      this.options.parallel || this.options.stream
-        ? pkg => this.runScriptInPackageStreaming(pkg)
-        : pkg => this.runScriptInPackageCapturing(pkg);
+    return pMap(this.packagesWithScript, pkg => this.runScriptInPackageStreaming(pkg));
+  }
+
+  runScriptInPackagesLexical() {
+    const runner = this.options.stream
+      ? pkg => this.runScriptInPackageStreaming(pkg)
+      : pkg => this.runScriptInPackageCapturing(pkg);
 
-    return pMap(this.packagesWithScript, runner);
+    return pMap(this.packagesWithScript, runner, { concurrency: this.concurrency });
   }
 
   runScriptInPackageStreaming(pkg) {