Output undefined channel for client (#675)

* added null output channel to the client

* potential fix the yarn problems

build/yarn.lock

@@ -569,7 +569,7 @@ extend@~1.2.1:
 "extensions-modules@file:../extensions-modules":
   version "0.1.0"
   dependencies:
-    dataprotocol-client "file:../../Library/Caches/Yarn/v1/dataprotocol-client"
+    dataprotocol-client "file:C:/Users/andresse/AppData/Local/Yarn/cache/v1/dataprotocol-client"
     decompress "^4.2.0"
     fs-extra-promise "^1.0.1"
     http-proxy-agent "^2.0.0"

dataprotocol-client/package.json

@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "description": "SQL Operations Studio studio implementation of vscode-language-client",
   "main": "lib/main.js",
+	"typings": "./lib/main",
   "scripts": {
     "prepare": "node ./node_modules/vscode/bin/install && tsc -p ./src",
     "compile": "tsc -p ./src",

dataprotocol-client/src/main.ts

@@ -23,6 +23,7 @@ function ensure<T, K extends keyof T>(target: T, key: K): T[K] {
 
 export interface LanguageClientOptions extends VSLanguageClientOptions {
 	providerId: string;
+	serverConnectionMetadata: any;
 }
 
 /**

extensions-modules/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "description": "Shared modules for Carbon extensions",
   "dependencies": {
-    "dataprotocol-client": "file:./../dataprotocol-client",
+    "dataprotocol-client": "file:../dataprotocol-client",
     "decompress": "^4.2.0",
     "fs-extra-promise": "^1.0.1",
     "http-proxy-agent": "^2.0.0",

extensions-modules/src/languageservice/serviceClient.ts

@@ -336,7 +336,22 @@ export class SqlToolsServiceClient {
 							configurationSection: SqlToolsServiceClient._constants.extensionConfigSectionName
 						},
 						errorHandler: new LanguageClientErrorHandler(SqlToolsServiceClient._constants),
-						serverConnectionMetadata: this._config.getConfigValue(Constants.serverConnectionMetadata)
+						serverConnectionMetadata: this._config.getConfigValue(Constants.serverConnectionMetadata),
+						outputChannel: {
+							append: () => {
+							},
+							appendLine: () => {
+							},
+							dispose: () => {
+							},
+							clear: () => {
+							},
+							hide: () => {
+							},
+							name: '',
+							show: () => {
+							}
+						}
 					};
 					this._serviceStatus.showServiceLoading();
 					// cache the client instance for later use

extensions/mssql/client/src/controllers/mainController.ts

@@ -11,7 +11,7 @@ import { Serialization } from '../serialize/serialization';
 import { AzureResourceProvider } from '../resourceProvider/resourceProvider';
 import { CredentialStore } from '../credentialstore/credentialstore';
 import { IExtensionConstants, Telemetry, Constants as SharedConstants, SqlToolsServiceClient, VscodeWrapper, Utils, PlatformInformation } from 'extensions-modules';
-import { LanguageClient } from 'dataprotocol-client';
+import { SqlOpsDataClient } from 'dataprotocol-client';
 import * as path from 'path';
 
 /**
@@ -67,17 +67,17 @@ export default class MainController implements vscode.Disposable {
 		return this._initialized;
 	}
 
-	private createClient(executableFiles: string[]): Promise<LanguageClient> {
+	private createClient(executableFiles: string[]): Promise<SqlOpsDataClient> {
 		return PlatformInformation.getCurrent(SqlToolsServiceClient.constants.getRuntimeId, SqlToolsServiceClient.constants.extensionName).then(platformInfo => {
 			return SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json')).createClient(this._context, platformInfo.runtimeId, undefined, executableFiles);
 		});
 	}
 
-	private createCredentialClient(): Promise<LanguageClient> {
+	private createCredentialClient(): Promise<SqlOpsDataClient> {
 		return this.createClient(['MicrosoftSqlToolsCredentials.exe', 'MicrosoftSqlToolsCredentials']);
 	}
 
-	private createResourceProviderClient(): Promise<LanguageClient> {
+	private createResourceProviderClient(): Promise<SqlOpsDataClient> {
 		return this.createClient(['SqlToolsResourceProviderService.exe', 'SqlToolsResourceProviderService']);
 	}
 
@@ -115,7 +115,7 @@ export default class MainController implements vscode.Disposable {
 
 				self.createCredentialClient().then(credentialClient => {
 					self._credentialStore.languageClient = credentialClient;
-					(<LanguageClient>credentialClient).onReady().then(() => {
+					credentialClient.onReady().then(() => {
 						let credentialProvider: data.CredentialProvider = {
 							handle: 0,
 							saveCredential(credentialId: string, password: string): Thenable<boolean> {

extensions/mssql/client/src/credentialstore/credentialstore.ts

@@ -7,7 +7,7 @@
 import * as Contracts from '../models/contracts';
 import { ICredentialStore } from './icredentialstore';
 import { SqlToolsServiceClient, Utils } from 'extensions-modules';
-import { LanguageClient } from 'dataprotocol-client';
+import { SqlOpsDataClient } from 'dataprotocol-client';
 import * as path from 'path';
 
 /**
@@ -17,7 +17,7 @@ import * as path from 'path';
  */
 export class CredentialStore implements ICredentialStore {
 
-	public languageClient: LanguageClient;
+	public languageClient: SqlOpsDataClient;
 
 	constructor(private _client?: SqlToolsServiceClient) {
 		if (!this._client) {

extensions/mssql/client/src/resourceprovider/resourceprovider.ts

@@ -6,7 +6,7 @@
 
 import * as Contracts from '../models/contracts';
 import { SqlToolsServiceClient } from 'extensions-modules';
-import { LanguageClient } from 'dataprotocol-client';
+import { SqlOpsDataClient } from 'dataprotocol-client';
 import * as data from 'data';
 import * as path from 'path';
 
@@ -18,9 +18,9 @@ import * as path from 'path';
  */
 export class AzureResourceProvider implements data.ResourceProvider {
 
-	public languageClient: LanguageClient;
+	public languageClient: SqlOpsDataClient;
 
-	constructor(private _client?: SqlToolsServiceClient, langClient?: LanguageClient) {
+	constructor(private _client?: SqlToolsServiceClient, langClient?: SqlOpsDataClient) {
 		if (!this._client) {
 			this._client = SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json'));
 		}

extensions/mssql/client/src/serialize/serialization.ts

@@ -8,7 +8,7 @@ import * as Contracts from '../models/contracts';
 import { ISerialization } from './iserialization';
 import { SqlToolsServiceClient } from 'extensions-modules';
 import * as data from 'data';
-import { LanguageClient } from 'dataprotocol-client';
+import { SqlOpsDataClient } from 'dataprotocol-client';
 import * as path from 'path';
 
 /**
@@ -16,7 +16,7 @@ import * as path from 'path';
  */
 export class Serialization implements ISerialization {
 
-	constructor(private _client?: SqlToolsServiceClient, private _languageClient?: LanguageClient) {
+	constructor(private _client?: SqlToolsServiceClient, private _languageClient?: SqlOpsDataClient) {
 		if (!this._client) {
 			this._client = SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json'));
 		}

extensions/yarn.lock

@@ -133,7 +133,7 @@ es6-promisify@^5.0.0:
 "extensions-modules@file:../extensions-modules":
   version "0.1.0"
   dependencies:
-    dataprotocol-client "file:../../Library/Caches/Yarn/v1/dataprotocol-client"
+    dataprotocol-client "file:C:/Users/andresse/AppData/Local/Yarn/cache/v1/dataprotocol-client"
     decompress "^4.2.0"
     fs-extra-promise "^1.0.1"
     http-proxy-agent "^2.0.0"