Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a45a14
Infer --from-npm version from DT package when provided
andrewbranch Sep 26, 2023
26f89d1
Add changeset
andrewbranch Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/gold-nails-dream.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@arethetypeswrong/cli": minor
---

Infer `--from-npm` version from a locally-provided DefinitelyTyped package
19 changes: 14 additions & 5 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
23 changes: 16 additions & 7 deletions packages/cli/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down