Update binaryen to latest nightly; Source map support

Author: dcodeIO

bin/asc.js

@@ -17,6 +17,9 @@ try {
   assemblyscript = require("../src");
 }
 
+const SOURCEMAP_ROOT = "assemblyscript:///";
+const LIBRARY_PREFIX = assemblyscript.LIBRARY_PREFIX;
+
 const conf = require("./asc.json");
 const opts = {};
 
@@ -126,7 +129,7 @@ libDirs.forEach(libDir => {
       var nextText = fs.readFileSync(path.join(libDir, file), { encoding: "utf8" });
       ++readCount;
       var time = measure(() => {
-        parser = assemblyscript.parseFile(nextText, ".std/" + file, parser, false);
+        parser = assemblyscript.parseFile(nextText, LIBRARY_PREFIX + file, parser, false);
       });
       parseTime += time;
       notIoTime += time;
@@ -170,7 +173,7 @@ args._.forEach(filename => {
 
   while ((nextFile = parser.nextFile()) != null) {
     var found = false;
-    if (nextFile.startsWith(".std/")) {
+    if (nextFile.startsWith(LIBRARY_PREFIX)) {
       for (var i = 0; i < libDirs.length; ++i) {
         readTime += measure(() => {
           try {
@@ -311,15 +314,17 @@ if (runPasses.length)
 
 function processSourceMap(sourceMap, sourceMapURL) {
   var json = JSON.parse(sourceMap);
-  return SourceMapConsumer.with(sourceMap, sourceMapURL, consumer => {
+  json.sources = json.sources.map(name => SOURCEMAP_ROOT + name);
+  var libPrefix = SOURCEMAP_ROOT + LIBRARY_PREFIX;
+  return SourceMapConsumer.with(json, sourceMapURL, consumer => {
     var generator = SourceMapGenerator.fromSourceMap(consumer);
     json.sources.forEach(name => {
       var text, found = false;
-      if (name.startsWith(".std/")) {
+      if (name.startsWith(libPrefix)) {
         for (var i = 0, k = libDirs.length; i < k; ++i) {
           readTime += measure(() => {
             try {
-              text = fs.readFileSync(path.join(libDirs[i], name.substring(4)), { encoding: "utf8" });
+              text = fs.readFileSync(path.join(libDirs[i], name.substring(libPrefix.length)), { encoding: "utf8" });
               found = true;
             } catch (e) {}
           });
@@ -328,15 +333,16 @@ function processSourceMap(sourceMap, sourceMapURL) {
       } else {
         readTime += measure(() => {
           try {
-            text = fs.readFileSync(name, { encoding: "utf8" });
+            text = fs.readFileSync(name.substring(SOURCEMAP_ROOT.length), { encoding: "utf8" });
             found = true;
           } catch (e) {}
         });
         ++readCount;
       }
-      if (found)
+      if (found) {
         generator.setSourceContent(name, text);
-      else
+        console.log(name + " ???");
+      } else
         console.error("No source content found for file '" + name + "'.");
     });
     return generator.toString();
@@ -362,7 +368,7 @@ if (!args.noEmit) {
       : null;
     var binary;
     writeTime += measure(() => {
-      binary = module.toBinary(sourceMapURL); // FIXME: 'not a valid URL' in FF
+      binary = module.toBinary("http://127.0.0.1:8080/"+sourceMapURL); // FIXME: 'not a valid URL' in FF
       fs.writeFileSync(args.binaryFile, binary.output);
     });
     ++writeCount;

examples/.gitignore

@@ -1,5 +1,6 @@
 *.wast
 *.wasm
+*.wasm.map
 node_modules/
 npm-debug.log
 package-lock.json

examples/game-of-life/game-of-life.html

@@ -5,7 +5,7 @@
 
   // Instantiate the module
   var module = new WebAssembly.Module(binary);
-  var instance = new WebAssembly.Instance(module, { /* no imports */ });
+  var instance = new WebAssembly.Instance(module, { env: { abort: function() {} } });
 
   // Set up the canvas with a 2D rendering context
   var cnv = document.getElementById("canvas");

examples/game-of-life/package.json

@@ -4,8 +4,8 @@
   "private": true,
   "scripts": {
     "build": "npm run build:untouched && npm run build:optimized",
-    "build:untouched": "asc assembly/game-of-life.ts -b game-of-life.untouched.wasm -t game-of-life.untouched.wast --validate",
-    "build:optimized": "asc -O assembly/game-of-life.ts -b game-of-life.optimized.wasm -t game-of-life.optimized.wast --validate",
+    "build:untouched": "asc assembly/game-of-life.ts -b game-of-life.untouched.wasm -t game-of-life.untouched.wast --validate --sourceMap --measure",
+    "build:optimized": "asc -O assembly/game-of-life.ts -b game-of-life.optimized.wasm -t game-of-life.optimized.wast --validate --sourceMap --measure",
     "browser": "game-of-life.html"
   }
 }

examples/i64-polyfill/package.json

@@ -17,8 +17,8 @@
   },
   "scripts": {
     "build": "npm run build:untouched && npm run build:optimized",
-    "build:untouched": "asc assembly/i64.ts -t i64.untouched.wast -b i64.untouched.wasm --noMemory --validate",
-    "build:optimized": "asc -O assembly/i64.ts -b i64.optimized.wasm -t i64.optimized.wast --noMemory --validate",
+    "build:untouched": "asc assembly/i64.ts -t i64.untouched.wast -b i64.untouched.wasm --noMemory --validate --sourceMap --measure",
+    "build:optimized": "asc -O assembly/i64.ts -b i64.optimized.wasm -t i64.optimized.wast --noMemory --validate --sourceMap --measure",
     "test": "node tests"
   },
   "files": [

examples/pson/package.json

@@ -4,8 +4,8 @@
   "private": true,
   "scripts": {
     "build": "npm run build:untouched && npm run build:optimized",
-    "build:untouched": "asc assembly/pson.ts -b pson.untouched.wasm -t pson.untouched.wast --validate",
-    "build:optimized": "asc -O assembly/pson.ts -b pson.optimized.wasm -t pson.optimized.wast --validate",
+    "build:untouched": "asc assembly/pson.ts -b pson.untouched.wasm -t pson.untouched.wast --validate --sourceMap --measure",
+    "build:optimized": "asc -O assembly/pson.ts -b pson.optimized.wasm -t pson.optimized.wast --validate --sourceMap --measure",
     "test": "node tests"
   },
   "devDependencies": {

examples/tlsf/README.md

@@ -1,8 +1,7 @@
 ![](https://s.gravatar.com/avatar/f105de3decfafc734b8eabe9a960b25d?size=48) TLSF
 =================
 
-An implementation of the [Two Level Segregate Fit](http://www.gii.upv.es/tlsf/main/docs)
-memory allocator in AssemblyScript.
+An implementation of the [Two Level Segregate Fit](http://www.gii.upv.es/tlsf/main/docs) memory allocator in AssemblyScript.
 
 Instructions
 ------------

examples/ugc/package.json

@@ -4,8 +4,8 @@
   "private": true,
   "scripts": {
     "build": "npm run build:untouched && npm run build:optimized",
-    "build:untouched": "asc assembly/ugc.ts -t ugc.untouched.wast -b ugc.untouched.wasm --validate",
-    "build:optimized": "asc -O3 assembly/ugc.ts -b ugc.optimized.wasm -t ugc.optimized.wast --validate --noDebug --noAssert",
+    "build:untouched": "asc assembly/ugc.ts -t ugc.untouched.wast -b ugc.untouched.wasm --validate --sourceMap --measure",
+    "build:optimized": "asc -O3 assembly/ugc.ts -b ugc.optimized.wasm -t ugc.optimized.wast --validate --noDebug --noAssert --sourceMap --measure",
     "test": "node tests"
   }
 }

lib/utils/README.md

@@ -1,4 +1,4 @@
-![](https://s.gravatar.com/avatar/f105de3decfafc734b8eabe9a960b25d?size=64) utils
+![](https://s.gravatar.com/avatar/f105de3decfafc734b8eabe9a960b25d?size=48) utils
 =================
 
 Utilities for working with [AssemblyScript](http://assemblyscript.org) modules.

lib/webpack/README.md

@@ -1,4 +1,4 @@
-![](https://s.gravatar.com/avatar/f105de3decfafc734b8eabe9a960b25d?size=64) webpack
+![](https://s.gravatar.com/avatar/f105de3decfafc734b8eabe9a960b25d?size=48) webpack
 =================
 
 [webpack](https://webpack.js.org/) loader for [AssemblyScript](http://assemblyscript.org) modules.
@@ -7,9 +7,9 @@ Usage
 -----
 
 ```js
-import Module from "@assemblyscript/webpack!module.wasm";
+import MyModule from "@assemblyscript/webpack!mymodule.wasm";
 
-var myModule = Module({ imports: { ... }});
+var myModule = new MyModule({ imports: { /* if any */ } });
 ```
 
-TODO: Wire .ts files to the compiler API, accepting options, but also keep raw .wasm support.
+TODO: Pipe .ts files through `asc`, accepting the usual options, but also keep raw .wasm support.

lib/webpack/decode.js

@@ -2,7 +2,7 @@
 var s64 = new Array(123);
 for (var i = 0; i < 64;) s64[i < 26 ? i + 65 : i < 52 ? i + 71 : i < 62 ? i - 4 : i - 59 | 43] = i++;
 
-module.exports = function(string) {
+module.exports = function decode(string) {
 
   // determine buffer length
   var length = string.length;

lib/webpack/index.js

@@ -4,9 +4,10 @@ function loader(buffer) {
   var data = base64.encode(buffer, 0, buffer.length);
   var code = [
     'var data = "' + data + '", wasm;',
-    'module.exports = function(options) {',
-    '  if (!wasm) wasm = require("@assemblyscript/webpack/decode")(data);',
-    '  return new WebAssembly.Instance(new WebAssembly.Module(wasm), options && options.imports || {}).exports;',
+    'module.exports = function AssemblyScriptModule(options) {',
+    '  if (!wasm)',
+    '    wasm = new WebAssembly.Module(require("@assemblyscript/webpack/decode")(data));',
+    '  return new WebAssembly.Instance(wasm, options && options.imports || {}).exports;',
     '};'
   ];
   return code.join("\n") + "\n";