Make fs.readJson and config.loadConfig sync

Author: rosen-vladimirov

lib/commands/plugin/list-plugins.ts

@@ -8,7 +8,7 @@ export class ListPluginsCommand implements ICommand {
 
 	public execute(args: string[]): IFuture<void> {
 		return (() => {
-			let installedPlugins: IPackageJsonDepedenciesResult = this.$pluginsService.getDependenciesFromPackageJson().wait();
+			let installedPlugins: IPackageJsonDepedenciesResult = this.$pluginsService.getDependenciesFromPackageJson();
 
 			let headers: string[] = ["Plugin", "Version"];
 			let dependenciesData: string[][] = this.createTableCells(installedPlugins.dependencies);

lib/config.ts

@@ -14,7 +14,7 @@ export class Configuration extends ConfigBase implements IConfiguration { // Use
 	/*don't require logger and everything that has logger as dependency in config.js due to cyclic dependency*/
 	constructor(protected $fs: IFileSystem) {
 		super($fs);
-		_.extend(this, this.loadConfig("config").wait());
+		_.extend(this, this.loadConfig("config"));
 	}
 }
 $injector.register("config", Configuration);

lib/declarations.ts

@@ -257,16 +257,16 @@ interface IXmlValidator {
 	/**
 	 * Checks the passed xml files for errors and if such exists, print them on the stdout.
 	 * @param {string[]} sourceFiles Files to be checked. Only the ones that ends with .xml are filtered.
-	 * @return {IFuture<boolean>} true in case there are no errors in specified files and false in case there's at least one error.
+	 * @return {boolean} true in case there are no errors in specified files and false in case there's at least one error.
 	 */
-	validateXmlFiles(sourceFiles: string[]): IFuture<boolean>;
+	validateXmlFiles(sourceFiles: string[]): boolean;
 
 	/**
 	 * Checks the passed xml file for errors and returns them as a result.
 	 * @param {string} sourceFile File to be checked.
-	 * @return {IFuture<string>} The errors detected (as a single string) or null in case there are no errors.
+	 * @return {string} The errors detected (as a single string) or null in case there are no errors.
 	 */
-	getXmlFileErrors(sourceFile: string): IFuture<string>;
+	getXmlFileErrors(sourceFile: string): string;
 }
 
 /**

lib/definitions/plugins.d.ts

@@ -5,7 +5,12 @@ interface IPluginsService {
 	prepare(pluginData: IDependencyData, platform: string): IFuture<void>;
 	getAllInstalledPlugins(): IFuture<IPluginData[]>;
 	ensureAllDependenciesAreInstalled(): IFuture<void>;
-	getDependenciesFromPackageJson(): IFuture<IPackageJsonDepedenciesResult>
+
+	/**
+	 * Returns all dependencies and devDependencies from pacakge.json file.
+	 * @returns {IPackageJsonDepedenciesResult}
+	 */
+	getDependenciesFromPackageJson(): IPackageJsonDepedenciesResult;
 }
 
 interface IPackageJsonDepedenciesResult {

lib/node-package-manager.ts

@@ -24,7 +24,7 @@ export class NodePackageManager implements INodePackageManager {
 				config["ignore-scripts"] = true;
 			}
 
-			let jsonContentBefore = this.$fs.readJson(path.join(pathToSave, "package.json")).wait();
+			let jsonContentBefore = this.$fs.readJson(path.join(pathToSave, "package.json"));
 			let dependenciesBefore = _.keys(jsonContentBefore.dependencies).concat(_.keys(jsonContentBefore.devDependencies));
 
 			let flags = this.getFlagsString(config, true);
@@ -58,7 +58,7 @@ export class NodePackageManager implements INodePackageManager {
 				}
 			}
 
-			let jsonContentAfter = this.$fs.readJson(path.join(pathToSave, "package.json")).wait();
+			let jsonContentAfter = this.$fs.readJson(path.join(pathToSave, "package.json"));
 			let dependenciesAfter = _.keys(jsonContentAfter.dependencies).concat(_.keys(jsonContentAfter.devDependencies));
 
 			/** This diff is done in case the installed pakcage is a URL address, a path to local directory or a .tgz file

lib/npm-installation-manager.ts

@@ -15,7 +15,7 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	}
 
 	public getLatestVersion(packageName: string): IFuture<string> {
-		return(() => {
+		return (() => {
 			return this.getVersion(packageName, constants.PackageVersion.LATEST).wait();
 		}).future<string>()();
 	}
@@ -31,10 +31,10 @@ export class NpmInstallationManager implements INpmInstallationManager {
 
 			let cliVersionRange = `~${this.$staticConfig.version}`;
 			let latestVersion = this.getLatestVersion(packageName).wait();
-			if(semver.satisfies(latestVersion, cliVersionRange)) {
+			if (semver.satisfies(latestVersion, cliVersionRange)) {
 				return latestVersion;
 			}
-			let data = this.$npm.view(packageName, {json: true, "versions": true}).wait();
+			let data = this.$npm.view(packageName, { json: true, "versions": true }).wait();
 
 			return semver.maxSatisfying(data, cliVersionRange) || latestVersion;
 		}).future<string>()();
@@ -50,26 +50,26 @@ export class NpmInstallationManager implements INpmInstallationManager {
 				let dependencyType = (opts && opts.dependencyType) || null;
 
 				return this.installCore(packageToInstall, pathToSave, version, dependencyType).wait();
-			} catch(error) {
+			} catch (error) {
 				this.$logger.debug(error);
 				this.$errors.fail("%s. Error: %s", NpmInstallationManager.NPM_LOAD_FAILED, error);
 			}
 
 		}).future<string>()();
 	}
 
-	public getInspectorFromCache(inspectorNpmPackageName: string, projectDir: string) : IFuture<string> {
+	public getInspectorFromCache(inspectorNpmPackageName: string, projectDir: string): IFuture<string> {
 		return (() => {
 			let inspectorPath = path.join(projectDir, "node_modules", inspectorNpmPackageName);
 
 			// local installation takes precedence over cache
-			if(!this.inspectorAlreadyInstalled(inspectorPath)) {
+			if (!this.inspectorAlreadyInstalled(inspectorPath)) {
 				let cachepath = this.$childProcess.exec("npm get cache").wait().trim();
 				let version = this.getLatestCompatibleVersion(inspectorNpmPackageName).wait();
 				let pathToPackageInCache = path.join(cachepath, inspectorNpmPackageName, version);
 				let pathToUnzippedInspector = path.join(pathToPackageInCache, "package");
 
-				if(!this.$fs.exists(pathToPackageInCache)) {
+				if (!this.$fs.exists(pathToPackageInCache)) {
 					this.$childProcess.exec(`npm cache add ${inspectorNpmPackageName}@${version}`).wait();
 					let inspectorTgzPathInCache = path.join(pathToPackageInCache, "package.tgz");
 					this.$childProcess.exec(`tar -xf ${inspectorTgzPathInCache} -C ${pathToPackageInCache}`).wait();
@@ -83,30 +83,30 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	}
 
 	private inspectorAlreadyInstalled(pathToInspector: string): Boolean {
-		if(this.$fs.exists(pathToInspector)) {
+		if (this.$fs.exists(pathToInspector)) {
 			return true;
 		}
 		return false;
 	}
 
 	private installCore(packageName: string, pathToSave: string, version: string, dependencyType: string): IFuture<string> {
 		return (() => {
-			const possiblePackageName= path.resolve(packageName);
-			if(this.$fs.exists(possiblePackageName)) {
+			const possiblePackageName = path.resolve(packageName);
+			if (this.$fs.exists(possiblePackageName)) {
 				packageName = possiblePackageName;
 			}
-			if(packageName.indexOf(".tgz") >= 0) {
+			if (packageName.indexOf(".tgz") >= 0) {
 				version = null;
 			}
 			// check if the packageName is url or local file and if it is, let npm install deal with the version
-			if(this.isURL(packageName) || this.$fs.exists(packageName)) {
+			if (this.isURL(packageName) || this.$fs.exists(packageName)) {
 				version = null;
 			} else {
 				version = version || this.getLatestCompatibleVersion(packageName).wait();
 			}
 
 			let installedModuleNames = this.npmInstall(packageName, pathToSave, version, dependencyType).wait();
-			let installedPackageName =  installedModuleNames[0];
+			let installedPackageName = installedModuleNames[0];
 
 			let pathToInstalledPackage = path.join(pathToSave, "node_modules", installedPackageName);
 			return pathToInstalledPackage;
@@ -120,18 +120,18 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	}
 
 	private npmInstall(packageName: string, pathToSave: string, version: string, dependencyType: string): IFuture<any> {
-		return(() => {
+		return (() => {
 			this.$logger.out("Installing ", packageName);
 
 			packageName = packageName + (version ? `@${version}` : "");
 
-			let npmOptions: any = {silent: true};
+			let npmOptions: any = { silent: true };
 
-			if(dependencyType) {
+			if (dependencyType) {
 				npmOptions[dependencyType] = true;
 			}
 
-			return this.$npm.install(packageName , pathToSave, npmOptions).wait();
+			return this.$npm.install(packageName, pathToSave, npmOptions).wait();
 		}).future<any>()();
 	}
 
@@ -141,7 +141,7 @@ export class NpmInstallationManager implements INpmInstallationManager {
 	 */
 	private getVersion(packageName: string, version: string): IFuture<string> {
 		return (() => {
-			let data:any = this.$npm.view(packageName, {json: true, "dist-tags": true}).wait();
+			let data: any = this.$npm.view(packageName, { json: true, "dist-tags": true }).wait();
 			this.$logger.trace("Using version %s. ", data[version]);
 
 			return data[version];

lib/project-data.ts

@@ -1,6 +1,6 @@
 import * as constants from "./constants";
 import * as path from "path";
-import {EOL} from "os";
+import { EOL } from "os";
 
 export class ProjectData implements IProjectData {
 	private static OLD_PROJECT_FILE_NAME = ".tnsproject";
@@ -24,27 +24,29 @@ export class ProjectData implements IProjectData {
 	}
 
 	private initializeProjectData(): IFuture<void> {
-		return(() => {
+		return (() => {
 			let projectDir = this.$projectHelper.projectDir;
 			// If no project found, projectDir should be null
-			if(projectDir) {
+			if (projectDir) {
 				this.initializeProjectDataCore(projectDir);
 				let data: any = null;
 
 				if (this.$fs.exists(this.projectFilePath)) {
 					let fileContent: any = null;
 					try {
-						fileContent = this.$fs.readJson(this.projectFilePath).wait();
+						fileContent = this.$fs.readJson(this.projectFilePath);
 						data = fileContent[this.$staticConfig.CLIENT_NAME_KEY_IN_PROJECT_FILE];
 					} catch (err) {
-						this.$errors.fail({formatStr: "The project file %s is corrupted." + EOL +
+						this.$errors.fail({
+							formatStr: "The project file %s is corrupted." + EOL +
 							"Consider restoring an earlier version from your source control or backup." + EOL +
 							"Additional technical info: %s",
-								suppressCommandHelp: true},
+							suppressCommandHelp: true
+						},
 							this.projectFilePath, err.toString());
 					}
 
-					if(data) {
+					if (data) {
 						this.projectId = data.id;
 						this.dependencies = fileContent.dependencies;
 					} else { // This is the case when we have package.json file but nativescipt key is not presented in it
@@ -65,7 +67,7 @@ export class ProjectData implements IProjectData {
 		return (() => {
 			let projectDir = this.projectDir || path.resolve(this.$options.path || ".");
 			let oldProjectFilePath = path.join(projectDir, ProjectData.OLD_PROJECT_FILE_NAME);
-			if(this.$fs.exists(oldProjectFilePath)) {
+			if (this.$fs.exists(oldProjectFilePath)) {
 				this.upgrade(projectDir, oldProjectFilePath).wait();
 			} else {
 				this.throwNoProjectFoundError();
@@ -76,16 +78,16 @@ export class ProjectData implements IProjectData {
 	private upgrade(projectDir: string, oldProjectFilePath: string): IFuture<void> {
 		return (() => {
 			try {
-				let oldProjectData = this.$fs.readJson(oldProjectFilePath).wait();
+				let oldProjectData = this.$fs.readJson(oldProjectFilePath);
 
 				let newProjectFilePath = this.projectFilePath || path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME);
-				let newProjectData = this.$fs.exists(newProjectFilePath) ? this.$fs.readJson(newProjectFilePath).wait() : {};
+				let newProjectData = this.$fs.exists(newProjectFilePath) ? this.$fs.readJson(newProjectFilePath) : {};
 				newProjectData[this.$staticConfig.CLIENT_NAME_KEY_IN_PROJECT_FILE] = oldProjectData;
 				this.$fs.writeJson(newProjectFilePath, newProjectData).wait();
 				this.projectId = newProjectData[this.$staticConfig.CLIENT_NAME_KEY_IN_PROJECT_FILE].id;
 
 				this.$fs.deleteFile(oldProjectFilePath);
-			} catch(err) {
+			} catch (err) {
 				this.$logger.out("An error occurred while upgrading your project.");
 				throw err;
 			}

lib/services/android-project-service.ts

@@ -4,9 +4,9 @@ import Future = require("fibers/future");
 import * as constants from "../constants";
 import * as semver from "semver";
 import * as projectServiceBaseLib from "./platform-project-service-base";
-import {DeviceAndroidDebugBridge} from "../common/mobile/android/device-android-debug-bridge";
-import {AndroidDeviceHashService} from "../common/mobile/android/android-device-hash-service";
-import {EOL} from "os";
+import { DeviceAndroidDebugBridge } from "../common/mobile/android/device-android-debug-bridge";
+import { AndroidDeviceHashService } from "../common/mobile/android/android-device-hash-service";
+import { EOL } from "os";
 
 export class AndroidProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
 	private static VALUES_DIRNAME = "values";
@@ -134,7 +134,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 				"silent": true
 			};
 
-			let projectPackageJson: any = this.$fs.readJson(this.$projectData.projectFilePath).wait();
+			let projectPackageJson: any = this.$fs.readJson(this.$projectData.projectFilePath);
 
 			_.each(AndroidProjectService.REQUIRED_DEV_DEPENDENCIES, (dependency: any) => {
 				let dependencyVersionInProject = (projectPackageJson.dependencies && projectPackageJson.dependencies[dependency.name]) ||
@@ -148,7 +148,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 					// The plugin version is not valid. Check node_modules for the valid version.
 					if (!cleanedVerson) {
 						let pathToPluginPackageJson = path.join(this.$projectData.projectDir, constants.NODE_MODULES_FOLDER_NAME, dependency.name, constants.PACKAGE_JSON_FILE_NAME);
-						dependencyVersionInProject = this.$fs.exists(pathToPluginPackageJson) && this.$fs.readJson(pathToPluginPackageJson).wait().version;
+						dependencyVersionInProject = this.$fs.exists(pathToPluginPackageJson) && this.$fs.readJson(pathToPluginPackageJson).version;
 					}
 
 					if (!semver.satisfies(dependencyVersionInProject || cleanedVerson, dependency.version)) {
@@ -312,7 +312,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			let originalAndroidManifestFilePath = path.join(this.$projectData.appResourcesDirectoryPath, this.$devicePlatformsConstants.Android, this.platformData.configurationFileName);
 
 			let manifestExists = this.$fs.exists(originalAndroidManifestFilePath);
-			if(!manifestExists) {
+			if (!manifestExists) {
 				this.$logger.warn('No manifest found in ' + originalAndroidManifestFilePath);
 				return;
 			}

lib/services/init-service.ts

@@ -29,7 +29,7 @@ export class InitService implements IInitService {
 			let projectData: any = {};
 
 			if (this.$fs.exists(this.projectFilePath)) {
-				projectData = this.$fs.readJson(this.projectFilePath).wait();
+				projectData = this.$fs.readJson(this.projectFilePath);
 			}
 
 			let projectDataBackup = _.extend({}, projectData);

lib/services/platform-service.ts

@@ -3,9 +3,9 @@ import * as shell from "shelljs";
 import * as constants from "../constants";
 import * as helpers from "../common/helpers";
 import * as semver from "semver";
-import {AppFilesUpdater} from "./app-files-updater";
+import { AppFilesUpdater } from "./app-files-updater";
 import * as temp from "temp";
-import {ProjectChangesInfo, IPrepareInfo} from "./project-changes-info";
+import { ProjectChangesInfo, IPrepareInfo } from "./project-changes-info";
 import Future = require("fibers/future");
 temp.track();
 let clui = require("clui");
@@ -99,7 +99,7 @@ export class PlatformService implements IPlatformService {
 				frameworkDir = path.resolve(frameworkDir);
 
 				let coreModuleName = this.addPlatformCore(platformData, frameworkDir).wait();
-				this.$npm.uninstall(coreModuleName, {save: true}, this.$projectData.projectDir).wait();
+				this.$npm.uninstall(coreModuleName, { save: true }, this.$projectData.projectDir).wait();
 			} catch (err) {
 				this.$fs.deleteDirectory(platformPath);
 				throw err;
@@ -114,7 +114,7 @@ export class PlatformService implements IPlatformService {
 
 	private addPlatformCore(platformData: IPlatformData, frameworkDir: string): IFuture<string> {
 		return (() => {
-			let coreModuleData = this.$fs.readJson(path.join(frameworkDir, "../", "package.json")).wait();
+			let coreModuleData = this.$fs.readJson(path.join(frameworkDir, "../", "package.json"));
 			let installedVersion = coreModuleData.version;
 			let coreModuleName = coreModuleData.name;
 
@@ -216,7 +216,7 @@ export class PlatformService implements IPlatformService {
 
 			this.ensurePlatformInstalled(platform).wait();
 
-			let changeInfo:ProjectChangesInfo = new ProjectChangesInfo(platform, force, skipModulesAndResources, this.$platformsData, this.$projectData, this.$devicePlatformsConstants, this.$options, this.$fs);
+			let changeInfo: ProjectChangesInfo = new ProjectChangesInfo(platform, force, skipModulesAndResources, this.$platformsData, this.$projectData, this.$devicePlatformsConstants, this.$options, this.$fs);
 			this._prepareInfo = changeInfo.prepareInfo;
 			if (!this.isPlatformPrepared(platform) || changeInfo.hasChanges) {
 				this.preparePlatformCore(platform, changeInfo).wait();
@@ -227,7 +227,7 @@ export class PlatformService implements IPlatformService {
 	}
 
 	@helpers.hook('prepare')
-	private preparePlatformCore(platform: string, changeInfo:ProjectChangesInfo): IFuture<void> {
+	private preparePlatformCore(platform: string, changeInfo: ProjectChangesInfo): IFuture<void> {
 		return (() => {
 
 			let platformData = this.$platformsData.getPlatformData(platform);
@@ -257,7 +257,7 @@ export class PlatformService implements IPlatformService {
 
 			platformData.platformProjectService.interpolateConfigurationFile().wait();
 
-			this.$logger.out("Project successfully prepared ("+platform+")");
+			this.$logger.out("Project successfully prepared (" + platform + ")");
 		}).future<void>()();
 	}
 
@@ -273,7 +273,7 @@ export class PlatformService implements IPlatformService {
 
 			const appUpdater = new AppFilesUpdater(appSourceDirectoryPath, appDestinationDirectoryPath, this.$options, this.$fs);
 			appUpdater.updateApp(sourceFiles => {
-				this.$xmlValidator.validateXmlFiles(sourceFiles).wait();
+				this.$xmlValidator.validateXmlFiles(sourceFiles);
 			});
 		}).future<void>()();
 	}
@@ -607,12 +607,12 @@ export class PlatformService implements IPlatformService {
 			let newVersion = version === constants.PackageVersion.NEXT ?
 				this.$npmInstallationManager.getNextVersion(platformData.frameworkPackageName).wait() :
 				version || this.$npmInstallationManager.getLatestCompatibleVersion(platformData.frameworkPackageName).wait();
-			let installedModuleDir = this.$npmInstallationManager.install(platformData.frameworkPackageName, this.$projectData.projectDir, {version: newVersion, dependencyType: "save"}).wait();
-			let cachedPackageData = this.$fs.readJson(path.join(installedModuleDir, "package.json")).wait();
+			let installedModuleDir = this.$npmInstallationManager.install(platformData.frameworkPackageName, this.$projectData.projectDir, { version: newVersion, dependencyType: "save" }).wait();
+			let cachedPackageData = this.$fs.readJson(path.join(installedModuleDir, "package.json"));
 			newVersion = (cachedPackageData && cachedPackageData.version) || newVersion;
 
 			let canUpdate = platformData.platformProjectService.canUpdatePlatform(installedModuleDir).wait();
-			this.$npm.uninstall(platformData.frameworkPackageName, {save: true}, this.$projectData.projectDir).wait();
+			this.$npm.uninstall(platformData.frameworkPackageName, { save: true }, this.$projectData.projectDir).wait();
 			if (canUpdate) {
 				if (!semver.valid(newVersion)) {
 					this.$errors.fail("The version %s is not valid. The version should consists from 3 parts separated by dot.", newVersion);