v3.4.0: add shortName config to control $ identifier name

lib/Agent.js

@@ -15,6 +15,8 @@ class Agent {
         this.args.split(' ').filter(v => v.trim()) :
         [this.args];
     }
+
+    this.shortName = options.shortName || '$';
   }
 
   compile(code, options) {
@@ -23,7 +25,7 @@ class Agent {
     if (options.async) {
       return code;
     } else {
-      return code + '\n;$.destroy();';
+      return code + '\n;' + this.shortName + '.destroy();';
     }
   }
 

lib/ConsoleAgent.js

@@ -6,6 +6,7 @@ const cp = require('child_process');
 const temp = require('temp');
 const ErrorParser = require('./parseError.js');
 
+
 class ConsoleAgent extends Agent {
   constructor(options) {
     super(options);
@@ -71,7 +72,11 @@ class ConsoleAgent extends Agent {
 
   compile (code, options) {
     code = super.compile(code, options);
-    const runtime = this.constructor.runtime;
+    let runtime = this.constructor.runtime;
+    if (runtime && this.options.shortName) {
+      runtime = runtime.replace(/\$/g, this.options.shortName);
+    }
+
     if (!runtime) {
       return code;
     } else {

lib/agents/ch.js

@@ -5,7 +5,6 @@ const inception = require('../inception');
 const runtimePath = require('../runtimePath');
 const ConsoleAgent = require('../ConsoleAgent');
 
-
 const runtimeStr = inception(
   fs.readFileSync(runtimePath.for('chakra'), 'utf8')
     .replace(/\r?\n/g, '')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eshost",
-  "version": "3.3.2",
+  "version": "3.4.0",
   "description": "Invoke ECMAScript scripts in any command line JS engine.",
   "main": "lib/eshost.js",
   "scripts": {

test/runify.js

@@ -11,7 +11,7 @@ const hosts = [
   ['../webkit/build/bin64/jsc.exe', 'jsc'],
   /*[undefined, 'chrome'],*/
 
-  ['C:/Program Files (x86)/Mozilla Firefox/firefox.exe', 'firefox'],
+  //['C:/Program Files (x86)/Mozilla Firefox/firefox.exe', 'firefox'],
   /*['C:/Program Files (x86)/Nightly/firefox.exe', 'firefox'],
   ['C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe', 'chrome'],
   */
@@ -39,6 +39,15 @@ hosts.forEach(function (record) {
       return agent.destroy();
     });
 
+    it('allows custom shortNames', function() {
+      return runify.createAgent(type, { hostPath: host, shortName: '$testing' }).then(agent => {
+        return agent.evalScript('$testing.evalScript("print(1)")').then(result => {
+          assert(result.error === null, 'no error');
+          assert.equal(result.stdout.indexOf('1'), 0);
+        });
+      });
+    });
+
     it('runs SyntaxErrors', function () {
       return agent.evalScript('foo x++').then(function (result) {
         assert(result.error, 'error is present');