fix: handle CLI usage as a library

DimitarTachev · DimitarTachev · commit ace53e535bdc · 2019-04-19T10:35:47.000+03:00
diff --git a/lib/commands/build.ts b/lib/commands/build.ts
@@ -65,7 +65,7 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 			this.$errors.fail(`Applications for platform ${platform} can not be built on this OS`);
 		}
 
-		this.$bundleValidatorHelper.validate();
+		this.$bundleValidatorHelper.validate(this.$projectData);
 	}
 
 	protected async validateArgs(args: string[], platform: string): Promise<ICanExecuteCommandOutput> {
diff --git a/lib/commands/debug.ts b/lib/commands/debug.ts
@@ -69,7 +69,7 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 		}
 
 		const minSupportedWebpackVersion = this.$options.hmr ? LiveSyncCommandHelper.MIN_SUPPORTED_WEBPACK_VERSION_WITH_HMR : null;
-		this.$bundleValidatorHelper.validate(minSupportedWebpackVersion);
+		this.$bundleValidatorHelper.validate(this.$projectData, minSupportedWebpackVersion);
 
 		const result = await super.canExecuteCommandBase(this.platform, { validateOptions: true, notConfiguredEnvOptions: { hideCloudBuildOption: true, hideSyncToPreviewAppOption: true } });
 		return result;
diff --git a/lib/commands/deploy.ts b/lib/commands/deploy.ts
@@ -14,8 +14,8 @@ export class DeployOnDeviceCommand extends ValidatePlatformCommandBase implement
 		$platformsData: IPlatformsData,
 		private $bundleValidatorHelper: IBundleValidatorHelper,
 		private $androidBundleValidatorHelper: IAndroidBundleValidatorHelper) {
-			super($options, $platformsData, $platformService, $projectData);
-			this.$projectData.initializeProjectData();
+		super($options, $platformsData, $platformService, $projectData);
+		this.$projectData.initializeProjectData();
 	}
 
 	public async execute(args: string[]): Promise<void> {
@@ -26,7 +26,7 @@ export class DeployOnDeviceCommand extends ValidatePlatformCommandBase implement
 
 	public async canExecute(args: string[]): Promise<boolean | ICanExecuteCommandOutput> {
 		this.$androidBundleValidatorHelper.validateNoAab();
-		this.$bundleValidatorHelper.validate();
+		this.$bundleValidatorHelper.validate(this.$projectData);
 		if (!args || !args.length || args.length > 1) {
 			return false;
 		}
diff --git a/lib/commands/preview.ts b/lib/commands/preview.ts
@@ -46,7 +46,7 @@ export class PreviewCommand implements ICommand {
 		}
 
 		await this.$networkConnectivityValidator.validate();
-		this.$bundleValidatorHelper.validate(PreviewCommand.MIN_SUPPORTED_WEBPACK_VERSION);
+		this.$bundleValidatorHelper.validate(this.$projectData, PreviewCommand.MIN_SUPPORTED_WEBPACK_VERSION);
 		return true;
 	}
 }
diff --git a/lib/declarations.d.ts b/lib/declarations.d.ts
@@ -940,13 +940,13 @@ interface IBundleValidatorHelper {
 	 * @param {string} minSupportedVersion the minimum supported version of nativescript-dev-webpack
 	 * @return {void}
 	 */
-	validate(minSupportedVersion?: string): void;
+	validate(projectData: IProjectData, minSupportedVersion?: string): void;
 
 	/**
 	 * Returns the installed bundler version.
 	 * @return {string}
 	 */
-	getBundlerDependencyVersion(bundlerName?: string): string;
+	getBundlerDependencyVersion(projectData: IProjectData, bundlerName?: string): string;
 }
 
 
diff --git a/lib/helpers/bundle-validator-helper.ts b/lib/helpers/bundle-validator-helper.ts
@@ -7,16 +7,14 @@ export class BundleValidatorHelper extends VersionValidatorHelper implements IBu
 		webpack: "nativescript-dev-webpack"
 	};
 
-	constructor(protected $projectData: IProjectData,
-		protected $errors: IErrors,
+	constructor(protected $errors: IErrors,
 		protected $options: IOptions) {
 		super();
-		this.$projectData.initializeProjectData();
 	}
 
-	public validate(minSupportedVersion?: string): void {
+	public validate(projectData: IProjectData, minSupportedVersion?: string): void {
 		if (this.$options.bundle) {
-			const currentVersion = this.getBundlerDependencyVersion();
+			const currentVersion = this.getBundlerDependencyVersion(projectData);
 			if (!currentVersion) {
 				this.$errors.failWithoutHelp(BundleValidatorMessages.MissingBundlePlugin);
 			}
@@ -28,11 +26,11 @@ export class BundleValidatorHelper extends VersionValidatorHelper implements IBu
 		}
 	}
 
-	public getBundlerDependencyVersion(bundlerName?: string): string {
+	public getBundlerDependencyVersion(projectData: IProjectData, bundlerName?: string): string {
 		let dependencyVersion = null;
 		const bundlePluginName = bundlerName || this.bundlersMap[this.$options.bundle];
-		const bundlerVersionInDependencies = this.$projectData.dependencies && this.$projectData.dependencies[bundlePluginName];
-		const bundlerVersionInDevDependencies = this.$projectData.devDependencies && this.$projectData.devDependencies[bundlePluginName];
+		const bundlerVersionInDependencies = projectData.dependencies && projectData.dependencies[bundlePluginName];
+		const bundlerVersionInDevDependencies = projectData.devDependencies && projectData.devDependencies[bundlePluginName];
 		dependencyVersion = bundlerVersionInDependencies || bundlerVersionInDevDependencies;
 
 		return dependencyVersion;
diff --git a/lib/helpers/livesync-command-helper.ts b/lib/helpers/livesync-command-helper.ts
@@ -152,7 +152,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {
 		}
 
 		const minSupportedWebpackVersion = this.$options.hmr ? LiveSyncCommandHelper.MIN_SUPPORTED_WEBPACK_VERSION_WITH_HMR : null;
-		this.$bundleValidatorHelper.validate(minSupportedWebpackVersion);
+		this.$bundleValidatorHelper.validate(this.$projectData, minSupportedWebpackVersion);
 
 		return result;
 	}
diff --git a/lib/services/project-data-service.ts b/lib/services/project-data-service.ts
@@ -19,7 +19,7 @@ interface IProjectFileData {
 }
 
 export class ProjectDataService implements IProjectDataService {
-	private defaultProjectDir = "";
+	private defaultProjectDir: string;
 	private static DEPENDENCIES_KEY_NAME = "dependencies";
 	private projectDataCache: IDictionary<IProjectData> = {};
 
@@ -28,12 +28,16 @@ export class ProjectDataService implements IProjectDataService {
 		private $logger: ILogger,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $androidResourcesMigrationService: IAndroidResourcesMigrationService,
-		private $injector: IInjector,
-		$projectData: IProjectData) {
-		// add the ProjectData of the default projectDir to the projectData cache
-		$projectData.initializeProjectData();
-		this.defaultProjectDir = $projectData.projectDir;
-		this.projectDataCache[this.defaultProjectDir] = $projectData;
+		private $injector: IInjector) {
+		try {
+			// add the ProjectData of the default projectDir to the projectData cache
+			const projectData = this.$injector.resolve("projectData");
+			projectData.initializeProjectData();
+			this.defaultProjectDir = projectData.projectDir;
+			this.projectDataCache[this.defaultProjectDir] = projectData;
+		} catch (e) {
+			// the CLI is required as a lib from a non-project folder
+		}
 	}
 
 	public getNSValue(projectDir: string, propertyName: string): any {
diff --git a/lib/services/workflow-service.ts b/lib/services/workflow-service.ts
@@ -68,7 +68,7 @@ export class WorkflowService implements IWorkflowService {
 		const validWebpackPluginTags = ["*", "latest", "next", "rc"];
 
 		let isInstalledVersionSupported = true;
-		const installedVersion = this.$bundleValidatorHelper.getBundlerDependencyVersion(webpackPluginName);
+		const installedVersion = this.$bundleValidatorHelper.getBundlerDependencyVersion(projectData, webpackPluginName);
 		this.$logger.trace(`Updating to webpack workflow: Found ${webpackPluginName} v${installedVersion}`);
 		if (validWebpackPluginTags.indexOf(installedVersion) === -1) {
 			const isInstalledVersionValid = !!semver.valid(installedVersion) || !!semver.coerce(installedVersion);
diff --git a/test/debug.ts b/test/debug.ts
@@ -15,6 +15,7 @@ import { SettingsService } from "../lib/common/test/unit-tests/stubs";
 function createTestInjector(): IInjector {
 	const testInjector: IInjector = new yok.Yok();
 
+	testInjector.register("workflowService", stubs.WorkflowServiceStub);
 	testInjector.register("debug|android", DebugAndroidCommand);
 	testInjector.register("config", Configuration);
 	testInjector.register("staticConfig", StaticConfig);
diff --git a/test/helpers/bundle-validator-helper.ts b/test/helpers/bundle-validator-helper.ts
@@ -90,17 +90,18 @@ describe("BundleValidatorHelper", () => {
 			]);
 		});
 
-		_.each(testCases, (testCase: any) => {
-			const deps = {
-				"nativescript-dev-webpack": testCase.currentWebpackVersion
-			};
+	_.each(testCases, (testCase: any) => {
+		const deps = {
+			"nativescript-dev-webpack": testCase.currentWebpackVersion
+		};
 
-			it(`${testCase.name}`, async () => {
-				const injector = createTestInjector({ dependencies: testCase.isDependency ? deps : null, devDependencies: !testCase.isDependency ? deps : null });
-				const bundleValidatorHelper = injector.resolve("bundleValidatorHelper");
-				bundleValidatorHelper.validate(testCase.minSupportedWebpackVersion);
+		it(`${testCase.name}`, async () => {
+			const injector = createTestInjector({ dependencies: testCase.isDependency ? deps : null, devDependencies: !testCase.isDependency ? deps : null });
+			const bundleValidatorHelper = injector.resolve("bundleValidatorHelper");
+			const projectData = injector.resolve("projectData");
+			bundleValidatorHelper.validate(projectData, testCase.minSupportedWebpackVersion);
 
-				assert.deepEqual(error, testCase.expectedError);
-			});
+			assert.deepEqual(error, testCase.expectedError);
 		});
+	});
 });
diff --git a/test/package-installation-manager.ts b/test/package-installation-manager.ts
@@ -14,10 +14,13 @@ import * as yok from "../lib/common/yok";
 import ChildProcessLib = require("../lib/common/child-process");
 import { SettingsService } from "../lib/common/test/unit-tests/stubs";
 import { ProjectDataService } from "../lib/services/project-data-service";
+import { WorkflowServiceStub, ProjectDataStub } from "./stubs";
 
 function createTestInjector(): IInjector {
 	const testInjector = new yok.Yok();
 
+	testInjector.register("workflowService", WorkflowServiceStub);
+	testInjector.register("projectData", ProjectDataStub);
 	testInjector.register("config", ConfigLib.Configuration);
 	testInjector.register("logger", LoggerLib.Logger);
 	testInjector.register("errors", ErrorsLib.Errors);
diff --git a/test/platform-commands.ts b/test/platform-commands.ts
@@ -20,6 +20,7 @@ import * as ChildProcessLib from "../lib/common/child-process";
 import ProjectChangesLib = require("../lib/services/project-changes-service");
 import { Messages } from "../lib/common/messages/messages";
 import { SettingsService } from "../lib/common/test/unit-tests/stubs";
+import { WorkflowServiceStub } from "./stubs";
 
 let isCommandExecuted = true;
 
@@ -97,6 +98,7 @@ function createTestInjector() {
 	const testInjector = new yok.Yok();
 
 	testInjector.register("injector", testInjector);
+	testInjector.register("workflowService", WorkflowServiceStub);
 	testInjector.register("hooksService", stubs.HooksServiceStub);
 	testInjector.register("staticConfig", StaticConfigLib.StaticConfig);
 	testInjector.register("nodeModulesDependenciesBuilder", {});
diff --git a/test/platform-service.ts b/test/platform-service.ts
@@ -32,6 +32,7 @@ temp.track();
 function createTestInjector() {
 	const testInjector = new yok.Yok();
 
+	testInjector.register("workflowService", stubs.WorkflowServiceStub);
 	testInjector.register('platformService', PlatformServiceLib.PlatformService);
 	testInjector.register('errors', stubs.ErrorsStub);
 	testInjector.register('logger', stubs.LoggerStub);
diff --git a/test/services/playground/preview-app-livesync-service.ts b/test/services/playground/preview-app-livesync-service.ts
@@ -1,6 +1,6 @@
 import { Yok } from "../../../lib/common/yok";
 import * as _ from 'lodash';
-import { LoggerStub, ErrorsStub } from "../../stubs";
+import { LoggerStub, ErrorsStub, WorkflowServiceStub } from "../../stubs";
 import { FilePayload, Device, FilesPayload } from "nativescript-preview-sdk";
 import { PreviewAppLiveSyncService } from "../../../lib/services/livesync/playground/preview-app-livesync-service";
 import * as chai from "chai";
@@ -101,6 +101,7 @@ function createTestInjector(options?: {
 	options = options || {};
 
 	const injector = new Yok();
+	injector.register("workflowService", WorkflowServiceStub);
 	injector.register("logger", LoggerMock);
 	injector.register("hmrStatusService", {});
 	injector.register("errors", ErrorsStub);
diff --git a/test/services/project-data-service.ts b/test/services/project-data-service.ts
@@ -1,7 +1,7 @@
 import { Yok } from "../../lib/common/yok";
 import { assert } from "chai";
 import { ProjectDataService } from "../../lib/services/project-data-service";
-import { LoggerStub } from "../stubs";
+import { LoggerStub, WorkflowServiceStub, ProjectDataStub } from "../stubs";
 import { NATIVESCRIPT_PROPS_INTERNAL_DELIMITER, PACKAGE_JSON_FILE_NAME, AssetConstants, ProjectTypes } from '../../lib/constants';
 import { DevicePlatformsConstants } from "../../lib/common/mobile/device-platforms-constants";
 import { basename, join } from "path";
@@ -43,6 +43,8 @@ const testData: any = [
 
 const createTestInjector = (readTextData?: string): IInjector => {
 	const testInjector = new Yok();
+	testInjector.register("workflowService", WorkflowServiceStub);
+	testInjector.register("projectData", ProjectDataStub);
 	testInjector.register("staticConfig", {
 		CLIENT_NAME_KEY_IN_PROJECT_FILE: CLIENT_NAME_KEY_IN_PROJECT_FILE,
 		PROJECT_FILE_NAME: "package.json"
diff --git a/test/stubs.ts b/test/stubs.ts
@@ -916,6 +916,12 @@ export class PerformanceService implements IPerformanceService {
 	processExecutionData() { }
 }
 
+export class WorkflowServiceStub implements IWorkflowService {
+	handleLegacyWorkflow(projectDir: string, settings: IWebpackWorkflowSettings, skipWarnings?: boolean, force?: boolean): Promise<void> {
+		return;
+	}
+}
+
 export class InjectorStub extends Yok implements IInjector {
 	constructor() {
 		super();
@@ -954,5 +960,6 @@ export class InjectorStub extends Yok implements IInjector {
 			getDevice: (): Mobile.IDevice => undefined,
 			getDeviceByIdentifier: (): Mobile.IDevice => undefined
 		});
+		this.register("workflowService", WorkflowServiceStub);
 	}
 }
diff --git a/test/update.ts b/test/update.ts
@@ -25,6 +25,7 @@ function createTestInjector(
 ): IInjector {
 	const testInjector: IInjector = new yok.Yok();
 	testInjector.register("logger", stubs.LoggerStub);
+	testInjector.register("workflowService", stubs.WorkflowServiceStub);
 	testInjector.register("options", Options);
 	testInjector.register('fs', stubs.FileSystemStub);
 	testInjector.register("analyticsService", {
@@ -49,10 +50,10 @@ function createTestInjector(
 	});
 	testInjector.register("pluginVariablesService", {});
 	testInjector.register("platformService", {
-		getInstalledPlatforms: function(): string[] {
+		getInstalledPlatforms: function (): string[] {
 			return installedPlatforms;
 		},
-		getAvailablePlatforms: function(): string[] {
+		getAvailablePlatforms: function (): string[] {
 			return availablePlatforms;
 		},
 		removePlatforms: async (): Promise<void> => undefined,
@@ -66,9 +67,9 @@ function createTestInjector(
 		getPlatformData: () => {
 			return {
 				platformProjectService: {
-						validate
-					}
-				};
+					validate
+				}
+			};
 		}
 	});
 	testInjector.register("settingsService", SettingsService);
@@ -161,7 +162,7 @@ describe("update command method tests", () => {
 			const fs = testInjector.resolve("fs");
 			const copyFileStub = sandbox.stub(fs, "copyFile");
 			const updateCommand = testInjector.resolve<UpdateCommand>(UpdateCommand);
-			return updateCommand.execute(["3.3.0"]).then( () => {
+			return updateCommand.execute(["3.3.0"]).then(() => {
 				assert.isTrue(copyFileStub.calledWith(path.join(projectFolder, "package.json")));
 				for (const folder of UpdateCommand.folders) {
 					assert.isTrue(copyFileStub.calledWith(path.join(projectFolder, folder)));

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {`
`65`	`65`	this.$errors.fail(`Applications for platform ${platform} can not be built on this OS`);
`66`	`66`	`}`
`67`	`67`
`68`		`- this.$bundleValidatorHelper.validate();`
	`68`	`+ this.$bundleValidatorHelper.validate(this.$projectData);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`protected async validateArgs(args: string[], platform: string): Promise<ICanExecuteCommandOutput> {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`const minSupportedWebpackVersion = this.$options.hmr ? LiveSyncCommandHelper.MIN_SUPPORTED_WEBPACK_VERSION_WITH_HMR : null;`
`72`		`- this.$bundleValidatorHelper.validate(minSupportedWebpackVersion);`
	`72`	`+ this.$bundleValidatorHelper.validate(this.$projectData, minSupportedWebpackVersion);`
`73`	`73`
`74`	`74`	`const result = await super.canExecuteCommandBase(this.platform, { validateOptions: true, notConfiguredEnvOptions: { hideCloudBuildOption: true, hideSyncToPreviewAppOption: true } });`
`75`	`75`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ export class PreviewCommand implements ICommand {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`await this.$networkConnectivityValidator.validate();`
`49`		`- this.$bundleValidatorHelper.validate(PreviewCommand.MIN_SUPPORTED_WEBPACK_VERSION);`
	`49`	`+ this.$bundleValidatorHelper.validate(this.$projectData, PreviewCommand.MIN_SUPPORTED_WEBPACK_VERSION);`
`50`	`50`	`return true;`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ export class LiveSyncCommandHelper implements ILiveSyncCommandHelper {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`const minSupportedWebpackVersion = this.$options.hmr ? LiveSyncCommandHelper.MIN_SUPPORTED_WEBPACK_VERSION_WITH_HMR : null;`
`155`		`- this.$bundleValidatorHelper.validate(minSupportedWebpackVersion);`
	`155`	`+ this.$bundleValidatorHelper.validate(this.$projectData, minSupportedWebpackVersion);`
`156`	`156`
`157`	`157`	`return result;`
`158`	`158`	`}`