From a506aa13945b7a7e0ffa3a9be8b882a3bcd38232 Mon Sep 17 00:00:00 2001
From: dcode <dcode@dcode.io>
Date: Thu, 14 May 2020 22:31:08 +0200
Subject: [PATCH] Rename asmjsFile to jsFile

---
 cli/asc.d.ts |  4 ++--
 cli/asc.js   | 20 ++++++++++----------
 cli/asc.json |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/cli/asc.d.ts b/cli/asc.d.ts
index b80289b41f..324de7b9b8 100644
--- a/cli/asc.d.ts
+++ b/cli/asc.d.ts
@@ -77,8 +77,8 @@ interface CompilerOptions {
   binaryFile?: string;
   /** Specifies the text output file (.wat). */
   textFile?: string;
-  /** Specifies the asm.js output file (.js). */
-  asmjsFile?: string;
+  /** Specifies the JavaScript (via wasm2js) output file (.js). */
+  jsFile?: string;
   /** Specifies the WebIDL output file (.webidl). */
   idlFile?: string;
   /** Specifies the TypeScript definition output file (.d.ts). */
diff --git a/cli/asc.js b/cli/asc.js
index c2a05417bb..94cbf25807 100644
--- a/cli/asc.js
+++ b/cli/asc.js
@@ -714,8 +714,8 @@ exports.main = function main(argv, options, callback) {
     if (args.outFile != null) {
       if (/\.was?t$/.test(args.outFile) && args.textFile == null) {
         args.textFile = args.outFile;
-      } else if (/\.js$/.test(args.outFile) && args.asmjsFile == null) {
-        args.asmjsFile = args.outFile;
+      } else if (/\.js$/.test(args.outFile) && args.jsFile == null) {
+        args.jsFile = args.outFile;
       } else if (args.binaryFile == null) {
         args.binaryFile = args.outFile;
       }
@@ -766,21 +766,21 @@ exports.main = function main(argv, options, callback) {
       }
     }
 
-    // Write asm.js
-    if (args.asmjsFile != null) {
-      let asm;
-      if (args.asmjsFile.length) {
+    // Write JS
+    if (args.jsFile != null) {
+      let js;
+      if (args.jsFile.length) {
         stats.emitCount++;
         stats.emitTime += measure(() => {
-          asm = module.toAsmjs();
+          js = module.toAsmjs();
         });
-        writeFile(args.asmjsFile, asm, baseDir);
+        writeFile(args.jsFile, js, baseDir);
       } else if (!hasStdout) {
         stats.emitCount++;
         stats.emitTime += measure(() => {
-          asm = module.toAsmjs();
+          js = module.toAsmjs();
         });
-        writeStdout(asm);
+        writeStdout(js);
         hasStdout = true;
       }
       hasOutput = true;
diff --git a/cli/asc.json b/cli/asc.json
index c85fc47da9..6b1cce300a 100644
--- a/cli/asc.json
+++ b/cli/asc.json
@@ -88,11 +88,11 @@
     "type": "s",
     "alias": "t"
   },
-  "asmjsFile": {
+  "jsFile": {
     "category": "Output",
-    "description": "Specifies the asm.js output file (.js).",
+    "description": "Specifies the JavaScript (via wasm2js) output file (.js).",
     "type": "s",
-    "alias": "a"
+    "alias": "j"
   },
   "idlFile": {
     "category": "Output",