Merge pull request #58 from euforic/TIMOB-15009

[TIMOB-15009] cannot see Alloy.Globals in modules when using LiveView

lib/fserver.js

@@ -208,11 +208,30 @@ FServer.start = function(opts) {
 				});
 
 				if (uri === '/app.js') {
+
 					var scope = detect(out.data);
+
+					// TODO probably a better way to do this, but this fix will work for now.
+
+					out.data = String(out.data).replace(/^#![^\n]*\n/, '').split('');
+
+					var v =  Object.keys(scope.lexvars['']);
+
+					v.forEach(function (vr) {
+					  var start = scope.lexvars[''][vr].parent.start;
+					  out.data[start] = ' ';
+					  out.data[start + 1] = ' ';
+					  out.data[start + 2] = ' ';
+					});
+					out.data = out.data.join('');
+
+
 					debug('[LiveView] app.js global variables: ', scope.locals[''], '\n');
+
 					scope.locals[''].forEach(function(lexVar){
-						out.data = 'lvGlobal._globalCtx.' + lexVar + ' = ' + lexVar + '; ' + out.data;
+						out.data = out.data + '\nlvGlobal._globalCtx.' + lexVar + ' = ' + lexVar + ';';
 					});
+
 					response.write(out.data);
 					response.end();
 				} else {

package.json

@@ -52,7 +52,7 @@
     "chokidar": "~0.6.2",
     "coloring": "~0.1.0",
     "debug": "~0.7.2",
-    "jsparse-tools": "~0.0.1"
+    "jsparse-tools": "~0.1.0"
   },
   "devDependencies": {
     "should": "~1.2.2",