feat: allow JSON in BOXEDNODE_{CONFIGURE,MAKE}_ARGS (#27)

In mongosh, we introduced `NODE_JS_CONFIGURE_ARGS` (not
remembering that boxednode already provides this capability).
We should just use a single consistent env var throughout
the build process.

This adds JSON array support for these environment variables
for cases in which the list items themselves contain commas,
and, as a drive-by fix, avoids mutating the input options
argument.

Author: addaleax

.github/workflows/nodejs.yml

@@ -18,6 +18,8 @@ jobs:
         with:
           check-latest: true
           node-version: ${{ matrix.node-version }}
+      - name: Install [email protected]
+        run: npm install -g [email protected]
       - name: Install Dependencies
         run: npm install
       - name: Test
@@ -40,6 +42,8 @@ jobs:
         with:
           check-latest: true
           node-version: ${{ matrix.node-version }}
+      - name: Install [email protected]
+        run: npm install -g [email protected]
       - name: Install Dependencies
         run: npm install
       - name: Sharded tests

package.json

@@ -52,7 +52,7 @@
     "gen-esm-wrapper": "^1.1.0",
     "mocha": "^8.1.3",
     "nyc": "^15.1.0",
-    "ts-node": "^9.0.0",
+    "ts-node": "^10.8.1",
     "typescript": "^4.0.3",
     "weak-napi": "2.0.2"
   },

src/index.ts

@@ -336,21 +336,32 @@ async function compileJSFileAsBinaryImpl (options: CompilationOptions, logger: L
   }
 }
 
-export async function compileJSFileAsBinary (options: CompilationOptions): Promise<void> {
+// Allow specifying arguments to make/configure/vcbuild through env vars,
+// either as a comma-separated list or as a JSON array
+function parseEnvVarArgList (value: string | undefined): string[] {
+  if (!value) return [];
+  try {
+    return JSON.parse(value);
+  } catch {
+    return value.split(',');
+  }
+}
+
+export async function compileJSFileAsBinary (options: Readonly<CompilationOptions>): Promise<void> {
   const logger = options.logger || new LoggerImpl();
 
-  options.configureArgs = options.configureArgs || [];
-  if (process.env.BOXEDNODE_CONFIGURE_ARGS) {
-    options.configureArgs.push(...process.env.BOXEDNODE_CONFIGURE_ARGS.split(','));
-  }
+  const configureArgs = [...(options.configureArgs || [])];
+  configureArgs.push(...parseEnvVarArgList(process.env.BOXEDNODE_CONFIGURE_ARGS));
 
-  options.makeArgs = options.makeArgs || [];
-  if (process.env.BOXEDNODE_MAKE_ARGS) {
-    options.makeArgs.push(...process.env.BOXEDNODE_MAKE_ARGS.split(','));
-  }
+  const makeArgs = [...(options.makeArgs || [])];
+  makeArgs.push(...parseEnvVarArgList(process.env.BOXEDNODE_MAKE_ARGS));
 
   try {
-    await compileJSFileAsBinaryImpl(options, logger);
+    await compileJSFileAsBinaryImpl({
+      ...options,
+      configureArgs,
+      makeArgs
+    }, logger);
   } catch (err) {
     logger.stepFailed(err);
     throw err;