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

Author: actions-user

.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.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview Definitions for asc.
+ * @license Apache-2.0
+ */
+
 import { OptionDescription } from "./util/options";
 export { OptionDescription };
 

cli/asc.js

@@ -1,15 +1,31 @@
-"use strict";
 /**
- * Compiler frontend for node.js
+ * @license
+ * Copyright 2020 Daniel Wirtz / The AssemblyScript Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Compiler frontend for node.js
  *
  * Uses the low-level API exported from src/index.ts so it works with the compiler compiled to
  * JavaScript as well as the compiler compiled to WebAssembly (eventually). Runs the sources
  * directly through ts-node if distribution files are not present (indicated by a `-dev` version).
  *
  * Can also be packaged as a bundle suitable for in-browser use with the standard library injected
  * in the build step. See dist/asc.js for the bundle and webpack.config.js for building details.
- *
- * @module cli/asc
  */
 
 // Use "." instead of "/" as cwd in browsers
@@ -390,7 +406,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 +495,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
@@ -570,6 +590,20 @@ exports.main = function main(argv, options, callback) {
   optimizeLevel = Math.min(Math.max(optimizeLevel, 0), 3);
   shrinkLevel = Math.min(Math.max(shrinkLevel, 0), 2);
 
+  try {
+    stats.compileTime += measure(() => {
+      assemblyscript.initializeProgram(program, compilerOptions);
+    });
+  } catch(e) {
+    return callback(e);
+  }
+
+  // Call afterInitialize transform hook
+  {
+    let error = applyTransform("afterInitialize", program);
+    if (error) return callback(error);
+  }
+
   var module;
   stats.compileCount++;
   try {
@@ -579,9 +613,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 +1058,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;

cli/transform.d.ts

@@ -1,7 +1,7 @@
 /**
- * Definitions for custom compiler transforms that can be applied with the `--transform` option.
- * @module cli/transform
- *//***/
+ * @fileoverview Compiler transform interface definitions.
+ * @license Apache-2.0
+ */
 
 import { Program, Parser, Module } from "..";
 import { OutputStream } from "./asc";
@@ -35,6 +35,9 @@ export abstract class Transform {
   /** Called when parsing is complete, before a program is instantiated from the AST. */
   afterParse?(parser: Parser): void;
 
+  /** Called after the program is instantiated. */
+  afterInitialize?(program: Program): void;
+
   /** Called when compilation is complete, before the module is being validated. */
   afterCompile?(module: Module): void;
 }

cli/transform.js

@@ -1,2 +1,7 @@
+/**
+ * @fileoverview Compiler transform interface.
+ * @license Apache-2.0
+ */
+
 // becomes replaced with the actual base by asc
 exports.Transform = function Transform() {};

cli/util/colors.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview Terminal colors utility definitions.
+ * @license Apache-2.0
+ */
+
 interface Colors {
   /** Whether terminal colors are supported. */
   supported: boolean;

cli/util/colors.js

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview Terminal colors utility.
+ * @license Apache-2.0
+ */
+
 var proc = typeof process !== "undefined" && process || {};
 var isCI = proc.env && "CI" in proc.env; // doesn't work when bundled because 'process' is a mock
 

cli/util/find.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview File finding utility definitions.
+ * @license Apache-2.0
+ */
+
 export function files(dirname: string, filter?: ((name: string) => bool) | RegExp): string[];
 export const TS: RegExp;
 export const TS_EXCEPT_DTS: RegExp;

cli/util/find.js

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview File finding utility.
+ * @license Apache-2.0
+ */
+
 const fs = require("fs");
 const path = require("path");
 

cli/util/mkdirp.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview Recursive mkdir definitions.
+ * @license Apache-2.0
+ */
+
 interface Options {
   mode?: number;
 }

cli/util/mkdirp.js

@@ -1,26 +1,28 @@
-/*
-Copyright 2010 James Halliday ([email protected])
-
-This project is free software released under the MIT/X11 license:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
+/**
+ * @fileoverview Recursive mkdir.
+ * @license
+ * Copyright 2010 James Halliday ([email protected])
+ * 
+ * This project is free software released under the MIT/X11 license:
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 
 var path = require("path");
 var fs = require("fs");

cli/util/options.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview Command line options utility definitions.
+ * @license Apache-2.0
+ */
+
 /** Command line option description. */
 export interface OptionDescription {
   /** Textual description. */

cli/util/options.js

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview Command line options utility.
+ * @license Apache-2.0
+ */
+
 const colorsUtil = require("./colors");
 
 // type | meaning

cli/util/utf8.d.ts

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview UTF8 utility definitions.
+ * @license Apache-2.0
+ */
+
 /**
  * Calculates the UTF8 byte length of a string.
  * @param {string} string String

cli/util/utf8.js

@@ -1,3 +1,8 @@
+/**
+ * @fileoverview UTF8 utility.
+ * @license Apache-2.0
+ */
+
 // @protobufjs/utf8
 
 /**

examples/game-of-life/assembly/index.ts

@@ -3,43 +3,49 @@
 // Configuration imported from JS
 import { BGR_ALIVE, BGR_DEAD, BIT_ROT } from "./config";
 
-var w: i32, h: i32, s: i32;
+var width: i32, height: i32, offset: i32;
 
 /** Gets an input pixel in the range [0, s]. */
 @inline
 function get(x: u32, y: u32): u32 {
-  return load<u32>((y * w + x) << 2);
+  return load<u32>((y * width + x) << 2);
 }
 
 /** Sets an output pixel in the range [s, 2*s]. */
 @inline
 function set(x: u32, y: u32, v: u32): void {
-  store<u32>((s + y * w + x) << 2, v);
+  store<u32>((offset + y * width + x) << 2, v);
 }
 
 /** Sets an output pixel in the range [s, 2*s] while fading it out. */
 @inline
 function rot(x: u32, y: u32, v: u32): void {
-  var a = max<i32>((v >>> 24) - BIT_ROT, 0);
-  set(x, y, (a << 24) | (v & 0x00ffffff));
+  var alpha = max<i32>((v >> 24) - BIT_ROT, 0);
+  set(x, y, (alpha << 24) | (v & 0x00ffffff));
 }
 
 /** Initializes width and height. Called once from JS. */
-export function init(width: i32, height: i32): void {
-  w = width;
-  h = height;
-  s = width * height;
+export function init(w: i32, h: i32): void {
+  width  = w;
+  height = h;
+  offset = w * h;
 
   // Start by filling output with random live cells.
   for (let y = 0; y < h; ++y) {
     for (let x = 0; x < w; ++x) {
-      set(x, y, Math.random() > 0.1 ? BGR_DEAD & 0x00ffffff : BGR_ALIVE | 0xff000000);
+      let c = Math.random() > 0.1
+        ? BGR_DEAD  & 0x00ffffff
+        : BGR_ALIVE | 0xff000000;
+      set(x, y, c);
     }
   }
 }
 
 /** Performs one step. Called about 30 times a second from JS. */
 export function step(): void {
+  var w = width,
+      h = height;
+
   var hm1 = h - 1, // h - 1
       wm1 = w - 1; // w - 1
 
@@ -55,9 +61,9 @@ export function step(): void {
       // Every cell interacts with its eight neighbours, which are the cells that are horizontally,
       // vertically, or diagonally adjacent. Least significant bit indicates alive or dead.
       let aliveNeighbors = (
-        (get(xm1, ym1) & 1) + (get(x  , ym1) & 1) + (get(xp1, ym1) & 1) +
-        (get(xm1, y  ) & 1)                       + (get(xp1, y  ) & 1) +
-        (get(xm1, yp1) & 1) + (get(x  , yp1) & 1) + (get(xp1, yp1) & 1)
+        (get(xm1, ym1) & 1) + (get(x, ym1) & 1) + (get(xp1, ym1) & 1) +
+        (get(xm1, y  ) & 1)                     + (get(xp1, y  ) & 1) +
+        (get(xm1, yp1) & 1) + (get(x, yp1) & 1) + (get(xp1, yp1) & 1)
       );
 
       let self = get(x, y);
@@ -78,10 +84,10 @@ export function step(): void {
 
 /** Fills the row and column indicated by `x` and `y` with random live cells. */
 export function fill(x: u32, y: u32, p: f64): void {
-  for (let ix = 0; ix < w; ++ix) {
+  for (let ix = 0; ix < width; ++ix) {
     if (Math.random() < p) set(ix, y, BGR_ALIVE | 0xff000000);
   }
-  for (let iy = 0; iy < h; ++iy) {
+  for (let iy = 0; iy < height; ++iy) {
     if (Math.random() < p) set(x, iy, BGR_ALIVE | 0xff000000);
   }
 }