Add options for ide commands

diff --git a/README.md b/README.md
index 11056877dfd01953abaf3fed6a11dc337a4d0ec3..034dac0f7240a2881d499094b33bfa34c9d99a15 100644 (file)
--- a/README.md
+++ b/README.md
@@ -56,7 +56,9 @@ const loaderConfig = {
   pscBundle: null, // purs bundle
   pscBundleArgs: {},
   pscIde: false, // instant rebuilds using psc-ide-server (experimental)
-  pscIdeArgs: {}, // for example, to use different psc-ide-server port: {port: 4088}
+  pscIdeClient: null, // purs ide client
+  pscIdeClientArgs: {}, // for example, to use different port {port: 4088}
+  pscIdeServer: null, // purs ide server
   pscIdeServerArgs: {}, // for example, to change the port { port: 4088 }
   pscIdeColors: false, // defaults to true if psc === 'psa'
   pscPackage: false,

diff --git a/src/ide.js b/src/ide.js
index e6a45c2fc885e4fac7c4bc9003e39567613e0600..00de55b5a17ec7b78f97b82629610247a729c395 100644 (file)
--- a/src/ide.js
+++ b/src/ide.js
@@ -36,9 +36,9 @@ UnknownModuleError.prototype.constructor = UnknownModuleError;
 module.exports.UnknownModuleError = UnknownModuleError;
 
 function spawnIdeClient(body, options) {
-  const ideClientCommand = 'purs';
+  const ideClientCommand = options.pscIdeClient || 'purs';
 
-  const ideClientArgs = ['ide', 'client'].concat(dargs(options.pscIdeArgs));
+  const ideClientArgs = (options.pscIdeClient ? [] : ['ide', 'client']).concat(dargs(options.pscIdeClientArgs));
 
   const stderr = [];
 
@@ -144,9 +144,9 @@ function formatIdeResult(result, options, index, length) {
 module.exports.connect = function connect(psModule) {
   const options = psModule.options
 
-  const serverCommand = 'purs';
+  const serverCommand = options.pscIdeServer || 'purs';
 
-  const serverArgs = ['ide', 'server'].concat(dargs(Object.assign({
+  const serverArgs = (options.pscIdeServer ? [] : ['ide', 'server']).concat(dargs(Object.assign({
     outputDirectory: options.output,
     '_': options.src
   }, options.pscIdeServerArgs)));

diff --git a/src/index.js b/src/index.js
index 11b06eb8653b168f5bcbfda32cbd673fd01e4967..4c5abd20a1e894ed827c1640b7c0a6c64bac9e12 100644 (file)
--- a/src/index.js
+++ b/src/index.js
@@ -108,9 +108,12 @@ module.exports = function purescriptLoader(source, map) {
     pscArgs: {},
     pscBundle: null,
     pscBundleArgs: {},
+    pscIdeClient: null,
+    pscIdeClientArgs: {},
+    pscIdeServer: null,
+    pscIdeServerArgs: {},
     pscIde: false,
     pscIdeColors: loaderOptions.psc === 'psa',
-    pscIdeArgs: {},
     pscPackage: false,
     bundleOutput: 'output/bundle.js',
     bundleNamespace: 'PS',