@knighted/duel 4.0.1 → 4.0.2-rc.1

package/dist/cjs/duel.cjs

@@ -9,7 +9,6 @@ const node_child_process_1 = require("node:child_process");
 const promises_1 = require("node:fs/promises");
 const node_crypto_1 = require("node:crypto");
 const node_perf_hooks_1 = require("node:perf_hooks");
-const glob_1 = require("glob");
 const find_up_1 = require("find-up");
 const module_1 = require("@knighted/module");
 const get_tsconfig_1 = require("get-tsconfig");
@@ -44,6 +43,13 @@ const logDiagnostics = (diags, projectDir, hazardAllowlist = null) => {
     }
     return hasError;
 };
+const collectGlob = async (pattern, options) => {
+    const files = [];
+    for await (const file of (0, promises_1.glob)(pattern, options)) {
+        files.push(file);
+    }
+    return files;
+};
 const duel = async (args) => {
     const ctx = await (0, init_js_1.init)(args);
     if (ctx) {
@@ -587,7 +593,7 @@ const duel = async (args) => {
                  * Transform ambiguous modules for the target dual build.
                  * @see https://github.com/microsoft/TypeScript/issues/58658
                  */
-                const toTransform = await (0, glob_1.glob)(`${subDir.replace(/\\/g, '/')}/**/*{.js,.jsx,.ts,.tsx}`, {
+                const toTransform = await collectGlob(`${subDir.replace(/\\/g, '/')}/**/*{.js,.jsx,.ts,.tsx}`, {
                     ignore: `${subDir.replace(/\\/g, '/')}/**/node_modules/**`,
                 });
                 let transformDiagnosticsError = false;
@@ -666,7 +672,7 @@ const duel = async (args) => {
                     throw err;
                 }
                 const dualGlob = dualTarget === 'commonjs' ? '**/*{.js,.cjs,.d.ts}' : '**/*{.js,.mjs,.d.ts}';
-                const filenames = await (0, glob_1.glob)(`${absoluteDualOutDir.replace(/\\/g, '/')}/${dualGlob}`, {
+                const filenames = await collectGlob(`${absoluteDualOutDir.replace(/\\/g, '/')}/${dualGlob}`, {
                     ignore: `${absoluteDualOutDir.replace(/\\/g, '/')}/**/node_modules/**`,
                 });
                 const rewriteSyntaxMode = dualTarget === 'commonjs' ? true : syntaxMode;
@@ -689,7 +695,7 @@ const duel = async (args) => {
                     onRewrite: (from, to) => logVerbose(`Rewrote specifiers in ${from} -> ${to}`),
                 });
                 if (dirs && originalType === 'commonjs') {
-                    const primaryFiles = await (0, glob_1.glob)(`${primaryOutDir.replace(/\\/g, '/')}/**/*{.js,.cjs,.d.ts}`, {
+                    const primaryFiles = await collectGlob(`${primaryOutDir.replace(/\\/g, '/')}/**/*{.js,.cjs,.d.ts}`, {
                         ignore: `${primaryOutDir.replace(/\\/g, '/')}/**/node_modules/**`,
                     });
                     await (0, resolver_js_1.rewriteSpecifiersAndExtensions)(primaryFiles, {

package/dist/cjs/util.cjs

@@ -7,7 +7,6 @@ const node_fs_1 = require("node:fs");
 const node_child_process_1 = require("node:child_process");
 const node_process_1 = require("node:process");
 const node_path_1 = require("node:path");
-const glob_1 = require("glob");
 const find_up_1 = require("find-up");
 const COLORS = {
     reset: '\x1b[0m',
@@ -281,7 +280,12 @@ const generateExports = async (options) => {
             return;
         }
         const baseEntry = baseMap.get(baseKey) ?? {};
-        baseEntry[kind] = withDot;
+        if (kind === 'types') {
+            baseEntry.types = baseEntry.types ?? withDot;
+        }
+        else {
+            baseEntry[kind] = withDot;
+        }
         baseMap.set(baseKey, baseEntry);
         const subpath = useEntriesSubpaths
             ? ensureDotSlash(stripKnownExt(relFromRoot))
@@ -291,7 +295,8 @@ const generateExports = async (options) => {
             const mappedSubpath = baseToSubpath.get(baseKey);
             if (mappedSubpath) {
                 const subEntry = subpathMap.get(mappedSubpath) ?? {};
-                subEntry.types = useWildcard ? toWildcardValue(withDot) : withDot;
+                const nextType = useWildcard ? toWildcardValue(withDot) : withDot;
+                subEntry.types = subEntry.types ?? nextType;
                 subpathMap.set(mappedSubpath, subEntry);
             }
             return;
@@ -303,10 +308,9 @@ const generateExports = async (options) => {
             baseToSubpath.set(baseKey, subpath);
         }
     };
-    const esmFiles = await (0, glob_1.glob)(`${esmRootPosix}/**/*.{js,mjs,d.ts,d.mts}`, {
+    for await (const file of (0, promises_1.glob)(`${esmRootPosix}/**/*.{js,mjs,d.ts,d.mts}`, {
         ignore: esmIgnore,
-    });
-    for (const file of esmFiles) {
+    })) {
         if (/\.d\.(ts|mts)$/.test(file)) {
             recordPath('types', file, esmRoot);
         }
@@ -314,10 +318,9 @@ const generateExports = async (options) => {
             recordPath('import', file, esmRoot);
         }
     }
-    const cjsFiles = await (0, glob_1.glob)(`${cjsRootPosix}/**/*.{js,cjs,d.ts,d.cts}`, {
+    for await (const file of (0, promises_1.glob)(`${cjsRootPosix}/**/*.{js,cjs,d.ts,d.cts}`, {
         ignore: cjsIgnore,
-    });
-    for (const file of cjsFiles) {
+    })) {
         if (/\.d\.(ts|cts)$/.test(file)) {
             recordPath('types', file, cjsRoot);
         }

package/dist/esm/duel.js

@@ -3,10 +3,9 @@ import { argv } from 'node:process';
 import { pathToFileURL } from 'node:url';
 import { join, dirname, resolve, relative, sep } from 'node:path';
 import { spawn } from 'node:child_process';
-import { writeFile, rm, mkdir, cp, access, readdir } from 'node:fs/promises';
+import { writeFile, rm, mkdir, cp, access, readdir, glob } from 'node:fs/promises';
 import { createHash } from 'node:crypto';
 import { performance } from 'node:perf_hooks';
-import { glob } from 'glob';
 import { findUp } from 'find-up';
 import { transform, collectProjectDualPackageHazards } from '@knighted/module';
 import { getTsconfig, parseTsconfig } from 'get-tsconfig';
@@ -41,6 +40,13 @@ const logDiagnostics = (diags, projectDir, hazardAllowlist = null) => {
     }
     return hasError;
 };
+const collectGlob = async (pattern, options) => {
+    const files = [];
+    for await (const file of glob(pattern, options)) {
+        files.push(file);
+    }
+    return files;
+};
 const duel = async (args) => {
     const ctx = await init(args);
     if (ctx) {
@@ -584,7 +590,7 @@ const duel = async (args) => {
                  * Transform ambiguous modules for the target dual build.
                  * @see https://github.com/microsoft/TypeScript/issues/58658
                  */
-                const toTransform = await glob(`${subDir.replace(/\\/g, '/')}/**/*{.js,.jsx,.ts,.tsx}`, {
+                const toTransform = await collectGlob(`${subDir.replace(/\\/g, '/')}/**/*{.js,.jsx,.ts,.tsx}`, {
                     ignore: `${subDir.replace(/\\/g, '/')}/**/node_modules/**`,
                 });
                 let transformDiagnosticsError = false;
@@ -663,7 +669,7 @@ const duel = async (args) => {
                     throw err;
                 }
                 const dualGlob = dualTarget === 'commonjs' ? '**/*{.js,.cjs,.d.ts}' : '**/*{.js,.mjs,.d.ts}';
-                const filenames = await glob(`${absoluteDualOutDir.replace(/\\/g, '/')}/${dualGlob}`, {
+                const filenames = await collectGlob(`${absoluteDualOutDir.replace(/\\/g, '/')}/${dualGlob}`, {
                     ignore: `${absoluteDualOutDir.replace(/\\/g, '/')}/**/node_modules/**`,
                 });
                 const rewriteSyntaxMode = dualTarget === 'commonjs' ? true : syntaxMode;
@@ -686,7 +692,7 @@ const duel = async (args) => {
                     onRewrite: (from, to) => logVerbose(`Rewrote specifiers in ${from} -> ${to}`),
                 });
                 if (dirs && originalType === 'commonjs') {
-                    const primaryFiles = await glob(`${primaryOutDir.replace(/\\/g, '/')}/**/*{.js,.cjs,.d.ts}`, {
+                    const primaryFiles = await collectGlob(`${primaryOutDir.replace(/\\/g, '/')}/**/*{.js,.cjs,.d.ts}`, {
                         ignore: `${primaryOutDir.replace(/\\/g, '/')}/**/node_modules/**`,
                     });
                     await rewriteSpecifiersAndExtensions(primaryFiles, {

package/dist/esm/util.js

@@ -1,10 +1,9 @@
 import { pathToFileURL } from 'node:url';
-import { realpath, readFile, writeFile, symlink, rm } from 'node:fs/promises';
+import { realpath, readFile, writeFile, symlink, rm, glob } from 'node:fs/promises';
 import { existsSync, rmSync } from 'node:fs';
 import { spawnSync } from 'node:child_process';
 import { cwd, platform } from 'node:process';
 import { join, resolve, relative, parse as parsePath, posix, isAbsolute, sep, normalize as normalizePath, } from 'node:path';
-import { glob } from 'glob';
 import { findUp } from 'find-up';
 const COLORS = {
     reset: '\x1b[0m',
@@ -266,7 +265,12 @@ const generateExports = async (options) => {
             return;
         }
         const baseEntry = baseMap.get(baseKey) ?? {};
-        baseEntry[kind] = withDot;
+        if (kind === 'types') {
+            baseEntry.types = baseEntry.types ?? withDot;
+        }
+        else {
+            baseEntry[kind] = withDot;
+        }
         baseMap.set(baseKey, baseEntry);
         const subpath = useEntriesSubpaths
             ? ensureDotSlash(stripKnownExt(relFromRoot))
@@ -276,7 +280,8 @@ const generateExports = async (options) => {
             const mappedSubpath = baseToSubpath.get(baseKey);
             if (mappedSubpath) {
                 const subEntry = subpathMap.get(mappedSubpath) ?? {};
-                subEntry.types = useWildcard ? toWildcardValue(withDot) : withDot;
+                const nextType = useWildcard ? toWildcardValue(withDot) : withDot;
+                subEntry.types = subEntry.types ?? nextType;
                 subpathMap.set(mappedSubpath, subEntry);
             }
             return;
@@ -288,10 +293,9 @@ const generateExports = async (options) => {
             baseToSubpath.set(baseKey, subpath);
         }
     };
-    const esmFiles = await glob(`${esmRootPosix}/**/*.{js,mjs,d.ts,d.mts}`, {
+    for await (const file of glob(`${esmRootPosix}/**/*.{js,mjs,d.ts,d.mts}`, {
         ignore: esmIgnore,
-    });
-    for (const file of esmFiles) {
+    })) {
         if (/\.d\.(ts|mts)$/.test(file)) {
             recordPath('types', file, esmRoot);
         }
@@ -299,10 +303,9 @@ const generateExports = async (options) => {
             recordPath('import', file, esmRoot);
         }
     }
-    const cjsFiles = await glob(`${cjsRootPosix}/**/*.{js,cjs,d.ts,d.cts}`, {
+    for await (const file of glob(`${cjsRootPosix}/**/*.{js,cjs,d.ts,d.cts}`, {
         ignore: cjsIgnore,
-    });
-    for (const file of cjsFiles) {
+    })) {
         if (/\.d\.(ts|cts)$/.test(file)) {
             recordPath('types', file, cjsRoot);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knighted/duel",
-  "version": "4.0.1",
+  "version": "4.0.2-rc.1",
   "description": "TypeScript dual packages.",
   "type": "module",
   "main": "dist/esm/duel.js",
@@ -89,10 +89,9 @@
   "dependencies": {
     "@jridgewell/gen-mapping": "^0.3.13",
     "@jridgewell/trace-mapping": "^0.3.31",
-    "@knighted/module": "^1.5.0",
+    "@knighted/module": "^1.5.2",
     "find-up": "^8.0.0",
     "get-tsconfig": "^4.13.0",
-    "glob": "^13.0.6",
     "magic-string": "^0.30.21",
     "read-package-up": "^12.0.0"
   },