Merge pull request AssemblyScript#2 from AssemblyScript/master

Sync from origin

Author: nidin

.gitattributes

@@ -1,3 +1,4 @@
 bin/* text eol=lf
 dist/* binary
 scripts/*.sh eol=lf
+lib/binaryen.js binary

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 notifications:
   email: false
 before_install: npm config set progress=false && npm i -g npm@latest --no-audit
-install: npm i --no-audit
+install: npm ci --no-audit
 cache:
   directories:
   - node_modules

CONTRIBUTING.md

@@ -42,7 +42,7 @@ Instructions are similar to those for bug reports. Please provide the following
 
 Before submitting your pull request, please make sure that the following conditions are met:
 
-* Your new code **adheres to the code style** through running `npm run lint`.
+* Your new code **adheres to the code style** through running `npm run check`.
 * Your new code **passes all existing and new tests** through running `npm run test:pr`.
 * Your PR **excludes distribution files** in `dist/**`.
 * You appended yourself to the **list of contributors** in the [NOTICE](./NOTICE) file.

NOTICE

@@ -8,6 +8,8 @@ under the licensing terms detailed in LICENSE:
 * Igor Sbitnev <[email protected]>
 * Norton Wang <[email protected]>
 * Alan Pierce <[email protected]>
+* Palmer <[email protected]>
+* Linus Unnebäck <[email protected]>
 
 Portions of this software are derived from third-party works licensed under
 the following terms:

README.md

@@ -2,6 +2,8 @@
 =================
 
 [![Build Status](https://travis-ci.org/AssemblyScript/assemblyscript.svg?branch=master)](https://travis-ci.org/AssemblyScript/assemblyscript)
+[![Backers on Open Collective](https://opencollective.com/assemblyscript/tiers/backer/badge.svg)](#backers)
+[![Sponsors on Open Collective](https://opencollective.com/assemblyscript/tiers/sponsor/badge.svg)](#sponsors)
 
 **AssemblyScript** compiles strictly typed [TypeScript](http://www.typescriptlang.org) (basically JavaScript with types) to [WebAssembly](http://webassembly.org) using [Binaryen](https://github.com/WebAssembly/binaryen). It generates lean and mean WebAssembly modules while being just an `npm install` away.
 
@@ -58,7 +60,7 @@ Examples
 * **[Conway's Game of Life](./examples/game-of-life)** [ [demo](https://rawgit.com/AssemblyScript/assemblyscript/master/examples/game-of-life/index.html) | [fiddle](https://webassembly.studio/?f=gvuw4enb3qk) ]<br />
   Continuously updates the cellular automaton and visualizes its state on a canvas.
 
-* **[Mandelbrot Set](./examples/mandelbrot)** [ [demo](https://rawgit.com/AssemblyScript/assemblyscript/master/examples/mandelbrot/index.html) | [fiddle](https://webassembly.studio/?f=pne1undq5g) ]<br />
+* **[Mandelbrot Set](./examples/mandelbrot)** [ [demo](https://rawgit.com/AssemblyScript/assemblyscript/master/examples/mandelbrot/index.html) | [fiddle](https://webassembly.studio/?f=m6hbiw9wyq) ]<br />
   Renders the Mandelbrot set to a canvas.
 
 * **[i64 polyfill](./examples/i64-polyfill)**<br />
@@ -91,7 +93,7 @@ $> npm run clean
 Linting potential changes:
 
 ```
-$> npm run lint
+$> npm run check
 ```
 
 Running the [tests](./tests):
@@ -105,3 +107,45 @@ Running everything in order (lint, clean, test, build, test):
 ```
 $> npm run all
 ```
+
+Contributing
+------------
+
+This project exists thanks to all the people who [contribute](CONTRIBUTING.md).
+
+<a href="https://github.com/AssemblyScript/assemblyscript/graphs/contributors"><img src="https://opencollective.com/assemblyscript/contributors.svg?width=890&button=false" /></a>
+
+Sponsoring
+----------
+
+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, [please donate](https://opencollective.com/assemblyscript).
+
+This is how we use the donations:
+
+* Allow the core team to work on AssemblyScript
+* Thank contributors if they invested a large amount of time in contributing
+* Support projects in the ecosystem that are of great value for us or users
+* Fees for money handling
+
+### Sponsors
+
+[Become a sponsor](https://opencollective.com/assemblyscript#sponsor) and get your logo on our README on Github with a link to your site.
+
+<a href="https://opencollective.com/assemblyscript/tiers/sponsor/0/website" target="_blank"><img src="https://opencollective.com/assemblyscript/tiers/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/assemblyscript/tiers/sponsor/1/website" target="_blank"><img src="https://opencollective.com/assemblyscript/tiers/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/assemblyscript/tiers/sponsor/2/website" target="_blank"><img src="https://opencollective.com/assemblyscript/tiers/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/assemblyscript/tiers/sponsor/3/website" target="_blank"><img src="https://opencollective.com/assemblyscript/tiers/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/assemblyscript/tiers/sponsor/4/website" target="_blank"><img src="https://opencollective.com/assemblyscript/tiers/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/assemblyscript/tiers/sponsor/5/website" target="_blank"><img src="https://opencollective.com/assemblyscript/tiers/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/assemblyscript/tiers/sponsor/6/website" target="_blank"><img src="https://opencollective.com/assemblyscript/tiers/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/assemblyscript/tiers/sponsor/7/website" target="_blank"><img src="https://opencollective.com/assemblyscript/tiers/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/assemblyscript/tiers/sponsor/8/website" target="_blank"><img src="https://opencollective.com/assemblyscript/tiers/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/assemblyscript/tiers/sponsor/9/website" target="_blank"><img src="https://opencollective.com/assemblyscript/tiers/sponsor/9/avatar.svg"></a>
+
+### Backers
+
+[Become a backer](https://opencollective.com/assemblyscript#backer) and get your image on our README on Github with a link to your site.
+
+<a href="https://opencollective.com/assemblyscript#backers" target="_blank"><img src="https://opencollective.com/assemblyscript/tiers/backer.svg?width=890"></a>
+
+Thank you for your support!

bin/asinit

@@ -206,8 +206,8 @@ function ensureGitignore() {
 function ensurePackageJson() {
   console.log("- Making sure that 'package.json' contains the build commands...")
   const entryPath = path.relative(projectDir, entryFile).replace(/\\/g, "/");
-  const buildUntouched = "asc " + entryPath + " -b build/untouched.wasm -t build/untouched.wat --sourceMap --validate";
-  const buildOptimized = "asc " + entryPath + " -b build/optimized.wasm -t build/optimized.wat --sourceMap --validate --optimize --noDebug";
+  const buildUntouched = "asc " + entryPath + " -b build/untouched.wasm -t build/untouched.wat --sourceMap --validate --debug";
+  const buildOptimized = "asc " + entryPath + " -b build/optimized.wasm -t build/optimized.wat --sourceMap --validate --optimize";
   const buildAll = "npm run asbuild:untouched && npm run asbuild:optimized";
   if (!fs.existsSync(packageFile)) {
     fs.writeFileSync(packageFile, JSON.stringify({

cli/asc.js

@@ -230,7 +230,7 @@ exports.main = function main(argv, options, callback) {
   var parser = null;
 
   // Include library files
-  if (!args.noLib) { // bundled
+  if (!args.noLib) {
     Object.keys(exports.libraryFiles).forEach(libPath => {
       if (libPath.indexOf("/") >= 0) return; // in sub-directory: imported on demand
       stats.parseCount++;
@@ -243,6 +243,16 @@ exports.main = function main(argv, options, callback) {
         );
       });
     });
+  } else { // always include builtins
+    stats.parseCount++;
+    stats.parseTime += measure(() => {
+      parser = assemblyscript.parseFile(
+        exports.libraryFiles["builtins"],
+        exports.libraryPrefix + "builtins.ts",
+        false,
+        parser
+      );
+    });
   }
   const customLibDirs = [];
   if (args.lib) {
@@ -495,7 +505,7 @@ exports.main = function main(argv, options, callback) {
 
   module.setOptimizeLevel(optimizeLevel);
   module.setShrinkLevel(shrinkLevel);
-  module.setDebugInfo(!args.noDebug);
+  module.setDebugInfo(args.debug);
 
   var runPasses = [];
   if (args.runPasses) {

cli/asc.json

@@ -81,13 +81,13 @@
     ],
     "type": "s"
   },
-  "noTreeShaking": {
-    "description": "Disables compiler-level tree-shaking, compiling everything.",
+  "debug": {
+    "description": "Enables debug information in emitted binaries.",
     "type": "b",
     "default": false
   },
-  "noDebug": {
-    "description": "Disables maintaining of debug information in binaries.",
+  "noTreeShaking": {
+    "description": "Disables compiler-level tree-shaking, compiling everything.",
     "type": "b",
     "default": false
   },