[js] Repair source map support and make it accesible from rakudo

Author: pmurias

src/HLL/Compiler.nqp

@@ -25,7 +25,7 @@ class HLL::Compiler does HLL::Backend::Default {
         # Command options and usage.
         @!cmdoptions := nqp::split(' ', 'e=s help|h target=s trace|t=s encoding=s output|o=s source-name=s combine version|v show-config verbose-config|V stagestats=s? ll-exception rxtrace nqpevent=s profile=s? profile-compile=s? profile-filename=s profile-stage=s'
 #?if js
-        ~ ' substagestats beautify nqp-runtime=s perl6-runtime=s libpath=s shebang execname=s'
+        ~ ' substagestats beautify nqp-runtime=s perl6-runtime=s libpath=s shebang execname=s source-map'
 #?endif
         );
         %!config     := nqp::hash();

src/NQP/Compiler.nqp

@@ -37,7 +37,6 @@ $nqpcomp.addstage('classname', :after<start>);
 @clo.push('bootstrap');
 #?endif
 #?if js
-@clo.push('source-map');
 @clo.push('source-map-debug');
 @clo.push('nyi=s');
 #?endif

src/vm/js/Chunk.nqp

@@ -59,27 +59,27 @@ class Chunk does Joinable {
         }
     }
 
-    method with_source_map_info() {
+    method with_source_map_info($hll-compiler) {
         my @parts;
         if nqp::isnull($!setup) {
         }
         elsif nqp::istype($!setup, Chunk) {
-            nqp::push(@parts, $!setup.with_source_map_info);
+            nqp::push(@parts, $!setup.with_source_map_info($hll-compiler));
         }
         else {
             for $!setup -> $part {
                 if nqp::isstr($part) {
                     nqp::push(@parts,quote_string($part, :json));
                 }
                 else {
-                    nqp::push(@parts,$part.with_source_map_info);
+                    nqp::push(@parts,$part.with_source_map_info($hll-compiler));
                 }
             }
         }
         my $parts := '[' ~ nqp::join(',', @parts) ~ ']';
         if nqp::defined($!node) && $!node.node {
             my $node := $!node.node;
-            my $location := HLL::Compiler.line_and_column_of($node.orig(), $node.from(), :cache(1));
+            my $location := $hll-compiler.line_and_column_of($node.orig(), $node.from(), :cache(1));
             "\{\"line\": {nqp::atpos_i($location, 0)}, \"column\": {nqp::atpos_i($location, 1)}, \"parts\": $parts\}";
         }
         else {

src/vm/js/Compiler.nqp

@@ -2014,8 +2014,8 @@ class QAST::CompilerJS does DWIMYNameMangling does SerializeOnce {
     }
 
     # return a json datastructure we later process into a source map
-    method emit_with_source_map($ast, *%named) {
-       self.as_js_with_prelude($ast, |%named).with_source_map_info
+    method emit_with_source_map($ast, $hll-compiler, *%named) {
+       self.as_js_with_prelude($ast, |%named).with_source_map_info($hll-compiler);
     }
 
     method emit_with_source_map_debug($ast, *%named) {

src/vm/js/HLL/Backend.nqp

@@ -180,7 +180,7 @@ class JavaScriptBackend {
         if %adverbs<source-map-debug> {
             $backend.emit_with_source_map_debug($qast, :$instant, :$shebang, :$nqp-runtime);
         } elsif %adverbs<source-map> {
-            $backend.emit_with_source_map($qast, :$instant, :$shebang, :$nqp-runtime);
+            $backend.emit_with_source_map($qast, HLL::Compiler, :$instant, :$shebang, :$nqp-runtime);
         } else {
             my $code := $backend.emit($qast, :$instant, :$substagestats, :$shebang, :$nqp-runtime);
             $code := self.beautify($code) if %adverbs<beautify>;

src/vm/js/bin/gen_sourcemap.js

@@ -6,10 +6,24 @@ var p6source = process.argv[3]
 var outputJs = process.argv[4];
 var outputSourceMap = process.argv[5];
 
+var SourceNode = map.SourceNode;
+
+function toNode(chunk) {
+  if (chunk.line) {
+    return new SourceNode(chunk.line, chunk.column-1, p6source , chunk.parts.map(function(c) {return toNode(c)}));
+  } else if (typeof chunk == 'string') {
+    return chunk;
+  } else if (chunk instanceof Array) {
+    return chunk.map(function(c) {return toNode(c)});
+  } else {
+      console.error(chunk);
+      throw "incorrect chunk";
+  }
+}
+
 var data = JSON.parse(fs.readFileSync(input,'utf-8'));
 
-var toNode = require('nqp-loader').toNode;
-var node = new SourceNode(null, null, p6source, toNode(data));
+var node = new SourceNode(null, null, p6source, ['//# sourceMappingURL=' + outputSourceMap + '\n', toNode(data)]);
 var sourceAndMap = node.toStringWithSourceMap({file: outputJs});
 fs.writeFileSync(outputJs,sourceAndMap.code);
 fs.writeFileSync(outputSourceMap,sourceAndMap.map.toString());