@knighted/duel 3.2.3 → 3.2.4

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];
@@ -56,6 +56,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 +76,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 +160,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 +182,9 @@ const generateExports = async (options) => {
             }
             if (Object.keys(out).length) {
                 exportsMap['.'] = out;
-                exportsMap[subpath] ??= out;
+                if (!exportsMap[subpath]) {
+                    exportsMap[subpath] = out;
+                }
             }
         }
     }

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 { 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];
@@ -53,6 +53,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 +73,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 +157,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 +179,9 @@ const generateExports = async (options) => {
             }
             if (Object.keys(out).length) {
                 exportsMap['.'] = out;
-                exportsMap[subpath] ??= out;
+                if (!exportsMap[subpath]) {
+                    exportsMap[subpath] = out;
+                }
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/duel",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "description": "TypeScript dual packages.",
   "type": "module",
   "main": "dist/esm/duel.js",