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

Author: actions-user

NOTICE

@@ -19,6 +19,7 @@ under the licensing terms detailed in LICENSE:
 * Stephen Paul Weber <stephen.weber@shopify.com>
 * Jay Phelps <hello@jayphelps.com>
 * jhwgh1968 <jhwgh1968@protonmail.com>
+* Jeffrey Charles <jeffreycharles@gmail.com>
 
 Portions of this software are derived from third-party works licensed under
 the following terms:

cli/asc.js

@@ -40,7 +40,8 @@ var assemblyscript, isDev = false;
     try { // `asc` on the command line without dist files
       require("ts-node").register({
         project: path.join(__dirname, "..", "src", "tsconfig.json"),
-        skipIgnore: true
+        skipIgnore: true,
+        compilerOptions: { target: "ES2016" }
       });
       require("../src/glue/js");
       assemblyscript = require("../src");
@@ -67,9 +68,6 @@ exports.version = exports.isBundle ? BUNDLE_VERSION : require("../package.json")
 /** Available CLI options. */
 exports.options = require("./asc.json");
 
-/** Common root used in source maps. */
-exports.sourceMapRoot = "assemblyscript:///";
-
 /** Prefix used for library files. */
 exports.libraryPrefix = assemblyscript.LIBRARY_PREFIX;
 
@@ -286,10 +284,14 @@ exports.main = function main(argv, options, callback) {
   // Set up transforms
   const transforms = [];
   if (args.transform) {
+    let tsNodeRegistered = false;
     let transformArgs = args.transform;
     for (let i = 0, k = transformArgs.length; i < k; ++i) {
       let filename = transformArgs[i].trim();
-      if (/\.ts$/.test(filename)) require("ts-node").register({ transpileOnly: true, skipProject: true });
+      if (!tsNodeRegistered && filename.endsWith('.ts')) {
+        require("ts-node").register({ transpileOnly: true, skipProject: true, compilerOptions: { target: "ES2016" } });
+        tsNodeRegistered = true;
+      }
       try {
         const classOrModule = require(require.resolve(filename, { paths: [baseDir, process.cwd()] }));
         if (typeof classOrModule === "function") {
@@ -370,8 +372,11 @@ exports.main = function main(argv, options, callback) {
     var sourceText = null; // text reported back to the compiler
     var sourcePath = null; // path reported back to the compiler
 
+    const libraryPrefix = exports.libraryPrefix;
+    const libraryFiles = exports.libraryFiles;
+
     // Try file.ts, file/index.ts, file.d.ts
-    if (!internalPath.startsWith(exports.libraryPrefix)) {
+    if (!internalPath.startsWith(libraryPrefix)) {
       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
@@ -381,22 +386,22 @@ exports.main = function main(argv, options, callback) {
 
     // Search library in this order: stdlib, custom lib dirs, paths
     } else {
-      const plainName = internalPath.substring(exports.libraryPrefix.length);
+      const plainName = internalPath.substring(libraryPrefix.length);
       const indexName = plainName + "/index";
-      if (exports.libraryFiles.hasOwnProperty(plainName)) {
-        sourceText = exports.libraryFiles[plainName];
-        sourcePath = exports.libraryPrefix + plainName + ".ts";
-      } else if (exports.libraryFiles.hasOwnProperty(indexName)) {
-        sourceText = exports.libraryFiles[indexName];
-        sourcePath = exports.libraryPrefix + indexName + ".ts";
+      if (libraryFiles.hasOwnProperty(plainName)) {
+        sourceText = libraryFiles[plainName];
+        sourcePath = libraryPrefix + plainName + ".ts";
+      } else if (libraryFiles.hasOwnProperty(indexName)) {
+        sourceText = libraryFiles[indexName];
+        sourcePath = libraryPrefix + indexName + ".ts";
       } else { // custom lib dirs
         for (const libDir of customLibDirs) {
           if ((sourceText = readFile(plainName + ".ts", libDir)) != null) {
-            sourcePath = exports.libraryPrefix + plainName + ".ts";
+            sourcePath = libraryPrefix + plainName + ".ts";
             break;
           } else {
             if ((sourceText = readFile(indexName + ".ts", libDir)) != null) {
-              sourcePath = exports.libraryPrefix + indexName + ".ts";
+              sourcePath = libraryPrefix + indexName + ".ts";
               break;
             }
           }
@@ -412,7 +417,7 @@ exports.main = function main(argv, options, callback) {
             const absBasePath = path.isAbsolute(basePath) ? basePath : path.join(baseDir, basePath);
             const paths = [];
             for (let parts = absBasePath.split(SEP), i = parts.length, k = SEP == "/" ? 0 : 1; i >= k; --i) {
-              if (parts[i - 1] != "node_modules") paths.push(parts.slice(0, i).join(SEP) + SEP + "node_modules");
+              if (parts[i - 1] !== "node_modules") paths.push(parts.slice(0, i).join(SEP) + SEP + "node_modules");
             }
             for (const currentPath of paths.concat(...args.path).map(p => path.relative(baseDir, p))) {
               if (args.traceResolution) stderr.write("  in " + path.join(currentPath, packageName) + EOL);
@@ -435,14 +440,14 @@ exports.main = function main(argv, options, callback) {
               const mainDir = path.join(currentPath, packageName, mainPath);
               const plainName = filePath;
               if ((sourceText = readFile(path.join(mainDir, plainName + ".ts"), baseDir)) != null) {
-                sourcePath = exports.libraryPrefix + packageName + "/" + plainName + ".ts";
+                sourcePath = libraryPrefix + packageName + "/" + plainName + ".ts";
                 packageBases.set(sourcePath.replace(/\.ts$/, ""), path.join(currentPath, packageName));
                 if (args.traceResolution) stderr.write("  -> " + path.join(mainDir, plainName + ".ts") + EOL);
                 break;
               } else if (!isPackageRoot) {
                 const indexName = filePath + "/index";
                 if ((sourceText = readFile(path.join(mainDir, indexName + ".ts"), baseDir)) !== null) {
-                  sourcePath = exports.libraryPrefix + packageName + "/" + indexName + ".ts";
+                  sourcePath = libraryPrefix + packageName + "/" + indexName + ".ts";
                   packageBases.set(sourcePath.replace(/\.ts$/, ""), path.join(currentPath, packageName));
                   if (args.traceResolution) stderr.write("  -> " + path.join(mainDir, indexName + ".ts") + EOL);
                   break;
@@ -453,10 +458,8 @@ exports.main = function main(argv, options, callback) {
         }
       }
     }
-
     // No such file
     if (sourceText == null) return null;
-
     return { sourceText, sourcePath };
   }
 
@@ -767,16 +770,17 @@ exports.main = function main(argv, options, callback) {
 
     // Write binary
     if (args.binaryFile != null) {
+      let basename = path.basename(args.binaryFile);
       let sourceMapURL = args.sourceMap != null
         ? args.sourceMap.length
           ? args.sourceMap
-          : path.basename(args.binaryFile) + ".map"
+          : "./" + basename + ".map"
         : null;
 
       let wasm;
       stats.emitCount++;
       stats.emitTime += measure(() => {
-        wasm = module.toBinary(sourceMapURL)
+        wasm = module.toBinary(sourceMapURL);
       });
 
       if (args.binaryFile.length) {
@@ -790,18 +794,19 @@ exports.main = function main(argv, options, callback) {
       // Post-process source map
       if (wasm.sourceMap != null) {
         if (args.binaryFile.length) {
-          let sourceMap = JSON.parse(wasm.sourceMap);
-          sourceMap.sourceRoot = exports.sourceMapRoot;
-          sourceMap.sources.forEach((name, index) => {
+          let map = JSON.parse(wasm.sourceMap);
+          map.sourceRoot = "./" + basename;
+          let contents = [];
+          map.sources.forEach((name, index) => {
             let text = assemblyscript.getSource(program, name.replace(/\.ts$/, ""));
             if (text == null) return callback(Error("Source of file '" + name + "' not found."));
-            if (!sourceMap.sourceContents) sourceMap.sourceContents = [];
-            sourceMap.sourceContents[index] = text;
+            contents[index] = text;
           });
+          map.sourcesContent = contents;
           writeFile(path.join(
             path.dirname(args.binaryFile),
             path.basename(sourceMapURL)
-          ).replace(/^\.\//, ""), JSON.stringify(sourceMap), baseDir);
+          ).replace(/^\.\//, ""), JSON.stringify(map), baseDir);
         } else {
           stderr.write("Skipped source map (stdout already occupied)" + EOL);
         }

src/tsconfig.json

@@ -3,7 +3,8 @@
   "compilerOptions": {
     "outDir": "../out",
     "allowJs": false,
-    "sourceMap": true
+    "sourceMap": true,
+    "target": "ES2016"
   },
   "include": [
     "./**/*.ts"