Use parseArgs in JS entry points. NFC (#23520)

Author: sbc100

.circleci/config.yml

@@ -755,9 +755,9 @@ jobs:
       # version.
       # Keep this in sync with MINIMUM_NODE_VERSION in tools/shared.py.
       - install-node-version:
-          node_version: "18.0.0"
+          node_version: "18.3.0"
       - run:
-          name: configure compiler to use 18.0.0
+          name: configure compiler to use 18.3.0
           command: echo "NODE_JS = '$(which node)'" >> ~/emsdk/.emscripten
       - install-node-canary
       - run-tests:

ChangeLog.md

@@ -35,7 +35,7 @@ See docs/process.md for more on how version tagging works.
 4.0.1 - 01/17/25
 ----------------
 - The minimum version of node required to run emscripten was bumped from v16.20
-  to v18.  Version 4.0 was mistakenly shipped with a change that required v20,
+  to v18.3.  Version 4.0 was mistakenly shipped with a change that required v20,
   but that was reverted. (#23410)
 - `emscripten_webgl_create_context` now displays a warning message when there is
   a conflict between the `majorVersion` requested and the WebGL support defined

src/compiler.mjs

@@ -5,32 +5,36 @@
  * SPDX-License-Identifier: MIT
  */
 
-// LLVM => JavaScript compiler, main entry point
+// JavaScript compiler, main entry point
 
-import {
-  Benchmarker,
-  applySettings,
-  assert,
-  loadDefaultSettings,
-  printErr,
-  read,
-} from './utility.mjs';
+import {Benchmarker, applySettings, loadDefaultSettings, printErr, read} from './utility.mjs';
+
+import assert from 'node:assert';
+import {parseArgs} from 'node:util';
 
 loadDefaultSettings();
 
-const argv = process.argv.slice(2);
-const symbolsOnlyArg = argv.indexOf('--symbols-only');
-if (symbolsOnlyArg != -1) {
-  argv.splice(symbolsOnlyArg, 1);
+const options = {
+  help: {type: 'boolean', short: 'h'},
+  'symbols-only': {type: 'boolean'},
+};
+const {values, positionals} = parseArgs({options, allowPositionals: true});
+
+if (values.help) {
+  console.log(`\
+Main entry point for JS compiler
+
+Usage: compiler.mjs <settings.json> [-o out.js] [--symbols-only]`);
+  process.exit(0);
 }
 
 // Load settings from JSON passed on the command line
-const settingsFile = argv[0];
-assert(settingsFile);
+const settingsFile = positionals[0];
+assert(settingsFile, 'settings file not specified');
 const user_settings = JSON.parse(read(settingsFile));
 applySettings(user_settings);
 
-export const symbolsOnly = symbolsOnlyArg != -1;
+export const symbolsOnly = values['symbols-only'];
 
 // In case compiler.mjs is run directly (as in gen_sig_info)
 // ALL_INCOMING_MODULE_JS_API might not be populated yet.

src/jsifier.mjs

@@ -7,6 +7,7 @@
 // Convert analyzed data to javascript. Everything has already been calculated
 // before this stage, which just does the final conversion to JavaScript.
 
+import assert from 'node:assert';
 import {
   ATEXITS,
   ATINITS,
@@ -21,7 +22,6 @@ import {
 } from './parseTools.mjs';
 import {
   addToCompileTimeContext,
-  assert,
   error,
   errorOccured,
   isDecorator,

src/modules.mjs

@@ -7,10 +7,10 @@
 import * as path from 'node:path';
 import * as fs from 'node:fs';
 import {fileURLToPath} from 'node:url';
+import assert from 'node:assert';
 
 import {
   isDecorator,
-  assert,
   isJsOnlySymbol,
   error,
   read,

src/parseTools.mjs

@@ -10,10 +10,10 @@
 
 import * as path from 'node:path';
 import {existsSync} from 'node:fs';
+import assert from 'node:assert';
 
 import {
   addToCompileTimeContext,
-  assert,
   error,
   printErr,
   read,

src/utility.mjs

@@ -13,8 +13,6 @@ import * as fs from 'node:fs';
 import * as vm from 'node:vm';
 import assert from 'node:assert';
 
-export {assert};
-
 export function safeQuote(x) {
   return x.replace(/"/g, '\\"').replace(/'/g, "\\'");
 }

test/test_sanity.py

@@ -287,8 +287,8 @@ def test_node(self):
                              ('v4.1.0', False),
                              ('v10.18.0', False),
                              ('v16.20.0', False),
-                             ('v18.0.0', True),
-                             ('v18.0.1-pre', True),
+                             ('v18.3.0', True),
+                             ('v18.3.1-pre', True),
                              ('cheez', False)):
       print(version, succeed)
       delete_file(SANITY_FILE)

tools/preprocessor.mjs

@@ -12,16 +12,28 @@
 //                   file with modified settings and supply the filename here.
 //    input file     This is the file that will be processed by the preprocessor
 
-import assert from 'assert';
+import assert from 'node:assert';
+import {parseArgs} from 'node:util';
 
 import {loadSettingsFile} from '../src/utility.mjs';
 
-const args = process.argv.slice(2);
+const options = {
+  'expand-macros': {type: 'boolean'},
+  help: {type: 'boolean', short: 'h'},
+};
+const {values, positionals} = parseArgs({options, allowPositionals: true});
 
-assert(args.length >= 2, 'Script requires 2 arguments');
-const settingsFile = args[0];
-const inputFile = args[1];
-const expandMacros = args.includes('--expandMacros');
+if (values.help) {
+  console.log(`\
+Run JS preprocessor / macro processor on an input file
+
+Usage: preprocessor.mjs <settings.json> <input-file> [--expand-macros]`);
+  process.exit(0);
+}
+
+assert(positionals.length == 2, 'Script requires 2 arguments');
+const settingsFile = positionals[0];
+const inputFile = positionals[1];
 
 loadSettingsFile(settingsFile);
 
@@ -32,7 +44,7 @@ const parseTools = await import('../src/parseTools.mjs');
 await import('../src/modules.mjs');
 
 let output = parseTools.preprocess(inputFile);
-if (expandMacros) {
+if (values['expand-macros']) {
   output = parseTools.processMacros(output, inputFile);
 }
 process.stdout.write(output);

tools/shared.py

@@ -57,8 +57,9 @@
 # distinct from the minimum version required to execute the generated code
 # (settings.MIN_NODE_VERSION).
 # This is currently set to v18 since this is the version of node available
-# in debian/stable (bookworm).
-MINIMUM_NODE_VERSION = (18, 0, 0)
+# in debian/stable (bookworm).  We need at least v18.3.0 because we make
+# use of util.parseArg which was added in v18.3.0.
+MINIMUM_NODE_VERSION = (18, 3, 0)
 EXPECTED_LLVM_VERSION = 21
 
 # These get set by setup_temp_dirs
@@ -741,7 +742,7 @@ def read_and_preprocess(filename, expand_macros=False):
   stdout = os.path.join(temp_dir, 'stdout')
   args = [settings_file, filename]
   if expand_macros:
-    args += ['--expandMacros']
+    args += ['--expand-macros']
 
   run_js_tool(path_from_root('tools/preprocessor.mjs'), args, stdout=open(stdout, 'w'), cwd=dirname)
   out = utils.read_file(stdout)