Add nativescriptCliPath option

Author: ivanbuhov

package.json

@@ -229,6 +229,11 @@
                 "type": "boolean",
                 "description": "Whether to sync files from node_modules folder.",
                 "default": false
+              },
+              "nativescriptCliPath": {
+                "type": "string",
+                "description": "Path to the nativescript CLI to be used by the NativeScript extension.",
+                "default": "tns"
               }
             }
           },
@@ -280,6 +285,11 @@
                 "type": "boolean",
                 "description": "Whether the app to run in emulator or on a physical device.",
                 "default": false
+              },
+              "nativescriptCliPath": {
+                "type": "string",
+                "description": "Path to the nativescript CLI to be used by the NativeScript extension.",
+                "default": "tns"
               }
             }
           }

src/debug-adapter/webKitAdapterInterfaces.d.ts

@@ -14,6 +14,7 @@ export interface ILaunchRequestArgs extends DebugProtocol.LaunchRequestArguments
     tnsOutput?: string;
     rebuild?: boolean;
     syncAllFiles?: boolean;
+    nativescriptCliPath?: string;
 }
 
 export interface IAttachRequestArgs extends DebugProtocol.AttachRequestArguments {
@@ -25,6 +26,7 @@ export interface IAttachRequestArgs extends DebugProtocol.AttachRequestArguments
     request: string;
     tnsArgs?: string[];
     tnsOutput?: string;
+    nativescriptCliPath?: string;
 }
 
 export interface ISetBreakpointsArgs extends DebugProtocol.SetBreakpointsArguments {

src/services/NsCliService.ts

@@ -138,7 +138,7 @@ export class IosProject extends NSProject {
 
         let rebuild = (args.request == "launch") ? (args as ILaunchRequestArgs).rebuild : true;
         // build command to execute
-        let command = new CommandBuilder()
+        let command = new CommandBuilder(args.nativescriptCliPath)
             .appendParam("debug")
             .appendParam(this.platform())
             .appendParamIf("--emulator", args.emulator)
@@ -232,7 +232,7 @@ export class AndroidProject extends NSProject {
             let launched = false;
 
             return new Promise<void>((resolve, reject) => {
-                let command = new CommandBuilder()
+                let command = new CommandBuilder(args.nativescriptCliPath)
                     .appendParam("debug")
                     .appendParam(this.platform())
                     .appendParamIf("--emulator", args.emulator)
@@ -286,7 +286,7 @@ export class AndroidProject extends NSProject {
 
         //return Promise.resolve(40001);
 
-        let command = new CommandBuilder()
+        let command = new CommandBuilder(args.nativescriptCliPath)
             .appendParam("debug")
             .appendParam(this.platform())
             .appendParam("--get-port")
@@ -337,10 +337,14 @@ export class AndroidProject extends NSProject {
 }
 
 class CommandBuilder {
-    public static tnsPath: string = 'tns';
 
+    private _tnsPath: string;
     private _command: string[] = [];
 
+    constructor(tnsPath?: string) {
+        this._tnsPath =  tnsPath || "tns";
+    }
+
     public appendParam(parameter: string): CommandBuilder {
         this._command.push(parameter);
         return this;
@@ -359,7 +363,7 @@ class CommandBuilder {
     }
 
     public build(): { path: string, args: string[] } {
-        return { path: CommandBuilder.tnsPath, args: this._command };
+        return { path: this._tnsPath, args: this._command };
     }
 
     public buildAsString(): string {