feat(customcompiler) allow the user to use a custom `typescriptServic…

…e.js` closes TypeStrong/atom-typescript#236
angelestelar5z · Apr 25, 2015 · 300239f · 300239f
1 parent 875e3b0
commit 300239f
Show file tree

Hide file tree

Showing 14 changed files with 103 additions and 41 deletions.
diff --git a/dist/main/atom/atomConfig.js b/dist/main/atom/atomConfig.js
@@ -1,10 +1,7 @@
-// Documentation https://atom.io/docs/api/v0.177.0/Config and http://json-schema.org/examples.html
-// To add a new setting you need to add to
-//    schema
-//    getter/setter
+var utils_1 = require("../lang/utils");
 var packageName = 'atom-typescript';
-function getConfig(name) {
-    return atom.config.get(packageName + '.' + name);
+function getConfig(nameLambda) {
+    return atom.config.get(packageName + '.' + utils_1.getName(nameLambda));
 }
 var Config = (function () {
     function Config() {
@@ -19,15 +16,34 @@ var Config = (function () {
                 type: 'string',
                 default: 'none'
             },
+            typescriptServices: {
+                title: 'Full path to a custom `typescriptServices.js`',
+                type: 'string',
+                default: ''
+            },
         };
     }
     Object.defineProperty(Config.prototype, "debugAtomTs", {
-        get: function () { return getConfig('debugAtomTs'); },
+        get: function () {
+            var _this = this;
+            return getConfig(function () { return _this.schema.debugAtomTs; });
+        },
         enumerable: true,
         configurable: true
     });
     Object.defineProperty(Config.prototype, "preferredQuoteCharacter", {
-        get: function () { return getConfig('preferredQuoteCharacter'); },
+        get: function () {
+            var _this = this;
+            return getConfig(function () { return _this.schema.preferredQuoteCharacter; });
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(Config.prototype, "typescriptServices", {
+        get: function () {
+            var _this = this;
+            return getConfig(function () { return _this.schema.typescriptServices; });
+        },
         enumerable: true,
         configurable: true
     });

diff --git a/dist/main/atomts.js b/dist/main/atomts.js
@@ -1,5 +1,6 @@
+var atomConfig = require('./atom/atomConfig');
 var makeTypeScriptGlobal_1 = require("../typescript/makeTypeScriptGlobal");
-makeTypeScriptGlobal_1.makeTsGlobal();
+makeTypeScriptGlobal_1.makeTsGlobal(atomConfig.typescriptServices);
 var path = require('path');
 var fs = require('fs');
 var apd = require('atom-package-dependencies');
@@ -20,7 +21,6 @@ var statusBarMessage;
 var editorWatch;
 var autoCompleteWatch;
 var parent = require('../worker/parent');
-var atomConfig = require('./atom/atomConfig');
 exports.config = atomConfig.schema;
 var utils_1 = require("./lang/utils");
 var hideIfNotActiveOnStart = utils_1.debounce(function () {

diff --git a/dist/main/lang/utils.js b/dist/main/lang/utils.js
@@ -207,3 +207,12 @@ exports.debounce = debounce;
 ;
 var punctuations = createMap([';', '{', '}', '(', ')', '.', ':', '<', '>', "'", '"']);
 exports.prefixEndsInPunctuation = function (prefix) { return prefix.length && prefix.trim().length && punctuations[prefix.trim()[prefix.trim().length - 1]]; };
+var nameExtractor = new RegExp("return (.*);");
+function getName(nameLambda) {
+    var m = nameExtractor.exec(nameLambda + "");
+    if (m == null)
+        throw new Error("The function does not contain a statement matching 'return variableName;'");
+    var access = m[1].split('.');
+    return access[access.length - 1];
+}
+exports.getName = getName;
diff --git a/dist/typescript/makeTypeScriptGlobal.js b/dist/typescript/makeTypeScriptGlobal.js
@@ -42,16 +42,21 @@ var path = require('path');
 global.stack = function () {
     console.error((new Error()).stack);
 };
-function makeTsGlobal() {
+function makeTsGlobal(typescriptServices) {
     var sandbox = {
         ts: {},
         console: console,
         stack: global.stack
     };
     vm.createContext(sandbox);
-    files.forEach(function (f) {
-        vm.runInContext(fs.readFileSync(path.resolve(__dirname, f)).toString(), sandbox);
-    });
+    if (typescriptServices) {
+        vm.runInContext(fs.readFileSync(typescriptServices).toString(), sandbox);
+    }
+    else {
+        files.forEach(function (f) {
+            vm.runInContext(fs.readFileSync(path.resolve(__dirname, f)).toString(), sandbox);
+        });
+    }
     global.ts = sandbox.ts;
 }
 exports.makeTsGlobal = makeTsGlobal;
diff --git a/dist/worker/child.js b/dist/worker/child.js
@@ -1,5 +1,9 @@
+var typescriptServices = '';
+if (process.argv.length > 2) {
+    typescriptServices = process.argv[2];
+}
 var makeTypeScriptGlobal_1 = require("../typescript/makeTypeScriptGlobal");
-makeTypeScriptGlobal_1.makeTsGlobal();
+makeTypeScriptGlobal_1.makeTsGlobal(typescriptServices);
 var workerLib = require('./lib/workerLib');
 var child = new workerLib.Child();
 var projectCache = require("../main/lang/projectCache");

diff --git a/dist/worker/lib/workerLib.js b/dist/worker/lib/workerLib.js
@@ -120,12 +120,12 @@ var Parent = (function (_super) {
         this.getProcess = function () { return _this.child; };
         this.stopped = false;
     }
-    Parent.prototype.startWorker = function (childJsPath, terminalError) {
+    Parent.prototype.startWorker = function (childJsPath, terminalError, customArguments) {
         var _this = this;
         try {
             this.child = spawn(this.node, [
                 childJsPath
-            ], { cwd: path.dirname(childJsPath), env: { ATOM_SHELL_INTERNAL_RUN_AS_NODE: '1' }, stdio: ['ipc'] });
+            ].concat(customArguments), { cwd: path.dirname(childJsPath), env: { ATOM_SHELL_INTERNAL_RUN_AS_NODE: '1' }, stdio: ['ipc'] });
             this.child.on('error', function (err) {
                 if (err.code === "ENOENT" && err.path === _this.node) {
                     _this.gotENOENTonSpawnNode = true;
@@ -152,14 +152,14 @@ var Parent = (function (_super) {
                 console.log('ts worker exited with code:', code);
                 if (code === orphanExitCode) {
                     console.log('ts worker restarting');
-                    _this.startWorker(childJsPath, terminalError);
+                    _this.startWorker(childJsPath, terminalError, customArguments);
                 }
                 else if (_this.gotENOENTonSpawnNode) {
                     terminalError(new Error('gotENOENTonSpawnNode'));
                 }
                 else {
                     console.log('ts worker restarting');
-                    _this.startWorker(childJsPath, terminalError);
+                    _this.startWorker(childJsPath, terminalError, customArguments);
                 }
             });
         }

diff --git a/dist/worker/parent.js b/dist/worker/parent.js
@@ -3,6 +3,7 @@ var childprocess = require('child_process');
 var exec = childprocess.exec;
 var spawn = childprocess.spawn;
 var workerLib = require('./lib/workerLib');
+var atomConfig = require("../main/atom/atomConfig");
 var parent = new workerLib.Parent();
 var mainPanel = require("../main/atom/views/mainPanelView");
 parent.pendingRequestsChanged = function (pending) {
@@ -14,7 +15,7 @@ if (debug_1.debug) {
     parent.sendToIpc = function (x) { return x; };
 }
 function startWorker() {
-    parent.startWorker(__dirname + '/child.js', showError);
+    parent.startWorker(__dirname + '/child.js', showError, atomConfig.typescriptServices ? [atomConfig.typescriptServices] : []);
     console.log('AtomTS worker started');
 }
 exports.startWorker = startWorker;

diff --git a/lib/main/atom/atomConfig.ts b/lib/main/atom/atomConfig.ts
@@ -1,13 +1,13 @@
-
+import {getName} from "../lang/utils";
 
 // Documentation https://atom.io/docs/api/v0.177.0/Config and http://json-schema.org/examples.html
 // To add a new setting you need to add to
 //    schema
 //    getter/setter
 
 var packageName = 'atom-typescript';
-function getConfig<T>(name: string): T {
-    return atom.config.get(packageName + '.' + name);
+function getConfig<T>(nameLambda: () => any): T {
+    return atom.config.get(packageName + '.' + getName(nameLambda));
 }
 
 class Config {
@@ -22,9 +22,15 @@ class Config {
             type: 'string',
             default: 'none'
         },
+        typescriptServices: {
+            title: 'Full path to a custom `typescriptServices.js`',
+            type: 'string',
+            default: ''
+        },
     }
-    get debugAtomTs() { return getConfig<boolean>('debugAtomTs') }
-    get preferredQuoteCharacter() { return getConfig<string>('preferredQuoteCharacter') }
+    get debugAtomTs() { return getConfig<boolean>(() => this.schema.debugAtomTs) }
+    get preferredQuoteCharacter() { return getConfig<string>(() => this.schema.preferredQuoteCharacter) }
+    get typescriptServices() { return getConfig<string>(() => this.schema.typescriptServices) }
 }
 var config = new Config();
 export = config;
diff --git a/lib/main/atomts.ts b/lib/main/atomts.ts
@@ -1,5 +1,6 @@
+import atomConfig = require('./atom/atomConfig');
 import {makeTsGlobal} from "../typescript/makeTypeScriptGlobal";
-makeTsGlobal();
+makeTsGlobal(atomConfig.typescriptServices);
 
 import path = require('path');
 import fs = require('fs');
@@ -44,7 +45,6 @@ export interface PackageState {
 import parent = require('../worker/parent');
 
 // Export config
-import atomConfig = require('./atom/atomConfig');
 export var config = atomConfig.schema;
 import {debounce} from "./lang/utils";
 
@@ -59,7 +59,7 @@ var hideIfNotActiveOnStart = debounce(() => {
 
 /** only called once we have our dependencies */
 function readyToActivate() {
-    
+
     // Add the documentation view
     documentationView.attach();
 

diff --git a/lib/main/lang/utils.ts b/lib/main/lang/utils.ts
@@ -296,3 +296,13 @@ export function debounce<T extends Function>(func: T, milliseconds: number, imme
 
 var punctuations = createMap([';', '{', '}', '(', ')', '.', ':', '<', '>', "'", '"']);
 export var prefixEndsInPunctuation = (prefix) => prefix.length && prefix.trim().length && punctuations[prefix.trim()[prefix.trim().length - 1]];
+
+var nameExtractor = new RegExp("return (.*);");
+/** Get the name using a lambda so that you don't have magic strings */
+export function getName(nameLambda: () => any) {
+    var m = nameExtractor.exec(nameLambda + "");
+    if (m == null)
+        throw new Error("The function does not contain a statement matching 'return variableName;'");
+    var access = m[1].split('.');
+    return access[access.length - 1];
+}
diff --git a/lib/typescript/makeTypeScriptGlobal.ts b/lib/typescript/makeTypeScriptGlobal.ts
@@ -46,11 +46,12 @@ import vm = require('vm');
 import fs = require('fs');
 import path = require('path');
 
-global.stack = function(){
+global.stack = function() {
     console.error((<any>new Error()).stack);
 }
 
-export function makeTsGlobal() {
+/** Makes the bundled typescript services global or (if passed in) a custom typescriptServices file */
+export function makeTsGlobal(typescriptServices?: string) {
     var sandbox = {
         // This is going to gather the ts module exports
         ts: {},
@@ -59,9 +60,14 @@ export function makeTsGlobal() {
     };
     vm.createContext(sandbox);
 
-    files.forEach(f=> {
-        vm.runInContext(fs.readFileSync(path.resolve(__dirname,f)).toString(), sandbox);
-    });
+    if (typescriptServices) {
+        vm.runInContext(fs.readFileSync(typescriptServices).toString(), sandbox);
+    }
+    else {
+        files.forEach(f=> {
+            vm.runInContext(fs.readFileSync(path.resolve(__dirname, f)).toString(), sandbox);
+        });
+    }
 
     // Finally export ts to the local global namespace
     global.ts = sandbox.ts;

diff --git a/lib/worker/child.ts b/lib/worker/child.ts
@@ -1,6 +1,10 @@
+var typescriptServices = '';
+if (process.argv.length > 2) {
+    typescriptServices = process.argv[2];
+}
 // setup typescript
 import {makeTsGlobal} from "../typescript/makeTypeScriptGlobal";
-makeTsGlobal();
+makeTsGlobal(typescriptServices);
 
 import workerLib = require('./lib/workerLib');
 

diff --git a/lib/worker/lib/workerLib.ts b/lib/worker/lib/workerLib.ts
@@ -50,7 +50,7 @@ class RequesterResponder {
     private currentListeners: { [messages: string]: { [id: string]: PromiseDeferred<any> } } = {};
     /** TODO: Display this in the UI  */
     private pendingRequests: string[] = [];
-    public pendingRequestsChanged = (pending:string[]) => null;
+    public pendingRequestsChanged = (pending: string[]) => null;
 
     /** process a message from the child */
     protected processResponse(m: any) {
@@ -69,7 +69,7 @@ class RequesterResponder {
             if (parsed.error) {
                 this.currentListeners[parsed.message][parsed.id].reject(parsed.error);
                 console.log(parsed.error);
-                console.log(parsed.error.stack);                
+                console.log(parsed.error.stack);
             }
             else {
                 this.currentListeners[parsed.message][parsed.id].resolve(parsed.data);
@@ -174,12 +174,12 @@ export class Parent extends RequesterResponder {
     private stopped = false;
 
     /** start worker */
-    startWorker(childJsPath: string, terminalError: (e: Error) => any) {
+    startWorker(childJsPath: string, terminalError: (e: Error) => any, customArguments: string[]) {
         try {
             this.child = spawn(this.node, [
             // '--debug', // Uncomment if you want to debug the child process
                 childJsPath
-            ], { cwd: path.dirname(childJsPath), env: { ATOM_SHELL_INTERNAL_RUN_AS_NODE: '1' }, stdio: ['ipc'] });
+            ].concat(customArguments), { cwd: path.dirname(childJsPath), env: { ATOM_SHELL_INTERNAL_RUN_AS_NODE: '1' }, stdio: ['ipc'] });
 
             this.child.on('error', (err) => {
                 if (err.code === "ENOENT" && err.path === this.node) {
@@ -213,7 +213,7 @@ export class Parent extends RequesterResponder {
                 // If orphaned then Definitely restart
                 if (code === orphanExitCode) {
                     console.log('ts worker restarting');
-                    this.startWorker(childJsPath, terminalError);
+                    this.startWorker(childJsPath, terminalError, customArguments);
                 }
                 // If we got ENOENT. Restarting will not help.
                 else if (this.gotENOENTonSpawnNode) {
@@ -222,7 +222,7 @@ export class Parent extends RequesterResponder {
                 // We haven't found a reson to not start worker yet
                 else {
                     console.log('ts worker restarting');
-                    this.startWorker(childJsPath, terminalError);
+                    this.startWorker(childJsPath, terminalError, customArguments);
                 }
             });
         } catch (err) {

diff --git a/lib/worker/parent.ts b/lib/worker/parent.ts
@@ -6,6 +6,7 @@ var spawn = childprocess.spawn;
 
 import workerLib = require('./lib/workerLib');
 import tsconfig = require('../main/tsconfig/tsconfig');
+import * as atomConfig from "../main/atom/atomConfig";
 
 var parent = new workerLib.Parent();
 import * as mainPanel from "../main/atom/views/mainPanelView";
@@ -22,7 +23,7 @@ if (debug) {
 }
 
 export function startWorker() {
-    parent.startWorker(__dirname + '/child.js', showError);
+    parent.startWorker(__dirname + '/child.js', showError, atomConfig.typescriptServices ? [atomConfig.typescriptServices] : []);
     console.log('AtomTS worker started')
 }