temp

Author: DuncanUszkay1

.eslintrc.js

@@ -69,10 +69,10 @@ module.exports = {
     // Quite common in scenarios where an iteration starts at `current = this`.
     "@typescript-eslint/no-this-alias": "off",
 
-    // Disabled here, but enabled again for JavaScript files
+    // Disabled here, but enabled again for JavaScript files.
     "no-unused-vars": "off",
 
-    // Disabled here, but enabled again for TypeScript files
+    // Disabled here, but enabled again for TypeScript files.
     "@typescript-eslint/no-unused-vars": "off"
   },
   overrides: [

.github/workflows/publish.yml

@@ -4,26 +4,17 @@ on:
     branches:
     - master
 jobs:
-  publish:
-    name: "Packages"
+  release:
+    name: Packages
     if: github.repository == 'DuncanUszkay1/assemblyscript'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
       with:
-        ref: release
+        ref: master
     - uses: dcodeIO/setup-node-nvm@master
       with:
         node-version: current
-    - name: Merge master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        git config user.name "GitHub Actions"
-        git config user.email "actions@github.com"
-        git remote set-url origin "https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
-        git fetch origin
-        git merge origin/master
     - name: Install dependencies
       run: npm ci
     - name: Build distribution files
@@ -32,41 +23,8 @@ jobs:
         npm run build
     - name: Test distribution files
       run: npm test
-    - name: Set up version
-      run: |
-        VERSION=$(node -e "console.log(require('./package.json').version)")
-        git add --force dist/*
-        if git rev-parse v$VERSION >/dev/null 2>&1; then
-          VERSION=$VERSION-nightly.$(date "+%Y%m%d")
-          if git rev-parse v$VERSION >/dev/null 2>&1; then
-            echo "Nightly $VERSION does already exist."
-            exit 1
-          fi
-          echo ::set-env name=CHANNEL::nightly
-          echo "Committing nightly ($VERSION) ..."
-          git commit -m "Nightly v$VERSION"
-          npm version $VERSION --no-git-tag-version --force
-        else
-          echo ::set-env name=CHANNEL::latest
-          echo "Committing release ($VERSION) ..."
-          git commit --allow-empty -m "Release v$VERSION"
-        fi
-        echo ::set-env name=VERSION::$VERSION
-        cd lib/loader
-        npm version $VERSION --no-git-tag-version --force
-        cd ../..
-    - name: Create tag and push distribution files
-      run: |
-        git tag v$VERSION
-        git push origin release
-        git push origin v$VERSION
-    - name: Publish to npm
+    - name: Make semantic release
       env:
-        NPM_REGISTRY: "registry.npmjs.org"
-        NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      run: |
-        npm config set "//${NPM_REGISTRY}/:_authToken=${NPM_AUTH_TOKEN}"
-        npm publish --tag $CHANNEL
-        cd lib/loader
-        npm publish --tag $CHANNEL --access public
-        cd ../..
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      run: node node_modules/semantic-release/bin/semantic-release.js --unstable

README.md

@@ -2,22 +2,22 @@
   <a href="https://assemblyscript.org" target="_blank" rel="noopener"><img width="100" src="https://avatars1.githubusercontent.com/u/28916798?s=200&v=4" alt="AssemblyScript logo"></a>
 </p>
 
-<h1 align="center">AssemblyScript Compiler</h1>
-
 <p align="center">
-  <a href="https://github.com/AssemblyScript/assemblyscript/actions"><img src="https://github.com/AssemblyScript/assemblyscript/workflows/Test/badge.svg?branch=master&event=push" alt="Actions Status" /></a>
-  <a href="https://www.npmjs.com/package/assemblyscript"><img src="https://img.shields.io/npm/v/assemblyscript.svg?color=0074C1" alt="npm package" /></a>
-  <a href="https://www.npmjs.com/package/assemblyscript"><img src="https://img.shields.io/npm/v/assemblyscript/nightly.svg?color=0074C1" alt="npm package (nightly)" /></a>
+  <a href="https://github.com/AssemblyScript/assemblyscript/actions"><img src="https://github.com/AssemblyScript/assemblyscript/workflows/Test/badge.svg?branch=master&event=push" alt="Test status" /></a>
+  <a href="https://github.com/AssemblyScript/assemblyscript/actions"><img src="https://github.com/AssemblyScript/assemblyscript/workflows/Publish/badge.svg?branch=master&event=schedule" alt="Publish status" /></a>
+  <a href="https://www.npmjs.com/package/assemblyscript"><img src="https://img.shields.io/npm/v/assemblyscript.svg?&label=&logo=npm&logoColor=ffffff&labelColor=eeeeee&color=cb3837" alt="npm package" /></a>
+  <a href="https://discord.gg/U63XU2J"><img src="https://img.shields.io/discord/721472913886281818.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2" alt="Discord online" /></a>
 </p>
 
-<p align="justify">AssemblyScript compiles a strict variant of <a href="http://www.typescriptlang.org">TypeScript</a> (basically JavaScript with types) to <a href="http://webassembly.org">WebAssembly</a> using <a href="https://github.com/WebAssembly/binaryen">Binaryen</a>. It generates lean and mean WebAssembly modules while being just an <code>npm install</code> away.</p>
+<p align="justify"><strong>AssemblyScript</strong> compiles a strict variant of <a href="http://www.typescriptlang.org">TypeScript</a> (basically JavaScript with types) to <a href="http://webassembly.org">WebAssembly</a> using <a href="https://github.com/WebAssembly/binaryen">Binaryen</a>. It generates lean and mean WebAssembly modules while being just an <code>npm install</code> away.</p>
 
-<p align="center">
-  <a href="https://assemblyscript.org">About</a> ·
-  <a href="https://assemblyscript.org/introduction.html">Introduction</a> ·
-  <a href="https://assemblyscript.org/quick-start.html">Quick start</a> ·
-  <a href="https://assemblyscript.org/development.html">Development instructions</a>
-</p>
+<h3 align="center">
+  <a href="https://assemblyscript.org">About</a> &nbsp;·&nbsp;
+  <a href="https://assemblyscript.org/introduction.html">Introduction</a> &nbsp;·&nbsp;
+  <a href="https://assemblyscript.org/quick-start.html">Quick&nbsp;start</a> &nbsp;·&nbsp;
+  <a href="https://assemblyscript.org/development.html">Development&nbsp;instructions</a>
+</h3>
+<br>
 
 <h2 align="center">Contributors</h2>
 

cli/asc.json

@@ -188,7 +188,8 @@
       " tail-calls          Tail call operations.",
       " multi-value         Multi value types."
     ],
-    "type": "S"
+    "type": "S",
+    "mutuallyExclusive": "disable"
   },
   "disable": {
     "category": "Features",
@@ -198,7 +199,8 @@
       " mutable-globals     Mutable global imports and exports.",
       ""
     ],
-    "type": "S"
+    "type": "S",
+    "mutuallyExclusive": "enable"
   },
   "use": {
     "category": "Features",

cli/util/options.d.ts

@@ -3,14 +3,19 @@
  * @license Apache-2.0
  */
 
+/** A set of options. */
+export interface OptionSet {
+  [key: string]: number | string
+}
+
 /** Command line option description. */
 export interface OptionDescription {
   /** Textual description. */
   description?: string | string[],
   /** Data type. One of (b)oolean [default], (i)nteger, (f)loat or (s)tring. Uppercase means multiple values. */
   type?: "b" | "i" | "f" | "s" | "I" | "F" | "S",
   /** Substituted options, if any. */
-  value?: { [key: string]: number | string },
+  value?: OptionSet,
   /** Short alias, if any. */
   alias?: string
   /** The default value, if any. */
@@ -27,19 +32,17 @@ interface Config {
 /** Parsing result. */
 interface Result {
   /** Parsed options. */
-  options: { [key: string]: number | string },
+  options: OptionSet,
   /** Unknown options. */
   unknown: string[],
   /** Normal arguments. */
   arguments: string[],
   /** Trailing arguments. */
-  trailing: string[],
-  /** Provided arguments from the cli. */
-  provided: Set<string>
+  trailing: string[]
 }
 
 /** Parses the specified command line arguments according to the given configuration. */
-export function parse(argv: string[], config: Config): Result;
+export function parse(argv: string[], config: Config, propagateDefaults?: boolean): Result;
 
 /** Help formatting options. */
 interface HelpOptions {
@@ -53,3 +56,9 @@ interface HelpOptions {
 
 /** Generates the help text for the specified configuration. */
 export function help(config: Config, options?: HelpOptions): string;
+
+/** Merges two sets of options into one, preferring the current over the parent set. */
+export function merge(config: Config, currentOptions: OptionSet, parentOptions: OptionSet): OptionSet;
+
+/** Populates default values on a parsed options result. */
+export function addDefaults(config: Config, options: OptionSet): OptionSet;

cli/util/options.js

@@ -16,12 +16,11 @@ const colorsUtil = require("./colors");
 // S    | string array
 
 /** Parses the specified command line arguments according to the given configuration. */
-function parse(argv, config) {
+function parse(argv, config, propagateDefaults = true) {
   var options = {};
   var unknown = [];
   var args = [];
   var trailing = [];
-  var provided = new Set();
 
   // make an alias map and initialize defaults
   var aliases = {};
@@ -54,13 +53,15 @@ function parse(argv, config) {
       else { args.push(arg); continue; } // argument
     }
     if (option) {
-      if (option.type == null || option.type === "b") {
-        options[key] = true; // flag
-        provided.add(key);
+      if (option.value) {
+        // alias setting fixed values
+        Object.keys(option.value).forEach(k => options[k] = option.value[k]);
+      } else if (option.type == null || option.type === "b") {
+        // boolean flag not taking a value
+        options[key] = true;
       } else {
-        // the argument was provided
-        if (i + 1 < argv.length && argv[i + 1].charCodeAt(0) != 45) { // present
-          provided.add(key);
+        if (i + 1 < argv.length && argv[i + 1].charCodeAt(0) != 45) {
+          // non-boolean with given value
           switch (option.type) {
             case "i": options[key] = parseInt(argv[++i], 10); break;
             case "I": options[key] = (options[key] || []).concat(parseInt(argv[++i], 10)); break;
@@ -70,7 +71,8 @@ function parse(argv, config) {
             case "S": options[key] = (options[key] || []).concat(argv[++i].split(",")); break;
             default: unknown.push(arg); --i;
           }
-        } else { // omitted
+        } else {
+          // non-boolean with omitted value
           switch (option.type) {
             case "i":
             case "f": options[key] = option.default || 0; break;
@@ -82,12 +84,12 @@ function parse(argv, config) {
           }
         }
       }
-      if (option.value) Object.keys(option.value).forEach(k => options[k] = option.value[k]);
     } else unknown.push(arg);
   }
   while (i < k) trailing.push(argv[i++]); // trailing
+  if (propagateDefaults) addDefaults(config, options);
 
-  return { options, unknown, arguments: args, trailing, provided };
+  return { options, unknown, arguments: args, trailing };
 }
 
 exports.parse = parse;
@@ -138,3 +140,93 @@ function help(config, options) {
 }
 
 exports.help = help;
+
+/** Sanitizes an option value to be a valid value of the option's type. */
+function sanitizeValue(value, type) {
+  if (value != null) {
+    switch (type) {
+      case undefined:
+      case "b": return Boolean(value);
+      case "i": return Math.trunc(value) || 0;
+      case "f": return Number(value) || 0;
+      case "s": return String(value);
+      case "I": {
+        if (!Array.isArray(value)) value = [ value ];
+        return value.map(v => Math.trunc(v) || 0);
+      }
+      case "F": {
+        if (!Array.isArray(value)) value = [ value ];
+        return value.map(v => Number(v) || 0);
+      }
+      case "S": {
+        if (!Array.isArray(value)) value = [ value ];
+        return value.map(String);
+      }
+    }
+  }
+  return undefined;
+}
+
+/** Merges two sets of options into one, preferring the current over the parent set. */
+function merge(config, currentOptions, parentOptions) {
+  const mergedOptions = {};
+  for (const [key, { type, mutuallyExclusive }] of Object.entries(config)) {
+    let currentValue = sanitizeValue(currentOptions[key], type);
+    let parentValue = sanitizeValue(parentOptions[key], type);
+    if (currentValue == null) {
+      if (parentValue != null) {
+        // only parent value present
+        if (Array.isArray(parentValue)) {
+          let exclude;
+          if (mutuallyExclusive != null && (exclude = currentOptions[mutuallyExclusive])) {
+            mergedOptions[key] = parentValue.filter(value => !exclude.includes(value));
+          } else {
+            mergedOptions[key] = parentValue.slice();
+          }
+        } else {
+          mergedOptions[key] = parentValue;
+        }
+      }
+    } else if (parentValue == null) {
+      // only current value present
+      if (Array.isArray(currentValue)) {
+        mergedOptions[key] = currentValue.slice();
+      } else {
+        mergedOptions[key] = currentValue;
+      }
+    } else {
+      // both current and parent values present
+      if (Array.isArray(currentValue)) {
+        let exclude;
+        if (mutuallyExclusive != null && (exclude = currentOptions[mutuallyExclusive])) {
+          mergedOptions[key] = [
+            ...currentValue,
+            ...parentValue.filter(value => !currentValue.includes(value) && !exclude.includes(value))
+          ];
+        } else {
+          mergedOptions[key] = [
+            ...currentValue,
+            ...parentValue.filter(value => !currentValue.includes(value)) // dedup
+          ];
+        }
+      } else {
+        mergedOptions[key] = currentValue;
+      }
+    }
+  }
+  return mergedOptions;
+}
+
+exports.merge = merge;
+
+/** Populates default values on a parsed options result. */
+function addDefaults(config, options) {
+  for (const [key, { default: defaultValue }] of Object.entries(config)) {
+    if (options[key] == null && defaultValue != null) {
+      options[key] = defaultValue;
+    }
+  }
+  return options;
+}
+
+exports.addDefaults = addDefaults;