Merge pull request #2180 from NativeScript/pete/android-dts-build-flag

Add androidTypings experimental flag

Author: petekanev

lib/android-tools-info.ts

@@ -86,6 +86,7 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 				infoData.buildToolsVersion = this.getBuildToolsVersion().wait();
 				infoData.targetSdkVersion = this.getTargetSdk().wait();
 				infoData.supportRepositoryVersion = this.getAndroidSupportRepositoryVersion().wait();
+				infoData.generateTypings = this.shouldGenerateTypings();
 
 				this.toolsInfo = infoData;
 			}
@@ -196,6 +197,10 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 		}).future<string>()();
 	}
 
+	private shouldGenerateTypings(): boolean {
+		return this.$options.androidTypings;
+	}
+
 	/**
 	 * Prints messages on the screen. In case the showWarningsAsErrors flag is set to true, warnings are shown, else - errors.
 	 * Uses logger.warn for warnings and errors.failWithoutHelp when erros must be shown.

lib/declarations.ts

@@ -91,6 +91,7 @@ interface IOptions extends ICommonOptions {
 	linkTo: string;
 	ng: boolean;
 	tsc: boolean;
+	androidTypings: boolean;
 	bundle: boolean;
 	platformTemplate: string;
 	port: Number;
@@ -224,6 +225,11 @@ interface IAndroidToolsInfoData {
 	 * In case it is not specified, compileSdkVersion will be used for targetSdkVersion.
 	 */
 	targetSdkVersion: number;
+
+	/**
+	 * Whether or not `.d.ts` typings should be generated for compileSdk. Experimental feature
+	 */
+	generateTypings: boolean;
 }
 
 interface ISocketProxyFactory {

lib/options.ts

@@ -15,34 +15,35 @@ export class Options extends commonOptionsLibPath.OptionsBase {
 			framework: { type: OptionType.String },
 			frameworkVersion: { type: OptionType.String },
 			copyFrom: { type: OptionType.String },
-			linkTo: { type: OptionType.String  },
+			linkTo: { type: OptionType.String },
 			symlink: { type: OptionType.Boolean },
 			forDevice: { type: OptionType.Boolean },
-			client: { type: OptionType.Boolean, default: true},
+			client: { type: OptionType.Boolean, default: true },
 			production: { type: OptionType.Boolean },
-			debugTransport: {type: OptionType.Boolean},
+			debugTransport: { type: OptionType.Boolean },
 			keyStorePath: { type: OptionType.String },
-			keyStorePassword: { type: OptionType.String,},
+			keyStorePassword: { type: OptionType.String, },
 			keyStoreAlias: { type: OptionType.String },
 			keyStoreAliasPassword: { type: OptionType.String },
-			ignoreScripts: {type: OptionType.Boolean },
-			disableNpmInstall: {type: OptionType.Boolean },
+			ignoreScripts: { type: OptionType.Boolean },
+			disableNpmInstall: { type: OptionType.Boolean },
 			tnsModulesVersion: { type: OptionType.String },
-			compileSdk: {type: OptionType.Number },
+			compileSdk: { type: OptionType.Number },
 			port: { type: OptionType.Number },
 			copyTo: { type: OptionType.String },
 			baseConfig: { type: OptionType.String },
 			platformTemplate: { type: OptionType.String },
-			ng: {type: OptionType.Boolean },
-			tsc: {type: OptionType.Boolean },
-			bundle: {type: OptionType.Boolean },
-			all: {type: OptionType.Boolean },
+			ng: { type: OptionType.Boolean },
+			tsc: { type: OptionType.Boolean },
+			androidTypings: { type: OptionType.Boolean },
+			bundle: { type: OptionType.Boolean },
+			all: { type: OptionType.Boolean },
 			teamId: { type: OptionType.String },
 			rebuild: { type: OptionType.Boolean, default: true },
 			syncAllFiles: { type: OptionType.Boolean },
 			liveEdit: { type: OptionType.Boolean }
 		},
-		path.join($hostInfo.isWindows ? process.env.AppData : path.join(osenv.home(), ".local/share"), ".nativescript-cli"),
+			path.join($hostInfo.isWindows ? process.env.AppData : path.join(osenv.home(), ".local/share"), ".nativescript-cli"),
 			$errors, $staticConfig);
 
 		// On Windows we moved settings from LocalAppData to AppData. Move the existing file to keep the existing settings

lib/services/android-project-service.ts

@@ -275,11 +275,13 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		let targetSdk = this.getTargetFromAndroidManifest().wait() || compileSdk;
 		let buildToolsVersion = androidToolsInfo.buildToolsVersion;
 		let appCompatVersion = androidToolsInfo.supportRepositoryVersion;
+		let generateTypings = androidToolsInfo.generateTypings;
 		let buildOptions = [
 			`-PcompileSdk=android-${compileSdk}`,
 			`-PtargetSdk=${targetSdk}`,
 			`-PbuildToolsVersion=${buildToolsVersion}`,
 			`-PsupportVersion=${appCompatVersion}`,
+			`-PgenerateTypings=${generateTypings}`
 		];
 
 		if (this.$options.release) {