Merge branch 'master' of https://github.com/AssemblyScript/assemblyscript

Author: DuncanUszkay1

NOTICE

@@ -23,6 +23,7 @@ under the licensing terms detailed in LICENSE:
 * Surma <surma@surma.dev>
 * Julien Letellier <letellier.julien@gmail.com>
 * Guido Zuidhof <me@guido.io>
+* ncave <777696+ncave@users.noreply.github.com>
 
 Portions of this software are derived from third-party works licensed under
 the following terms:

README.md

@@ -22,13 +22,13 @@
 <h2 align="center">Contributors</h2>
 
 <p align="center">
-  <a href="https://assemblyscript.org/#contributors"><img src="https://assemblyscript.org/contributors.svg" alt="Contributor logos" /></a>
+  <a href="https://assemblyscript.org/#contributors"><img src="https://assemblyscript.org/contributors.svg" alt="Contributor logos" width="720" /></a>
 </p>
 
 <h2 align="center">Thanks to our sponsors!</h2>
 
 <p align="justify">Most of the core team members and most contributors do this open source work in their free time. If you use AssemblyScript for a serious task or plan to do so, and you'd like us to invest more time on it, <a href="https://opencollective.com/assemblyscript/donate" target="_blank" rel="noopener">please donate</a> to our <a href="https://opencollective.com/assemblyscript" target="_blank" rel="noopener">OpenCollective</a>. By sponsoring this project, your logo will show up below. Thank you so much for your support!</p>
 
 <p align="center">
-  <a href="https://assemblyscript.org/#sponsors"><img src="https://assemblyscript.org/sponsors.svg" alt="Sponsor logos" /></a>
+  <a href="https://assemblyscript.org/#sponsors"><img src="https://assemblyscript.org/sponsors.svg" alt="Sponsor logos" width="720" /></a>
 </p>

bin/asinit

@@ -316,7 +316,9 @@ function ensureIndexJs() {
     fs.writeFileSync(indexFile, [
       "const fs = require(\"fs\");",
       "const loader = require(\"@assemblyscript/loader\");",
-      "module.exports = loader.instantiateSync(fs.readFileSync(__dirname + \"/build/optimized.wasm\"), { /* imports */ })"
+      "const imports = { /* imports go here */ };",
+      "const wasmModule = loader.instantiateSync(fs.readFileSync(__dirname + \"/build/optimized.wasm\"), imports);",
+      "module.exports = wasmModule.exports;"
     ].join("\n") + "\n");
     console.log(colors.green("  Created: ") + indexFile);
   } else {

src/common.ts

@@ -62,21 +62,23 @@ export enum CommonFlags {
   RESOLVED = 1 << 21,
   /** Is compiled. */
   COMPILED = 1 << 22,
+  /** Did error. */
+  ERRORED = 1 << 23,
   /** Has a constant value and is therefore inlined. */
-  INLINED = 1 << 23,
+  INLINED = 1 << 24,
   /** Is scoped. */
-  SCOPED = 1 << 24,
+  SCOPED = 1 << 25,
   /** Is a stub. */
-  STUB = 1 << 25,
+  STUB = 1 << 26,
   /** Is a virtual method. */
-  VIRTUAL = 1 << 26,
+  VIRTUAL = 1 << 27,
   /** Is (part of) a closure. */
-  IN_SCOPE_CLOSURE = 1 << 27,
+  IN_SCOPE_CLOSURE = 1 << 28,
 
   // Other
 
   /** Is quoted. */
-  QUOTED = 1 << 28
+  QUOTED = 1 << 29
 }
 
 /** Path delimiter inserted between file system levels. */