chore: fix PR comments

DimitarTachev · DimitarTachev · commit f9be51d0fce6 · 2019-04-23T11:26:02.000+03:00
diff --git a/lib/commands/build.ts b/lib/commands/build.ts
@@ -16,7 +16,7 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {
 	}
 
 	public async executeCore(args: string[]): Promise<string> {
-		await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		const platform = args[0].toLowerCase();
 		const appFilesUpdaterOptions: IAppFilesUpdaterOptions = {
 			bundle: !!this.$options.bundle,
diff --git a/lib/commands/debug.ts b/lib/commands/debug.ts
@@ -24,7 +24,7 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		await this.$devicesService.initialize({
 			platform: this.platform,
 			deviceId: this.$options.device,
diff --git a/lib/commands/prepare.ts b/lib/commands/prepare.ts
@@ -14,7 +14,7 @@ export class PrepareCommand extends ValidatePlatformCommandBase implements IComm
 	}
 
 	public async execute(args: string[]): Promise<void> {
-		await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		const appFilesUpdaterOptions: IAppFilesUpdaterOptions = {
 			bundle: !!this.$options.bundle,
 			release: this.$options.release,
diff --git a/lib/commands/preview.ts b/lib/commands/preview.ts
@@ -21,7 +21,7 @@ export class PreviewCommand implements ICommand {
 	}
 
 	public async execute(): Promise<void> {
-		await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		this.$previewAppLogProvider.on(DEVICE_LOG_EVENT_NAME, (deviceId: string, message: string) => {
 			this.$logger.info(message);
 		});
diff --git a/lib/commands/run.ts b/lib/commands/run.ts
@@ -19,7 +19,7 @@ export class RunCommandBase implements ICommand {
 
 	public allowedParameters: ICommandParameter[] = [];
 	public async execute(args: string[]): Promise<void> {
-		await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		await this.$analyticsService.trackPreviewAppData(this.platform, this.$projectData.projectDir);
 		return this.$liveSyncCommandHelper.executeCommandLiveSync(this.platform, this.liveSyncCommandHelperAdditionalOptions);
 	}
diff --git a/lib/commands/test.ts b/lib/commands/test.ts
@@ -14,7 +14,7 @@ abstract class TestCommandBase {
 	protected abstract $workflowService: IWorkflowService;
 
 	async execute(args: string[]): Promise<void> {
-		await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });
 		await this.$testExecutionService.startKarmaServer(this.platform, this.$projectData, this.projectFilesConfig);
 	}
 
diff --git a/lib/commands/update.ts b/lib/commands/update.ts
@@ -30,8 +30,7 @@ export class UpdateCommand extends ValidatePlatformCommandBase implements IComma
 
 	public async execute(args: string[]): Promise<void> {
 		if (this.$options.workflow) {
-			const forceWebpackWorkflow = true;
-			await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, forceWebpackWorkflow);
+			await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, force: true });
 			return;
 		}
 
diff --git a/lib/common/helpers.ts b/lib/common/helpers.ts
@@ -385,7 +385,11 @@ export function createTable(headers: string[], data: string[][]): any {
 }
 
 export function getMessageWithBorders(message: string, spanLength = 3): string {
-	const longestRowLength = message.split(EOL).sort(function (a, b) { return b.length - a.length; })[0].length;
+	if (!message) {
+		return "";
+	}
+
+	const longestRowLength = message.split(EOL).sort((a, b) => { return b.length - a.length; })[0].length;
 	let border = "*".repeat(longestRowLength + 2 * spanLength); // * 2 for both sides
 	if (border.length % 2 === 0) {
 		border += "*"; // the * should always be an odd number in order to get * in each edge (we will remove the even *s below)
diff --git a/lib/definitions/platform.d.ts b/lib/definitions/platform.d.ts
@@ -15,7 +15,14 @@ interface IBuildPlatformAction {
 }
 
 interface IWorkflowService {
-	handleLegacyWorkflow(projectDir: string, settings: IWebpackWorkflowSettings, skipWarnings?: boolean, force?: boolean): Promise<void>;
+	handleLegacyWorkflow(options: IHandleLegacyWorkflowOptions): Promise<void>;
+}
+
+interface IHandleLegacyWorkflowOptions {
+	projectDir: string;
+	settings: IWebpackWorkflowSettings;
+	skipWarnings?: boolean;
+	force?: boolean;
 }
 
 interface IWebpackWorkflowSettings {
diff --git a/lib/services/livesync/playground/preview-app-livesync-service.ts b/lib/services/livesync/playground/preview-app-livesync-service.ts
@@ -30,7 +30,7 @@ export class PreviewAppLiveSyncService extends EventEmitter implements IPreviewA
 	@performanceLog()
 	public async initialize(data: IPreviewAppLiveSyncData): Promise<void> {
 		await this.$previewSdkService.initialize(data.projectDir, async (device: Device) => {
-			await this.$workflowService.handleLegacyWorkflow(data.projectDir, data);
+			await this.$workflowService.handleLegacyWorkflow({ projectDir: data.projectDir, settings: data });
 			try {
 				if (!device) {
 					this.$errors.failWithoutHelp("Sending initial preview files without a specified device is not supported.");
diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts
@@ -222,7 +222,7 @@ export class PlatformService extends EventEmitter implements IPlatformService {
 
 	@performanceLog()
 	public async preparePlatform(platformInfo: IPreparePlatformInfo): Promise<boolean> {
-		await this.$workflowService.handleLegacyWorkflow(platformInfo.projectData.projectDir, platformInfo.appFilesUpdaterOptions);
+		await this.$workflowService.handleLegacyWorkflow({ projectDir: platformInfo.projectData.projectDir, settings: platformInfo.appFilesUpdaterOptions });
 		const changesInfo = await this.getChangesInfo(platformInfo);
 		const shouldPrepare = await this.shouldPrepare({ platformInfo, changesInfo });
 
diff --git a/lib/services/project-data-service.ts b/lib/services/project-data-service.ts
@@ -1,7 +1,6 @@
 import * as path from "path";
 import * as constants from "../constants";
 import { ProjectData } from "../project-data";
-import { parseJson } from "../common/helpers";
 import { exported } from "../common/decorators";
 import {
 	NATIVESCRIPT_PROPS_INTERNAL_DELIMITER,
@@ -197,9 +196,8 @@ export class ProjectDataService implements IProjectDataService {
 	private getNsConfig(nsConfigPath: string): INsConfig {
 		let result = this.getNsConfigDefaultObject();
 		if (this.$fs.exists(nsConfigPath)) {
-			const nsConfigContent = this.$fs.readText(nsConfigPath);
 			try {
-				result = <INsConfig>parseJson(nsConfigContent);
+				result = <INsConfig>this.$fs.readJson(nsConfigPath);
 			} catch (e) {
 				// default
 			}
diff --git a/lib/services/workflow-service.ts b/lib/services/workflow-service.ts
@@ -4,8 +4,8 @@ import * as semver from "semver";
 import { EOL } from "os";
 
 export class WorkflowService implements IWorkflowService {
-	private legacyWorkflowDeprecationMessage = `With the upcoming NativeScript 6.0 the Webpack workflow will become the only way of build apps.
-More info about the reason for this change and how to migrate your project can be found in the link below:
+	private legacyWorkflowDeprecationMessage = `With the upcoming NativeScript 6.0 the Webpack workflow will become the only way of building apps.
+More info about the reasons for this change and how to migrate your project can be found in the link below:
 <TODO: add link here>`;
 	private webpackWorkflowConfirmMessage = `Do you want to switch your app to the Webpack workflow?`;
 
@@ -19,7 +19,8 @@ More info about the reason for this change and how to migrate your project can b
 	) {
 	}
 
-	public async handleLegacyWorkflow(projectDir: string, settings: IWebpackWorkflowSettings, skipWarnings?: boolean, force?: boolean): Promise<void> {
+	public async handleLegacyWorkflow(options: IHandleLegacyWorkflowOptions): Promise<void> {
+		const { projectDir, settings, skipWarnings, force } = options;
 		if (!settings.bundle || force) {
 			const projectData = this.$projectDataService.getProjectData(projectDir);
 			if (typeof (projectData.useLegacyWorkflow) !== "boolean" || force) {
diff --git a/test/stubs.ts b/test/stubs.ts
@@ -917,7 +917,7 @@ export class PerformanceService implements IPerformanceService {
 }
 
 export class WorkflowServiceStub implements IWorkflowService {
-	handleLegacyWorkflow(projectDir: string, settings: IWebpackWorkflowSettings, skipWarnings?: boolean, force?: boolean): Promise<void> {
+	handleLegacyWorkflow(options: IHandleLegacyWorkflowOptions): Promise<void> {
 		return;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export abstract class BuildCommandBase extends ValidatePlatformCommandBase {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public async executeCore(args: string[]): Promise<string> {`
`19`		`- await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);`
	`19`	`+ await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });`
`20`	`20`	`const platform = args[0].toLowerCase();`
`21`	`21`	`const appFilesUpdaterOptions: IAppFilesUpdaterOptions = {`
`22`	`22`	`bundle: !!this.$options.bundle,`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export class DebugPlatformCommand extends ValidatePlatformCommandBase implements`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public async execute(args: string[]): Promise<void> {`
`27`		`- await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);`
	`27`	`+ await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });`
`28`	`28`	`await this.$devicesService.initialize({`
`29`	`29`	`platform: this.platform,`
`30`	`30`	`deviceId: this.$options.device,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export class PrepareCommand extends ValidatePlatformCommandBase implements IComm`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public async execute(args: string[]): Promise<void> {`
`17`		`- await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);`
	`17`	`+ await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });`
`18`	`18`	`const appFilesUpdaterOptions: IAppFilesUpdaterOptions = {`
`19`	`19`	`bundle: !!this.$options.bundle,`
`20`	`20`	`release: this.$options.release,`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ export class PreviewCommand implements ICommand {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public async execute(): Promise<void> {`
`24`		`- await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);`
	`24`	`+ await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });`
`25`	`25`	`this.$previewAppLogProvider.on(DEVICE_LOG_EVENT_NAME, (deviceId: string, message: string) => {`
`26`	`26`	`this.$logger.info(message);`
`27`	`27`	`});`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export class RunCommandBase implements ICommand {`
`19`	`19`
`20`	`20`	`public allowedParameters: ICommandParameter[] = [];`
`21`	`21`	`public async execute(args: string[]): Promise<void> {`
`22`		`- await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);`
	`22`	`+ await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });`
`23`	`23`	`await this.$analyticsService.trackPreviewAppData(this.platform, this.$projectData.projectDir);`
`24`	`24`	`return this.$liveSyncCommandHelper.executeCommandLiveSync(this.platform, this.liveSyncCommandHelperAdditionalOptions);`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ abstract class TestCommandBase {`
`14`	`14`	`protected abstract $workflowService: IWorkflowService;`
`15`	`15`
`16`	`16`	`async execute(args: string[]): Promise<void> {`
`17`		`- await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, true);`
	`17`	`+ await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, skipWarnings: true });`
`18`	`18`	`await this.$testExecutionService.startKarmaServer(this.platform, this.$projectData, this.projectFilesConfig);`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ export class UpdateCommand extends ValidatePlatformCommandBase implements IComma`
`30`	`30`
`31`	`31`	`public async execute(args: string[]): Promise<void> {`
`32`	`32`	`if (this.$options.workflow) {`
`33`		`- const forceWebpackWorkflow = true;`
`34`		`- await this.$workflowService.handleLegacyWorkflow(this.$projectData.projectDir, this.$options, forceWebpackWorkflow);`
	`33`	`+ await this.$workflowService.handleLegacyWorkflow({ projectDir: this.$projectData.projectDir, settings: this.$options, force: true });`
`35`	`34`	`return;`
`36`	`35`	`}`
`37`	`36`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,14 @@ interface IBuildPlatformAction {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`interface IWorkflowService {`
`18`		`- handleLegacyWorkflow(projectDir: string, settings: IWebpackWorkflowSettings, skipWarnings?: boolean, force?: boolean): Promise<void>;`
	`18`	`+ handleLegacyWorkflow(options: IHandleLegacyWorkflowOptions): Promise<void>;`
	`19`	`+}`
	`20`	`+`
	`21`	`+interface IHandleLegacyWorkflowOptions {`
	`22`	`+ projectDir: string;`
	`23`	`+ settings: IWebpackWorkflowSettings;`
	`24`	`+ skipWarnings?: boolean;`
	`25`	`+ force?: boolean;`
`19`	`26`	`}`
`20`	`27`
`21`	`28`	`interface IWebpackWorkflowSettings {`