Skip to content

Commit 73170c0

Browse files
committed
Defer concurrency control to maxSockets
1 parent a19278f commit 73170c0

File tree

2 files changed

+31
-18
lines changed

2 files changed

+31
-18
lines changed

packages/definitions-parser/src/check-parse-results.ts

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
import { ParseDefinitionsOptions } from "./get-definitely-typed";
22
import { TypingsData, AllPackages, formatTypingVersion } from "./packages";
3-
import { mapDefined, nAtATime, FS, logger, writeLog, Logger, defaultCacheDir, max, min } from "@definitelytyped/utils";
3+
import {
4+
mapDefined,
5+
FS,
6+
logger,
7+
writeLog,
8+
Logger,
9+
ProgressBar,
10+
defaultCacheDir,
11+
max,
12+
min,
13+
} from "@definitelytyped/utils";
414
import * as pacote from "pacote";
515
import * as semver from "semver";
616

@@ -30,17 +40,17 @@ export async function checkParseResults(
3040
}
3141

3242
if (includeNpmChecks) {
33-
await nAtATime(
34-
10,
35-
allPackages.allTypings(),
36-
(pkg) => checkNpm(pkg, log, dependedOn),
37-
options.progress
38-
? {
39-
name: "Checking for typed packages...",
40-
flavor: (pkg) => pkg.desc,
41-
}
42-
: undefined
43+
const allTypings = allPackages.allTypings();
44+
const progress = options.progress && new ProgressBar({ name: "Checking for typed packages..." });
45+
let i = 0;
46+
await Promise.all(
47+
allTypings.map((pkg) =>
48+
checkNpm(pkg, log, dependedOn).then(() => {
49+
if (progress) progress.update(++i / allTypings.length, pkg.desc);
50+
})
51+
)
4352
);
53+
if (progress) progress.done();
4454
}
4555

4656
await writeLog("conflicts.md", logResult());

packages/retag/src/index.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
loggerWithErrors,
1515
LoggerWithErrors,
1616
defaultCacheDir,
17-
nAtATime,
1817
} from "@definitelytyped/utils";
1918
import {
2019
AnyPackage,
@@ -65,12 +64,16 @@ async function tag(dry: boolean, nProcesses: number, name?: string) {
6564
await updateTypeScriptVersionTags(pkg, version, publishClient, consoleLogger.info, dry);
6665
await updateLatestTag(pkg.fullNpmName, version, publishClient, consoleLogger.info, dry);
6766
} else {
68-
await nAtATime(10, await AllPackages.readLatestTypings(), async (pkg) => {
69-
// Only update tags for the latest version of the package.
70-
const version = await getLatestTypingVersion(pkg);
71-
await updateTypeScriptVersionTags(pkg, version, publishClient, consoleLogger.info, dry);
72-
await updateLatestTag(pkg.fullNpmName, version, publishClient, consoleLogger.info, dry);
73-
});
67+
await Promise.all(
68+
(
69+
await AllPackages.readLatestTypings()
70+
).map(async (pkg) => {
71+
// Only update tags for the latest version of the package.
72+
const version = await getLatestTypingVersion(pkg);
73+
await updateTypeScriptVersionTags(pkg, version, publishClient, consoleLogger.info, dry);
74+
await updateLatestTag(pkg.fullNpmName, version, publishClient, consoleLogger.info, dry);
75+
})
76+
);
7477
}
7578
// Don't tag notNeeded packages
7679
}

0 commit comments

Comments
 (0)