Decouple cli and project services

Author: ivanbuhov

src/analytics/AnalyticsService.ts

@@ -4,8 +4,8 @@ import { Version } from '../common/version';
 import { GUAService } from './GUAService';
 import { TelerikAnalyticsService } from './TelerikAnalyticsService';
 import { AnalyticsBaseInfo, OperatingSystem } from './AnalyticsBaseInfo';
-import { ExtensionVersionService } from '../common/ExtensionVersionService';
-import * as ns from '../project/NsCliService';
+import { ExtensionHostServices as Services } from '../services/extensionHostServices';
+import * as utils from '../common/utilities';
 
 export class AnalyticsService {
     private _baseInfo: AnalyticsBaseInfo;
@@ -39,8 +39,8 @@ export class AnalyticsService {
         };
 
         this._baseInfo = {
-            cliVersion: ns.CliVersionInfo.getInstalledCliVersion().toString(),
-            extensionVersion: require('../../../package.json').version,
+            cliVersion: Services.cli.version.toString(),
+            extensionVersion: utils.getInstalledExtensionVersion().toString(),
             operatingSystem: operatingSystem,
             userId: AnalyticsService.generateMachineId()
         };

src/common/extensionVersionService.ts

@@ -1,6 +1,7 @@
 import * as https from 'https';
 import * as vscode from 'vscode';
 import {Version} from './version';
+import * as utils from './utilities';
 
 export type LatestPublishedVersionCheckResult = {latestPublishedVersion: string, timestamp: number};
 
@@ -74,7 +75,7 @@ export class ExtensionVersionService {
 
     public get isLatestInstalled(): Promise<{ result: boolean, error: string }> {
         return this.latestPublishedVersion.then(latestVersion => {
-            let extensionVersion = Version.parse(require('../../package.json').version);
+            let extensionVersion = utils.getInstalledExtensionVersion();
             let isLatest: boolean = extensionVersion.compareBySubminorTo(latestVersion) >= 0;
             let error = isLatest ? null : `A new version of the NativeScript extension is available. Open "Extensions" panel to update to v${latestVersion}.`;
             return {result: isLatest, error: error};

src/debug-adapter/utilities.ts src/common/utilities.tssrc/debug-adapter/utilities.ts renamed to src/common/utilities.ts

@@ -9,6 +9,7 @@ import * as os from 'os';
 import * as fs from 'fs';
 import * as url from 'url';
 import * as path from 'path';
+import {Version} from './Version';
 
 export const enum Platform {
     Windows, OSX, Linux
@@ -376,3 +377,11 @@ export function lstrip(s: string, lStr: string): string {
         s.substr(lStr.length) :
         s;
 }
+
+export function getInstalledExtensionVersion(): Version {
+    return Version.parse(require('../../package.json').version);
+}
+
+export function getMinSupportedCliVersion(): Version {
+    return Version.parse(require('../../package.json').minNativescriptCliVersion);
+}

src/debug-adapter/adapter/adapterProxy.ts

@@ -2,7 +2,7 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-import * as utils from '../utilities';
+import * as utils from '../../common/utilities';
 import {DebugAdapterServices as Services} from '../../services/debugAdapterServices';
 import {DebugProtocol} from 'vscode-debugprotocol';
 

src/debug-adapter/adapter/pathTransformer.ts

@@ -2,7 +2,7 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-import * as utils from '../utilities';
+import * as utils from '../../common/utilities';
 import {DebugAdapterServices as Services} from '../../services/debugAdapterServices';
 import {DebugProtocol} from 'vscode-debugprotocol';
 

src/debug-adapter/adapter/sourceMaps/pathUtilities.ts

@@ -7,7 +7,7 @@
 import * as Path from 'path';
 import * as URL from 'url';
 import {DebugAdapterServices as Services} from '../../../services/debugAdapterServices';
-import * as utils from '../../utilities';
+import * as utils from '../../../common/utilities';
 
 export function getPathRoot(p: string) {
     if (p) {

src/debug-adapter/adapter/sourceMaps/sourceMapTransformer.ts

@@ -7,7 +7,7 @@ import * as fs from 'fs';
 import {DebugAdapterServices as Services} from '../../../services/debugAdapterServices';
 import {DebugProtocol} from 'vscode-debugprotocol';
 import {ISourceMaps, SourceMaps} from './sourceMaps';
-import * as utils from '../../utilities';
+import * as utils from '../../../common/utilities';
 
 interface IPendingBreakpoint {
     resolve: () => void;

src/debug-adapter/adapter/sourceMaps/sourceMaps.ts

@@ -9,7 +9,7 @@ import * as URL from 'url';
 import * as FS from 'fs';
 import {SourceMapConsumer} from 'source-map';
 import * as PathUtils from './pathUtilities';
-import * as utils from '../../utilities';
+import * as utils from '../../../common/utilities';
 import {DebugAdapterServices as Services} from '../../../services/debugAdapterServices';
 
 

src/debug-adapter/connection/iosConnection.ts

@@ -6,7 +6,7 @@ import * as net from 'net';
 import * as stream from 'stream';
 import {EventEmitter} from 'events';
 import {INSDebugConnection} from './INSDebugConnection';
-import * as utils from '../utilities';
+import * as utils from '../../common/utilities';
 import {DebugAdapterServices as Services} from '../../services/debugAdapterServices';
 
 interface IMessageWithId {

src/debug-adapter/consoleHelper.ts

@@ -3,7 +3,7 @@
  *--------------------------------------------------------*/
 
 import * as url from 'url';
-import * as Utilities from './utilities';
+import * as Utilities from '../common/utilities';
 
 export function formatConsoleMessage(m: WebKitProtocol.Console.Message, isClientPath :boolean = false): { text: string, isError: boolean } {
     let outputText: string;