Merge remote-tracking branch 'origin/master' into release

Author: actions-user

cli/asc.d.ts

@@ -77,8 +77,8 @@ interface CompilerOptions {
   binaryFile?: string;
   /** Specifies the text output file (.wat). */
   textFile?: string;
-  /** Specifies the asm.js output file (.js). */
-  asmjsFile?: string;
+  /** Specifies the JavaScript (via wasm2js) output file (.js). */
+  jsFile?: string;
   /** Specifies the WebIDL output file (.webidl). */
   idlFile?: string;
   /** Specifies the TypeScript definition output file (.d.ts). */
@@ -97,8 +97,14 @@ interface CompilerOptions {
   noEmit?: boolean;
   /** Imports the memory provided as 'env.memory'. */
   importMemory?: boolean;
-  /** Declare memory as shared by settings the max shared memory. */
-  sharedMemory?: number;
+  /** Does not export the memory as 'memory'. */
+  noExportMemory?: boolean;
+  /** Sets the initial memory size in pages. */
+  initialMemory?: number;
+  /** Sets the maximum memory size in pages. */
+  maximumMemory?: number;
+  /** Declare memory as shared. Requires maximumMemory. */
+  sharedMemory?: boolean;
   /** Sets the start offset of compiler-generated static memory. */
   memoryBase?: number;
   /** Imports the function table provided as 'env.table'. */
@@ -133,8 +139,6 @@ interface CompilerOptions {
   listFiles?: boolean;
   /** Prints measuring information on I/O and compile times. */
   measure?: boolean;
-  /** Prints the module's runtime type information to stderr. */
-  printrtti?: boolean;
   /** Disables terminal colors. */
   noColors?: boolean;
   /** Specifies an alternative file extension. */

cli/asc.js

@@ -272,7 +272,10 @@ exports.main = function main(argv, options, callback) {
   const compilerOptions = assemblyscript.newOptions();
   assemblyscript.setTarget(compilerOptions, 0);
   assemblyscript.setNoAssert(compilerOptions, args.noAssert);
+  assemblyscript.setExportMemory(compilerOptions, !args.noExportMemory);
   assemblyscript.setImportMemory(compilerOptions, args.importMemory);
+  assemblyscript.setInitialMemory(compilerOptions, args.initialMemory >>> 0);
+  assemblyscript.setMaximumMemory(compilerOptions, args.maximumMemory >>> 0);
   assemblyscript.setSharedMemory(compilerOptions, args.sharedMemory);
   assemblyscript.setImportTable(compilerOptions, args.importTable);
   assemblyscript.setExportTable(compilerOptions, args.exportTable);
@@ -711,8 +714,8 @@ exports.main = function main(argv, options, callback) {
     if (args.outFile != null) {
       if (/\.was?t$/.test(args.outFile) && args.textFile == null) {
         args.textFile = args.outFile;
-      } else if (/\.js$/.test(args.outFile) && args.asmjsFile == null) {
-        args.asmjsFile = args.outFile;
+      } else if (/\.js$/.test(args.outFile) && args.jsFile == null) {
+        args.jsFile = args.outFile;
       } else if (args.binaryFile == null) {
         args.binaryFile = args.outFile;
       }
@@ -763,21 +766,21 @@ exports.main = function main(argv, options, callback) {
       }
     }
 
-    // Write asm.js
-    if (args.asmjsFile != null) {
-      let asm;
-      if (args.asmjsFile.length) {
+    // Write JS
+    if (args.jsFile != null) {
+      let js;
+      if (args.jsFile.length) {
         stats.emitCount++;
         stats.emitTime += measure(() => {
-          asm = module.toAsmjs();
+          js = module.toAsmjs();
         });
-        writeFile(args.asmjsFile, asm, baseDir);
+        writeFile(args.jsFile, js, baseDir);
       } else if (!hasStdout) {
         stats.emitCount++;
         stats.emitTime += measure(() => {
-          asm = module.toAsmjs();
+          js = module.toAsmjs();
         });
-        writeStdout(asm);
+        writeStdout(js);
         hasStdout = true;
       }
       hasOutput = true;
@@ -846,9 +849,7 @@ exports.main = function main(argv, options, callback) {
   if (args.measure) {
     printStats(stats, stderr);
   }
-  if (args.printrtti) {
-    printRTTI(program, stderr);
-  }
+
   return callback(null);
 
   function readFileNode(filename, baseDir) {
@@ -1001,15 +1002,6 @@ function printStats(stats, output) {
 
 exports.printStats = printStats;
 
-/** Prints runtime type information. */
-function printRTTI(program, output) {
-  if (!output) output = process.stderr;
-  output.write("# Runtime type information (RTTI)\n");
-  output.write(assemblyscript.buildRTTI(program));
-}
-
-exports.printRTTI = printRTTI;
-
 var allocBuffer = typeof global !== "undefined" && global.Buffer
   ? global.Buffer.allocUnsafe || function(len) { return new global.Buffer(len); }
   : function(len) { return new Uint8Array(len) };

cli/asc.json

@@ -88,11 +88,11 @@
     "type": "s",
     "alias": "t"
   },
-  "asmjsFile": {
+  "jsFile": {
     "category": "Output",
-    "description": "Specifies the asm.js output file (.js).",
+    "description": "Specifies the JavaScript (via wasm2js) output file (.js).",
     "type": "s",
-    "alias": "a"
+    "alias": "j"
   },
   "idlFile": {
     "category": "Output",
@@ -128,12 +128,30 @@
     "type": "b",
     "default": false
   },
-  "sharedMemory": {
+  "noExportMemory": {
+    "category": "Features",
+    "description": "Does not export the memory as 'memory'.",
+    "type": "b",
+    "default": false
+  },
+  "initialMemory": {
+    "category": "Features",
+    "description": "Sets the initial memory size in pages.",
+    "type": "i",
+    "default": 0
+  },
+  "maximumMemory": {
     "category": "Features",
-    "description": "Declare memory as shared by settings the max shared memory.",
+    "description": "Sets the maximum memory size in pages.",
     "type": "i",
     "default": 0
   },
+  "sharedMemory": {
+    "category": "Features",
+    "description": "Declare memory as shared. Requires maximumMemory.",
+    "type": "b",
+    "default": false
+  },
   "importTable": {
     "category": "Features",
     "description": "Imports the function table provided as 'env.table'.",
@@ -303,11 +321,6 @@
     "type": "b",
     "default": false
   },
-  "printrtti": {
-    "description": "Prints the module's runtime type information to stderr.",
-    "type": "b",
-    "default": false
-  },
   " ...": {
     "description": "Specifies node.js options (CLI only). See: node --help"
   },

cli/util/options.d.ts

@@ -13,6 +13,8 @@ export interface OptionDescription {
   value?: { [key: string]: number | string },
   /** Short alias, if any. */
   alias?: string
+  /** The default value, if any. */
+  default?: string | number | boolean | string[] | number[];
 }
 
 /** Configuration object. */
@@ -29,7 +31,9 @@ interface Result {
   /** Normal arguments. */
   arguments: string[],
   /** Trailing arguments. */
-  trailing: string[]
+  trailing: string[],
+  /** Provided arguments from the cli. */
+  provided: Set<string>
 }
 
 /** Parses the specified command line arguments according to the given configuration. */

cli/util/options.js

@@ -21,6 +21,7 @@ function parse(argv, config) {
   var unknown = [];
   var arguments = [];
   var trailing = [];
+  var provided = new Set();
 
   // make an alias map and initialize defaults
   var aliases = {};
@@ -53,9 +54,13 @@ function parse(argv, config) {
       else { arguments.push(arg); continue; } // argument
     }
     if (option) {
-      if (option.type == null || option.type === "b") options[key] = true; // flag
-      else {
+      if (option.type == null || option.type === "b") {
+        options[key] = true; // flag
+        provided.add(key);
+      } else {
+        // the argument was provided
         if (i + 1 < argv.length && argv[i + 1].charCodeAt(0) != 45) { // present
+          provided.add(key);
           switch (option.type) {
             case "i": options[key] = parseInt(argv[++i], 10); break;
             case "I": options[key] = (options[key] || []).concat(parseInt(argv[++i], 10)); break;
@@ -82,7 +87,7 @@ function parse(argv, config) {
   }
   while (i < k) trailing.push(argv[i++]); // trailing
 
-  return { options, unknown, arguments, trailing };
+  return { options, unknown, arguments, trailing, provided };
 }
 
 exports.parse = parse;

lib/loader/index.d.ts

@@ -5,9 +5,10 @@ export interface ResultObject {
   instance: WebAssembly.Instance;
 }
 
-/** WebAssembly imports with two levels of nesting. */
+
+/** WebAssembly imports with an optional env object and two levels of nesting. */
 export type Imports = {
-  [key: string]: object,
+  [key: string]: any;
   env?: {
     memory?: WebAssembly.Memory;
     table?: WebAssembly.Table;

package-lock.json

@@ -8,7 +8,7 @@
     "assemblyscript",
     "wasm"
   ],
-  "version": "0.9.4",
+  "version": "0.10.0",
   "author": "Daniel Wirtz <[email protected]>",
   "contributors": [],
   "license": "Apache-2.0",
@@ -21,22 +21,22 @@
     "url": "https://github.com/AssemblyScript/assemblyscript/issues"
   },
   "dependencies": {
-    "binaryen": "92.0.0-nightly.20200426",
+    "binaryen": "93.0.0-nightly.20200514",
     "long": "^4.0.0",
     "source-map-support": "^0.5.19",
     "ts-node": "^6.2.0"
   },
   "devDependencies": {
-    "@types/node": "^13.13.2",
+    "@types/node": "^14.0.1",
     "browser-process-hrtime": "^1.0.0",
     "diff": "^4.0.2",
     "glob": "^7.1.6",
     "physical-cpu-count": "^2.0.0",
     "source-map-support": "^0.5.19",
-    "ts-loader": "^6.2.2",
+    "ts-loader": "^7.0.4",
     "ts-node": "^6.2.0",
     "tslint": "^5.20.1",
-    "typescript": "^3.8.3",
+    "typescript": "^3.9.2",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.11"
   },