Merge pull request #95 from ngdenterprise/neoxp-update

Update `neoxp` to fix relative path support in invoke files

Author: djnicholson

package.json

@@ -321,7 +321,7 @@
   },
   "scripts": {
     "bundle-nxp": "npm run bundle-nxp-download && npm run bundle-nxp-extract",
-    "bundle-nxp-download": "shx rm -rf deps/nxp && shx mkdir -p deps/nxp && nwget \"https://github.com/neo-project/neo-express/releases/download/2.0.35-preview/Neo.Express.2.0.35-preview.nupkg\" -O deps/nxp/nxp.nupkg",
+    "bundle-nxp-download": "shx rm -rf deps/nxp && shx mkdir -p deps/nxp && nwget \"https://github.com/neo-project/neo-express/releases/download/2.0.37-preview/Neo.Express.2.0.37-preview.nupkg\" -O deps/nxp/nxp.nupkg",
     "bundle-nxp-extract": "cd deps/nxp && extract-zip nxp.nupkg",
     "compile": "npm run compile-ext && npm run compile-panel",
     "compile-ext": "webpack --config src/extension/webpack.config.js --mode development",

src/extension/commands/neoExpressCommands.ts

@@ -176,6 +176,7 @@ export default class NeoExpressCommands {
       return;
     }
     const output = await neoExpress.runUnsafe(
+      undefined,
       command,
       "-i",
       identifier.configPath

src/extension/neoExpress/neoExpress.ts

@@ -59,17 +59,25 @@ export default class NeoExpress {
         }
       });
     });
-    
+
     terminal.show();
-    
+
     // Give the terminal a chance to get a lock on the blockchain before
     // starting to do any offline commands.
     await hasStarted;
-    
+
     return terminal;
   }
 
-  async run(
+  run(
+    command: Command,
+    ...options: string[]
+  ): Promise<{ message: string; isError?: boolean }> {
+    return this.runInDirectory(undefined, command, ...options);
+  }
+
+  async runInDirectory(
+    cwd: string | undefined,
     command: Command,
     ...options: string[]
   ): Promise<{ message: string; isError?: boolean }> {
@@ -78,7 +86,7 @@ export default class NeoExpress {
     const releaseLock = await this.getRunLock();
     try {
       const startedAtInternal = new Date().getTime();
-      const result = await this.runUnsafe(command, ...options);
+      const result = await this.runUnsafe(cwd, command, ...options);
       const endedAtInternal = new Date().getTime();
       durationInternal = endedAtInternal - startedAtInternal;
       return result;
@@ -98,6 +106,7 @@ export default class NeoExpress {
   }
 
   async runUnsafe(
+    cwd: string | undefined,
     command: string,
     ...options: string[]
   ): Promise<{ message: string; isError?: boolean }> {
@@ -112,7 +121,9 @@ export default class NeoExpress {
     try {
       return new Promise((resolve, reject) => {
         const startedAt = new Date().getTime();
-        const process = childProcess.spawn(this.dotnetPath, dotNetArguments);
+        const process = childProcess.spawn(this.dotnetPath, dotNetArguments, {
+          cwd,
+        });
         let complete = false;
         const watchdog = () => {
           if (!complete && new Date().getTime() - startedAt > TIMEOUT_IN_MS) {

src/extension/panelControllers/invokeFilePanelController.ts

@@ -293,7 +293,7 @@ export default class InvokeFilePanelController extends PanelControllerBase<
     }
   }
 
-  private async runFile(path: string) {
+  private async runFile(filePath: string) {
     let connection = this.activeConnection.connection;
     if (!connection) {
       await this.activeConnection.connect();
@@ -330,14 +330,15 @@ export default class InvokeFilePanelController extends PanelControllerBase<
       }
       await this.document.save();
       await this.updateViewState({ collapseTransactions: false });
-      const result = await this.neoExpress.run(
+      const result = await this.neoExpress.runInDirectory(
+        path.dirname(this.document.uri.fsPath),
         "contract",
         "invoke",
         "-w",
         witnessScope,
         "-i",
         connection.blockchainIdentifier.configPath,
-        path,
+        filePath,
         account
       );
       if (result.isError) {