Skip to content

Commit 66f2a49

Browse files
rigor789rigor789
committed
chore: add prettier
1 parent 183f848 commit 66f2a49

File tree

477 files changed

+44395
-15812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

477 files changed

+44395
-15812
lines changed

‎.prettierrc.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"useTabs": true
3+
}

‎lib/android-tools-info.ts‎

Lines changed: 88 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,47 @@
11
import * as path from "path";
2-
import * as _ from 'lodash';
2+
import * as _ from "lodash";
33
import { cache } from "./common/decorators";
44
import { androidToolsInfo } from "@nativescript/doctor";
5-
import { injector } from './common/yok';
6-
import { IAndroidToolsInfo, IOptions, IAndroidToolsInfoData, IAndroidToolsInfoValidateInput, IAndroidToolsInfoOptions } from "./declarations";
5+
import { injector } from "./common/yok";
6+
import {
7+
IAndroidToolsInfo,
8+
IOptions,
9+
IAndroidToolsInfoData,
10+
IAndroidToolsInfoValidateInput,
11+
IAndroidToolsInfoOptions,
12+
} from "./declarations";
713
import { IErrors, IProjectDir } from "./common/declarations";
814

915
export class AndroidToolsInfo implements IAndroidToolsInfo {
10-
constructor(private $errors: IErrors,
16+
constructor(
17+
private $errors: IErrors,
1118
private $logger: ILogger,
1219
private $options: IOptions,
13-
protected $staticConfig: Config.IStaticConfig) {
14-
}
20+
protected $staticConfig: Config.IStaticConfig
21+
) {}
1522

1623
@cache()
1724
public getToolsInfo(config: IProjectDir): IAndroidToolsInfoData {
18-
const infoData: IAndroidToolsInfoData = <IAndroidToolsInfoData>(androidToolsInfo.getToolsInfo({projectDir: config.projectDir}));
25+
const infoData: IAndroidToolsInfoData = <IAndroidToolsInfoData>(
26+
androidToolsInfo.getToolsInfo({ projectDir: config.projectDir })
27+
);
1928

2029
infoData.androidHomeEnvVar = androidToolsInfo.androidHome;
21-
infoData.compileSdkVersion = this.getCompileSdkVersion(infoData.installedTargets, infoData.compileSdkVersion);
30+
infoData.compileSdkVersion = this.getCompileSdkVersion(
31+
infoData.installedTargets,
32+
infoData.compileSdkVersion
33+
);
2234
infoData.targetSdkVersion = this.getTargetSdk(infoData.compileSdkVersion);
2335
infoData.generateTypings = this.shouldGenerateTypings();
2436

25-
this.$logger.trace("Installed Android Targets are: ", infoData.installedTargets);
26-
this.$logger.trace("Selected buildToolsVersion is:", infoData.buildToolsVersion);
37+
this.$logger.trace(
38+
"Installed Android Targets are: ",
39+
infoData.installedTargets
40+
);
41+
this.$logger.trace(
42+
"Selected buildToolsVersion is:",
43+
infoData.buildToolsVersion
44+
);
2745

2846
return infoData;
2947
}
@@ -33,7 +51,12 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
3351
const showWarningsAsErrors = options && options.showWarningsAsErrors;
3452
const isAndroidHomeValid = this.validateAndroidHomeEnvVariable(options);
3553

36-
detectedErrors = androidToolsInfo.validateInfo({projectDir: options.projectDir}).map(warning => this.printMessage(warning.warning, showWarningsAsErrors)).length > 0;
54+
detectedErrors =
55+
androidToolsInfo
56+
.validateInfo({ projectDir: options.projectDir })
57+
.map((warning) =>
58+
this.printMessage(warning.warning, showWarningsAsErrors)
59+
).length > 0;
3760

3861
if (options && options.validateTargetSdk) {
3962
detectedErrors = this.validateTargetSdk(options);
@@ -45,22 +68,44 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
4568
public validateTargetSdk(options: IAndroidToolsInfoOptions): boolean {
4669
let detectedErrors = false;
4770

48-
const toolsInfoData = this.getToolsInfo({ projectDir: options.projectDir});
71+
const toolsInfoData = this.getToolsInfo({ projectDir: options.projectDir });
4972
const targetSdk = toolsInfoData.targetSdkVersion;
5073

51-
detectedErrors = androidToolsInfo.validateMinSupportedTargetSdk({targetSdk, projectDir: options.projectDir}).map(warning => this.printMessage(warning.warning, options.showWarningsAsErrors)).length > 0;
74+
detectedErrors =
75+
androidToolsInfo
76+
.validateMinSupportedTargetSdk({
77+
targetSdk,
78+
projectDir: options.projectDir,
79+
})
80+
.map((warning) =>
81+
this.printMessage(warning.warning, options.showWarningsAsErrors)
82+
).length > 0;
5283

5384
if (!detectedErrors) {
54-
androidToolsInfo.validataMaxSupportedTargetSdk({targetSdk, projectDir: options.projectDir}).map(warning => this.$logger.warn(warning.warning));
85+
androidToolsInfo
86+
.validataMaxSupportedTargetSdk({
87+
targetSdk,
88+
projectDir: options.projectDir,
89+
})
90+
.map((warning) => this.$logger.warn(warning.warning));
5591
}
5692

5793
return detectedErrors;
5894
}
5995

60-
public validateJavacVersion(installedJavacVersion: string, options?: IAndroidToolsInfoOptions): boolean {
96+
public validateJavacVersion(
97+
installedJavacVersion: string,
98+
options?: IAndroidToolsInfoOptions
99+
): boolean {
61100
const showWarningsAsErrors = options && options.showWarningsAsErrors;
62101

63-
return androidToolsInfo.validateJavacVersion(installedJavacVersion).map(warning => this.printMessage(warning.warning, showWarningsAsErrors)).length > 0;
102+
return (
103+
androidToolsInfo
104+
.validateJavacVersion(installedJavacVersion)
105+
.map((warning) =>
106+
this.printMessage(warning.warning, showWarningsAsErrors)
107+
).length > 0
108+
);
64109
}
65110

66111
public async getPathToAdbFromAndroidHome(): Promise<string> {
@@ -69,17 +114,31 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
69114
} catch (err) {
70115
// adb does not exist, so ANDROID_HOME is not set correctly
71116
// try getting default adb path (included in CLI package)
72-
this.$logger.trace(`Error while executing '${path.join(androidToolsInfo.androidHome, "platform-tools", "adb")} help'. Error is: ${err.message}`);
117+
this.$logger.trace(
118+
`Error while executing '${path.join(
119+
androidToolsInfo.androidHome,
120+
"platform-tools",
121+
"adb"
122+
)} help'. Error is: ${err.message}`
123+
);
73124
}
74125

75126
return null;
76127
}
77128

78129
@cache()
79-
public validateAndroidHomeEnvVariable(options?: IAndroidToolsInfoOptions): boolean {
130+
public validateAndroidHomeEnvVariable(
131+
options?: IAndroidToolsInfoOptions
132+
): boolean {
80133
const showWarningsAsErrors = options && options.showWarningsAsErrors;
81134

82-
return androidToolsInfo.validateAndroidHomeEnvVariable().map(warning => this.printMessage(warning.warning, showWarningsAsErrors)).length > 0;
135+
return (
136+
androidToolsInfo
137+
.validateAndroidHomeEnvVariable()
138+
.map((warning) =>
139+
this.printMessage(warning.warning, showWarningsAsErrors)
140+
).length > 0
141+
);
83142
}
84143

85144
private shouldGenerateTypings(): boolean {
@@ -102,13 +161,18 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
102161
}
103162
}
104163

105-
private getCompileSdkVersion(installedTargets: string[], latestCompileSdk: number): number {
164+
private getCompileSdkVersion(
165+
installedTargets: string[],
166+
latestCompileSdk: number
167+
): number {
106168
const userSpecifiedCompileSdk = this.$options.compileSdk;
107169

108170
if (userSpecifiedCompileSdk) {
109171
const androidCompileSdk = `${androidToolsInfo.ANDROID_TARGET_PREFIX}-${userSpecifiedCompileSdk}`;
110172
if (!_.includes(installedTargets, androidCompileSdk)) {
111-
this.$errors.fail(`You have specified '${userSpecifiedCompileSdk}' for compile sdk, but it is not installed on your system.`);
173+
this.$errors.fail(
174+
`You have specified '${userSpecifiedCompileSdk}' for compile sdk, but it is not installed on your system.`
175+
);
112176
}
113177

114178
return userSpecifiedCompileSdk;
@@ -119,7 +183,9 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
119183

120184
// TODO check if still needed
121185
private getTargetSdk(compileSdk: number): number {
122-
const targetSdk = this.$options.sdk ? parseInt(this.$options.sdk) : compileSdk;
186+
const targetSdk = this.$options.sdk
187+
? parseInt(this.$options.sdk)
188+
: compileSdk;
123189
this.$logger.trace(`Selected targetSdk is: ${targetSdk}`);
124190
return targetSdk;
125191
}

‎lib/base-package-manager.ts‎

Lines changed: 63 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,34 @@
11
import { isInteractive } from "./common/helpers";
2-
import { INodePackageManager, INodePackageManagerInstallOptions, INpmInstallResultInfo, INpmsResult, INpmPackageNameParts } from "./declarations";
3-
import { IDictionary, IChildProcess, IFileSystem, IHostInfo } from "./common/declarations";
2+
import {
3+
INodePackageManager,
4+
INodePackageManagerInstallOptions,
5+
INpmInstallResultInfo,
6+
INpmsResult,
7+
INpmPackageNameParts,
8+
} from "./declarations";
9+
import {
10+
IDictionary,
11+
IChildProcess,
12+
IFileSystem,
13+
IHostInfo,
14+
} from "./common/declarations";
415

516
export abstract class BasePackageManager implements INodePackageManager {
6-
public abstract install(packageName: string, pathToSave: string, config: INodePackageManagerInstallOptions): Promise<INpmInstallResultInfo>;
7-
public abstract uninstall(packageName: string, config?: IDictionary<string | boolean>, path?: string): Promise<string>;
17+
public abstract install(
18+
packageName: string,
19+
pathToSave: string,
20+
config: INodePackageManagerInstallOptions
21+
): Promise<INpmInstallResultInfo>;
22+
public abstract uninstall(
23+
packageName: string,
24+
config?: IDictionary<string | boolean>,
25+
path?: string
26+
): Promise<string>;
827
public abstract view(packageName: string, config: Object): Promise<any>;
9-
public abstract search(filter: string[], config: IDictionary<string | boolean>): Promise<string>;
28+
public abstract search(
29+
filter: string[],
30+
config: IDictionary<string | boolean>
31+
): Promise<string>;
1032
public abstract searchNpms(keyword: string): Promise<INpmsResult>;
1133
public abstract getRegistryPackageData(packageName: string): Promise<any>;
1234
public abstract getCachePath(): Promise<string>;
@@ -17,10 +39,14 @@ export abstract class BasePackageManager implements INodePackageManager {
1739
private $hostInfo: IHostInfo,
1840
private $pacoteService: IPacoteService,
1941
private packageManager: string
20-
) { }
42+
) {}
2143

2244
public async isRegistered(packageName: string): Promise<boolean> {
23-
if (this.isURL(packageName) || this.$fs.exists(packageName) || this.isTgz(packageName)) {
45+
if (
46+
this.isURL(packageName) ||
47+
this.$fs.exists(packageName) ||
48+
this.isTgz(packageName)
49+
) {
2450
return false;
2551
}
2652

@@ -38,7 +64,9 @@ export abstract class BasePackageManager implements INodePackageManager {
3864
}
3965
}
4066

41-
public async getPackageNameParts(fullPackageName: string): Promise<INpmPackageNameParts> {
67+
public async getPackageNameParts(
68+
fullPackageName: string
69+
): Promise<INpmPackageNameParts> {
4270
// support <reserved_name>@<version> syntax, for example typescript@1.0.0
4371
// support <scoped_package_name>@<version> syntax, for example @nativescript/vue-template@1.0.0
4472
const lastIndexOfAtSign = fullPackageName.lastIndexOf("@");
@@ -51,12 +79,16 @@ export abstract class BasePackageManager implements INodePackageManager {
5179

5280
return {
5381
name: templateName || fullPackageName,
54-
version: version
82+
version: version,
5583
};
5684
}
5785

58-
public async getPackageFullName(packageNameParts: INpmPackageNameParts): Promise<string> {
59-
return packageNameParts.version ? `${packageNameParts.name}@${packageNameParts.version}` : packageNameParts.name;
86+
public async getPackageFullName(
87+
packageNameParts: INpmPackageNameParts
88+
): Promise<string> {
89+
return packageNameParts.version
90+
? `${packageNameParts.name}@${packageNameParts.version}`
91+
: packageNameParts.name;
6092
}
6193

6294
protected getPackageManagerExecutableName(): string {
@@ -69,10 +101,17 @@ export abstract class BasePackageManager implements INodePackageManager {
69101
return npmExecutableName;
70102
}
71103

72-
protected async processPackageManagerInstall(packageName: string, params: string[], opts: { cwd: string, isInstallingAllDependencies: boolean }): Promise<INpmInstallResultInfo> {
104+
protected async processPackageManagerInstall(
105+
packageName: string,
106+
params: string[],
107+
opts: { cwd: string; isInstallingAllDependencies: boolean }
108+
): Promise<INpmInstallResultInfo> {
73109
const npmExecutable = this.getPackageManagerExecutableName();
74110
const stdioValue = isInteractive() ? "inherit" : "pipe";
75-
await this.$childProcess.spawnFromEvent(npmExecutable, params, "close", { cwd: opts.cwd, stdio: stdioValue });
111+
await this.$childProcess.spawnFromEvent(npmExecutable, params, "close", {
112+
cwd: opts.cwd,
113+
stdio: stdioValue,
114+
});
76115

77116
// Whenever calling "npm install" or "yarn add" without any arguments (hence installing all dependencies) no output is emitted on stdout
78117
// Luckily, whenever you call "npm install" or "yarn add" to install all dependencies chances are you won't need the name/version of the package you're installing because there is none.
@@ -84,18 +123,23 @@ export abstract class BasePackageManager implements INodePackageManager {
84123
const packageMetadata = await this.$pacoteService.manifest(packageName);
85124
return {
86125
name: packageMetadata.name,
87-
version: packageMetadata.version
126+
version: packageMetadata.version,
88127
};
89128
}
90129

91130
protected getFlagsString(config: any, asArray: boolean): any {
92131
const array: Array<string> = [];
93132
for (const flag in config) {
94-
if (flag === "global" && this.packageManager !== 'yarn') {
133+
if (flag === "global" && this.packageManager !== "yarn") {
95134
array.push(`--${flag}`);
96135
array.push(`${config[flag]}`);
97136
} else if (config[flag]) {
98-
if (flag === "dist-tags" || flag === "versions" || flag === "name" || flag === "gradle") {
137+
if (
138+
flag === "dist-tags" ||
139+
flag === "versions" ||
140+
flag === "name" ||
141+
flag === "gradle"
142+
) {
99143
array.push(` ${flag}`);
100144
continue;
101145
}
@@ -114,8 +158,9 @@ export abstract class BasePackageManager implements INodePackageManager {
114158
}
115159

116160
private isURL(str: string): boolean {
117-
const urlRegex = '^(?!mailto:)(?:(?:http|https|ftp)://)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$';
118-
const url = new RegExp(urlRegex, 'i');
161+
const urlRegex =
162+
"^(?!mailto:)(?:(?:http|https|ftp)://)(?:\\S+(?::\\S*)?@)?(?:(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[0-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))|localhost)(?::\\d{2,5})?(?:(/|\\?|#)[^\\s]*)?$";
163+
const url = new RegExp(urlRegex, "i");
119164
return str.length < 2083 && url.test(str);
120165
}
121166
}

0 commit comments

Comments
 (0)