Defer concurrency control to maxSockets

microsoft · Jun 2, 2022 · 73170c0 · 73170c0
1 parent a19278f
commit 73170c0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/packages/definitions-parser/src/check-parse-results.ts b/packages/definitions-parser/src/check-parse-results.ts
@@ -1,6 +1,16 @@
 import { ParseDefinitionsOptions } from "./get-definitely-typed";
 import { TypingsData, AllPackages, formatTypingVersion } from "./packages";
-import { mapDefined, nAtATime, FS, logger, writeLog, Logger, defaultCacheDir, max, min } from "@definitelytyped/utils";
+import {
+  mapDefined,
+  FS,
+  logger,
+  writeLog,
+  Logger,
+  ProgressBar,
+  defaultCacheDir,
+  max,
+  min,
+} from "@definitelytyped/utils";
 import * as pacote from "pacote";
 import * as semver from "semver";
 
@@ -30,17 +40,17 @@ export async function checkParseResults(
   }
 
   if (includeNpmChecks) {
-    await nAtATime(
-      10,
-      allPackages.allTypings(),
-      (pkg) => checkNpm(pkg, log, dependedOn),
-      options.progress
-        ? {
-            name: "Checking for typed packages...",
-            flavor: (pkg) => pkg.desc,
-          }
-        : undefined
+    const allTypings = allPackages.allTypings();
+    const progress = options.progress && new ProgressBar({ name: "Checking for typed packages..." });
+    let i = 0;
+    await Promise.all(
+      allTypings.map((pkg) =>
+        checkNpm(pkg, log, dependedOn).then(() => {
+          if (progress) progress.update(++i / allTypings.length, pkg.desc);
+        })
+      )
     );
+    if (progress) progress.done();
   }
 
   await writeLog("conflicts.md", logResult());

diff --git a/packages/retag/src/index.ts b/packages/retag/src/index.ts
@@ -14,7 +14,6 @@ import {
   loggerWithErrors,
   LoggerWithErrors,
   defaultCacheDir,
-  nAtATime,
 } from "@definitelytyped/utils";
 import {
   AnyPackage,
@@ -65,12 +64,16 @@ async function tag(dry: boolean, nProcesses: number, name?: string) {
     await updateTypeScriptVersionTags(pkg, version, publishClient, consoleLogger.info, dry);
     await updateLatestTag(pkg.fullNpmName, version, publishClient, consoleLogger.info, dry);
   } else {
-    await nAtATime(10, await AllPackages.readLatestTypings(), async (pkg) => {
-      // Only update tags for the latest version of the package.
-      const version = await getLatestTypingVersion(pkg);
-      await updateTypeScriptVersionTags(pkg, version, publishClient, consoleLogger.info, dry);
-      await updateLatestTag(pkg.fullNpmName, version, publishClient, consoleLogger.info, dry);
-    });
+    await Promise.all(
+      (
+        await AllPackages.readLatestTypings()
+      ).map(async (pkg) => {
+        // Only update tags for the latest version of the package.
+        const version = await getLatestTypingVersion(pkg);
+        await updateTypeScriptVersionTags(pkg, version, publishClient, consoleLogger.info, dry);
+        await updateLatestTag(pkg.fullNpmName, version, publishClient, consoleLogger.info, dry);
+      })
+    );
   }
   // Don't tag notNeeded packages
 }