Use pacote

Author: jablko

__mocks__/pacote.ts

@@ -0,0 +1,21 @@
+import * as util from "util";
+
+export async function manifest(spec: string) {
+  switch (spec) {
+    case "[email protected]": // Older than the @types/jest package.
+    case "[email protected]": // The same version as the @types/jest package.
+    case "[email protected]": // Newer than the @types/jest package.
+      // These versions exist (don't throw).
+      return;
+    case "[email protected]": // A nonexistent version of the target JS package.
+      // eslint-disable-next-line no-throw-literal
+      throw { code: "ETARGET" };
+    case "@types/jest": // The @types/jest package.
+      return { version: "50.0.0" };
+    case "[email protected]": // A nonexistent target JS package.
+    case "@types/nonexistent": // A nonexistent @types package.
+      // eslint-disable-next-line no-throw-literal
+      throw { code: "E404" };
+  }
+  throw new Error(`Unexpected npm registry fetch: ${util.inspect(spec)}`);
+}

package.json

@@ -28,6 +28,6 @@
     "ts-jest": "^25.2.1",
     "tslint": "^6.1.2",
     "tslint-microsoft-contrib": "^6.2.0",
-    "typescript": "^4.5.5"
+    "typescript": "^4.6.4"
   }
 }

packages/definitions-parser/package.json

@@ -24,10 +24,12 @@
     "@definitelytyped/utils": "^0.0.113-next.7",
     "@types/node": "^14.14.35",
     "fs-extra": "^9.1.0",
+    "pacote": "^13.3.0",
     "semver": "^7.3.7"
   },
   "devDependencies": {
-    "@types/fs-extra": "^9.0.8"
+    "@types/fs-extra": "^9.0.8",
+    "@types/pacote": "^11.1.3"
   },
   "peerDependencies": {
     "typescript": "*"

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

@@ -1,37 +1,13 @@
 import { ParseDefinitionsOptions } from "./get-definitely-typed";
 import { TypingsData, AllPackages, formatTypingVersion } from "./packages";
-import {
-  assertDefined,
-  mapDefined,
-  nAtATime,
-  FS,
-  logger,
-  writeLog,
-  Logger,
-  UncachedNpmInfoClient,
-  NpmInfoRawVersions,
-  NpmInfoVersion,
-  max,
-  min,
-} from "@definitelytyped/utils";
+import { mapDefined, nAtATime, FS, logger, writeLog, Logger, defaultCacheDir, max, min } from "@definitelytyped/utils";
+import * as pacote from "pacote";
 import * as semver from "semver";
 
-export async function checkParseResults(
-  includeNpmChecks: false,
-  dt: FS,
-  options: ParseDefinitionsOptions
-): Promise<void>;
-export async function checkParseResults(
-  includeNpmChecks: true,
-  dt: FS,
-  options: ParseDefinitionsOptions,
-  client: UncachedNpmInfoClient
-): Promise<void>;
 export async function checkParseResults(
   includeNpmChecks: boolean,
   dt: FS,
-  options: ParseDefinitionsOptions,
-  client?: UncachedNpmInfoClient
+  options: ParseDefinitionsOptions
 ): Promise<void> {
   const allPackages = await AllPackages.read(dt);
   const [log, logResult] = logger();
@@ -57,7 +33,7 @@ export async function checkParseResults(
     await nAtATime(
       10,
       allPackages.allTypings(),
-      (pkg) => checkNpm(pkg, log, dependedOn, client!),
+      (pkg) => checkNpm(pkg, log, dependedOn),
       options.progress
         ? {
             name: "Checking for typed packages...",
@@ -120,14 +96,15 @@ Check the path mappings for [${Array.from(allPackages.allDependencyTypings(pkg))
 async function checkNpm(
   { major, minor, name, libraryName, projectName, contributors }: TypingsData,
   log: Logger,
-  dependedOn: ReadonlySet<string>,
-  client: UncachedNpmInfoClient
+  dependedOn: ReadonlySet<string>
 ): Promise<void> {
   if (notNeededExceptions.has(name)) {
     return;
   }
 
-  const info = await client.fetchRawNpmInfo(name); // Gets info for the real package, not the @types package
+  const info = await pacote.packument(name, { cache: defaultCacheDir, fullMetadata: true }).catch((cause) => {
+    if (cause.code !== "E404") throw cause;
+  }); // Gets info for the real package, not the @types package
   if (!info) {
     return;
   }
@@ -169,21 +146,20 @@ async function checkNpm(
   }
 }
 
-export async function packageHasTypes(packageName: string, client: UncachedNpmInfoClient): Promise<boolean> {
-  const info = assertDefined(await client.fetchRawNpmInfo(packageName));
-  return versionHasTypes(info.versions[info["dist-tags"].latest]);
+export async function packageHasTypes(packageName: string): Promise<boolean> {
+  return versionHasTypes(await pacote.manifest(packageName, { cache: defaultCacheDir, fullMetadata: true }));
 }
 
 function getRegularVersions(
-  versions: NpmInfoRawVersions
+  versions: pacote.Packument["versions"]
 ): readonly { readonly version: semver.SemVer; readonly hasTypes: boolean }[] {
   return Object.entries(versions).map(([versionString, info]) => ({
     version: new semver.SemVer(versionString),
     hasTypes: versionHasTypes(info),
   }));
 }
 
-function versionHasTypes(info: NpmInfoVersion): boolean {
+function versionHasTypes(info: pacote.Manifest): boolean {
   return "types" in info || "typings" in info;
 }
 

packages/definitions-parser/src/git.ts

@@ -17,9 +17,9 @@ import {
   FS,
   consoleLogger,
   assertDefined,
-  UncachedNpmInfoClient,
-  NpmInfo,
+  defaultCacheDir,
 } from "@definitelytyped/utils";
+import * as pacote from "pacote";
 import * as semver from "semver";
 import { getAffectedPackages } from "./get-affected-packages";
 
@@ -96,11 +96,8 @@ export async function getAffectedPackagesFromDiff(
   const allPackages = await AllPackages.read(dt);
   const diffs = await gitDiff(consoleLogger.info, definitelyTypedPath);
   if (diffs.find((d) => d.file === "notNeededPackages.json")) {
-    const uncached = new UncachedNpmInfoClient();
     for (const deleted of getNotNeededPackages(allPackages, diffs)) {
-      const source = await uncached.fetchNpmInfo(deleted.libraryName); // eg @babel/parser
-      const typings = await uncached.fetchNpmInfo(deleted.fullNpmName); // eg @types/babel__parser
-      checkNotNeededPackage(deleted, source, typings);
+      checkNotNeededPackage(deleted);
     }
   }
 
@@ -133,30 +130,28 @@ export async function getAffectedPackagesFromDiff(
  * 2. asOfVersion must be newer than `@types/name@latest` on npm
  * 3. `name@asOfVersion` must exist on npm
  */
-export function checkNotNeededPackage(
-  unneeded: NotNeededPackage,
-  source: NpmInfo | undefined,
-  typings: NpmInfo | undefined
-) {
-  source = assertDefined(
-    source,
-    `The entry for ${unneeded.fullNpmName} in notNeededPackages.json has
+export async function checkNotNeededPackage(unneeded: NotNeededPackage) {
+  await pacote.manifest(`${unneeded.libraryName}@${unneeded.version}`, { cache: defaultCacheDir }).catch((cause) => {
+    throw cause.code === "E404"
+      ? new Error(
+          `The entry for ${unneeded.fullNpmName} in notNeededPackages.json has
 "libraryName": "${unneeded.libraryName}", but there is no npm package with this name.
-Unneeded packages have to be replaced with a package on npm.`
-  );
-  typings = assertDefined(typings, `Unexpected error: @types package not found for ${unneeded.fullNpmName}`);
-  const latestTypings = assertDefined(
-    typings.distTags.get("latest"),
-    `Unexpected error: ${unneeded.fullNpmName} is missing the "latest" tag.`
-  );
+Unneeded packages have to be replaced with a package on npm.`,
+          { cause }
+        )
+      : cause.code === "ETARGET"
+      ? new Error(`The specified version ${unneeded.version} of ${unneeded.libraryName} is not on npm.`, { cause })
+      : cause;
+  }); // eg @babel/parser
+  const typings = await pacote.manifest(unneeded.fullNpmName, { cache: defaultCacheDir }).catch((cause) => {
+    throw cause.code === "E404"
+      ? new Error(`Unexpected error: @types package not found for ${unneeded.fullNpmName}`, { cause })
+      : cause;
+  }); // eg @types/babel__parser
   assert(
-    semver.gt(unneeded.version, latestTypings),
+    semver.gt(unneeded.version, typings.version),
     `The specified version ${unneeded.version} of ${unneeded.libraryName} must be newer than the version
-it is supposed to replace, ${latestTypings} of ${unneeded.fullNpmName}.`
-  );
-  assert(
-    source.versions.has(String(unneeded.version)),
-    `The specified version ${unneeded.version} of ${unneeded.libraryName} is not on npm.`
+it is supposed to replace, ${typings.version} of ${unneeded.fullNpmName}.`
   );
 }
 

packages/definitions-parser/test/git.test.ts

@@ -1,4 +1,3 @@
-import { NpmInfo } from "@definitelytyped/utils";
 import { createTypingsVersionRaw, testo } from "./utils";
 import { GitDiff, getNotNeededPackages, checkNotNeededPackage } from "../src/git";
 import { NotNeededPackage, TypesDataFile, AllPackages } from "../src/packages";
@@ -65,94 +64,33 @@ testo({
   // TODO: Test with dependents, etc etc
 });
 
-const empty: NpmInfo = {
-  homepage: "",
-  distTags: new Map(),
-  versions: new Map(),
-  time: new Map(),
-};
 testo({
   missingSource() {
-    expect(() => checkNotNeededPackage(jestNotNeeded[0], undefined, empty)).toThrow(
+    return expect(checkNotNeededPackage(new NotNeededPackage("jest", "nonexistent", "100.0.0"))).rejects.toThrow(
       "The entry for @types/jest in notNeededPackages.json"
     );
   },
   missingTypings() {
-    expect(() => checkNotNeededPackage(jestNotNeeded[0], empty, undefined)).toThrow(
-      "@types package not found for @types/jest"
-    );
-  },
-  missingTypingsLatest() {
-    expect(() => checkNotNeededPackage(jestNotNeeded[0], empty, empty)).toThrow(
-      '@types/jest is missing the "latest" tag'
+    return expect(checkNotNeededPackage(new NotNeededPackage("nonexistent", "jest", "100.0.0"))).rejects.toThrow(
+      "@types package not found for @types/nonexistent"
     );
   },
   deprecatedSameVersion() {
-    expect(() => {
-      checkNotNeededPackage(jestNotNeeded[0], empty, {
-        homepage: "jest.com",
-        distTags: new Map([["latest", "100.0.0"]]),
-        versions: new Map(),
-        time: new Map([["modified", ""]]),
-      });
-    }).toThrow(`The specified version 100.0.0 of jest must be newer than the version
-it is supposed to replace, 100.0.0 of @types/jest.`);
+    return expect(checkNotNeededPackage(new NotNeededPackage("jest", "jest", "50.0.0"))).rejects
+      .toThrow(`The specified version 50.0.0 of jest must be newer than the version
+it is supposed to replace, 50.0.0 of @types/jest.`);
   },
   deprecatedOlderVersion() {
-    expect(() => {
-      checkNotNeededPackage(jestNotNeeded[0], empty, {
-        homepage: "jest.com",
-        distTags: new Map([["latest", "999.0.0"]]),
-        versions: new Map(),
-        time: new Map([["modified", ""]]),
-      });
-    }).toThrow(`The specified version 100.0.0 of jest must be newer than the version
-it is supposed to replace, 999.0.0 of @types/jest.`);
+    return expect(checkNotNeededPackage(new NotNeededPackage("jest", "jest", "4.0.0"))).rejects
+      .toThrow(`The specified version 4.0.0 of jest must be newer than the version
+it is supposed to replace, 50.0.0 of @types/jest.`);
   },
   missingNpmVersion() {
-    expect(() => {
-      checkNotNeededPackage(jestNotNeeded[0], empty, {
-        homepage: "jest.com",
-        distTags: new Map([["latest", "4.0.0"]]),
-        versions: new Map(),
-        time: new Map([["modified", ""]]),
-      });
-    }).toThrow("The specified version 100.0.0 of jest is not on npm.");
-  },
-  olderNpmVersion() {
-    expect(() =>
-      checkNotNeededPackage(
-        jestNotNeeded[0],
-        {
-          homepage: "jest.com",
-          distTags: new Map(),
-          versions: new Map([["50.0.0", {}]]),
-          time: new Map([["modified", ""]]),
-        },
-        {
-          homepage: "jest.com",
-          distTags: new Map([["latest", "4.0.0"]]),
-          versions: new Map(),
-          time: new Map([["modified", ""]]),
-        }
-      )
-    ).toThrow("The specified version 100.0.0 of jest is not on npm.");
+    return expect(checkNotNeededPackage(new NotNeededPackage("jest", "jest", "999.0.0"))).rejects.toThrow(
+      "The specified version 999.0.0 of jest is not on npm."
+    );
   },
   ok() {
-    checkNotNeededPackage(
-      jestNotNeeded[0],
-      {
-        homepage: "jest.com",
-        distTags: new Map(),
-        versions: new Map([["100.0.0", {}]]),
-        time: new Map([["modified", ""]]),
-      },
-      {
-        homepage: "jest.com",
-        distTags: new Map([["latest", "4.0.0"]]),
-        versions: new Map(),
-        time: new Map([["modified", ""]]),
-      }
-    );
+    return checkNotNeededPackage(new NotNeededPackage("jest", "jest", "100.0.0"));
   },
 });

packages/perf/src/measure/measurePerf.ts

@@ -260,7 +260,7 @@ function getLatestTypesVersionForTypeScriptVersion(
 ): string | undefined {
   const tsVersion = new semver.SemVer(typeScriptVersion);
   for (let i = typesVersions.length - 1; i > 0; i--) {
-    if (semver.gte(tsVersion, `${typesVersions[i]}.0-`)) {
+    if (semver.gte(tsVersion, `${typesVersions[i]}.0-0`)) {
       return typesVersions[i];
     }
   }

packages/publisher/package.json

@@ -21,6 +21,7 @@
     "hh-mm-ss": "^1.2.0",
     "longjohn": "^0.2.11",
     "oboe": "^2.1.3",
+    "pacote": "^13.3.0",
     "semver": "^7.3.7",
     "source-map-support": "^0.4.0",
     "typescript": "^4.1.0",
@@ -31,6 +32,7 @@
     "@types/hh-mm-ss": "^1.2.1",
     "@types/mz": "^0.0.31",
     "@types/oboe": "^2.0.28",
+    "@types/pacote": "^11.1.3",
     "@types/source-map-support": "^0.4.0",
     "@types/yargs": "^15.0.4"
   },