Merge pull request #94 from arethetypeswrong/cli-dt

Infer --from-npm version from DT package when provided

Author: andrewbranch

.changeset/gold-nails-dream.md

@@ -0,0 +1,5 @@
+---
+"@arethetypeswrong/cli": minor
+---
+
+Infer `--from-npm` version from a locally-provided DefinitelyTyped package

package-lock.json

@@ -42,6 +42,7 @@
     "@types/marked-terminal": "^3.1.3",
     "@types/node": "^20.2.5",
     "@types/node-fetch": "^2.6.4",
+    "@types/semver": "^7.5.3",
     "typescript": "^5.0.0-dev.20230207"
   },
   "dependencies": {
@@ -51,6 +52,7 @@
     "commander": "^10.0.1",
     "marked": "^5.1.0",
     "marked-terminal": "^5.2.0",
-    "node-fetch": "^2.6.4"
+    "node-fetch": "^2.6.4",
+    "semver": "^7.5.4"
   }
 }

packages/cli/package.json

@@ -14,6 +14,7 @@ import readline from "readline";
 import { problemFlags } from "./problemUtils.js";
 import { readConfig } from "./readConfig.js";
 import * as render from "./render/index.js";
+import { major, minor } from "semver";
 
 const packageJson = createRequire(import.meta.url)("../package.json");
 const version = packageJson.version;
@@ -111,13 +112,21 @@ particularly ESM-related module resolution issues.`
         if (result.status === "error") {
           program.error(result.error);
         } else {
-          const pkg = dtIsPath
-            ? (await core.createPackageFromNpm(`${result.data.name}@${result.data.version}`)).mergedWithTypes(
-                core.createPackageFromTarballData(new Uint8Array(await readFile(opts.definitelyTyped as string)))
-              )
-            : await core.createPackageFromNpm(`${result.data.name}@${result.data.version}`, {
-                definitelyTyped: opts.definitelyTyped,
-              });
+          let pkg;
+          if (dtIsPath) {
+            const dtPackage = core.createPackageFromTarballData(
+              new Uint8Array(await readFile(opts.definitelyTyped as string))
+            );
+            const pkgVersion =
+              result.data.versionKind === "none"
+                ? `${major(dtPackage.packageVersion)}.${minor(dtPackage.packageVersion)}`
+                : result.data.version;
+            pkg = (await core.createPackageFromNpm(`${result.data.name}@${pkgVersion}`)).mergedWithTypes(dtPackage);
+          } else {
+            pkg = await core.createPackageFromNpm(`${result.data.name}@${result.data.version}`, {
+              definitelyTyped: opts.definitelyTyped,
+            });
+          }
           analysis = await core.checkPackage(pkg, {
             entrypoints: opts.entrypoints,
             includeEntrypoints: opts.includeEntrypoints,