chore: cleanup

NathanWalker · rigor789 · commit eebdd774fcd7 · 2020-09-04T21:44:30.000+02:00
diff --git a/lib/android-tools-info.ts b/lib/android-tools-info.ts
@@ -1,6 +1,7 @@
 import * as path from "path";
 import { cache } from "./common/decorators";
 import { androidToolsInfo } from "nativescript-doctor";
+import { injector } from './common/yok';
 
 export class AndroidToolsInfo implements IAndroidToolsInfo {
 	constructor(private $errors: IErrors,
@@ -120,4 +121,4 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 		return targetSdk;
 	}
 }
-$injector.register("androidToolsInfo", AndroidToolsInfo);
+injector.register("androidToolsInfo", AndroidToolsInfo);
diff --git a/lib/common/decorators.ts b/lib/common/decorators.ts
@@ -133,9 +133,9 @@ export function performanceLog(injector?: IInjector): any {
 
 // inspired by https://github.com/NativeScript/NativeScript/blob/55dfe25938569edbec89255008e5ad9804901305/tns-core-modules/globals/globals.ts#L121-L137
 export function deprecated(additionalInfo?: string, injector?: IInjector): any {
-	const isDeprecatedMessage = " is deprecated.";
+  const isDeprecatedMessage = " is deprecated.";
 	return (target: Object, key: string, descriptor: TypedPropertyDescriptor<any>): TypedPropertyDescriptor<any> => {
-		injector = injector || $injector;
+    injector = injector || $injector;
 		additionalInfo = additionalInfo || "";
 		const $logger = <ILogger>injector.resolve("logger");
 		if (descriptor) {
diff --git a/lib/common/definitions/iconv-lite.d.ts b/lib/common/definitions/iconv-lite.d.ts
diff --git a/lib/common/file-system.ts b/lib/common/file-system.ts
@@ -7,8 +7,8 @@ import * as shelljs from "shelljs";
 import { parseJson } from "./helpers";
 import { PACKAGE_JSON_FILE_NAME } from "../constants";
 import { EOL } from "os";
-import stringifyPackage from "stringify-package";
-import detectNewline from "detect-newline";
+import stringifyPackage = require("stringify-package");
+import detectNewline = require("detect-newline");
 
 // TODO: Add .d.ts for mkdirp module (or use it from @types repo).
 const mkdirp = require("mkdirp");
diff --git a/lib/common/mobile/android/android-device-file-system.ts b/lib/common/mobile/android/android-device-file-system.ts
@@ -1,5 +1,5 @@
 import * as path from "path";
-import * as semver from "semver";
+const semver = require("semver");
 import { AndroidDeviceHashService } from "./android-device-hash-service";
 import { executeActionByChunks } from "../../helpers";
 import { DEFAULT_CHUNK_SIZE } from '../../constants';
diff --git a/lib/common/mobile/android/android-emulator-services.ts b/lib/common/mobile/android/android-emulator-services.ts
@@ -2,7 +2,7 @@ import { AndroidVirtualDevice } from "../../constants";
 import { getCurrentEpochTime, sleep } from "../../helpers";
 import { EOL } from "os";
 import { LoggerConfigData } from "../../../constants";
-import * as semver from "semver";
+const semver = require("semver");
 
 export class AndroidEmulatorServices implements Mobile.IEmulatorPlatformService {
 	constructor(private $androidGenymotionService: Mobile.IAndroidVirtualDeviceService,
diff --git a/lib/common/mobile/android/android-ini-file-parser.ts b/lib/common/mobile/android/android-ini-file-parser.ts
@@ -1,9 +1,8 @@
 import { AndroidVirtualDevice } from '../../constants';
-import * as iconv from "iconv-lite";
 
 export class AndroidIniFileParser implements Mobile.IAndroidIniFileParser {
 	constructor(private $fs: IFileSystem) {
-		iconv.extendNodeEncodings();
+
 	}
 
 	public parseIniFile(iniFilePath: string): Mobile.IAvdInfo {
diff --git a/lib/common/mobile/android/logcat-helper.ts b/lib/common/mobile/android/logcat-helper.ts
@@ -1,4 +1,4 @@
-import byline from "byline";
+import byline = require("byline");
 import { DeviceAndroidDebugBridge } from "./device-android-debug-bridge";
 import { ChildProcess } from "child_process";
 import * as semver from "semver";
diff --git a/lib/common/mobile/ios/device/ios-device-operations.ts b/lib/common/mobile/ios/device/ios-device-operations.ts
@@ -1,7 +1,7 @@
 import { IOSDeviceLib as IOSDeviceLibModule } from "ios-device-lib";
 import { cache } from "../../../decorators";
 import { DEVICE_LOG_EVENT_NAME } from "../../../constants";
-import assert from "assert";
+import assert = require("assert");
 import { EventEmitter } from "events";
 
 export class IOSDeviceOperations extends EventEmitter implements IIOSDeviceOperations, IDisposable, IShouldDispose {
diff --git a/lib/common/opener.ts b/lib/common/opener.ts
@@ -1,4 +1,4 @@
-import xopen from "open";
+import xopen = require("open");
 
 export class Opener implements IOpener {
 
diff --git a/lib/common/prompter.ts b/lib/common/prompter.ts
@@ -98,7 +98,7 @@ export class Prompter implements IPrompter {
 			};
 		});
 
-		const schema: prompt.Question = {
+		const schema: any = {
 			message: promptMessage,
 			type: "list",
 			name: "userAnswer",
diff --git a/lib/common/services/help-service.ts b/lib/common/services/help-service.ts
@@ -1,6 +1,6 @@
 import * as path from "path";
 import { EOL } from "os";
-import marked from "marked";
+import marked = require("marked");
 import { CommandsDelimiters } from "../constants";
 
 interface IHtmlPageGenerationData {
diff --git a/lib/common/services/project-files-manager.ts b/lib/common/services/project-files-manager.ts
@@ -1,4 +1,4 @@
-import minimatch from "minimatch";
+import minimatch = require("minimatch");
 import * as path from "path";
 import * as util from "util";
 
diff --git a/lib/common/test/unit-tests/file-system.ts b/lib/common/test/unit-tests/file-system.ts
@@ -1,6 +1,6 @@
 import { Yok } from "../../yok";
 import * as path from "path";
-import temp from "temp";
+import temp = require("temp");
 import * as hostInfoLib from "../../host-info";
 import { assert, use } from "chai";
 import * as fileSystemFile from "../../file-system";
diff --git a/lib/common/test/unit-tests/mobile/android/logcat-helper.ts b/lib/common/test/unit-tests/mobile/android/logcat-helper.ts
@@ -5,7 +5,7 @@ import * as path from "path";
 import * as childProcess from "child_process";
 import * as fileSystem from "fs";
 import { EventEmitter } from "events";
-import stream from "stream";
+import stream = require("stream");
 
 class ChildProcessMockInstance extends EventEmitter {
 	public stdout: stream.Readable;
diff --git a/lib/common/test/unit-tests/mobile/devices-service.ts b/lib/common/test/unit-tests/mobile/devices-service.ts
@@ -214,7 +214,7 @@ const nodeJsTimer = {
 
 const originalSetInterval = setInterval;
 function mockSetInterval(testCaseCallback?: Function): void {
-	global.setInterval = (callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer => {
+	(<any>global).setInterval = (callback: (...args: any[]) => void, ms: number, ...args: any[]): any => {
 		const execution = async () => {
 			if (testCaseCallback) {
 				testCaseCallback();
@@ -1220,7 +1220,7 @@ describe("devicesService", () => {
 
 		it("should not start device detection interval if there is one running.", async () => {
 
-			global.setInterval = (callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer => {
+			(<any>global).setInterval = (callback: (...args: any[]) => void, ms: number, ...args: any[]): any => {
 
 				const execution = async () => {
 					await callback();
diff --git a/lib/common/test/unit-tests/mobile/project-files-manager.ts b/lib/common/test/unit-tests/mobile/project-files-manager.ts
@@ -12,7 +12,7 @@ import * as path from "path";
 import { Yok } from "../../../yok";
 import { ProjectFilesProviderBase } from "../../../services/project-files-provider-base";
 
-import temp from "temp";
+import temp = require("temp");
 import { LiveSyncPaths } from "../../../constants";
 import { TempServiceStub } from "../../../../../test/stubs";
 temp.track();
diff --git a/lib/common/test/unit-tests/yok.ts b/lib/common/test/unit-tests/yok.ts
@@ -462,7 +462,7 @@ describe("yok", () => {
 
 	it("overrides module when it is required more than once and overrideAlreadyRequiredModule is true", () => {
 		const injector = new Yok();
-		const cliGlobal = <ICliGlobal>global;
+		const cliGlobal = <ICliGlobal><unknown>global;
 		const injectorCache = cliGlobal.$injector;
 		cliGlobal.$injector = injector;
 		const tmpPathA = temp.path({ prefix: "overrideAlreadyRequiredModule_fileA" });
@@ -516,7 +516,7 @@ $injector.register("a", A);
 			// The file is created in temp dir, but this requires modification of the import statements in it.
 			// Also we have to modify the global $injector, so when the file is required, the $injector.register... will be the same injector that we are testing.
 			const injector = new Yok();
-			const cliGlobal = <ICliGlobal>global;
+			const cliGlobal = <ICliGlobal><unknown>global;
 			const injectorCache = cliGlobal.$injector;
 			cliGlobal.$injector = injector;
 
diff --git a/lib/common/yok.ts b/lib/common/yok.ts
@@ -1,4 +1,5 @@
 import * as path from "path";
+import * as _ from 'lodash';
 import { annotate, isPromise } from "./helpers";
 import { ERROR_NO_VALID_SUBCOMMAND_FORMAT } from "./constants";
 import { CommandsDelimiters } from "./constants";
@@ -445,4 +446,7 @@ export class Yok implements IInjector {
 	}
 }
 
-export let injector = new Yok();
+if (!global.$injector) {
+  global.$injector = new Yok(); 
+}
+export const injector = global.$injector;
diff --git a/lib/package-installation-manager.ts b/lib/package-installation-manager.ts
@@ -1,5 +1,5 @@
 import * as path from "path";
-import * as semver from "semver";
+const semver = require("semver");
 import * as constants from "./constants";
 
 export class PackageInstallationManager implements IPackageInstallationManager {
diff --git a/lib/providers/project-files-provider.ts b/lib/providers/project-files-provider.ts
@@ -1,4 +1,4 @@
-import minimatch from "minimatch";
+import minimatch = require("minimatch");
 import * as constants from "../constants";
 import * as path from "path";
 import { ProjectFilesProviderBase } from "../common/services/project-files-provider-base";
diff --git a/lib/services/assets-generation/assets-generation-service.ts b/lib/services/assets-generation/assets-generation-service.ts
@@ -1,5 +1,5 @@
-import * as Jimp from "jimp";
-import * as Color from "color";
+const Jimp = require("jimp");
+const Color = require("color");
 import { exported } from "../../common/decorators";
 import { AssetConstants } from '../../constants';
 
@@ -48,10 +48,10 @@ export class AssetsGenerationService implements IAssetsGenerationService {
 					assetSubGroup && propertiesToEnumerate.indexOf(imageTypeKey) !== -1
 				)
 			)
-			.flatten<IAssetSubGroup>()
-			.map(assetSubGroup => assetSubGroup.images)
-			.flatten<IAssetItem>()
-			.filter(assetItem => !!assetItem.filename)
+			.flatten()
+			.map((assetSubGroup: IAssetSubGroup) => assetSubGroup.images)
+			.flatten()
+			.filter((assetItem: any) => !!assetItem.filename)
 			.value();
 
 		for (const assetItem of assetItems) {
@@ -77,7 +77,7 @@ export class AssetsGenerationService implements IAssetsGenerationService {
 				continue;
 			}
 
-			let image: Jimp;
+			let image: typeof Jimp;
 			switch (operation) {
 				case Operations.OverlayWith:
 					const overlayImageScale = assetItem.overlayImageScale || AssetConstants.defaultOverlayImageScale;
@@ -104,12 +104,12 @@ export class AssetsGenerationService implements IAssetsGenerationService {
 		}
 	}
 
-	private async resize(imagePath: string, width: number, height: number): Promise<Jimp> {
+	private async resize(imagePath: string, width: number, height: number): Promise<typeof Jimp> {
 		const image = await Jimp.read(imagePath);
 		return image.scaleToFit(width, height);
 	}
 
-	private generateImage(background: string, width: number, height: number, outputPath: string, overlayImage?: Jimp): Jimp {
+	private generateImage(background: string, width: number, height: number, outputPath: string, overlayImage?: typeof Jimp): typeof Jimp {
 		// Typescript declarations for Jimp are not updated to define the constructor with backgroundColor so we workaround it by casting it to <any> for this case only.
 		const J = <any>Jimp;
 		const backgroundColor = this.getRgbaNumber(background);
diff --git a/lib/services/log-source-map-service.ts b/lib/services/log-source-map-service.ts
@@ -47,7 +47,7 @@ export class LogSourceMapService implements Mobile.ILogSourceMapService {
 			if (!this.$fs.getFsStats(filePath).isDirectory()) {
 				const source = this.$fs.readText(filePath);
 				const sourceMapRaw = sourceMapConverter.fromSource(source);
-				let smc: sourcemap.SourceMapConsumer = null;
+				let smc: any = null;
 				if (sourceMapRaw && sourceMapRaw.sourcemap) {
 					const sourceMap = sourceMapRaw.sourcemap;
 					smc = new sourcemap.SourceMapConsumer(sourceMap);
diff --git a/lib/services/project-data-service.ts b/lib/services/project-data-service.ts
@@ -28,7 +28,6 @@ export class ProjectDataService implements IProjectDataService {
 		private $logger: ILogger,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
     private $androidResourcesMigrationService: IAndroidResourcesMigrationService,
-    private $pluginService: IPluginsService,
 		private $injector: IInjector) {
 		try {
 			// add the ProjectData of the default projectDir to the projectData cache
@@ -39,7 +38,11 @@ export class ProjectDataService implements IProjectDataService {
 		} catch (e) {
 			// the CLI is required as a lib from a non-project folder
 		}
-	}
+  }
+  
+  get $pluginsService(): IPluginsService {
+    return this.$injector.resolve("pluginsService");
+  }
 
 	public getNSValue(projectDir: string, propertyName: string): any {
 		return this.getValue(projectDir, this.getNativeScriptPropertyName(propertyName));
@@ -402,7 +405,7 @@ export class ProjectDataService implements IProjectDataService {
   }
   
   public getRuntimePackage(projectDir: string, platform: SupportedPlatform): IBasePluginData {
-    return this.$pluginService.getDependenciesFromPackageJson(projectDir).devDependencies.find(d => {
+    return this.$pluginsService.getDependenciesFromPackageJson(projectDir).devDependencies.find(d => {
       if (platform === Platforms.ios) {
         return [constants.SCOPED_IOS_RUNTIME_NAME, constants.TNS_IOS_RUNTIME_NAME].includes(d.name);
       } else if (platform === Platforms.android) {
diff --git a/lib/services/terminal-spinner-service.ts b/lib/services/terminal-spinner-service.ts
@@ -1,4 +1,4 @@
-import * as ora from 'ora';
+const ora = require('ora');
 
 export class TerminalSpinnerService implements ITerminalSpinnerService {
 	public createSpinner(spinnerOptions: ITerminalSpinnerOptions = {}): ITerminalSpinner {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
diff --git a/test/.mocharc.yml b/test/.mocharc.yml
diff --git a/test/cocoapods-service.ts b/test/cocoapods-service.ts
diff --git a/test/controllers/update-controller.ts b/test/controllers/update-controller.ts
diff --git a/test/ios-entitlements-service.ts b/test/ios-entitlements-service.ts
diff --git a/test/services/analytics/analytics-service.ts b/test/services/analytics/analytics-service.ts
diff --git a/test/services/livesync/android-livesync-tool.ts b/test/services/livesync/android-livesync-tool.ts
diff --git a/test/stubs.ts b/test/stubs.ts
diff --git a/test/test-bootstrap.ts b/test/test-bootstrap.ts
diff --git a/tsconfig.json b/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`import * as path from "path";`
`2`	`2`	`import { cache } from "./common/decorators";`
`3`	`3`	`import { androidToolsInfo } from "nativescript-doctor";`
	`4`	`+import { injector } from './common/yok';`
`4`	`5`
`5`	`6`	`export class AndroidToolsInfo implements IAndroidToolsInfo {`
`6`	`7`	`constructor(private $errors: IErrors,`
`@@ -120,4 +121,4 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {`
`120`	`121`	`return targetSdk;`
`121`	`122`	`}`
`122`	`123`	`}`
`123`		`-$injector.register("androidToolsInfo", AndroidToolsInfo);`
	`124`	`+injector.register("androidToolsInfo", AndroidToolsInfo);`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,8 @@`
`1`	`1`	`import { AndroidVirtualDevice } from '../../constants';`
`2`		`-import * as iconv from "iconv-lite";`
`3`	`2`
`4`	`3`	`export class AndroidIniFileParser implements Mobile.IAndroidIniFileParser {`
`5`	`4`	`constructor(private $fs: IFileSystem) {`
`6`		`- iconv.extendNodeEncodings();`
	`5`	`+`
`7`	`6`	`}`
`8`	`7`
`9`	`8`	`public parseIniFile(iniFilePath: string): Mobile.IAvdInfo {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import byline from "byline";`
	`1`	`+import byline = require("byline");`
`2`	`2`	`import { DeviceAndroidDebugBridge } from "./device-android-debug-bridge";`
`3`	`3`	`import { ChildProcess } from "child_process";`
`4`	`4`	`import * as semver from "semver";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import xopen from "open";`
	`1`	`+import xopen = require("open");`
`2`	`2`
`3`	`3`	`export class Opener implements IOpener {`
`4`	`4`