[js] Add support for using the setting in code that is webpacked and sent to the browser.

Author: pmurias

examples/webpacked/README

@@ -1,5 +1,5 @@
 You need to install webpack.
-And then using npm install src/vm/js/nqp-loader and src/vm/js/nqp-runtime and install empty-module from npm.
+And then using npm install src/vm/js/nqp-loader and src/vm/js/nqp-runtime and install empty-module, browserify-bignum from npm.
 For increased awesomeness we use webpack-dev-server and webpack-reload-plugin so you need to install those.
 
 

examples/webpacked/example.nqp

@@ -26,4 +26,4 @@ sub setup() {
 
 set-setup(&setup);
 
-nqp::say("Hello Fancy Browser World");
+say("Hello Fancy Browser World");

examples/webpacked/webpack.config.js

@@ -7,11 +7,11 @@ module.exports = {
     alias: {
       "ffi": "empty-module",
       "fs-ext": "empty-module",
-      "bignum": "empty-module",
       "ffi": "empty-module",
       "ref": "empty-module",
       "nqp-js-io": "empty-module",
-      "sleep": "empty-module"
+      "sleep": "empty-module",
+      "bignum": "browserify-bignum"
     }
   },
   output: {

src/vm/js/Compiler.nqp

@@ -1097,6 +1097,11 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
         }
     }
 
+    my sub loadable($name) {
+        # workaround for webpack
+        quote_string($name) ~ ", function() \{return require({quote_string($name)})\}";
+    }
+
     multi method as_js(QAST::CompUnit $node, :$want, :$cps) {
         # Should have a single child which is the outer block.
         if +@($node) != 1 || !nqp::istype($node[0], QAST::Block) {
@@ -1124,13 +1129,13 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
                     if nqp::istype($op, QAST::Op) && $op.op eq 'forceouterctx' {
                         $*SETTING_NAME := $op[1][1].value;
                         $*SETTING_TARGET := $op[0].value;
-                        $pre := $pre ~ "nqp.load_setting({quote_string($*SETTING_NAME)});\n";
+                        $pre := $pre ~ "nqp.load_setting({loadable($*SETTING_NAME ~ '.setting')});\n";
                         # HACK to get nqp::sprintf to work
                         $pre := $pre ~ "require('sprintf');\n"; 
                     } elsif nqp::istype($op, QAST::Op)
                         && $op.op eq 'callmethod'
                         && $op.name eq 'load_module' {
-                        $pre := $pre ~ "nqp.load_module({quote_string($op[1].value)});\n";
+                        $pre := $pre ~ "nqp.load_module({loadable($op[1].value)});\n";
                     } else {
 #                        self.log($op.dump);
                     }

src/vm/js/nqp-loader/main.js

@@ -31,7 +31,7 @@ module.exports = function(source) {
   var tmp = temp.openSync();
   fs.writeFileSync(tmp.path, source);
 
-  var command = "cd "+path+";.//nqp-js --setting=NULL --target=js --source-map '" + tmp.path + "'";
+  var command = "cd "+path+";.//nqp-js --target=js --source-map '" + tmp.path + "'";
 
 
   var result = child_process.execSync(command, {encoding:"utf8"});

src/vm/js/nqp-runtime/deserialization.js

@@ -595,10 +595,11 @@ BinaryCursor.prototype.deserialize = function(sc) {
 
   var declareCuids = 'var ' + cuids.join(',') + ';\n';
 
-  var prelude = "var nqp = require('nqp-runtime');\n";
+  var prelude = ";\n";
   if (code) {
     /* TODO reduce accidental poisoning */
     /* TODO make cuids be in scope */
+    var nqp = require('nqp-runtime');
     eval(prelude + declareCuids + code);
   }
 

src/vm/js/nqp-runtime/runtime.js

@@ -65,17 +65,19 @@ function saveCtx(where, block) {
   saveCtxAs = old;
 }
 
-exports.load_setting = function(settingName) {
-  exports.load_module(settingName + '.setting');
-};
-
-exports.load_module = function(module) {
+exports.load_module = function(module, helper) {
   saveCtx(module, function() {
     module = module.replace(/::/g, '/');
-    require(module);
+    if (helper) {
+        helper();
+    } else {
+        require(module);
+    }
   });
 };
 
+exports.load_setting = exports.load_module;
+
 exports.setup_setting = function(settingName) {
   return savedCtxs[settingName + '.setting'];
 };