Clean up portable memory definitions (#973)

Author: dcodeIO

cli/asc.js

@@ -49,9 +49,7 @@ var assemblyscript, isDev = false;
       try { // `require("dist/asc.js")` in explicit browser tests
         assemblyscript = eval("require('./assemblyscript')");
       } catch (e) {
-        // combine both errors that lead us here
-        e.message = e_ts.stack + "\n---\n" + e.stack;
-        throw e;
+        throw Error(e_ts.stack + "\n---\n" + e.stack);
       }
     }
   }
@@ -302,10 +300,13 @@ exports.main = function main(argv, options, callback) {
     var sourceText = null; // text reported back to the compiler
     var sourcePath = null; // path reported back to the compiler
 
-    // Try file.ts, file/index.ts
+    // Try file.ts, file/index.ts, file.d.ts
     if (!internalPath.startsWith(exports.libraryPrefix)) {
       if ((sourceText = readFile(sourcePath = internalPath + ".ts", baseDir)) == null) {
-        sourceText = readFile(sourcePath = internalPath + "/index.ts", baseDir);
+        if ((sourceText = readFile(sourcePath = internalPath + "/index.ts", baseDir)) == null) {
+          // portable d.ts: uses the .js file next to it in JS or becomes an import in Wasm
+          sourceText = readFile(sourcePath = internalPath + ".d.ts", baseDir);
+        }
       }
 
     // Search library in this order: stdlib, custom lib dirs, paths

package-lock.json

@@ -21,7 +21,7 @@
     "url": "https://github.com/AssemblyScript/assemblyscript/issues"
   },
   "dependencies": {
-    "binaryen": "89.0.0-nightly.20191120",
+    "binaryen": "89.0.0-nightly.20191204",
     "long": "^4.0.0",
     "source-map-support": "^0.5.16",
     "ts-node": "^6.2.0",

package.json

@@ -330,7 +330,7 @@ export class Compiler extends DiagnosticEmitter {
       max(options.memoryBase, 8)
     );
     this.module = Module.create();
-    var featureFlags: BinaryenFeatureFlags = 0;
+    var featureFlags: FeatureFlags = 0;
     if (this.options.hasFeature(Feature.SIGN_EXTENSION)) featureFlags |= FeatureFlags.SignExt;
     if (this.options.hasFeature(Feature.MUTABLE_GLOBALS)) featureFlags |= FeatureFlags.MutableGloabls;
     if (this.options.hasFeature(Feature.NONTRAPPING_F2I)) featureFlags |= FeatureFlags.NontrappingFPToInt;

src/compiler.ts

@@ -0,0 +1,17 @@
+const binaryen = global.Binaryen || require("binaryen");
+
+module.exports = binaryen;
+
+const { Module } = require("../module");
+
+Module.prototype.toText = function() {
+  // NOTE: Conversion to StackIR can yield conversion artifacts like sequences
+  // of unreachable statements not actually emitted by the compiler. Optimizing
+  // StackIR removes these again, but may also suppress useless code emitted by
+  // the compiler that's then no longer visible in tests. Both not ideal.
+  return binaryen.wrapModule(this.ref).emitStackIR(/* optimize-stack-ir */ true);
+};
+
+Module.prototype.toAsmjs = function() {
+  return binaryen.wrapModule(this.ref).emitAsmjs();
+};

src/glue/binaryen.d.ts

@@ -4,21 +4,7 @@
  * @preferred
  *//***/
 
-import "./binaryen"; // must be first so portable can pick up the memory implementation
 import "../../../std/portable/index";
+import "../binaryen";
 import "./float";
 import "./i64";
-
-import { Module } from "../../module";
-
-Module.prototype.toText = function(this: Module) {
-  // NOTE: Conversion to StackIR can yield conversion artifacts like sequences
-  // of unreachable statements not actually emitted by the compiler. Optimizing
-  // StackIR removes these again, but may also suppress useless code emitted by
-  // the compiler that's then no longer visible in tests. Both not ideal.
-  return binaryen.wrapModule(this.ref).emitStackIR(/* optimize-stack-ir */ true);
-};
-
-Module.prototype.toAsmjs = function(this: Module) {
-  return binaryen.wrapModule(this.ref).emitAsmjs();
-};