Extract ProjectCommandSet into its own file

pgonzal · pgonzal · commit 487acf15e2fe · 2018-06-08T12:03:31.000-07:00
diff --git a/apps/rush-lib/src/api/Rush.ts b/apps/rush-lib/src/api/Rush.ts
@@ -8,7 +8,7 @@ import { IPackageJson } from '@microsoft/node-core-library';
 
 import { RushCommandLineParser } from '../cli/RushCommandLineParser';
 import { RushConstants } from './RushConstants';
-import { RushX } from './RushX';
+import { RushXCommandLine } from '../cli/RushXCommandLine';
 import { CommandLineMigrationAdvisor } from '../cli/CommandLineMigrationAdvisor';
 
 /**
@@ -55,7 +55,7 @@ export class Rush {
   public static launchRushX(launcherVersion: string, isManaged: boolean): void {
     Rush._printStartupBanner(isManaged);
 
-    RushX.launchRushX(launcherVersion, isManaged);
+    RushXCommandLine.launchRushX(launcherVersion, isManaged);
   }
 
   /**
diff --git a/apps/rush-lib/src/cli/RushXCommandLine.ts b/apps/rush-lib/src/cli/RushXCommandLine.ts
@@ -9,48 +9,12 @@ import * as path from 'path';
 import {
   PackageJsonLookup,
   IPackageJson,
-  Text,
-  IPackageJsonScriptTable
+  Text
  } from '@microsoft/node-core-library';
 import { Utilities } from '../utilities/Utilities';
+import { ProjectCommandSet } from '../logic/ProjectCommandSet';
 
-/**
- * Parses the "scripts" section from package.json
- */
-class ProjectCommandSet {
-  public readonly malformedScriptNames: string[] = [];
-  public readonly commandNames: string[] = [];
-  private readonly _scriptsByName: Map<string, string> = new Map<string, string>();
-
-  public constructor(packageJson: IPackageJson) {
-    const scripts: IPackageJsonScriptTable = packageJson.scripts || { };
-
-    for (const scriptName of Object.keys(scripts)) {
-      if (scriptName[0] === '-' || scriptName.length === 0) {
-        this.malformedScriptNames.push(scriptName);
-      } else {
-        this.commandNames.push(scriptName);
-        this._scriptsByName.set(scriptName, scripts[scriptName]);
-      }
-    }
-
-    this.commandNames.sort();
-  }
-
-  public tryGetScriptBody(commandName: string): string | undefined {
-    return this._scriptsByName.get(commandName);
-  }
-
-  public getScriptBody(commandName: string): string {
-    const result: string | undefined = this.tryGetScriptBody(commandName);
-    if (result === undefined) {
-      throw new Error(`The command "${commandName}" was not found`);
-    }
-    return result;
-  }
-}
-
-export class RushX {
+export class RushXCommandLine {
   public static launchRushX(launcherVersion: string, isManaged: boolean): void {
     // NodeJS can sometimes accidentally terminate with a zero exit code  (e.g. for an uncaught
     // promise exception), so we start with the assumption that the exit code is 1
@@ -82,7 +46,7 @@ export class RushX {
       //   rush -h
       //   rush --unrecognized-option
       if (args.length === 0 || args[0][0] === '-') {
-        RushX._showUsage(packageJson, projectCommandSet);
+        RushXCommandLine._showUsage(packageJson, projectCommandSet);
         return;
       }
 
diff --git a/apps/rush-lib/src/logic/ProjectCommandSet.ts b/apps/rush-lib/src/logic/ProjectCommandSet.ts
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
+
+import {
+  IPackageJson,
+  IPackageJsonScriptTable
+ } from '@microsoft/node-core-library';
+
+/**
+ * Parses the "scripts" section from package.json and provides support for executing scripts.
+ */
+export class ProjectCommandSet {
+  public readonly malformedScriptNames: string[] = [];
+  public readonly commandNames: string[] = [];
+  private readonly _scriptsByName: Map<string, string> = new Map<string, string>();
+
+  public constructor(packageJson: IPackageJson) {
+    const scripts: IPackageJsonScriptTable = packageJson.scripts || { };
+
+    for (const scriptName of Object.keys(scripts)) {
+      if (scriptName[0] === '-' || scriptName.length === 0) {
+        this.malformedScriptNames.push(scriptName);
+      } else {
+        this.commandNames.push(scriptName);
+        this._scriptsByName.set(scriptName, scripts[scriptName]);
+      }
+    }
+
+    this.commandNames.sort();
+  }
+
+  public tryGetScriptBody(commandName: string): string | undefined {
+    return this._scriptsByName.get(commandName);
+  }
+
+  public getScriptBody(commandName: string): string {
+    const result: string | undefined = this.tryGetScriptBody(commandName);
+    if (result === undefined) {
+      throw new Error(`The command "${commandName}" was not found`);
+    }
+    return result;
+  }
+}
