Clean up some of the extensions (#8267)

* 💄

* prune unused code

* more cleanup

* remove abunch of used code

extensions/import/package.json

@@ -51,7 +51,7 @@
 				}
 			]
 		},
-		"configuration":{
+		"configuration": {
 			"type": "object",
 			"title": "%flatfileimport.configuration.title%",
 			"properties": {
@@ -70,7 +70,9 @@
 		"vscode-extension-telemetry": "0.0.18",
 		"vscode-nls": "^3.2.1"
 	},
-	"devDependencies": {},
+	"devDependencies": {
+		"@types/node": "10"
+	},
 	"__metadata": {
 		"id": "23",
 		"publisherDisplayName": "Microsoft",

extensions/import/src/services/features.ts

@@ -2,14 +2,14 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
 import { SqlOpsDataClient, SqlOpsFeature } from 'dataprotocol-client';
 import {
 	ClientCapabilities,
 	StaticFeature,
 	RPCMessageType,
-	ServerCapabilities
+	ServerCapabilities,
+	RequestType
 } from 'vscode-languageclient';
 import * as UUID from 'vscode-languageclient/lib/utils/uuid';
 import { Disposable } from 'vscode';
@@ -57,7 +57,7 @@ export class FlatFileImportFeature extends SqlOpsFeature<undefined> {
 	protected registerProvider(options: undefined): Disposable {
 		const client = this._client;
 
-		let requestSender = (requestType, params) => {
+		let requestSender = (requestType: RequestType<any, any, void, void>, params: any) => {
 			return client.sendRequest(requestType, params).then(
 				r => {
 					return r as any;

extensions/import/src/services/serviceApiManager.ts

@@ -3,29 +3,24 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as azdata from 'azdata';
 import * as vscode from 'vscode';
-import * as contracts from './contracts';
-import { SqlOpsDataClient } from 'dataprotocol-client/lib/main';
 
 export enum ApiType {
 	FlatFileProvider = 'FlatFileProvider'
 }
 
-export interface IServiceApi {
+interface IServiceApi {
 	onRegisteredApi<T>(type: ApiType): vscode.Event<T>;
 	registerApi<T>(type: ApiType, feature: T): vscode.Disposable;
 }
 
-export interface IModelViewDefinition {
+interface IModelViewDefinition {
 	id: string;
 	modelView: azdata.ModelView;
 }
 
-export class ServiceApiManager implements IServiceApi {
-	private modelViewRegistrations: { [id: string]: boolean } = {};
+class ServiceApiManager implements IServiceApi {
 	private featureEventChannels: { [type: string]: vscode.EventEmitter<any> } = {};
 	private _onRegisteredModelView = new vscode.EventEmitter<IModelViewDefinition>();
 

extensions/import/src/services/serviceClient.ts

@@ -3,8 +3,6 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import { SqlOpsDataClient, ClientOptions } from 'dataprotocol-client';
 import { ServerProvider, Events } from 'service-downloader';
 import { ServerOptions, TransportKind } from 'vscode-languageclient';
@@ -17,7 +15,6 @@ import { EventAndListener } from 'eventemitter2';
 import { Telemetry, LanguageClientErrorHandler } from './telemetry';
 import * as Constants from '../constants';
 import { TelemetryFeature, FlatFileImportFeature } from './features';
-import * as serviceUtils from './serviceUtils';
 import { promises as fs } from 'fs';
 
 export class ServiceClient {

extensions/import/src/services/serviceUtils.ts

@@ -3,80 +3,9 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as path from 'path';
-import * as os from 'os';
-
-// The function is a duplicate of \src\paths.js. IT would be better to import path.js but it doesn't
-// work for now because the extension is running in different process.
-export function getAppDataPath(): string {
-	let platform = process.platform;
-	switch (platform) {
-		case 'win32': return process.env['APPDATA'] || path.join(process.env['USERPROFILE'], 'AppData', 'Roaming');
-		case 'darwin': return path.join(os.homedir(), 'Library', 'Application Support');
-		case 'linux': return process.env['XDG_CONFIG_HOME'] || path.join(os.homedir(), '.config');
-		default: throw new Error('Platform not supported');
-	}
-}
-
-export function ensure(target: object, key: string): any {
+export function ensure(target: { [key: string]: any }, key: string): any {
 	if (target[key] === void 0) {
 		target[key] = {} as any;
 	}
 	return target[key];
 }
-
-export interface IPackageInfo {
-	name: string;
-	version: string;
-	aiKey: string;
-}
-
-export function getPackageInfo(packageJson: any): IPackageInfo {
-	if (packageJson) {
-		return {
-			name: packageJson.name,
-			version: packageJson.version,
-			aiKey: packageJson.aiKey
-		};
-	}
-}
-
-export function verifyPlatform(): Thenable<boolean> {
-	if (os.platform() === 'darwin' && parseFloat(os.release()) < 16) {
-		return Promise.resolve(false);
-	} else {
-		return Promise.resolve(true);
-	}
-}
-
-export function getRuntimeDisplayName(runtime: Runtime): string {
-	switch (runtime) {
-		case Runtime.Windows_64:
-			return 'Windows';
-		case Runtime.Windows_86:
-			return 'Windows';
-		case Runtime.OSX:
-			return 'OSX';
-		case Runtime.Linux_64:
-			return 'Linux';
-		default:
-			return 'Unknown';
-	}
-}
-
-export enum Runtime {
-	Unknown = <any>'Unknown',
-	Windows_86 = <any>'Windows_86',
-	Windows_64 = <any>'Windows_64',
-	OSX = <any>'OSX',
-	CentOS_7 = <any>'CentOS_7',
-	Debian_8 = <any>'Debian_8',
-	Fedora_23 = <any>'Fedora_23',
-	OpenSUSE_13_2 = <any>'OpenSUSE_13_2',
-	SLES_12_2 = <any>'SLES_12_2',
-	RHEL_7 = <any>'RHEL_7',
-	Ubuntu_14 = <any>'Ubuntu_14',
-	Ubuntu_16 = <any>'Ubuntu_16',
-	Linux_64 = <any>'Linux_64',
-	Linux_86 = <any>'Linux-86'
-}

extensions/import/src/services/telemetry.ts

@@ -74,7 +74,7 @@ export class LanguageClientErrorHandler {
 /**
  * Filters error paths to only include source files. Exported to support testing
  */
-export function FilterErrorPath(line: string): string {
+function FilterErrorPath(line: string): string | undefined {
 	if (line) {
 		let values: string[] = line.split('/out/');
 		if (values.length <= 1) {
@@ -84,6 +84,7 @@ export function FilterErrorPath(line: string): string {
 			return values[1];
 		}
 	}
+	return undefined;
 }
 
 export class Telemetry {

extensions/import/src/wizard/api/basePage.ts

@@ -40,9 +40,9 @@ export abstract class BasePage {
 	 * Sets up a navigation validator.
 	 * This will be called right before onPageEnter().
 	 */
-	public abstract setupNavigationValidator();
+	public abstract setupNavigationValidator(): void;
 
-	protected async getServerValues(): Promise<{ connection, displayName, name }[]> {
+	protected async getServerValues(): Promise<{ connection: azdata.connection.Connection, displayName: string, name: string }[]> {
 		let cons = await azdata.connection.getActiveConnections();
 		// This user has no active connections ABORT MISSION
 		if (!cons || cons.length === 0) {
@@ -90,7 +90,7 @@ export abstract class BasePage {
 		return values;
 	}
 
-	protected async getDatabaseValues(): Promise<{ displayName, name }[]> {
+	protected async getDatabaseValues(): Promise<{ displayName: string, name: string }[]> {
 		let idx = -1;
 		let count = -1;
 		let values = (await azdata.connection.listDatabases(this.model.server.connectionId)).map(db => {

extensions/import/src/wizard/pages/prosePreviewPage.ts

@@ -3,15 +3,12 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as azdata from 'azdata';
 import * as nls from 'vscode-nls';
 import { ImportDataModel } from '../api/models';
 import { ImportPage } from '../api/importPage';
 import { FlatFileProvider } from '../../services/contracts';
 import { FlatFileWizard } from '../flatFileWizard';
-import { PerformanceObserver } from 'perf_hooks';
 
 const localize = nls.loadMessageBundle();
 

extensions/import/tsconfig.json

@@ -12,10 +12,7 @@
 		"moduleResolution": "node",
 		"declaration": false,
 		"strict": false,
-		"noImplicitAny": false,
 		"noUnusedParameters": false,
-		"noImplicitReturns": false,
-		"noUnusedLocals": false,
 	},
 	"exclude": [
 		"node_modules"

extensions/import/yarn.lock

@@ -2,6 +2,11 @@
 # yarn lockfile v1
 
 
+"@types/node@10":
+  version "10.17.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.4.tgz#8993a4fe3c4022fda66bf4ea660d615fc5659c6f"
+  integrity sha512-F2pgg+LcIr/elguz+x+fdBX5KeZXGUOp7TV8M0TVIrDezYLFRNt8oMTyps0VQ1kj5WGGoR18RdxnRDHXrIFHMQ==
+
 agent-base@4:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"