@knighted/duel 3.2.3 → 3.2.5

package/README.md

@@ -53,7 +53,7 @@ And then running it:
 npm run build
 ```
 
-If everything worked, you should have an ESM build inside of `dist` and a CJS build inside of `dist/cjs`. Now you can update your [`exports`](https://nodejs.org/api/packages.html#exports) to match the build output.
+If everything worked, you should have an ESM build inside of `dist` and a CJS build inside of `dist/cjs`. You can manually update your [`exports`](https://nodejs.org/api/packages.html#exports) to match the build output, or run `duel --exports <mode>` to generate them automatically (see [docs/exports.md](docs/exports.md)).
 
 It should work similarly for a CJS-first project. Except, your package.json file would use `"type": "commonjs"` and the dual build directory is in `dist/esm`.
 

package/dist/cjs/duel.cjs

@@ -27,7 +27,7 @@ const getSubpath = (mode, relFromRoot) => {
     }
     if (mode === 'dir') {
         const last = segments.at(-1);
-        return last ? `./${last}` : null;
+        return last ? `./${last}/*` : null;
     }
     if (mode === 'wildcard') {
         const first = segments[0];
@@ -36,7 +36,8 @@ const getSubpath = (mode, relFromRoot) => {
     return null;
 };
 const handleErrorAndExit = message => {
-    const exitCode = Number(message);
+    const parsed = parseInt(message, 10);
+    const exitCode = Number.isNaN(parsed) ? 1 : parsed;
     (0, util_js_1.logError)('Compilation errors found.');
     process.exit(exitCode);
 };
@@ -56,6 +57,17 @@ const generateExports = async (options) => {
     if (esmRootPosix.startsWith(`${cjsRootPosix}/`)) {
         cjsIgnore.push(`${esmRootPosix}/**`);
     }
+    const toWildcardValue = value => {
+        const dir = node_path_1.posix.dirname(value);
+        const file = node_path_1.posix.basename(value);
+        const dtsMatch = file.match(/(\.d\.(?:ts|mts|cts))$/i);
+        if (dtsMatch) {
+            const ext = dtsMatch[1];
+            return dir === '.' ? `./*${ext}` : `${dir}/*${ext}`;
+        }
+        const ext = node_path_1.posix.extname(file);
+        return dir === '.' ? `./*${ext}` : `${dir}/*${ext}`;
+    };
     const recordPath = (kind, filePath, root) => {
         const relPkg = toPosix((0, node_path_1.relative)(pkgDir, filePath));
         const relFromRoot = toPosix((0, node_path_1.relative)(root, filePath));
@@ -65,18 +77,19 @@ const generateExports = async (options) => {
         baseEntry[kind] = withDot;
         baseMap.set(baseKey, baseEntry);
         const subpath = getSubpath(mode, relFromRoot);
+        const useWildcard = subpath?.includes('*');
         if (kind === 'types') {
             const mappedSubpath = baseToSubpath.get(baseKey);
             if (mappedSubpath) {
                 const subEntry = subpathMap.get(mappedSubpath) ?? {};
-                subEntry.types = withDot;
+                subEntry.types = useWildcard ? toWildcardValue(withDot) : withDot;
                 subpathMap.set(mappedSubpath, subEntry);
             }
             return;
         }
         if (subpath && subpath !== '.') {
             const subEntry = subpathMap.get(subpath) ?? {};
-            subEntry[kind] = withDot;
+            subEntry[kind] = useWildcard ? toWildcardValue(withDot) : withDot;
             subpathMap.set(subpath, subEntry);
             baseToSubpath.set(baseKey, subpath);
         }
@@ -148,9 +161,10 @@ const generateExports = async (options) => {
             exportsMap[subpath] = out;
         }
     }
-    if (!exportsMap['.'] && baseMap.size) {
-        const [subpath, entry] = subpathMap.entries().next().value ?? [];
-        if (entry) {
+    if (!exportsMap['.']) {
+        const firstNonWildcard = [...subpathMap.entries()].find(([key]) => !key.includes('*'));
+        if (firstNonWildcard) {
+            const [subpath, entry] = firstNonWildcard;
             const out = {};
             if (entry.types) {
                 out.types = entry.types;
@@ -169,7 +183,9 @@ const generateExports = async (options) => {
             }
             if (Object.keys(out).length) {
                 exportsMap['.'] = out;
-                exportsMap[subpath] ??= out;
+                if (!exportsMap[subpath]) {
+                    exportsMap[subpath] = out;
+                }
             }
         }
     }
@@ -186,10 +202,10 @@ const duel = async (args) => {
     if (ctx) {
         const { projectDir, tsconfig, configPath, modules, dirs, transformSyntax, pkg, exports: exportsOpt, } = ctx;
         const tsc = await (0, find_up_1.findUp)(async (dir) => {
-            const tscBin = (0, node_path_1.join)(dir, 'node_modules', '.bin', 'tsc');
+            const candidate = (0, node_path_1.join)(dir, 'node_modules', 'typescript', 'bin', 'tsc');
             try {
-                await (0, promises_1.access)(tscBin);
-                return tscBin;
+                await (0, promises_1.access)(candidate);
+                return (0, node_path_1.resolve)(candidate);
             }
             catch {
                 /* continue */
@@ -197,8 +213,10 @@ const duel = async (args) => {
         }, { 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', shell: node_process_1.platform === 'win32' });
+                const args = outDir
+                    ? [tsc, '-p', project, '--outDir', outDir]
+                    : [tsc, '-p', project];
+                const build = (0, node_child_process_1.spawn)(process.execPath, args, { stdio: 'inherit' });
                 build.on('exit', code => {
                     if (code > 0) {
                         return reject(new Error(code));

package/dist/cjs/util.cjs

@@ -45,10 +45,9 @@ 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'], {
+const getCompileFiles = (tscPath, wd = (0, node_process_1.cwd)()) => {
+    const { stdout } = (0, node_child_process_1.spawnSync)(process.execPath, [tscPath, '--listFilesOnly'], {
         cwd: wd,
-        shell: node_process_1.platform === 'win32',
     });
     // Exclude node_modules and empty strings.
     return stdout

package/dist/cjs/util.d.cts

@@ -3,4 +3,4 @@ export function logError(msg: any): void;
 export function logSuccess(msg: any): void;
 export function logWarn(msg: any): void;
 export function getRealPathAsFileUrl(path: any): Promise<string>;
-export function getCompileFiles(tscBinPath: any, wd?: string): string[];
+export function getCompileFiles(tscPath: any, wd?: string): string[];

package/dist/esm/duel.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { argv, platform } from 'node:process';
-import { join, dirname, resolve, relative, parse as parsePath } from 'node:path';
+import { argv } from 'node:process';
+import { join, dirname, resolve, relative, parse as parsePath, posix } from 'node:path';
 import { spawn } from 'node:child_process';
 import { writeFile, rm, rename, mkdir, cp, access, readFile } from 'node:fs/promises';
 import { randomBytes } from 'node:crypto';
@@ -24,7 +24,7 @@ const getSubpath = (mode, relFromRoot) => {
     }
     if (mode === 'dir') {
         const last = segments.at(-1);
-        return last ? `./${last}` : null;
+        return last ? `./${last}/*` : null;
     }
     if (mode === 'wildcard') {
         const first = segments[0];
@@ -33,7 +33,8 @@ const getSubpath = (mode, relFromRoot) => {
     return null;
 };
 const handleErrorAndExit = message => {
-    const exitCode = Number(message);
+    const parsed = parseInt(message, 10);
+    const exitCode = Number.isNaN(parsed) ? 1 : parsed;
     logError('Compilation errors found.');
     process.exit(exitCode);
 };
@@ -53,6 +54,17 @@ const generateExports = async (options) => {
     if (esmRootPosix.startsWith(`${cjsRootPosix}/`)) {
         cjsIgnore.push(`${esmRootPosix}/**`);
     }
+    const toWildcardValue = value => {
+        const dir = posix.dirname(value);
+        const file = posix.basename(value);
+        const dtsMatch = file.match(/(\.d\.(?:ts|mts|cts))$/i);
+        if (dtsMatch) {
+            const ext = dtsMatch[1];
+            return dir === '.' ? `./*${ext}` : `${dir}/*${ext}`;
+        }
+        const ext = posix.extname(file);
+        return dir === '.' ? `./*${ext}` : `${dir}/*${ext}`;
+    };
     const recordPath = (kind, filePath, root) => {
         const relPkg = toPosix(relative(pkgDir, filePath));
         const relFromRoot = toPosix(relative(root, filePath));
@@ -62,18 +74,19 @@ const generateExports = async (options) => {
         baseEntry[kind] = withDot;
         baseMap.set(baseKey, baseEntry);
         const subpath = getSubpath(mode, relFromRoot);
+        const useWildcard = subpath?.includes('*');
         if (kind === 'types') {
             const mappedSubpath = baseToSubpath.get(baseKey);
             if (mappedSubpath) {
                 const subEntry = subpathMap.get(mappedSubpath) ?? {};
-                subEntry.types = withDot;
+                subEntry.types = useWildcard ? toWildcardValue(withDot) : withDot;
                 subpathMap.set(mappedSubpath, subEntry);
             }
             return;
         }
         if (subpath && subpath !== '.') {
             const subEntry = subpathMap.get(subpath) ?? {};
-            subEntry[kind] = withDot;
+            subEntry[kind] = useWildcard ? toWildcardValue(withDot) : withDot;
             subpathMap.set(subpath, subEntry);
             baseToSubpath.set(baseKey, subpath);
         }
@@ -145,9 +158,10 @@ const generateExports = async (options) => {
             exportsMap[subpath] = out;
         }
     }
-    if (!exportsMap['.'] && baseMap.size) {
-        const [subpath, entry] = subpathMap.entries().next().value ?? [];
-        if (entry) {
+    if (!exportsMap['.']) {
+        const firstNonWildcard = [...subpathMap.entries()].find(([key]) => !key.includes('*'));
+        if (firstNonWildcard) {
+            const [subpath, entry] = firstNonWildcard;
             const out = {};
             if (entry.types) {
                 out.types = entry.types;
@@ -166,7 +180,9 @@ const generateExports = async (options) => {
             }
             if (Object.keys(out).length) {
                 exportsMap['.'] = out;
-                exportsMap[subpath] ??= out;
+                if (!exportsMap[subpath]) {
+                    exportsMap[subpath] = out;
+                }
             }
         }
     }
@@ -183,10 +199,10 @@ const duel = async (args) => {
     if (ctx) {
         const { projectDir, tsconfig, configPath, modules, dirs, transformSyntax, pkg, exports: exportsOpt, } = ctx;
         const tsc = await findUp(async (dir) => {
-            const tscBin = join(dir, 'node_modules', '.bin', 'tsc');
+            const candidate = join(dir, 'node_modules', 'typescript', 'bin', 'tsc');
             try {
-                await access(tscBin);
-                return tscBin;
+                await access(candidate);
+                return resolve(candidate);
             }
             catch {
                 /* continue */
@@ -194,8 +210,10 @@ const duel = async (args) => {
         }, { 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', shell: platform === 'win32' });
+                const args = outDir
+                    ? [tsc, '-p', project, '--outDir', outDir]
+                    : [tsc, '-p', project];
+                const build = spawn(process.execPath, args, { stdio: 'inherit' });
                 build.on('exit', code => {
                     if (code > 0) {
                         return reject(new Error(code));

package/dist/esm/util.d.ts

@@ -3,4 +3,4 @@ export function logError(msg: any): void;
 export function logSuccess(msg: any): void;
 export function logWarn(msg: any): void;
 export function getRealPathAsFileUrl(path: any): Promise<string>;
-export function getCompileFiles(tscBinPath: any, wd?: string): string[];
+export function getCompileFiles(tscPath: any, wd?: string): string[];

package/dist/esm/util.js

@@ -1,7 +1,7 @@
 import { pathToFileURL } from 'node:url';
 import { realpath } from 'node:fs/promises';
 import { spawnSync } from 'node:child_process';
-import { cwd, platform } from 'node:process';
+import { cwd } from 'node:process';
 import { EOL } from 'node:os';
 const COLORS = {
     reset: '\x1b[0m',
@@ -37,10 +37,9 @@ const getRealPathAsFileUrl = async (path) => {
     const asFileUrl = pathToFileURL(realPath).href;
     return asFileUrl;
 };
-const getCompileFiles = (tscBinPath, wd = cwd()) => {
-    const { stdout } = spawnSync(tscBinPath, ['--listFilesOnly'], {
+const getCompileFiles = (tscPath, wd = cwd()) => {
+    const { stdout } = spawnSync(process.execPath, [tscPath, '--listFilesOnly'], {
         cwd: wd,
-        shell: platform === 'win32',
     });
     // Exclude node_modules and empty strings.
     return stdout

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/duel",
-  "version": "3.2.3",
+  "version": "3.2.5",
   "description": "TypeScript dual packages.",
   "type": "module",
   "main": "dist/esm/duel.js",
@@ -25,7 +25,7 @@
     "lint": "eslint src/*.js test/*.js",
     "test:integration": "node --test --test-reporter=spec test/integration.js",
     "test:monorepos": "node --test --test-reporter=spec test/monorepos.js",
-    "test": "c8 --reporter=text --reporter=text-summary --reporter=lcov node --test --test-reporter=spec test/integration.js test/monorepos.js",
+    "test": "c8 --reporter=text --reporter=text-summary --reporter=lcov node --trace-deprecation --test --test-reporter=spec test/integration.js test/monorepos.js",
     "build": "node src/duel.js --dirs --mode globals",
     "prepack": "npm run build",
     "prepare": "husky"
@@ -70,6 +70,7 @@
     "@tsconfig/recommended": "^1.0.10",
     "@types/node": "^24.10.1",
     "c8": "^10.1.3",
+    "cross-spawn": "^7.0.6",
     "eslint": "^9.39.1",
     "eslint-plugin-n": "^17.23.1",
     "globals": "^16.3.0",