Merge pull request #3947 from NativeScript/tachev/update-typings

Dimitar Tachev · web-flow · commit 616782000380 · 2018-09-28T19:21:30.000+03:00
chore: update node typings to 8
diff --git a/lib/common/file-system.ts b/lib/common/file-system.ts
@@ -304,7 +304,7 @@ export class FileSystem implements IFileSystem {
 		}
 	}
 
-	public symlink(sourcePath: string, destinationPath: string, type?: string): void {
+	public symlink(sourcePath: string, destinationPath: string, type?: fs.symlink.Type): void {
 		fs.symlinkSync(sourcePath, destinationPath, type);
 	}
 
diff --git a/lib/common/helpers.ts b/lib/common/helpers.ts
@@ -432,7 +432,7 @@ export function isPromise(candidateFuture: any): boolean {
 	return !!(candidateFuture && typeof (candidateFuture.then) === "function");
 }
 
-export async function attachAwaitDetach(eventName: string, eventEmitter: EventEmitter, eventHandler: Function, operation: Promise<any>) {
+export async function attachAwaitDetach(eventName: string, eventEmitter: EventEmitter, eventHandler: (...args: any[]) => void, operation: Promise<any>) {
 	eventEmitter.on(eventName, eventHandler);
 
 	try {
diff --git a/lib/common/mobile/ios/device/ios-device.ts b/lib/common/mobile/ios/device/ios-device.ts
@@ -10,7 +10,7 @@ export class IOSDevice implements Mobile.IiOSDevice {
 	public deviceInfo: Mobile.IDeviceInfo;
 
 	private _socket: net.Socket;
-	private _deviceLogHandler: Function;
+	private _deviceLogHandler: (...args: any[]) => void;
 
 	constructor(private deviceActionInfo: IOSDeviceLib.IDeviceActionInfo,
 		private $injector: IInjector,
diff --git a/lib/common/prompter.ts b/lib/common/prompter.ts
@@ -159,7 +159,7 @@ export class Prompter implements IPrompter {
 	private cleanListener(stream: NodeJS.WritableStream, eventName: string, listenerName: string): void {
 		const eventListeners: any[] = process.stdout.listeners(eventName);
 
-		const listenerFunction: Function = _.find(eventListeners, (func: any) => func.name === listenerName);
+		const listenerFunction: (...args: any[]) => void = _.find(eventListeners, (func: any) => func.name === listenerName);
 
 		if (listenerFunction) {
 			stream.removeListener(eventName, listenerFunction);
diff --git a/lib/common/services/process-service.ts b/lib/common/services/process-service.ts
@@ -14,7 +14,7 @@ export class ProcessService implements IProcessService {
 		const callbackToString = callback.toString();
 
 		if (this._listeners.length === 0) {
-			_.each(ProcessService.PROCESS_EXIT_SIGNALS, (signal: string) => {
+			_.each(ProcessService.PROCESS_EXIT_SIGNALS, (signal: NodeJS.Signals) => {
 				process.on(signal, () => this.executeAllCallbacks.apply(this));
 			});
 		}
diff --git a/lib/common/test/unit-tests/process-service.ts b/lib/common/test/unit-tests/process-service.ts
@@ -25,7 +25,7 @@ describe("Process service", () => {
 		$processService.attachToProcessExitSignals({}, emptyFunction);
 		$processService.attachToProcessExitSignals({}, emptyFunction);
 
-		_.each(processExitSignals, (signal: string) => {
+		_.each(processExitSignals, (signal: NodeJS.Signals) => {
 			// We need to search only for our listener because each exit signal have different listeners added to it.
 			const actualListeners = _.filter(process.listeners(signal), (listener: Function) => listener.toString().indexOf("executeAllCallbacks") >= 0);
 			assert.deepEqual(actualListeners.length, 1);
diff --git a/lib/services/analytics/analytics-service.ts b/lib/services/analytics/analytics-service.ts
@@ -192,7 +192,7 @@ export class AnalyticsService extends AnalyticsServiceBase {
 		return new Promise<void>((resolve, reject) => {
 			if (broker && broker.connected) {
 				try {
-					broker.send(message, resolve);
+					broker.send(message, (error: Error) => resolve());
 				} catch (err) {
 					this.$logger.trace("Error while trying to send message to broker:", err);
 					resolve();
diff --git a/lib/services/debug-service.ts b/lib/services/debug-service.ts
@@ -111,7 +111,7 @@ export class DebugService extends EventEmitter implements IDebugService {
 
 		if (fullUrl) {
 			const parseQueryString = true;
-			const wsQueryParam = parse(fullUrl, parseQueryString).query.ws;
+			const wsQueryParam = <string>parse(fullUrl, parseQueryString).query.ws;
 			const hostPortSplit = wsQueryParam && wsQueryParam.split(":");
 			debugInfo.port = hostPortSplit && +hostPortSplit[1];
 		}
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -95,7 +95,7 @@
     "@types/color": "3.0.0",
     "@types/lockfile": "1.0.0",
     "@types/lodash": "4.14.116",
-    "@types/node": "6.0.61",
+    "@types/node": "8.10.30",
     "@types/ora": "1.3.3",
     "@types/qr-image": "3.2.0",
     "@types/request": "0.0.45",
diff --git a/test/helpers/preview-command-helper.ts b/test/helpers/preview-command-helper.ts
@@ -68,8 +68,8 @@ function makeInteractive() {
 }
 
 function makeNonInteractive() {
-	process.stdout.isTTY = false;
-	process.stdin.isTTY = false;
+	(<any>process.stdout).isTTY = false;
+	(<any>process.stdin).isTTY = false;
 }
 
 function reset() {
diff --git a/test/services/livesync/android-livesync-tool.ts b/test/services/livesync/android-livesync-tool.ts
@@ -18,7 +18,7 @@ const protocolVersion = "0.2.0";
 class TestSocket extends LiveSyncSocket {
 	public accomulatedData: Buffer[] = [];
 	public connect () {
-		//ignore
+		return this;
 	}
 
 	public writeAsync(data: Buffer | string, cb?: string | Function, encoding?: Function | string): Promise<Boolean> {
diff --git a/test/services/platform-environment-requirements.ts b/test/services/platform-environment-requirements.ts
@@ -132,7 +132,7 @@ describe("platformEnvironmentRequirements ", () => {
 			assert.deepEqual(['Sync to Playground', 'Configure for Local Builds', 'Skip Step and Configure Manually'], promptForChoiceData[0].choices);
 		});
 		it("should skip env check when NS_SKIP_ENV_CHECK environment variable is passed", async() => {
-			process.env.NS_SKIP_ENV_CHECK = true;
+			(<any>process.env).NS_SKIP_ENV_CHECK = true;
 
 			const output = await platformEnvironmentRequirements.checkEnvironmentRequirements({ platform });
 
@@ -221,8 +221,8 @@ describe("platformEnvironmentRequirements ", () => {
 
 		describe("when console is non interactive", () => {
 			beforeEach(() => {
-				process.stdout.isTTY = false;
-				process.stdin.isTTY = false;
+				(<any>process).stdout.isTTY = false;
+				(<any>process.stdin).isTTY = false;
 				mockDoctorService({ canExecuteLocalBuild: false });
 			});
 

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ export class FileSystem implements IFileSystem {`
`304`	`304`	`}`
`305`	`305`	`}`
`306`	`306`
`307`		`- public symlink(sourcePath: string, destinationPath: string, type?: string): void {`
	`307`	`+ public symlink(sourcePath: string, destinationPath: string, type?: fs.symlink.Type): void {`
`308`	`308`	`fs.symlinkSync(sourcePath, destinationPath, type);`
`309`	`309`	`}`
`310`	`310`
Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ export function isPromise(candidateFuture: any): boolean {`
`432`	`432`	`return !!(candidateFuture && typeof (candidateFuture.then) === "function");`
`433`	`433`	`}`
`434`	`434`
`435`		`-export async function attachAwaitDetach(eventName: string, eventEmitter: EventEmitter, eventHandler: Function, operation: Promise<any>) {`
	`435`	`+export async function attachAwaitDetach(eventName: string, eventEmitter: EventEmitter, eventHandler: (...args: any[]) => void, operation: Promise<any>) {`
`436`	`436`	`eventEmitter.on(eventName, eventHandler);`
`437`	`437`
`438`	`438`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export class ProcessService implements IProcessService {`
`14`	`14`	`const callbackToString = callback.toString();`
`15`	`15`
`16`	`16`	`if (this._listeners.length === 0) {`
`17`		`- _.each(ProcessService.PROCESS_EXIT_SIGNALS, (signal: string) => {`
	`17`	`+ _.each(ProcessService.PROCESS_EXIT_SIGNALS, (signal: NodeJS.Signals) => {`
`18`	`18`	`process.on(signal, () => this.executeAllCallbacks.apply(this));`
`19`	`19`	`});`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ export class DebugService extends EventEmitter implements IDebugService {`
`111`	`111`
`112`	`112`	`if (fullUrl) {`
`113`	`113`	`const parseQueryString = true;`
`114`		`- const wsQueryParam = parse(fullUrl, parseQueryString).query.ws;`
	`114`	`+ const wsQueryParam = <string>parse(fullUrl, parseQueryString).query.ws;`
`115`	`115`	`const hostPortSplit = wsQueryParam && wsQueryParam.split(":");`
`116`	`116`	`debugInfo.port = hostPortSplit && +hostPortSplit[1];`
`117`	`117`	`}`