Move protocol client out (#643)

* close

* connection is working

* formatting

* adds all

* formatting

* formatting and changing how features are initialized

* formatting

* changed named of typings file

* update

* updated to use dataprotocol npm

* formatting

* removed unneeded logging

* readd npm shrinkwrap

* still not working

* removed unnecessary codfe

* addressed comments

* readded azure resource provider

* fix capabilities cacheing

* added backwards capat for older protocol

* update shrinkwrap

* update shrinkwrap

* updated shrinkwrap

* fixed tests

* removed dead code

* remove dead code

* fix compile

* remove backcompat stuff

* change location of npm

* vbump sqltools

* merge master

* fix imports

* fix build breaks

* update for sqlops

* update yarn dependencies

src/sql/parts/connection/common/connectionConfig.ts

@@ -9,12 +9,12 @@ import * as Utils from './utils';
 import { IConnectionProfile, IConnectionProfileStore } from './interfaces';
 import { IConnectionConfig } from './iconnectionConfig';
 import { ConnectionProfileGroup, IConnectionProfileGroup } from './connectionProfileGroup';
-import { ConfigurationEditingService, IConfigurationValue, IConfigurationValue as TConfigurationValue } from 'vs/workbench/services/configuration/node/configurationEditingService';
+import { ConfigurationEditingService, IConfigurationValue } from 'vs/workbench/services/configuration/node/configurationEditingService';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { ConnectionProfile } from './connectionProfile';
 import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
-import * as data from 'data';
+import * as sqlops from 'sqlops';
 import * as nls from 'vs/nls';
 
 import { generateUuid } from 'vs/base/common/uuid';
@@ -29,7 +29,7 @@ export interface ISaveGroupResult {
  */
 export class ConnectionConfig implements IConnectionConfig {
 
-	private _providerCapabilitiesMap: { [providerName: string]: data.DataProtocolServerCapabilities };
+	private _providerCapabilitiesMap: { [providerName: string]: sqlops.DataProtocolServerCapabilities };
 	/**
 	 * Constructor.
 	 */
@@ -37,7 +37,7 @@ export class ConnectionConfig implements IConnectionConfig {
 		private _configurationEditService: ConfigurationEditingService,
 		private _workspaceConfigurationService: IWorkspaceConfigurationService,
 		private _capabilitiesService: ICapabilitiesService,
-		cachedMetadata?: data.DataProtocolServerCapabilities[]
+		cachedMetadata?: sqlops.DataProtocolServerCapabilities[]
 	) {
 		this._providerCapabilitiesMap = {};
 		this.setCachedMetadata(cachedMetadata);
@@ -48,7 +48,7 @@ export class ConnectionConfig implements IConnectionConfig {
 		}
 	}
 
-	public setCachedMetadata(cachedMetadata: data.DataProtocolServerCapabilities[]): void {
+	public setCachedMetadata(cachedMetadata: sqlops.DataProtocolServerCapabilities[]): void {
 		if (cachedMetadata) {
 			cachedMetadata.forEach(item => {
 				this.updateCapabilitiesCache(item.providerName, item);
@@ -81,13 +81,13 @@ export class ConnectionConfig implements IConnectionConfig {
 		return allGroups;
 	}
 
-	private updateCapabilitiesCache(providerName: string, providerCapabilities: data.DataProtocolServerCapabilities): void {
+	private updateCapabilitiesCache(providerName: string, providerCapabilities: sqlops.DataProtocolServerCapabilities): void {
 		if (providerName && providerCapabilities) {
 			this._providerCapabilitiesMap[providerName] = providerCapabilities;
 		}
 	}
 
-	private getCapabilitiesFromCache(providerName: string): data.DataProtocolServerCapabilities {
+	private getCapabilitiesFromCache(providerName: string): sqlops.DataProtocolServerCapabilities {
 		if (providerName in this._providerCapabilitiesMap) {
 			return this._providerCapabilitiesMap[providerName];
 		}
@@ -99,8 +99,8 @@ export class ConnectionConfig implements IConnectionConfig {
 	* Gets the data from the metadata stored in the config
 	* @param providerName Provider Name
 	*/
-	public getCapabilities(providerName: string): data.DataProtocolServerCapabilities {
-		let result: data.DataProtocolServerCapabilities = this.getCapabilitiesFromCache(providerName);
+	public getCapabilities(providerName: string): sqlops.DataProtocolServerCapabilities {
+		let result: sqlops.DataProtocolServerCapabilities = this.getCapabilitiesFromCache(providerName);
 		if (result) {
 			return result;
 		} else {
@@ -159,7 +159,7 @@ export class ConnectionConfig implements IConnectionConfig {
 		});
 	}
 
-	private getConnectionProfileInstance(profile: IConnectionProfile, groupId: string, providerCapabilities: data.DataProtocolServerCapabilities): ConnectionProfile {
+	private getConnectionProfileInstance(profile: IConnectionProfile, groupId: string, providerCapabilities: sqlops.DataProtocolServerCapabilities): ConnectionProfile {
 		let connectionProfile = profile as ConnectionProfile;
 		if (connectionProfile === undefined) {
 			connectionProfile = new ConnectionProfile(providerCapabilities, profile);
@@ -519,7 +519,7 @@ export class ConnectionConfig implements IConnectionConfig {
 	 */
 	private getConfiguration(key: string): any {
 		let configs: any;
-		configs = this._workspaceConfigurationService.inspect<IConnectionProfileStore[] | IConnectionProfileGroup[] | data.DataProtocolServerCapabilities[]>(key);
+		configs = this._workspaceConfigurationService.inspect<IConnectionProfileStore[] | IConnectionProfileGroup[] | sqlops.DataProtocolServerCapabilities[]>(key);
 		return configs;
 	}
 
@@ -530,7 +530,7 @@ export class ConnectionConfig implements IConnectionConfig {
 	 */
 	private writeConfiguration(
 		key: string,
-		profiles: IConnectionProfileStore[] | IConnectionProfileGroup[] | data.DataProtocolServerCapabilities[],
+		profiles: IConnectionProfileStore[] | IConnectionProfileGroup[] | sqlops.DataProtocolServerCapabilities[],
 		target: ConfigurationTarget = ConfigurationTarget.USER): Promise<void> {
 		return new Promise<void>((resolve, reject) => {
 			let configValue: IConfigurationValue = {

src/sql/parts/connection/common/connectionGlobalStatus.ts

@@ -2,7 +2,7 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { ConnectionSummary } from 'data';
+import { ConnectionSummary } from 'sqlops';
 import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar';
 import * as LocalizedConstants from 'sql/parts/connection/common/localizedConstants';
 

src/sql/parts/connection/common/connectionManagement.ts

@@ -11,7 +11,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import Event from 'vs/base/common/event';
 import { IAction } from 'vs/base/common/actions';
 import Severity from 'vs/base/common/severity';
-import data = require('data');
+import * as sqlops from 'sqlops';
 import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup';
 import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
 import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
@@ -81,7 +81,7 @@ export interface IConnectionManagementService {
 	onConnect: Event<IConnectionParams>;
 	onDisconnect: Event<IConnectionParams>;
 	onConnectionChanged: Event<IConnectionParams>;
-	onLanguageFlavorChanged: Event<data.DidChangeLanguageFlavorParams>;
+	onLanguageFlavorChanged: Event<sqlops.DidChangeLanguageFlavorParams>;
 
 	/**
 	 * Opens the connection dialog to create new connection
@@ -124,11 +124,11 @@ export interface IConnectionManagementService {
 	/**
 	 * Adds the successful connection to MRU and send the connection error back to the connection handler for failed connections
 	 */
-	onConnectionComplete(handle: number, connectionInfoSummary: data.ConnectionInfoSummary): void;
+	onConnectionComplete(handle: number, connectionInfoSummary: sqlops.ConnectionInfoSummary): void;
 
 	onIntelliSenseCacheComplete(handle: number, connectionUri: string): void;
 
-	onConnectionChangedNotification(handle: number, changedConnInfo: data.ChangedConnectionInfo);
+	onConnectionChangedNotification(handle: number, changedConnInfo: sqlops.ChangedConnectionInfo);
 
 	getConnectionGroups(): ConnectionProfileGroup[];
 
@@ -150,7 +150,7 @@ export interface IConnectionManagementService {
 
 	deleteConnectionGroup(group: ConnectionProfileGroup): Promise<boolean>;
 
-	getAdvancedProperties(): data.ConnectionOption[];
+	getAdvancedProperties(): sqlops.ConnectionOption[];
 
 	getConnectionId(connectionProfile: IConnectionProfile): string;
 
@@ -180,12 +180,12 @@ export interface IConnectionManagementService {
 
 	addSavedPassword(connectionProfile: IConnectionProfile): Promise<IConnectionProfile>;
 
-	listDatabases(connectionUri: string): Thenable<data.ListDatabasesResult>;
+	listDatabases(connectionUri: string): Thenable<sqlops.ListDatabasesResult>;
 
 	/**
 	 * Register a connection provider
 	 */
-	registerProvider(providerId: string, provider: data.ConnectionProvider): void;
+	registerProvider(providerId: string, provider: sqlops.ConnectionProvider): void;
 
 	editGroup(group: ConnectionProfileGroup): Promise<void>;
 
@@ -216,7 +216,7 @@ export interface IConnectionManagementService {
 
 	hasRegisteredServers(): boolean;
 
-	getCapabilities(providerName: string): data.DataProtocolServerCapabilities;
+	getCapabilities(providerName: string): sqlops.DataProtocolServerCapabilities;
 
 	canChangeConnectionConfig(profile: ConnectionProfile, newGroupID: string): boolean;
 
@@ -305,7 +305,7 @@ export interface INewConnectionParams {
 	connectionType: ConnectionType;
 	input?: IConnectableInput;
 	runQueryOnCompletion?: RunQueryOnConnectionMode;
-	querySelection?: data.ISelectionData;
+	querySelection?: sqlops.ISelectionData;
 	showDashboard?: boolean;
 }
 

src/sql/parts/connection/common/connectionManagementInfo.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
-import * as data from 'data';
+import * as sqlops from 'sqlops';
 import { StopWatch } from 'vs/base/common/stopwatch';
 
 /**
@@ -64,7 +64,7 @@ export class ConnectionManagementInfo {
 	/**
 	 * Information about the connected server.
 	 */
-	serverInfo: data.ServerInfo;
+	serverInfo: sqlops.ServerInfo;
 
 	/**
 	 * Owner uri assigned to the connection

src/sql/parts/connection/common/connectionManagementService.ts

@@ -31,7 +31,7 @@ import { IResourceProviderService } from 'sql/parts/accountManagement/common/int
 import { IAngularEventingService, AngularEventType } from 'sql/services/angularEventing/angularEventingService';
 import * as QueryConstants from 'sql/parts/query/common/constants';
 
-import * as data from 'data';
+import * as sqlops from 'sqlops';
 
 import * as nls from 'vs/nls';
 import * as errors from 'vs/base/common/errors';
@@ -64,7 +64,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 
 	private disposables: IDisposable[] = [];
 
-	private _providers: { [handle: string]: data.ConnectionProvider; } = Object.create(null);
+	private _providers: { [handle: string]: sqlops.ConnectionProvider; } = Object.create(null);
 
 	private _uriToProvider: { [uri: string]: string; } = Object.create(null);
 
@@ -76,7 +76,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 	private _onDisconnect: Emitter<IConnectionParams>;
 	private _onConnectRequestSent: Emitter<void>;
 	private _onConnectionChanged: Emitter<IConnectionParams>;
-	private _onLanguageFlavorChanged: Emitter<data.DidChangeLanguageFlavorParams>;
+	private _onLanguageFlavorChanged: Emitter<sqlops.DidChangeLanguageFlavorParams>;
 
 	private _connectionGlobalStatus: ConnectionGlobalStatus;
 
@@ -126,7 +126,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 		this._onDisconnect = new Emitter<IConnectionParams>();
 		this._onConnectionChanged = new Emitter<IConnectionParams>();
 		this._onConnectRequestSent = new Emitter<void>();
-		this._onLanguageFlavorChanged = new Emitter<data.DidChangeLanguageFlavorParams>();
+		this._onLanguageFlavorChanged = new Emitter<sqlops.DidChangeLanguageFlavorParams>();
 
 		this._onProvidersReady = new Deferred();
 
@@ -182,7 +182,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 		return this._onConnectRequestSent.event;
 	}
 
-	public get onLanguageFlavorChanged(): Event<data.DidChangeLanguageFlavorParams> {
+	public get onLanguageFlavorChanged(): Event<sqlops.DidChangeLanguageFlavorParams> {
 		return this._onLanguageFlavorChanged.event;
 	}
 
@@ -195,7 +195,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 	private _providerCount: number = 0;
 
 	// Connection Provider Registration
-	public registerProvider(providerId: string, provider: data.ConnectionProvider): void {
+	public registerProvider(providerId: string, provider: sqlops.ConnectionProvider): void {
 		this._providers[providerId] = provider;
 
 		// temporarily close splash screen when a connection provider has been registered
@@ -655,7 +655,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 		return this._connectionStore.clearRecentlyUsed();
 	}
 
-	public clearRecentConnection(connectionProfile: IConnectionProfile) : void {
+	public clearRecentConnection(connectionProfile: IConnectionProfile): void {
 		this._connectionStore.removeConnectionToMemento(connectionProfile, Constants.recentConnections);
 	}
 
@@ -679,7 +679,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 		return Object.keys(this._providers);
 	}
 
-	public getCapabilities(providerName: string): data.DataProtocolServerCapabilities {
+	public getCapabilities(providerName: string): sqlops.DataProtocolServerCapabilities {
 		let capabilities = this._capabilitiesService.getCapabilities();
 		if (capabilities !== undefined && capabilities.length > 0) {
 			return capabilities.find(c => c.providerName === providerName);
@@ -687,7 +687,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 		return undefined;
 	}
 
-	public getAdvancedProperties(): data.ConnectionOption[] {
+	public getAdvancedProperties(): sqlops.ConnectionOption[] {
 
 		let capabilities = this._capabilitiesService.getCapabilities();
 		if (capabilities !== undefined && capabilities.length > 0) {
@@ -832,13 +832,13 @@ export class ConnectionManagementService implements IConnectionManagementService
 		});
 	}
 
-	private sendListDatabasesRequest(uri: string): Thenable<data.ListDatabasesResult> {
+	private sendListDatabasesRequest(uri: string): Thenable<sqlops.ListDatabasesResult> {
 		let providerId: string = this.getProviderIdFromUri(uri);
 		if (!providerId) {
 			return Promise.resolve(undefined);
 		}
 
-		return new Promise<data.ListDatabasesResult>((resolve, reject) => {
+		return new Promise<sqlops.ListDatabasesResult>((resolve, reject) => {
 			let provider = this._providers[providerId];
 			provider.listDatabases(uri).then(result => {
 				if (result && result.databaseNames) {
@@ -895,7 +895,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 		});
 	}
 
-	public onConnectionComplete(handle: number, info: data.ConnectionInfoSummary): void {
+	public onConnectionComplete(handle: number, info: sqlops.ConnectionInfoSummary): void {
 		const self = this;
 		let connection = this._connectionStatusManager.onConnectionComplete(info);
 
@@ -923,7 +923,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 		}
 	}
 
-	public onConnectionChangedNotification(handle: number, changedConnInfo: data.ChangedConnectionInfo): void {
+	public onConnectionChangedNotification(handle: number, changedConnInfo: sqlops.ChangedConnectionInfo): void {
 		let profile: IConnectionProfile = this._connectionStatusManager.onConnectionChanged(changedConnInfo);
 		this._notifyConnectionChanged(profile, changedConnInfo.connectionUri);
 	}
@@ -1023,28 +1023,26 @@ export class ConnectionManagementService implements IConnectionManagementService
 		const self = this;
 
 		return new Promise<IConnectionResult>((resolve, reject) => {
-			this._capabilitiesService.onCapabilitiesReady().then(() => {
-				let connectionInfo = this._connectionStatusManager.addConnection(connection, uri);
-				// Setup the handler for the connection complete notification to call
-				connectionInfo.connectHandler = ((connectResult, errorMessage, errorCode, callStack) => {
-					let connectionMngInfo = this._connectionStatusManager.findConnection(uri);
-					if (connectionMngInfo && connectionMngInfo.deleted) {
+			let connectionInfo = this._connectionStatusManager.addConnection(connection, uri);
+			// Setup the handler for the connection complete notification to call
+			connectionInfo.connectHandler = ((connectResult, errorMessage, errorCode, callStack) => {
+				let connectionMngInfo = this._connectionStatusManager.findConnection(uri);
+				if (connectionMngInfo && connectionMngInfo.deleted) {
+					this._connectionStatusManager.deleteConnection(uri);
+					resolve({ connected: connectResult, errorMessage: undefined, errorCode: undefined, callStack: undefined, errorHandled: true });
+				} else {
+					if (errorMessage) {
+						// Connection to the server failed
 						this._connectionStatusManager.deleteConnection(uri);
-						resolve({ connected: connectResult, errorMessage: undefined, errorCode: undefined, callStack: undefined, errorHandled: true });
+						resolve({ connected: connectResult, errorMessage: errorMessage, errorCode: errorCode, callStack: callStack });
 					} else {
-						if (errorMessage) {
-							// Connection to the server failed
-							this._connectionStatusManager.deleteConnection(uri);
-							resolve({ connected: connectResult, errorMessage: errorMessage, errorCode: errorCode, callStack: callStack });
-						} else {
-							resolve({ connected: connectResult, errorMessage: errorMessage, errorCode: errorCode, callStack: callStack });
-						}
+						resolve({ connected: connectResult, errorMessage: errorMessage, errorCode: errorCode, callStack: callStack });
 					}
-				});
-
-				// send connection request
-				self.sendConnectRequest(connection, uri);
+				}
 			});
+
+			// send connection request
+			self.sendConnectRequest(connection, uri);
 		});
 	}
 
@@ -1197,7 +1195,7 @@ export class ConnectionManagementService implements IConnectionManagementService
 		return this._connectionStatusManager.isConnected(fileUri) ? this._connectionStatusManager.findConnection(fileUri) : undefined;
 	}
 
-	public listDatabases(connectionUri: string): Thenable<data.ListDatabasesResult> {
+	public listDatabases(connectionUri: string): Thenable<sqlops.ListDatabasesResult> {
 		const self = this;
 		if (self.isConnected(connectionUri)) {
 			return self.sendListDatabasesRequest(connectionUri);

src/sql/parts/connection/common/connectionProfile.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { ConnectionProfileGroup } from './connectionProfileGroup';
-import * as data from 'data';
+import * as sqlops from 'sqlops';
 import { ProviderConnectionInfo } from 'sql/parts/connection/common/providerConnectionInfo';
 import * as interfaces from 'sql/parts/connection/common/interfaces';
 import { equalsIgnoreCase } from 'vs/base/common/strings';
@@ -28,7 +28,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
 	public saveProfile: boolean;
 
 	public isDisconnecting: boolean = false;
-	public constructor(serverCapabilities?: data.DataProtocolServerCapabilities, model?: interfaces.IConnectionProfile) {
+	public constructor(serverCapabilities?: sqlops.DataProtocolServerCapabilities, model?: interfaces.IConnectionProfile) {
 		super(serverCapabilities, model);
 		if (model) {
 			this.groupId = model.groupId;
@@ -137,7 +137,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
 		return super.getOptionsKey();
 	}
 
-	public onProviderRegistered(serverCapabilities: data.DataProtocolServerCapabilities): void {
+	public onProviderRegistered(serverCapabilities: sqlops.DataProtocolServerCapabilities): void {
 		if (serverCapabilities.providerName === this.providerName) {
 			this.setServerCapabilities(serverCapabilities);
 		}
@@ -164,13 +164,13 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
 		return result;
 	}
 
-	public toConnectionInfo(): data.ConnectionInfo {
+	public toConnectionInfo(): sqlops.ConnectionInfo {
 		return {
 			options: this.options
 		};
 	}
 
-	public static createFromStoredProfile(profile: interfaces.IConnectionProfileStore, serverCapabilities: data.DataProtocolServerCapabilities): ConnectionProfile {
+	public static createFromStoredProfile(profile: interfaces.IConnectionProfileStore, serverCapabilities: sqlops.DataProtocolServerCapabilities): ConnectionProfile {
 		let connectionInfo = new ConnectionProfile(serverCapabilities, undefined);
 		connectionInfo.options = profile.options;
 
@@ -187,7 +187,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
 		return connectionInfo;
 	}
 
-	public static convertToConnectionProfile(serverCapabilities: data.DataProtocolServerCapabilities, conn: interfaces.IConnectionProfile): ConnectionProfile {
+	public static convertToConnectionProfile(serverCapabilities: sqlops.DataProtocolServerCapabilities, conn: interfaces.IConnectionProfile): ConnectionProfile {
 		if (conn) {
 			let connectionProfile: ConnectionProfile = undefined;
 			let connectionProfileInstance = conn as ConnectionProfile;
@@ -205,7 +205,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
 	}
 
 	public static convertToProfileStore(
-		serverCapabilities: data.DataProtocolServerCapabilities,
+		serverCapabilities: sqlops.DataProtocolServerCapabilities,
 		connectionProfile: interfaces.IConnectionProfile): interfaces.IConnectionProfileStore {
 		if (connectionProfile) {
 			let connectionInfo = ConnectionProfile.convertToConnectionProfile(serverCapabilities, connectionProfile);

src/sql/parts/connection/common/connectionStatusManager.ts

@@ -9,21 +9,21 @@ import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesServ
 import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
 import { IConnectionProfile } from './interfaces';
 import * as Utils from './utils';
-import * as data from 'data';
+import * as sqlops from 'sqlops';
 import { StopWatch } from 'vs/base/common/stopwatch';
 
 export class ConnectionStatusManager {
 
 	private _connections: { [id: string]: ConnectionManagementInfo };
-	private _providerCapabilitiesMap: { [providerName: string]: data.DataProtocolServerCapabilities };
+	private _providerCapabilitiesMap: { [providerName: string]: sqlops.DataProtocolServerCapabilities };
 
 	constructor( @ICapabilitiesService private _capabilitiesService: ICapabilitiesService) {
 		this._connections = {};
 		this._providerCapabilitiesMap = {};
 	}
 
-	public getCapabilities(providerName: string): data.DataProtocolServerCapabilities {
-		let result: data.DataProtocolServerCapabilities;
+	public getCapabilities(providerName: string): sqlops.DataProtocolServerCapabilities {
+		let result: sqlops.DataProtocolServerCapabilities;
 
 		if (providerName in this._providerCapabilitiesMap) {
 			result = this._providerCapabilitiesMap[providerName];
@@ -126,7 +126,7 @@ export class ConnectionStatusManager {
 		return newId;
 	}
 
-	public onConnectionComplete(summary: data.ConnectionInfoSummary): ConnectionManagementInfo {
+	public onConnectionComplete(summary: sqlops.ConnectionInfoSummary): ConnectionManagementInfo {
 		let connection = this._connections[summary.ownerUri];
 		connection.serviceTimer.stop();
 		connection.connecting = false;
@@ -139,7 +139,7 @@ export class ConnectionStatusManager {
 	 * Updates database name after connection is complete
 	 * @param summary connection summary
 	 */
-	public updateDatabaseName(summary: data.ConnectionInfoSummary): void {
+	public updateDatabaseName(summary: sqlops.ConnectionInfoSummary): void {
 		let connection = this._connections[summary.ownerUri];
 
 		//Check if the existing connection database name is different the one in the summary
@@ -174,7 +174,7 @@ export class ConnectionStatusManager {
 		return ownerUriToReturn;
 	}
 
-	public onConnectionChanged(changedConnInfo: data.ChangedConnectionInfo): IConnectionProfile {
+	public onConnectionChanged(changedConnInfo: sqlops.ChangedConnectionInfo): IConnectionProfile {
 		let connection = this._connections[changedConnInfo.connectionUri];
 		if (connection && connection.connectionProfile) {
 			connection.connectionProfile.serverName = changedConnInfo.connection.serverName;

src/sql/parts/connection/common/connectionStore.ts

@@ -18,9 +18,10 @@ import { ConnectionProfileGroup, IConnectionProfileGroup } from './connectionPro
 import { ConfigurationEditingService } from 'vs/workbench/services/configuration/node/configurationEditingService';
 import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration';
 import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
-import * as data from 'data';
 import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes';
 
+import * as sqlops from 'sqlops';
+
 const MAX_CONNECTIONS_DEFAULT = 25;
 
 /**
@@ -213,9 +214,9 @@ export class ConnectionStore {
 		});
 	}
 
-	private getCachedServerCapabilities(): data.DataProtocolServerCapabilities[] {
+	private getCachedServerCapabilities(): sqlops.DataProtocolServerCapabilities[] {
 		if (this._memento) {
-			let metadata: data.DataProtocolServerCapabilities[] = this._memento[Constants.capabilitiesOptions];
+			let metadata: sqlops.DataProtocolServerCapabilities[] = this._memento[Constants.capabilitiesOptions];
 			return metadata;
 		} else {
 			return undefined;
@@ -234,7 +235,7 @@ export class ConnectionStore {
 	 * Gets the list of recently used connections. These will not include the password - a separate call to
 	 * {addSavedPassword} is needed to fill that before connecting
 	 *
-	 * @returns {data.ConnectionInfo} the array of connections, empty if none are found
+	 * @returns {sqlops.ConnectionInfo} the array of connections, empty if none are found
 	 */
 	public getRecentlyUsedConnections(): ConnectionProfile[] {
 		let configValues: IConnectionProfile[] = this._memento[Constants.recentConnections];
@@ -275,7 +276,7 @@ export class ConnectionStore {
 	 * Gets the list of active connections. These will not include the password - a separate call to
 	 * {addSavedPassword} is needed to fill that before connecting
 	 *
-	 * @returns {data.ConnectionInfo} the array of connections, empty if none are found
+	 * @returns {sqlops.ConnectionInfo} the array of connections, empty if none are found
 	 */
 	public getActiveConnections(): ConnectionProfile[] {
 		let configValues: IConnectionProfile[] = this._memento[Constants.activeConnections];

src/sql/parts/connection/common/iconnectionConfig.ts

@@ -8,7 +8,7 @@
 import { IConnectionProfile } from './interfaces';
 import { IConnectionProfileGroup, ConnectionProfileGroup } from './connectionProfileGroup';
 import { ConnectionProfile } from './connectionProfile';
-import data = require('data');
+import * as sqlops from 'sqlops';
 
 /**
  * Interface for a configuration file that stores connection profiles.
@@ -23,8 +23,8 @@ export interface IConnectionConfig {
 	getAllGroups(): IConnectionProfileGroup[];
 	changeGroupIdForConnectionGroup(source: ConnectionProfileGroup, target: ConnectionProfileGroup): Promise<void>;
 	changeGroupIdForConnection(source: ConnectionProfile, targetGroupId: string): Promise<void>;
-	setCachedMetadata(cachedMetaData: data.DataProtocolServerCapabilities[]): void;
-	getCapabilities(providerName: string): data.DataProtocolServerCapabilities;
+	setCachedMetadata(cachedMetaData: sqlops.DataProtocolServerCapabilities[]): void;
+	getCapabilities(providerName: string): sqlops.DataProtocolServerCapabilities;
 	editGroup(group: ConnectionProfileGroup): Promise<void>;
 	deleteConnection(profile: ConnectionProfile): Promise<void>;
 	deleteGroup(group: ConnectionProfileGroup): Promise<void>;

src/sql/parts/connection/common/interfaces.ts

@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 'use strict';
-import * as data from 'data';
+import * as sqlops from 'sqlops';
 
 // A Connection Profile contains all the properties of connection credentials, with additional
 // optional name and details on whether password should be saved
-export interface IConnectionProfile extends data.ConnectionInfo {
+export interface IConnectionProfile extends sqlops.ConnectionInfo {
 	serverName: string;
 	databaseName: string;
 	userName: string;

src/sql/parts/connection/common/providerConnectionInfo.ts

@@ -5,21 +5,21 @@
 
 'use strict';
 
-import data = require('data');
+import * as sqlops from 'sqlops';
 import * as interfaces from 'sql/parts/connection/common/interfaces';
 import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
 import * as Constants from 'sql/parts/connection/common/constants';
 
-export class ProviderConnectionInfo implements data.ConnectionInfo {
+export class ProviderConnectionInfo implements sqlops.ConnectionInfo {
 
 	options: { [name: string]: any };
 
 	public providerName: string;
-	protected _serverCapabilities: data.DataProtocolServerCapabilities;
+	protected _serverCapabilities: sqlops.DataProtocolServerCapabilities;
 	private static readonly SqlAuthentication = 'SqlLogin';
 	public static readonly ProviderPropertyName = 'providerName';
 
-	public constructor(serverCapabilities?: data.DataProtocolServerCapabilities, model?: interfaces.IConnectionProfile) {
+	public constructor(serverCapabilities?: sqlops.DataProtocolServerCapabilities, model?: interfaces.IConnectionProfile) {
 		this.options = {};
 		if (serverCapabilities) {
 			this._serverCapabilities = serverCapabilities;
@@ -47,11 +47,11 @@ export class ProviderConnectionInfo implements data.ConnectionInfo {
 		return instance;
 	}
 
-	public get serverCapabilities(): data.DataProtocolServerCapabilities {
+	public get serverCapabilities(): sqlops.DataProtocolServerCapabilities {
 		return this._serverCapabilities;
 	}
 
-	public setServerCapabilities(value: data.DataProtocolServerCapabilities) {
+	public setServerCapabilities(value: sqlops.DataProtocolServerCapabilities) {
 		this._serverCapabilities = value;
 	}
 
@@ -220,7 +220,7 @@ export class ProviderConnectionInfo implements data.ConnectionInfo {
 		return displayName;
 	}
 
-	public getProviderOptions(): data.ConnectionOption[] {
+	public getProviderOptions(): sqlops.ConnectionOption[] {
 		return this._serverCapabilities.connectionProvider.options;
 	}