Merge branch 'main' into Issue-2289

Author: JesseCodeBones

.github/workflows/test.yml

@@ -71,7 +71,7 @@ jobs:
     - uses: dcodeIO/setup-node-nvm@master
       with:
         node-mirror: https://nodejs.org/download/v8-canary/
-        node-version: 18.0.0-v8-canary20211115037fd7ae8d
+        node-version: 19.0.0-v8-canary20220719f8973d8de1
     - name: Install dependencies
       run: npm ci --no-audit
     - name: Build

.npmrc

@@ -0,0 +1 @@
+engine-strict=true

NOTICE

@@ -47,6 +47,9 @@ under the licensing terms detailed in LICENSE:
 * Yasushi Ando <[email protected]>
 * Syed Jafri <[email protected]>
 * Peter Hayman <[email protected]>
+* ApsarasX <[email protected]>
+* Adrien Zinger <[email protected]>
+* Ruixiang Chen <[email protected]>
 
 Portions of this software are derived from third-party works licensed under
 the following terms:

bin/asc.js

@@ -19,15 +19,17 @@ if ((!hasSourceMaps || ~posCustomArgs) && !isDeno) {
     nodeArgs.push(...args.slice(posCustomArgs + 1));
     args.length = posCustomArgs;
   }
-  (await import("child_process")).spawnSync(
+  const { status, signal } = (await import("child_process")).spawnSync(
     nodePath,
     [...nodeArgs, thisPath, ...args],
     { stdio: "inherit" }
   );
+  if (status || signal) process.exitCode = 1;
 } else {
-  const { error } = (await import("../dist/asc.js")).main(process.argv.slice(2), {
+  const apiResult = (await import("../dist/asc.js")).main(process.argv.slice(2), {
     stdout: process.stdout,
     stderr: process.stderr
   });
+  const { error }  = await apiResult;
   if (error) process.exitCode = 1;
 }

cli/index.js

@@ -62,6 +62,10 @@ function toUpperSnakeCase(str) {
   return str.replace(/-/g, "_").toUpperCase();
 }
 
+function isNonEmptyString(value) {
+  return typeof value === "string" && value !== "";
+}
+
 /** Ensures that an object is a wrapper class instead of just a pointer. */
 // function __wrap(ptrOrObj, wrapperClass) {
 //   if (typeof ptrOrObj === "number") {
@@ -309,7 +313,9 @@ export async function main(argv, options) {
   assemblyscript.setSharedMemory(compilerOptions, opts.sharedMemory);
   assemblyscript.setImportTable(compilerOptions, opts.importTable);
   assemblyscript.setExportTable(compilerOptions, opts.exportTable);
-  assemblyscript.setExportStart(compilerOptions, typeof opts.exportStart === "string" ? opts.exportStart : null);
+  if (opts.exportStart) {
+    assemblyscript.setExportStart(compilerOptions, isNonEmptyString(opts.exportStart) ? opts.exportStart : "_start");
+  }
   assemblyscript.setMemoryBase(compilerOptions, opts.memoryBase >>> 0);
   assemblyscript.setTableBase(compilerOptions, opts.tableBase >>> 0);
   assemblyscript.setSourceMap(compilerOptions, opts.sourceMap != null);
@@ -318,7 +324,7 @@ export async function main(argv, options) {
   assemblyscript.setLowMemoryLimit(compilerOptions, opts.lowMemoryLimit >>> 0);
   assemblyscript.setExportRuntime(compilerOptions, opts.exportRuntime);
   assemblyscript.setBundleVersion(compilerOptions, bundleMajorVersion, bundleMinorVersion, bundlePatchVersion);
-  if (!opts.stackSize && opts.runtime == "incremental") {
+  if (!opts.stackSize && runtime === 2 /* incremental */) {
     opts.stackSize = assemblyscript.DEFAULT_STACK_SIZE;
   }
   assemblyscript.setStackSize(compilerOptions, opts.stackSize);
@@ -615,7 +621,7 @@ export async function main(argv, options) {
         stats.parseTime += stats.end(begin);
       }
     }
-    const numErrors = checkDiagnostics(program, stderr, options.reportDiagnostic, stderrColors.enabled);
+    const numErrors = checkDiagnostics(program, stderr, opts.disableWarning, options.reportDiagnostic, stderrColors.enabled);
     if (numErrors) {
       const err = Error(`${numErrors} parse error(s)`);
       err.stack = err.message; // omit stack
@@ -724,7 +730,7 @@ export async function main(argv, options) {
       ? assemblyscript.getBinaryenModuleRef(module)
       : module.ref
   );
-  var numErrors = checkDiagnostics(program, stderr, options.reportDiagnostic, stderrColors.enabled);
+  var numErrors = checkDiagnostics(program, stderr, opts.disableWarning, options.reportDiagnostic, stderrColors.enabled);
   if (numErrors) {
     const err = Error(`${numErrors} compile error(s)`);
     err.stack = err.message; // omit stack
@@ -737,7 +743,7 @@ export async function main(argv, options) {
     if (error) return prepareResult(error);
   }
 
-  numErrors = checkDiagnostics(program, stderr, options.reportDiagnostic, stderrColors.enabled);
+  numErrors = checkDiagnostics(program, stderr, opts.disableWarning, options.reportDiagnostic, stderrColors.enabled);
   if (numErrors) {
     const err = Error(`${numErrors} afterCompile error(s)`);
     err.stack = err.message; // omit stack
@@ -835,7 +841,7 @@ export async function main(argv, options) {
         }
         if (next.length >= last.length) {
           if (next.length > last.length) {
-            stderr.write(`Last converge was suboptimial.${EOL}`);
+            stderr.write(`Last converge was suboptimal.${EOL}`);
           }
           break;
         }
@@ -1117,17 +1123,22 @@ async function getConfig(file, baseDir, readFile) {
 }
 
 /** Checks diagnostics emitted so far for errors. */
-export function checkDiagnostics(program, stderr, reportDiagnostic, useColors) {
+export function checkDiagnostics(program, stderr, disableWarning, reportDiagnostic, useColors) {
   if (typeof useColors === "undefined" && stderr) useColors = stderr.isTTY;
   var numErrors = 0;
   do {
     let diagnostic = assemblyscript.nextDiagnostic(program);
     if (!diagnostic) break;
     if (stderr) {
-      stderr.write(
-        assemblyscript.formatDiagnostic(diagnostic, useColors, true) +
-        EOL + EOL
-      );
+      const isDisabledWarning = (diagnostic) => {
+        if (disableWarning == null) return false;
+        if (!disableWarning.length) return true;
+        const code = assemblyscript.getDiagnosticCode(diagnostic);
+        return disableWarning.includes(code);
+      };
+      if (assemblyscript.isError(diagnostic) || !isDisabledWarning(diagnostic)) {
+        stderr.write(assemblyscript.formatDiagnostic(diagnostic, useColors, true) + EOL + EOL);
+      }
     }
     if (reportDiagnostic) {
       function wrapRange(range) {

cli/options.json

@@ -282,7 +282,7 @@
   },
   "runPasses": {
     "category": "Binaryen",
-    "description":  [
+    "description": [
       "Specifies additional Binaryen passes to run after other",
       "optimizations, if any. See: Binaryen/src/passes/pass.cpp"
     ],
@@ -313,6 +313,13 @@
     "type": "b",
     "default": false
   },
+  "disableWarning": {
+    "description": [
+      "Disables warnings matching the given diagnostic code.", 
+      "If no diagnostic code is given, all warnings are disabled."
+    ],
+    "type": "I"
+  },
   "noEmit": {
     "description": "Performs compilation as usual but does not emit code.",
     "type": "b",