casraf/DefinitelyTyped-tools
1
0
Fork 0
mirror of https://github.com/chenasraf/DefinitelyTyped-tools.git synced 2026-05-17 17:48:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate typescript-versions into own package

Browse Source
This commit is contained in:
Andrew Branch
2020-04-14 15:53:52 -07:00
parent 88172254de
commit ad42efb5bc
16 changed files with 177 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/definitions-parser/package.json
View File

@@ -20,6 +20,7 @@
},
"dependencies": {
"@definitelytyped/header-parser": "^0.0.23-next.0",
"@definitelytyped/typescript-versions": "0.0.23-next.0",
"@definitelytyped/utils": "^0.0.23-next.0",
"@types/node": "^12.12.29",
"fs-extra": "^8.1.0",

4
packages/definitions-parser/src/lib/definition-parser.ts
View File

@@ -24,9 +24,9 @@ import {
join,
flatMap,
unique,
unmangleScopedPackage,
TypeScriptVersion
unmangleScopedPackage
} from "@definitelytyped/utils";
import { TypeScriptVersion } from "@definitelytyped/typescript-versions";
function matchesVersion(typingsDataRaw: TypingsDataRaw, version: TypingVersion, considerLibraryMinorVersion: boolean) {
return (

11
packages/definitions-parser/src/packages.ts
View File

@@ -1,14 +1,7 @@
import assert = require("assert");
import { Author } from "@definitelytyped/header-parser";
import {
FS,
mapValues,
assertSorted,
unmangleScopedPackage,
Semver,
TypeScriptVersion,
AllTypeScriptVersion
} from "@definitelytyped/utils";
import { FS, mapValues, assertSorted, unmangleScopedPackage, Semver } from "@definitelytyped/utils";
import { AllTypeScriptVersion, TypeScriptVersion } from "@definitelytyped/typescript-versions";
import { readDataFile } from "./data-file";
import { scopeName, typesDirectoryName } from "./lib/settings";
import { parseVersionFromDirectoryName } from "./parse-definitions";

2
packages/header-parser/package.json
View File

@@ -20,7 +20,7 @@
"url": "https://github.com/DefinitelyTyped/tools/issues"
},
"dependencies": {
"@definitelytyped/utils": "^0.0.23-next.0",
"@definitelytyped/typescript-versions": "0.0.23-next.0",
"@types/parsimmon": "^1.10.1",
"parsimmon": "^1.13.0"
},

6
packages/header-parser/src/index.ts
View File

@@ -1,5 +1,5 @@
import pm = require("parsimmon");
import { AllTypeScriptVersion, TypeScriptVersion } from "@definitelytyped/utils";
import { AllTypeScriptVersion, TypeScriptVersion } from "@definitelytyped/typescript-versions";
/*
@@ -36,10 +36,6 @@ export interface ParseError {
readonly expected: readonly string[];
}
export function isTypeScriptVersion(str: string): str is TypeScriptVersion {
return TypeScriptVersion.all.includes(str as TypeScriptVersion);
}
export function makeTypesVersionsForPackageJson(typesVersions: readonly TypeScriptVersion[]): unknown {
if (typesVersions.length === 0) {
return undefined;

8
packages/publisher/package-lock.json generated
View File

@@ -663,7 +663,7 @@
"json-stable-stringify": "^1.0.1",
"strip-json-comments": "^2.0.1",
"tslint": "5.14.0",
"typescript": "^3.9.0-dev.20200413",
"typescript": "^3.9.0-dev.20200414",
"yargs": "^15.1.0"
},
"dependencies": {
@@ -5083,9 +5083,9 @@
"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
},
"typescript": {
"version": "3.9.0-dev.20200413",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.0-dev.20200413.tgz",
"integrity": "sha512-wpPljcRc3uLTVpQ8mtKTkS42ipVnW1E7lU5iII+JSKaUDH1ymeo3duvMz8o2sCRUDoZR0SE0SLcinaZ1q4gD7A=="
"version": "3.9.0-dev.20200414",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.0-dev.20200414.tgz",
"integrity": "sha512-wqAPcJUX4SPnySVpP58Vh09b4ncxxHdwP9HaPP9YTaOGHS3PyychJcbvMBqlKVXdvBvhHoacVDSB0Agn2zu4hA=="
},
"underscore": {
"version": "1.10.2",

1
packages/publisher/package.json
View File

@@ -8,6 +8,7 @@
"dependencies": {
"@definitelytyped/definitions-parser": "^0.0.23-next.0",
"@definitelytyped/header-parser": "^0.0.23-next.0",
"@definitelytyped/typescript-versions": "0.0.23-next.0",
"@definitelytyped/utils": "^0.0.23-next.0",
"@octokit/rest": "^16.1.0",
"adal-node": "^0.1.22",

9
packages/publisher/src/lib/package-publisher.ts
View File

@@ -1,12 +1,5 @@
import assert = require("assert");
import {
Logger,
joinPaths,
readFileAndWarn,
TypeScriptVersion,
NpmPublishClient,
Registry
} from "@definitelytyped/utils";
import { Logger, joinPaths, readFileAndWarn, NpmPublishClient, Registry } from "@definitelytyped/utils";
import { NotNeededPackage, AnyPackage } from "@definitelytyped/definitions-parser";
import { ChangedTyping } from "./versions";
import { outputDirectory } from "../util/util";

3
packages/typescript-versions/README.md Normal file
View File

@@ -0,0 +1,3 @@
# @definitelytyped/typescript-versions
List of supported TypeScript versions.

19
packages/typescript-versions/package.json Normal file
View File

@@ -0,0 +1,19 @@
{
"name": "@definitelytyped/typescript-versions",
"version": "0.0.23-next.0",
"description": "List of supported TypeScript versions",
"author": "Andrew Branch <andrew@wheream.io>",
"homepage": "https://github.com/microsoft/DefinitelyTyped-tools#readme",
"license": "MIT",
"main": "dist/index.js",
"publishConfig": {
"access": "public"
},
"repository": {
"type": "git",
"url": "git+https://github.com/microsoft/DefinitelyTyped-tools.git"
},
"bugs": {
"url": "https://github.com/microsoft/DefinitelyTyped-tools/issues"
}
}

126
packages/typescript-versions/src/index.ts Normal file
View File

@@ -0,0 +1,126 @@
import assert from "assert";
/*
# How to add new version of Typescript #
For the RC:
1. Add a new version to the end of `supportedTags`.
2. Update failing tests.
3. Publish and update dependents.
For the release:
1. Add new versions to the end of `TypeScriptVersion` and `supported`.
2. Update failing tests.
3. Publish and update dependents.
# How to deprecate versions on Definitely Typed #
1. Move versions from `TypeScriptVersion` to `UnsupportedTypeScriptVersion`.
2. Move versions from `supported` to `unsupported`.
3. Remove entry from `supportedTags`.
4. Update failing tests.
5. Publish and update dependents.
*/
/** Parseable but unsupported TypeScript versions. */
export type UnsupportedTypeScriptVersion = "2.0" | "2.1" | "2.2" | "2.3" | "2.4" | "2.5" | "2.6" | "2.7";
/**
* Parseable and supported TypeScript versions.
* Only add to this list if we will support this version on DefinitelyTyped.
*/
export type TypeScriptVersion =
| "2.8"
| "2.9"
| "3.0"
| "3.1"
| "3.2"
| "3.3"
| "3.4"
| "3.5"
| "3.6"
| "3.7"
| "3.8"
| "3.9";
export type AllTypeScriptVersion = UnsupportedTypeScriptVersion | TypeScriptVersion;
export namespace TypeScriptVersion {
export const supported: readonly TypeScriptVersion[] = [
"2.8",
"2.9",
"3.0",
"3.1",
"3.2",
"3.3",
"3.4",
"3.5",
"3.6",
"3.7",
"3.8",
"3.9"
];
export const unsupported: readonly UnsupportedTypeScriptVersion[] = [
"2.0",
"2.1",
"2.2",
"2.3",
"2.4",
"2.5",
"2.6",
"2.7"
];
export const all: readonly AllTypeScriptVersion[] = [...unsupported, ...supported];
export const lowest = supported[0];
/** Latest version that may be specified in a `// TypeScript Version:` header. */
export const latest = supported[supported.length - 1];
/** @deprecated */
export function isPrerelease(_version: TypeScriptVersion): boolean {
return false;
}
export function isSupported(v: AllTypeScriptVersion): v is TypeScriptVersion {
return supported.indexOf(v as TypeScriptVersion) > -1;
}
export function range(min: TypeScriptVersion): readonly TypeScriptVersion[] {
return supported.filter(v => v >= min);
}
const supportedTags: readonly string[] = [
"ts2.8",
"ts2.9",
"ts3.0",
"ts3.1",
"ts3.2",
"ts3.3",
"ts3.4",
"ts3.5",
"ts3.6",
"ts3.7",
"ts3.8",
"ts3.9",
"latest"
];
/** List of NPM tags that should be changed to point to the latest version. */
export function tagsToUpdate(v: TypeScriptVersion): readonly string[] {
const idx = supportedTags.indexOf(`ts${v}`);
assert(idx !== -1);
return supportedTags.slice(idx);
}
export function previous(v: TypeScriptVersion): TypeScriptVersion | undefined {
const index = supported.indexOf(v);
assert(index !== -1);
return index === 0 ? undefined : supported[index - 1];
}
export function isRedirectable(v: TypeScriptVersion): boolean {
return all.indexOf(v) >= all.indexOf("3.1");
}
}

8
packages/typescript-versions/tsconfig.json Normal file
View File

@@ -0,0 +1,8 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "dist"
},
"include": ["src"]
}

1
packages/utils/package.json
View File

@@ -19,6 +19,7 @@
"url": "https://github.com/DefinitelyTyped/tools/issues"
},
"dependencies": {
"@definitelytyped/typescript-versions": "0.0.23-next.0",
"@types/node": "^12.12.29",
"charm": "^1.0.2",
"fs-extra": "^8.1.0",

128
packages/utils/src/typescript-installer.ts
View File

@@ -3,135 +3,11 @@ import { exec } from "child_process";
import * as fs from "fs-extra";
import * as os from "os";
import * as path from "path";
/*
# How to add new version of Typescript #
For the RC:
1. Add a new version to the end of `supportedTags`.
2. Update failing tests.
3. Publish and update dependents.
For the release:
1. Add new versions to the end of `TypeScriptVersion` and `supported`.
2. Update failing tests.
3. Publish and update dependents.
# How to deprecate versions on Definitely Typed #
1. Move versions from `TypeScriptVersion` to `UnsupportedTypeScriptVersion`.
2. Move versions from `supported` to `unsupported`.
3. Remove entry from `supportedTags`.
4. Update failing tests.
5. Publish and update dependents.
*/
const installsDir = path.join(os.homedir(), ".dts", "typescript-installs");
/** Parseable but unsupported TypeScript versions. */
export type UnsupportedTypeScriptVersion = "2.0" | "2.1" | "2.2" | "2.3" | "2.4" | "2.5" | "2.6" | "2.7";
/**
* Parseable and supported TypeScript versions.
* Only add to this list if we will support this version on DefinitelyTyped.
*/
export type TypeScriptVersion =
| "2.8"
| "2.9"
| "3.0"
| "3.1"
| "3.2"
| "3.3"
| "3.4"
| "3.5"
| "3.6"
| "3.7"
| "3.8"
| "3.9";
export type AllTypeScriptVersion = UnsupportedTypeScriptVersion | TypeScriptVersion;
import { TypeScriptVersion } from "@definitelytyped/typescript-versions";
export type TsVersion = TypeScriptVersion | "next" | "local";
export namespace TypeScriptVersion {
export const supported: readonly TypeScriptVersion[] = [
"2.8",
"2.9",
"3.0",
"3.1",
"3.2",
"3.3",
"3.4",
"3.5",
"3.6",
"3.7",
"3.8",
"3.9"
];
export const unsupported: readonly UnsupportedTypeScriptVersion[] = [
"2.0",
"2.1",
"2.2",
"2.3",
"2.4",
"2.5",
"2.6",
"2.7"
];
export const all: readonly AllTypeScriptVersion[] = [...unsupported, ...supported];
export const lowest = supported[0];
/** Latest version that may be specified in a `// TypeScript Version:` header. */
export const latest = supported[supported.length - 1];
/** @deprecated */
export function isPrerelease(_version: TypeScriptVersion): boolean {
return false;
}
export function isSupported(v: AllTypeScriptVersion): v is TypeScriptVersion {
return supported.indexOf(v as TypeScriptVersion) > -1;
}
export function range(min: TypeScriptVersion): readonly TypeScriptVersion[] {
return supported.filter(v => v >= min);
}
const supportedTags: readonly string[] = [
"ts2.8",
"ts2.9",
"ts3.0",
"ts3.1",
"ts3.2",
"ts3.3",
"ts3.4",
"ts3.5",
"ts3.6",
"ts3.7",
"ts3.8",
"ts3.9",
"latest"
];
/** List of NPM tags that should be changed to point to the latest version. */
export function tagsToUpdate(v: TypeScriptVersion): readonly string[] {
const idx = supportedTags.indexOf(`ts${v}`);
assert(idx !== -1);
return supportedTags.slice(idx);
}
export function previous(v: TypeScriptVersion): TypeScriptVersion | undefined {
const index = supported.indexOf(v);
assert(index !== -1);
return index === 0 ? undefined : supported[index - 1];
}
export function isRedirectable(v: TypeScriptVersion): boolean {
return all.indexOf(v) >= all.indexOf("3.1");
}
}
const installsDir = path.join(os.homedir(), ".dts", "typescript-installs");
export async function installAllTypeScriptVersions() {
for (const v of TypeScriptVersion.supported) {

5
packages/utils/tsconfig.json
View File

@@ -4,5 +4,8 @@
"rootDir": "src",
"outDir": "dist"
},
"include": ["src"]
"include": ["src"],
"references": [
{ "path": "../typescript-versions" }
]
}

1
tsconfig.all.json
View File

@@ -6,6 +6,7 @@
{ "path": "packages/header-parser" },
{ "path": "packages/perf" },
{ "path": "packages/publisher" },
{ "path": "packages/typescript-versions" },
{ "path": "packages/utils" }
]
}