From 4b10080eb89062a4f4da09aad799f3e914b39236 Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Fri, 17 Sep 2021 12:36:22 +0200
Subject: [PATCH] Improve naming around ambiguous items

---
 mochify/index.js              |  6 +++---
 mochify/lib/resolve-bundle.js | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/mochify/index.js b/mochify/index.js
index cf4926da..1959fc79 100644
--- a/mochify/index.js
+++ b/mochify/index.js
@@ -24,7 +24,7 @@ async function mochify(options = {}) {
   const mocha_runner = createMochaRunner(config.reporter || 'spec');
   const { mochifyDriver } = resolveMochifyDriver(config.driver);
 
-  const [mocha, client, files] = await Promise.all([
+  const [mocha, client, resolved_spec] = await Promise.all([
     readFile(require.resolve('mocha/mocha.js'), 'utf8'),
     readFile(require.resolve('./client'), 'utf8'),
     resolveSpec(config.spec)
@@ -36,7 +36,7 @@ async function mochify(options = {}) {
   let server = null;
   if (config.serve || config.esm) {
     const _scripts = [mocha, configured_client];
-    const _modules = config.esm ? files : [];
+    const _modules = config.esm ? resolved_spec : [];
     server = await startServer(
       config.serve || process.cwd(),
       Object.assign({ _scripts, _modules }, config.server_options)
@@ -47,7 +47,7 @@ async function mochify(options = {}) {
   const driver_promise = mochifyDriver(driver_options);
   const bundler_promise = config.esm
     ? Promise.resolve('')
-    : resolveBundle(config.bundle, files);
+    : resolveBundle(config.bundle, resolved_spec);
 
   let driver, bundle;
   try {
diff --git a/mochify/lib/resolve-bundle.js b/mochify/lib/resolve-bundle.js
index d8767771..7f01ec4d 100644
--- a/mochify/lib/resolve-bundle.js
+++ b/mochify/lib/resolve-bundle.js
@@ -6,18 +6,21 @@ const { parseArgsStringToArgv } = require('string-argv');
 
 exports.resolveBundle = resolveBundle;
 
-async function resolveBundle(command, files) {
-  if (typeof files === 'object' && typeof files.pipe === 'function') {
-    return bufferStream(files);
+async function resolveBundle(command, resolved_spec) {
+  if (
+    typeof resolved_spec === 'object' &&
+    typeof resolved_spec.pipe === 'function'
+  ) {
+    return bufferStream(resolved_spec);
   }
 
   if (!command) {
-    return concatFiles(files);
+    return concatFiles(resolved_spec);
   }
 
   const [cmd, ...args] = parseArgsStringToArgv(command);
 
-  const result = await execa(cmd, args.concat(files), {
+  const result = await execa(cmd, args.concat(resolved_spec), {
     preferLocal: true
   });
 
@@ -35,9 +38,9 @@ async function concatFiles(files) {
 
 function bufferStream(stream) {
   return new Promise((resolve, reject) => {
-    const bs = [];
-    stream.on('data', (chunk) => bs.push(chunk));
+    const buffers = [];
+    stream.on('data', (chunk) => buffers.push(chunk));
     stream.on('error', (err) => reject(err));
-    stream.on('end', () => resolve(Buffer.concat(bs).toString()));
+    stream.on('end', () => resolve(Buffer.concat(buffers).toString('utf8')));
   });
 }