Convert compiler.js to JS module. NFC.

src/compiler.js → src/compiler.mjs

@@ -7,10 +7,15 @@
 
 // LLVM => JavaScript compiler, main entry point
 
-const fs = require('fs');
-globalThis.vm = require('vm');
-globalThis.assert = require('assert');
-globalThis.nodePath = require('path');
+import * as fs from 'fs';
+import * as path from 'path';
+import * as vm from 'vm';
+import * as url from 'url';
+import assert from 'assert';
+
+globalThis.vm = vm;
+globalThis.assert = assert;
+globalThis.nodePath = path;
 
 globalThis.print = (x) => {
   process.stdout.write(x + '\n');
@@ -22,9 +27,10 @@ globalThis.printErr = (x) => {
 
 function find(filename) {
   assert(filename);
-  const prefixes = [__dirname, process.cwd()];
+  const dirname = url.fileURLToPath(new URL('.', import.meta.url));
+  const prefixes = [dirname, process.cwd()];
   for (let i = 0; i < prefixes.length; ++i) {
-    const combined = nodePath.join(prefixes[i], filename);
+    const combined = path.join(prefixes[i], filename);
     if (fs.existsSync(combined)) {
       return combined;
     }
@@ -96,7 +102,7 @@ if (!STRICT) {
 // Main
 // ===============================
 
-B = new Benchmarker();
+const B = new Benchmarker();
 
 try {
   runJSify();

src/utility.js

@@ -233,7 +233,7 @@ function isPowerOfTwo(x) {
 }
 
 /** @constructor */
-function Benchmarker() {
+globalThis.Benchmarker = function() {
   const totals = {};
   const ids = [];
   const lastTime = 0;

tools/emscripten.py

@@ -190,7 +190,7 @@ def compile_javascript(symbols_only=False):
     args = [settings_file]
     if symbols_only:
       args += ['--symbols-only']
-    out = shared.run_js_tool(path_from_root('src/compiler.js'),
+    out = shared.run_js_tool(path_from_root('src/compiler.mjs'),
                              args, stdout=subprocess.PIPE, stderr=stderr_file,
                              cwd=path_from_root('src'), env=env, encoding='utf-8')
   if symbols_only:

tools/link.py

@@ -241,7 +241,7 @@ def generate_js_sym_info():
   # mode of the js compiler that would generate a list of all possible symbols
   # that could be checked in.
   _, forwarded_data = emscripten.compile_javascript(symbols_only=True)
-  # When running in symbols_only mode compiler.js outputs a flat list of C symbols.
+  # When running in symbols_only mode compiler.mjs outputs a flat list of C symbols.
   return json.loads(forwarded_data)
 
 

tools/maint/gen_sig_info.py

@@ -314,7 +314,7 @@ def extract_sig_info(sig_info, extra_settings=None, extra_cflags=None, cxx=False
     settings.update(extra_settings)
   with tempfiles.get_file('.json') as settings_json:
     utils.write_file(settings_json, json.dumps(settings))
-    output = shared.run_js_tool(utils.path_from_root('src/compiler.js'),
+    output = shared.run_js_tool(utils.path_from_root('src/compiler.mjs'),
                                 ['--symbols-only', settings_json],
                                 stdout=subprocess.PIPE, cwd=utils.path_from_root())
   symbols = json.loads(output)['deps'].keys()

tools/toolchain_profiler.results_template.html

@@ -217,7 +217,7 @@
         ret.concat([out]);
     }
     return ret;
-  } else if (startsWith(basename, 'compiler.js')) {
+  } else if (startsWith(basename, 'compiler.mjs')) {
     var posParams = findPositionalParams(cmdLine, []);
     var interestingParams = [];
     for(var i = 1; i < posParams.length; ++i) {