ASify

.github/workflows/ci.yml

@@ -141,3 +141,20 @@ jobs:
         cd lib/loader
         npm run asbuild
         npm run test
+  test-bootstrap:
+    name: "Test self-compilation on node: node"
+    runs-on: ubuntu-latest
+    needs: check
+    steps:
+    - uses: actions/[email protected]
+    - uses: dcodeIO/[email protected]
+      with:
+        node-version: node
+    - name: Install dependencies
+      run: npm ci --no-audit
+    - name: Clean distribution files
+      run: npm run clean
+    - name: Test self-compilation
+      run: |
+        npm run asbuild
+        npm run astest

cli/asc.js

@@ -390,7 +390,8 @@ exports.main = function main(argv, options, callback) {
       if ((sourceText = readFile(sourcePath = internalPath + ".ts", baseDir)) == null) {
         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);
+          sourcePath = internalPath + ".ts";
+          sourceText = readFile(internalPath + ".d.ts", baseDir);
         }
       }
 
@@ -478,13 +479,16 @@ exports.main = function main(argv, options, callback) {
     var internalPath;
     while ((internalPath = assemblyscript.nextFile(program)) != null) {
       let file = getFile(internalPath, assemblyscript.getDependee(program, internalPath));
-      if (!file) return callback(Error("Import file '" + internalPath + ".ts' not found."))
+      if (!file) return callback(Error("Import '" + internalPath + "' not found."))
       stats.parseCount++;
       stats.parseTime += measure(() => {
         assemblyscript.parse(program, file.sourceText, file.sourcePath, false);
       });
     }
-    if (checkDiagnostics(program, stderr)) return callback(Error("Parse error"));
+    var numErrors = checkDiagnostics(program, stderr);
+    if (numErrors) {
+      return callback(Error(numErrors + " parse error(s)"));
+    }
   }
 
   // Include runtime template before entry files so its setup runs first
@@ -579,9 +583,10 @@ exports.main = function main(argv, options, callback) {
   } catch (e) {
     return callback(e);
   }
-  if (checkDiagnostics(program, stderr)) {
+  var numErrors = checkDiagnostics(program, stderr);
+  if (numErrors) {
     if (module) module.dispose();
-    return callback(Error("Compile error"));
+    return callback(Error(numErrors + " compile error(s)"));
   }
 
   // Call afterCompile transform hook
@@ -1023,17 +1028,17 @@ exports.main = function main(argv, options, callback) {
 /** Checks diagnostics emitted so far for errors. */
 function checkDiagnostics(program, stderr) {
   var diagnostic;
-  var hasErrors = false;
+  var numErrors = 0;
   while ((diagnostic = assemblyscript.nextDiagnostic(program)) != null) {
     if (stderr) {
       stderr.write(
         assemblyscript.formatDiagnostic(diagnostic, stderr.isTTY, true) +
         EOL + EOL
       );
     }
-    if (assemblyscript.isError(diagnostic)) hasErrors = true;
+    if (assemblyscript.isError(diagnostic)) ++numErrors;
   }
-  return hasErrors;
+  return numErrors;
 }
 
 exports.checkDiagnostics = checkDiagnostics;

package.json

@@ -63,7 +63,11 @@
     "all": "npm run check && npm run make",
     "docs": "typedoc --tsconfig tsconfig-docs.json --mode modules --name \"AssemblyScript Compiler API\" --out ./docs/api --ignoreCompilerErrors --excludeNotExported --excludePrivate --excludeExternals --exclude **/std/** --includeDeclarations --readme src/README.md",
     "prepublishOnly": "node scripts/prepublish",
-    "postpublish": "node scripts/postpublish"
+    "postpublish": "node scripts/postpublish",
+    "asbuild": "npm run asbuild:untouched && npm run asbuild:optimized",
+    "asbuild:untouched": "node bin/asc src/glue/wasm/index.ts src/index.ts -t out/assemblyscript.untouched.wat -b out/assemblyscript.untouched.wasm -d out/assemblyscript.d.ts --validate --debug --measure",
+    "asbuild:optimized": "node bin/asc src/glue/wasm/index.ts src/index.ts -t out/assemblyscript.optimized.wat -b out/assemblyscript.optimized.wasm -O3 --validate --measure",
+    "astest": "ts-node tests/bootstrap"
   },
   "releaseFiles": [
     "lib/rtrace/index.d.ts",