@knighted/duel 1.0.7 → 2.0.0-rc.0

package/README.md

@@ -10,11 +10,12 @@ Tool for building a Node.js [dual package](https://nodejs.org/api/packages.html#
 
 - Bidirectional ESM ↔️ CJS dual builds inferred from the package.json `type`.
 - Correctly preserves module systems for `.mts` and `.cts` file extensions.
+- Resolves the [differences between ES modules and CommonJS](https://nodejs.org/api/esm.html#differences-between-es-modules-and-commonjs).
 - Use only one package.json and tsconfig.json.
 
 ## Requirements
 
-- Node >= 16.19.0.
+- Node >= 20.11.0
 
 ## Example
 
@@ -67,18 +68,6 @@ If you prefer to have both builds in directories inside of your defined `outDir`
 
 Assuming an `outDir` of `dist`, running the above will create `dist/esm` and `dist/cjs` directories.
 
-### Parallel builds
-
-This is experimental, as your mileage may vary based on the size of your `node_modules` directory.
-
-```json
-"scripts": {
-  "build": "duel --parallel"
-}
-```
-
-You _might_ reduce your build times, but only if your project has minimal dependencies. This requires first copying your project to a parent directory of `--project` if it exists as a writable folder. Common [gitignored directories for Node.js projects](https://github.com/github/gitignore/blob/main/Node.gitignore) are not copied, with the exception of `node_modules`. See the [notes](#notes) as to why this can't be improved much further. In most cases, you're better off with serial builds.
-
 ## Options
 
 The available options are limited, because you should define most of them inside your project's `tsconfig.json` file.
@@ -86,7 +75,6 @@ The available options are limited, because you should define most of them inside
 - `--project, -p` The path to the project's configuration file. Defaults to `tsconfig.json`.
 - `--pkg-dir, -k` The directory to start looking for a package.json file. Defaults to the cwd.
 - `--dirs, -d` Outputs both builds to directories inside of `outDir`. Defaults to `false`.
-- `--parallel, -l` Run the builds in parallel. Defaults to `false`.
 
 You can run `duel --help` to get the same info. Below is the output of that:
 
@@ -97,7 +85,6 @@ Options:
 --project, -p [path] 	 Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.
 --pkg-dir, -k [path] 	 The directory to start looking for a package.json file. Defaults to cwd.
 --dirs, -d 		 Output both builds to directories inside of outDir. [esm, cjs].
---parallel, -l 		 Run the builds in parallel.
 --help, -h 		 Print this message.
 ```
 
@@ -115,5 +102,4 @@ These are definitely edge cases, and would only really come up if your project m
 
 ## Notes
 
-As far as I can tell, `duel` is one (if not the only) way to get a correct dual package build using `tsc` with only **one package.json and tsconfig.json file**, _and also preserving module system by file extension_. Basically, how you expect things to work. The Microsoft backed TypeScript team [keep](https://github.com/microsoft/TypeScript/pull/54546) [talking](https://github.com/microsoft/TypeScript/issues/54593) about dual build support, but their philosophy is mainly one of self-preservation, rather than collaboration. For instance, they continue to [refuse to rewrite specifiers](https://github.com/microsoft/TypeScript/issues/16577). The downside of their decisions, and the fact that `npm` does not support using alternative names for the package.json file, is that `duel` must copy your project
-directory before attempting to run the builds in parallel.
+As far as I can tell, `duel` is one (if not the only) way to get a correct dual package build using `tsc` with only **one package.json and tsconfig.json file**, _while also preserving module system by file extension_. Basically, how you expect things to work. The Microsoft backed TypeScript team [keep](https://github.com/microsoft/TypeScript/pull/54546) [talking](https://github.com/microsoft/TypeScript/issues/54593) about dual build support, but they continue to [refuse to rewrite specifiers](https://github.com/microsoft/TypeScript/issues/16577).

package/dist/cjs/duel.cjs

@@ -11,29 +11,9 @@ const node_perf_hooks_1 = require("node:perf_hooks");
 const glob_1 = require("glob");
 const find_up_1 = require("find-up");
 const specifier_1 = require("@knighted/specifier");
+const module_1 = require("@knighted/module");
 const init_js_1 = require("./init.cjs");
 const util_js_1 = require("./util.cjs");
-const tsc = await (0, find_up_1.findUp)(async (dir) => {
-    const tscBin = (0, node_path_1.join)(dir, 'node_modules', '.bin', 'tsc');
-    if (await (0, find_up_1.pathExists)(tscBin)) {
-        return tscBin;
-    }
-});
-const runBuild = (project, outDir) => {
-    return new Promise((resolve, reject) => {
-        const args = outDir ? ['-p', project, '--outDir', outDir] : ['-p', project];
-        const build = (0, node_child_process_1.spawn)(tsc, args, { stdio: 'inherit' });
-        build.on('error', err => {
-            reject(new Error(`Failed to compile: ${err.message}`));
-        });
-        build.on('exit', code => {
-            if (code > 0) {
-                return reject(new Error(code));
-            }
-            resolve(code);
-        });
-    });
-};
 const handleErrorAndExit = message => {
     const exitCode = Number(message);
     if (isNaN(exitCode)) {
@@ -48,7 +28,28 @@ const handleErrorAndExit = message => {
 const duel = async (args) => {
     const ctx = await (0, init_js_1.init)(args);
     if (ctx) {
-        const { projectDir, tsconfig, configPath, parallel, dirs, pkg } = ctx;
+        const { projectDir, tsconfig, configPath, dirs, pkg } = ctx;
+        const tsc = await (0, find_up_1.findUp)(async (dir) => {
+            const tscBin = (0, node_path_1.join)(dir, 'node_modules', '.bin', 'tsc');
+            if (await (0, find_up_1.pathExists)(tscBin)) {
+                return tscBin;
+            }
+        }, { cwd: projectDir });
+        const runBuild = (project, outDir) => {
+            return new Promise((resolve, reject) => {
+                const args = outDir ? ['-p', project, '--outDir', outDir] : ['-p', project];
+                const build = (0, node_child_process_1.spawn)(tsc, args, { stdio: 'inherit' });
+                build.on('error', err => {
+                    reject(new Error(`Failed to compile: ${err.message}`));
+                });
+                build.on('exit', code => {
+                    if (code > 0) {
+                        return reject(new Error(code));
+                    }
+                    resolve(code);
+                });
+            });
+        };
         const pkgDir = (0, node_path_1.dirname)(pkg.path);
         const outDir = tsconfig.compilerOptions?.outDir ?? 'dist';
         const absoluteOutDir = (0, node_path_1.resolve)(projectDir, outDir);
@@ -97,133 +98,77 @@ const duel = async (args) => {
         const logSuccess = start => {
             (0, util_js_1.log)(`Successfully created a dual ${isCjsBuild ? 'CJS' : 'ESM'} build in ${Math.round(node_perf_hooks_1.performance.now() - start)}ms.`);
         };
-        if (parallel) {
-            const paraName = `_${hex}_`;
-            const paraParent = (0, node_path_1.join)(projectDir, '..');
-            const paraTempDir = (0, node_path_1.join)(paraParent, paraName);
-            let isDirWritable = true;
-            try {
-                const stats = await (0, promises_1.stat)(paraParent);
-                if (stats.isDirectory()) {
-                    await (0, promises_1.access)(paraParent, promises_1.constants.W_OK);
-                }
-                else {
-                    isDirWritable = false;
-                }
-            }
-            catch {
-                isDirWritable = false;
-            }
-            if (!isDirWritable) {
-                (0, util_js_1.logError)('No writable directory to prepare parallel builds. Exiting.');
-                return;
-            }
-            (0, util_js_1.log)('Preparing parallel build...');
-            const prepStart = node_perf_hooks_1.performance.now();
-            await (0, promises_1.cp)(projectDir, paraTempDir, {
-                recursive: true,
-                /**
-                 * Ignore common .gitignored directories in Node.js projects.
-                 * Except node_modules.
-                 *
-                 * @see https://github.com/github/gitignore/blob/main/Node.gitignore
-                 */
-                filter: src => !/logs|pids|lib-cov|coverage|bower_components|build|dist|jspm_packages|web_modules|out|\.next|\.tsbuildinfo|\.npm|\.node_repl_history|\.tgz|\.yarn|\.pnp|\.nyc_output|\.grunt|\.DS_Store/i.test(src),
-            });
-            const dualConfigPath = (0, node_path_1.join)(paraTempDir, 'tsconfig.json');
-            const absoluteDualOutDir = (0, node_path_1.join)(paraTempDir, isCjsBuild ? (0, node_path_1.join)(outDir, 'cjs') : (0, node_path_1.join)(outDir, 'esm'));
+        (0, util_js_1.log)('Starting primary build...');
+        let success = false;
+        const startTime = node_perf_hooks_1.performance.now();
+        try {
+            await runPrimaryBuild();
+            success = true;
+        }
+        catch ({ message }) {
+            handleErrorAndExit(message);
+        }
+        if (success) {
+            const compileFiles = (0, util_js_1.getCompileFiles)(tsc, projectDir);
+            const subDir = (0, node_path_1.join)(projectDir, `_${hex}_`);
+            const dualConfigPath = (0, node_path_1.join)(subDir, `tsconfig.${hex}.json`);
+            const absoluteDualOutDir = (0, node_path_1.join)(projectDir, isCjsBuild ? (0, node_path_1.join)(outDir, 'cjs') : (0, node_path_1.join)(outDir, 'esm'));
             const tsconfigDual = getOverrideTsConfig();
-            await (0, promises_1.writeFile)(dualConfigPath, JSON.stringify(tsconfigDual));
-            await (0, promises_1.writeFile)((0, node_path_1.join)(paraTempDir, 'package.json'), JSON.stringify({
+            const pkgRename = 'package.json.bak';
+            let errorMsg = '';
+            // Copy project directory as a subdirectory
+            await (0, promises_1.mkdir)(subDir);
+            await Promise.all(compileFiles.map(file => (0, promises_1.cp)(file, (0, node_path_1.resolve)(subDir, (0, node_path_1.relative)(projectDir, file)))));
+            /**
+             * Create a new package.json with updated `type` field.
+             * Create a new tsconfig.json.
+             */
+            await (0, promises_1.rename)(pkg.path, (0, node_path_1.join)(pkgDir, pkgRename));
+            await (0, promises_1.writeFile)(pkg.path, JSON.stringify({
                 type: isCjsBuild ? 'commonjs' : 'module',
             }));
-            (0, util_js_1.log)(`Prepared in ${Math.round(node_perf_hooks_1.performance.now() - prepStart)}ms.`);
-            (0, util_js_1.log)('Starting parallel dual builds...');
-            let success = false;
-            const startTime = node_perf_hooks_1.performance.now();
+            await (0, promises_1.writeFile)(dualConfigPath, JSON.stringify(tsconfigDual));
+            /**
+             * Transform ambiguous modules for the target dual build.
+             * @see https://github.com/microsoft/TypeScript/issues/58658
+             */
+            const toTransform = await (0, glob_1.glob)(`${subDir}/**/*{.js,.jsx,.ts,.tsx}`, {
+                ignore: 'node_modules/**',
+            });
+            for (const file of toTransform) {
+                await (0, module_1.transform)(file, { out: file, type: isCjsBuild ? 'commonjs' : 'module' });
+            }
+            // Build dual
+            (0, util_js_1.log)('Starting dual build...');
             try {
-                await Promise.all([
-                    runPrimaryBuild(),
-                    runBuild(dualConfigPath, absoluteDualOutDir),
-                ]);
-                success = true;
+                await runBuild(dualConfigPath, absoluteDualOutDir);
             }
             catch ({ message }) {
-                handleErrorAndExit(message);
+                success = false;
+                errorMsg = message;
+            }
+            finally {
+                // Cleanup and restore
+                await (0, promises_1.rm)(dualConfigPath, { force: true });
+                await (0, promises_1.rm)(pkg.path, { force: true });
+                await (0, promises_1.rm)(subDir, { force: true, recursive: true });
+                await (0, promises_1.rename)((0, node_path_1.join)(pkgDir, pkgRename), pkg.path);
+                if (errorMsg) {
+                    handleErrorAndExit(errorMsg);
+                }
             }
             if (success) {
                 const filenames = await (0, glob_1.glob)(`${absoluteDualOutDir}/**/*{.js,.d.ts}`, {
                     ignore: 'node_modules/**',
                 });
                 await updateSpecifiersAndFileExtensions(filenames);
-                // Copy over and cleanup
-                await (0, promises_1.cp)(absoluteDualOutDir, (0, node_path_1.join)(absoluteOutDir, isCjsBuild ? 'cjs' : 'esm'), {
-                    recursive: true,
-                });
-                await (0, promises_1.rm)(paraTempDir, { force: true, recursive: true });
                 logSuccess(startTime);
             }
         }
-        else {
-            (0, util_js_1.log)('Starting primary build...');
-            let success = false;
-            const startTime = node_perf_hooks_1.performance.now();
-            try {
-                await runPrimaryBuild();
-                success = true;
-            }
-            catch ({ message }) {
-                handleErrorAndExit(message);
-            }
-            if (success) {
-                const dualConfigPath = (0, node_path_1.join)(projectDir, `tsconfig.${hex}.json`);
-                const absoluteDualOutDir = (0, node_path_1.join)(projectDir, isCjsBuild ? (0, node_path_1.join)(outDir, 'cjs') : (0, node_path_1.join)(outDir, 'esm'));
-                const tsconfigDual = getOverrideTsConfig();
-                const pkgRename = 'package.json.bak';
-                let errorMsg = '';
-                /**
-                 * Create a new package.json with updated `type` field.
-                 * Create a new tsconfig.json.
-                 *
-                 * The need to create a new package.json makes doing
-                 * the builds in parallel difficult.
-                 */
-                await (0, promises_1.rename)(pkg.path, (0, node_path_1.join)(pkgDir, pkgRename));
-                await (0, promises_1.writeFile)(pkg.path, JSON.stringify({
-                    type: isCjsBuild ? 'commonjs' : 'module',
-                }));
-                await (0, promises_1.writeFile)(dualConfigPath, JSON.stringify(tsconfigDual));
-                // Build dual
-                (0, util_js_1.log)('Starting dual build...');
-                try {
-                    await runBuild(dualConfigPath, absoluteDualOutDir);
-                }
-                catch ({ message }) {
-                    success = false;
-                    errorMsg = message;
-                }
-                finally {
-                    // Cleanup and restore
-                    await (0, promises_1.rm)(dualConfigPath, { force: true });
-                    await (0, promises_1.rm)(pkg.path, { force: true });
-                    await (0, promises_1.rename)((0, node_path_1.join)(pkgDir, pkgRename), pkg.path);
-                    if (errorMsg) {
-                        handleErrorAndExit(errorMsg);
-                    }
-                }
-                if (success) {
-                    const filenames = await (0, glob_1.glob)(`${absoluteDualOutDir}/**/*{.js,.d.ts}`, {
-                        ignore: 'node_modules/**',
-                    });
-                    await updateSpecifiersAndFileExtensions(filenames);
-                    logSuccess(startTime);
-                }
-            }
-        }
     }
 };
 exports.duel = duel;
 const realFileUrlArgv1 = await (0, util_js_1.getRealPathAsFileUrl)(node_process_1.argv[1]);
-if (import.meta.url === realFileUrlArgv1) {
+if (require("node:url").pathToFileURL(__filename).toString() === realFileUrlArgv1) {
     await duel();
 }

package/dist/cjs/init.cjs

@@ -32,11 +32,6 @@ const init = async (args) => {
                     short: 'k',
                     default: (0, node_process_1.cwd)(),
                 },
-                parallel: {
-                    type: 'boolean',
-                    short: 'l',
-                    default: false,
-                },
                 dirs: {
                     type: 'boolean',
                     short: 'd',
@@ -61,11 +56,10 @@ const init = async (args) => {
         (0, util_js_1.log)("--project, -p [path] \t Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.");
         (0, util_js_1.log)('--pkg-dir, -k [path] \t The directory to start looking for a package.json file. Defaults to cwd.');
         (0, util_js_1.log)('--dirs, -d \t\t Output both builds to directories inside of outDir. [esm, cjs].');
-        (0, util_js_1.log)('--parallel, -l \t\t Run the builds in parallel.');
         (0, util_js_1.log)('--help, -h \t\t Print this message.');
     }
     else {
-        const { project, 'target-extension': targetExt, 'pkg-dir': pkgDir, parallel, dirs, } = parsed;
+        const { project, 'target-extension': targetExt, 'pkg-dir': pkgDir, dirs } = parsed;
         let configPath = (0, node_path_1.resolve)(project);
         let stats = null;
         let pkg = null;
@@ -114,7 +108,6 @@ const init = async (args) => {
             return {
                 pkg,
                 dirs,
-                parallel,
                 tsconfig,
                 projectDir,
                 configPath,

package/dist/cjs/{init.d.ts → init.d.cts}

@@ -1,7 +1,6 @@
 export function init(args: any): Promise<false | {
     pkg: import("read-package-up", { with: { "resolution-mode": "import" } }).NormalizedReadResult;
     dirs: boolean | undefined;
-    parallel: boolean | undefined;
     tsconfig: any;
     projectDir: string;
     configPath: string;

package/dist/cjs/util.cjs

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRealPathAsFileUrl = exports.logError = exports.log = void 0;
+exports.getCompileFiles = exports.getRealPathAsFileUrl = exports.logError = exports.log = void 0;
 const node_url_1 = require("node:url");
 const promises_1 = require("node:fs/promises");
+const node_child_process_1 = require("node:child_process");
+const node_process_1 = require("node:process");
 const log = (color = '\x1b[30m', msg = '') => {
     // eslint-disable-next-line no-console
     console.log(`${color}%s\x1b[0m`, msg);
@@ -16,3 +18,12 @@ const getRealPathAsFileUrl = async (path) => {
     return asFileUrl;
 };
 exports.getRealPathAsFileUrl = getRealPathAsFileUrl;
+const getCompileFiles = (tscBinPath, wd = (0, node_process_1.cwd)()) => {
+    const { stdout } = (0, node_child_process_1.spawnSync)(tscBinPath, ['--listFilesOnly'], { cwd: wd });
+    // Exclude node_modules and empty strings.
+    return stdout
+        .toString()
+        .split('\n')
+        .filter(path => !/node_modules|^$/.test(path));
+};
+exports.getCompileFiles = getCompileFiles;

package/dist/cjs/util.d.cts

@@ -1,3 +1,4 @@
 export function log(color?: string, msg?: string): void;
 export const logError: (msg?: string | undefined) => void;
 export function getRealPathAsFileUrl(path: any): Promise<string>;
+export function getCompileFiles(tscBinPath: any, wd?: string): string[];

package/dist/esm/duel.js

@@ -1,36 +1,16 @@
 #!/usr/bin/env node
 import { argv } from 'node:process';
-import { join, dirname, resolve } from 'node:path';
+import { join, dirname, resolve, relative } from 'node:path';
 import { spawn } from 'node:child_process';
-import { writeFile, rm, cp, rename, stat, access, constants } from 'node:fs/promises';
+import { writeFile, rm, rename, cp, mkdir } from 'node:fs/promises';
 import { randomBytes } from 'node:crypto';
 import { performance } from 'node:perf_hooks';
 import { glob } from 'glob';
 import { findUp, pathExists } from 'find-up';
 import { specifier } from '@knighted/specifier';
+import { transform } from '@knighted/module';
 import { init } from './init.js';
-import { getRealPathAsFileUrl, logError, log } from './util.js';
-const tsc = await findUp(async (dir) => {
-    const tscBin = join(dir, 'node_modules', '.bin', 'tsc');
-    if (await pathExists(tscBin)) {
-        return tscBin;
-    }
-});
-const runBuild = (project, outDir) => {
-    return new Promise((resolve, reject) => {
-        const args = outDir ? ['-p', project, '--outDir', outDir] : ['-p', project];
-        const build = spawn(tsc, args, { stdio: 'inherit' });
-        build.on('error', err => {
-            reject(new Error(`Failed to compile: ${err.message}`));
-        });
-        build.on('exit', code => {
-            if (code > 0) {
-                return reject(new Error(code));
-            }
-            resolve(code);
-        });
-    });
-};
+import { getRealPathAsFileUrl, getCompileFiles, logError, log } from './util.js';
 const handleErrorAndExit = message => {
     const exitCode = Number(message);
     if (isNaN(exitCode)) {
@@ -45,7 +25,28 @@ const handleErrorAndExit = message => {
 const duel = async (args) => {
     const ctx = await init(args);
     if (ctx) {
-        const { projectDir, tsconfig, configPath, parallel, dirs, pkg } = ctx;
+        const { projectDir, tsconfig, configPath, dirs, pkg } = ctx;
+        const tsc = await findUp(async (dir) => {
+            const tscBin = join(dir, 'node_modules', '.bin', 'tsc');
+            if (await pathExists(tscBin)) {
+                return tscBin;
+            }
+        }, { cwd: projectDir });
+        const runBuild = (project, outDir) => {
+            return new Promise((resolve, reject) => {
+                const args = outDir ? ['-p', project, '--outDir', outDir] : ['-p', project];
+                const build = spawn(tsc, args, { stdio: 'inherit' });
+                build.on('error', err => {
+                    reject(new Error(`Failed to compile: ${err.message}`));
+                });
+                build.on('exit', code => {
+                    if (code > 0) {
+                        return reject(new Error(code));
+                    }
+                    resolve(code);
+                });
+            });
+        };
         const pkgDir = dirname(pkg.path);
         const outDir = tsconfig.compilerOptions?.outDir ?? 'dist';
         const absoluteOutDir = resolve(projectDir, outDir);
@@ -94,129 +95,73 @@ const duel = async (args) => {
         const logSuccess = start => {
             log(`Successfully created a dual ${isCjsBuild ? 'CJS' : 'ESM'} build in ${Math.round(performance.now() - start)}ms.`);
         };
-        if (parallel) {
-            const paraName = `_${hex}_`;
-            const paraParent = join(projectDir, '..');
-            const paraTempDir = join(paraParent, paraName);
-            let isDirWritable = true;
-            try {
-                const stats = await stat(paraParent);
-                if (stats.isDirectory()) {
-                    await access(paraParent, constants.W_OK);
-                }
-                else {
-                    isDirWritable = false;
-                }
-            }
-            catch {
-                isDirWritable = false;
-            }
-            if (!isDirWritable) {
-                logError('No writable directory to prepare parallel builds. Exiting.');
-                return;
-            }
-            log('Preparing parallel build...');
-            const prepStart = performance.now();
-            await cp(projectDir, paraTempDir, {
-                recursive: true,
-                /**
-                 * Ignore common .gitignored directories in Node.js projects.
-                 * Except node_modules.
-                 *
-                 * @see https://github.com/github/gitignore/blob/main/Node.gitignore
-                 */
-                filter: src => !/logs|pids|lib-cov|coverage|bower_components|build|dist|jspm_packages|web_modules|out|\.next|\.tsbuildinfo|\.npm|\.node_repl_history|\.tgz|\.yarn|\.pnp|\.nyc_output|\.grunt|\.DS_Store/i.test(src),
-            });
-            const dualConfigPath = join(paraTempDir, 'tsconfig.json');
-            const absoluteDualOutDir = join(paraTempDir, isCjsBuild ? join(outDir, 'cjs') : join(outDir, 'esm'));
+        log('Starting primary build...');
+        let success = false;
+        const startTime = performance.now();
+        try {
+            await runPrimaryBuild();
+            success = true;
+        }
+        catch ({ message }) {
+            handleErrorAndExit(message);
+        }
+        if (success) {
+            const compileFiles = getCompileFiles(tsc, projectDir);
+            const subDir = join(projectDir, `_${hex}_`);
+            const dualConfigPath = join(subDir, `tsconfig.${hex}.json`);
+            const absoluteDualOutDir = join(projectDir, isCjsBuild ? join(outDir, 'cjs') : join(outDir, 'esm'));
             const tsconfigDual = getOverrideTsConfig();
-            await writeFile(dualConfigPath, JSON.stringify(tsconfigDual));
-            await writeFile(join(paraTempDir, 'package.json'), JSON.stringify({
+            const pkgRename = 'package.json.bak';
+            let errorMsg = '';
+            // Copy project directory as a subdirectory
+            await mkdir(subDir);
+            await Promise.all(compileFiles.map(file => cp(file, resolve(subDir, relative(projectDir, file)))));
+            /**
+             * Create a new package.json with updated `type` field.
+             * Create a new tsconfig.json.
+             */
+            await rename(pkg.path, join(pkgDir, pkgRename));
+            await writeFile(pkg.path, JSON.stringify({
                 type: isCjsBuild ? 'commonjs' : 'module',
             }));
-            log(`Prepared in ${Math.round(performance.now() - prepStart)}ms.`);
-            log('Starting parallel dual builds...');
-            let success = false;
-            const startTime = performance.now();
+            await writeFile(dualConfigPath, JSON.stringify(tsconfigDual));
+            /**
+             * Transform ambiguous modules for the target dual build.
+             * @see https://github.com/microsoft/TypeScript/issues/58658
+             */
+            const toTransform = await glob(`${subDir}/**/*{.js,.jsx,.ts,.tsx}`, {
+                ignore: 'node_modules/**',
+            });
+            for (const file of toTransform) {
+                await transform(file, { out: file, type: isCjsBuild ? 'commonjs' : 'module' });
+            }
+            // Build dual
+            log('Starting dual build...');
             try {
-                await Promise.all([
-                    runPrimaryBuild(),
-                    runBuild(dualConfigPath, absoluteDualOutDir),
-                ]);
-                success = true;
+                await runBuild(dualConfigPath, absoluteDualOutDir);
             }
             catch ({ message }) {
-                handleErrorAndExit(message);
+                success = false;
+                errorMsg = message;
+            }
+            finally {
+                // Cleanup and restore
+                await rm(dualConfigPath, { force: true });
+                await rm(pkg.path, { force: true });
+                await rm(subDir, { force: true, recursive: true });
+                await rename(join(pkgDir, pkgRename), pkg.path);
+                if (errorMsg) {
+                    handleErrorAndExit(errorMsg);
+                }
             }
             if (success) {
                 const filenames = await glob(`${absoluteDualOutDir}/**/*{.js,.d.ts}`, {
                     ignore: 'node_modules/**',
                 });
                 await updateSpecifiersAndFileExtensions(filenames);
-                // Copy over and cleanup
-                await cp(absoluteDualOutDir, join(absoluteOutDir, isCjsBuild ? 'cjs' : 'esm'), {
-                    recursive: true,
-                });
-                await rm(paraTempDir, { force: true, recursive: true });
                 logSuccess(startTime);
             }
         }
-        else {
-            log('Starting primary build...');
-            let success = false;
-            const startTime = performance.now();
-            try {
-                await runPrimaryBuild();
-                success = true;
-            }
-            catch ({ message }) {
-                handleErrorAndExit(message);
-            }
-            if (success) {
-                const dualConfigPath = join(projectDir, `tsconfig.${hex}.json`);
-                const absoluteDualOutDir = join(projectDir, isCjsBuild ? join(outDir, 'cjs') : join(outDir, 'esm'));
-                const tsconfigDual = getOverrideTsConfig();
-                const pkgRename = 'package.json.bak';
-                let errorMsg = '';
-                /**
-                 * Create a new package.json with updated `type` field.
-                 * Create a new tsconfig.json.
-                 *
-                 * The need to create a new package.json makes doing
-                 * the builds in parallel difficult.
-                 */
-                await rename(pkg.path, join(pkgDir, pkgRename));
-                await writeFile(pkg.path, JSON.stringify({
-                    type: isCjsBuild ? 'commonjs' : 'module',
-                }));
-                await writeFile(dualConfigPath, JSON.stringify(tsconfigDual));
-                // Build dual
-                log('Starting dual build...');
-                try {
-                    await runBuild(dualConfigPath, absoluteDualOutDir);
-                }
-                catch ({ message }) {
-                    success = false;
-                    errorMsg = message;
-                }
-                finally {
-                    // Cleanup and restore
-                    await rm(dualConfigPath, { force: true });
-                    await rm(pkg.path, { force: true });
-                    await rename(join(pkgDir, pkgRename), pkg.path);
-                    if (errorMsg) {
-                        handleErrorAndExit(errorMsg);
-                    }
-                }
-                if (success) {
-                    const filenames = await glob(`${absoluteDualOutDir}/**/*{.js,.d.ts}`, {
-                        ignore: 'node_modules/**',
-                    });
-                    await updateSpecifiersAndFileExtensions(filenames);
-                    logSuccess(startTime);
-                }
-            }
-        }
     }
 };
 const realFileUrlArgv1 = await getRealPathAsFileUrl(argv[1]);

package/dist/esm/init.d.ts

@@ -1,7 +1,6 @@
 export function init(args: any): Promise<false | {
     pkg: import("read-package-up").NormalizedReadResult;
     dirs: boolean | undefined;
-    parallel: boolean | undefined;
     tsconfig: any;
     projectDir: string;
     configPath: string;

package/dist/esm/init.js

@@ -26,11 +26,6 @@ const init = async (args) => {
                     short: 'k',
                     default: cwd(),
                 },
-                parallel: {
-                    type: 'boolean',
-                    short: 'l',
-                    default: false,
-                },
                 dirs: {
                     type: 'boolean',
                     short: 'd',
@@ -55,11 +50,10 @@ const init = async (args) => {
         log("--project, -p [path] \t Compile the project given the path to its configuration file, or to a folder with a 'tsconfig.json'.");
         log('--pkg-dir, -k [path] \t The directory to start looking for a package.json file. Defaults to cwd.');
         log('--dirs, -d \t\t Output both builds to directories inside of outDir. [esm, cjs].');
-        log('--parallel, -l \t\t Run the builds in parallel.');
         log('--help, -h \t\t Print this message.');
     }
     else {
-        const { project, 'target-extension': targetExt, 'pkg-dir': pkgDir, parallel, dirs, } = parsed;
+        const { project, 'target-extension': targetExt, 'pkg-dir': pkgDir, dirs } = parsed;
         let configPath = resolve(project);
         let stats = null;
         let pkg = null;
@@ -108,7 +102,6 @@ const init = async (args) => {
             return {
                 pkg,
                 dirs,
-                parallel,
                 tsconfig,
                 projectDir,
                 configPath,

package/dist/esm/util.d.ts

@@ -1,3 +1,4 @@
 export function log(color?: string, msg?: string): void;
 export const logError: (msg?: string | undefined) => void;
 export function getRealPathAsFileUrl(path: any): Promise<string>;
+export function getCompileFiles(tscBinPath: any, wd?: string): string[];

package/dist/esm/util.js

@@ -1,5 +1,7 @@
 import { pathToFileURL } from 'node:url';
 import { realpath } from 'node:fs/promises';
+import { spawnSync } from 'node:child_process';
+import { cwd } from 'node:process';
 const log = (color = '\x1b[30m', msg = '') => {
     // eslint-disable-next-line no-console
     console.log(`${color}%s\x1b[0m`, msg);
@@ -10,4 +12,12 @@ const getRealPathAsFileUrl = async (path) => {
     const asFileUrl = pathToFileURL(realPath).href;
     return asFileUrl;
 };
-export { log, logError, getRealPathAsFileUrl };
+const getCompileFiles = (tscBinPath, wd = cwd()) => {
+    const { stdout } = spawnSync(tscBinPath, ['--listFilesOnly'], { cwd: wd });
+    // Exclude node_modules and empty strings.
+    return stdout
+        .toString()
+        .split('\n')
+        .filter(path => !/node_modules|^$/.test(path));
+};
+export { log, logError, getRealPathAsFileUrl, getCompileFiles };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@knighted/duel",
-  "version": "1.0.7",
+  "version": "2.0.0-rc.0",
   "description": "TypeScript dual packages.",
   "type": "module",
-  "main": "dist",
+  "main": "dist/esm/duel.js",
   "bin": "dist/esm/duel.js",
   "exports": {
     ".": {
@@ -14,7 +14,7 @@
     "./package.json": "./package.json"
   },
   "engines": {
-    "node": ">=16.19.0"
+    "node": ">=20.11.0"
   },
   "engineStrict": true,
   "scripts": {
@@ -51,19 +51,20 @@
     "url": "https://github.com/knightedcodemonkey/duel/issues"
   },
   "peerDependencies": {
-    "typescript": ">=4.0.0 || >=4.9.0-dev || >=5.3.0-dev || 5.4.0-dev || 5.5.0-dev"
+    "typescript": ">=4.0.0 || >=4.9.0-dev || >=5.3.0-dev || >=5.4.0-dev || >=5.5.0-dev || next"
   },
   "devDependencies": {
-    "@types/node": "^20.4.6",
+    "@types/node": "^20.11.0",
     "c8": "^8.0.1",
     "eslint": "^8.45.0",
     "eslint-plugin-n": "^16.0.1",
     "prettier": "^3.2.4",
-    "typescript": "^5.5.0-dev.20240228",
-    "vite": "^5.0.12"
+    "typescript": "^5.5.0-dev.20240525",
+    "vite": "^5.2.8"
   },
   "dependencies": {
-    "@knighted/specifier": "^1.0.1",
+    "@knighted/module": "^1.0.0-alpha.3",
+    "@knighted/specifier": "^2.0.0-rc.1",
     "find-up": "^6.3.0",
     "glob": "^10.3.3",
     "jsonc-parser": "^3.2.0",