maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use "ts2.2" (or "ts2.3", etc.) NPM tag in typingsInstaller

Browse source
This commit is contained in:
Andy Hanson 2017-01-30 07:49:17 -08:00
parent 445421b68b
commit 58cb9a7f08
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/harness/unittests/typingsInstaller.ts
View file

@ -44,6 +44,8 @@ namespace ts.projectSystem {
}); });
} }
import typingsName = server.typingsInstaller.typingsName;
describe("typingsInstaller", () => { describe("typingsInstaller", () => {
it("configured projects (typings installed) 1", () => { it("configured projects (typings installed) 1", () => {
const file1 = { const file1 = {
@ -519,32 +521,32 @@ namespace ts.projectSystem {
const commander = { const commander = {
path: "/a/data/node_modules/@types/commander/index.d.ts", path: "/a/data/node_modules/@types/commander/index.d.ts",
content: "declare const commander: { x: number }", content: "declare const commander: { x: number }",
typings: "@types/commander" typings: typingsName("commander")
}; };
const jquery = { const jquery = {
path: "/a/data/node_modules/@types/jquery/index.d.ts", path: "/a/data/node_modules/@types/jquery/index.d.ts",
content: "declare const jquery: { x: number }", content: "declare const jquery: { x: number }",
typings: "@types/jquery" typings: typingsName("jquery")
}; };
const lodash = { const lodash = {
path: "/a/data/node_modules/@types/lodash/index.d.ts", path: "/a/data/node_modules/@types/lodash/index.d.ts",
content: "declare const lodash: { x: number }", content: "declare const lodash: { x: number }",
typings: "@types/lodash" typings: typingsName("lodash")
}; };
const cordova = { const cordova = {
path: "/a/data/node_modules/@types/cordova/index.d.ts", path: "/a/data/node_modules/@types/cordova/index.d.ts",
content: "declare const cordova: { x: number }", content: "declare const cordova: { x: number }",
typings: "@types/cordova" typings: typingsName("cordova")
}; };
const grunt = { const grunt = {
path: "/a/data/node_modules/@types/grunt/index.d.ts", path: "/a/data/node_modules/@types/grunt/index.d.ts",
content: "declare const grunt: { x: number }", content: "declare const grunt: { x: number }",
typings: "@types/grunt" typings: typingsName("grunt")
}; };
const gulp = { const gulp = {
path: "/a/data/node_modules/@types/gulp/index.d.ts", path: "/a/data/node_modules/@types/gulp/index.d.ts",
content: "declare const gulp: { x: number }", content: "declare const gulp: { x: number }",
typings: "@types/gulp" typings: typingsName("gulp")
}; };
const host = createServerHost([lodashJs, commanderJs, file3]); const host = createServerHost([lodashJs, commanderJs, file3]);
@ -554,7 +556,7 @@ namespace ts.projectSystem {
} }
installWorker(_requestId: number, args: string[], _cwd: string, cb: TI.RequestCompletedAction): void { installWorker(_requestId: number, args: string[], _cwd: string, cb: TI.RequestCompletedAction): void {
let typingFiles: (FileOrFolder & { typings: string })[] = []; let typingFiles: (FileOrFolder & { typings: string })[] = [];
if (args.indexOf("@types/commander") >= 0) { if (args.indexOf(typingsName("commander")) >= 0) {
typingFiles = [commander, jquery, lodash, cordova]; typingFiles = [commander, jquery, lodash, cordova];
} }
else { else {
@ -982,7 +984,7 @@ namespace ts.projectSystem {
return; return;
} }
if (response.kind === server.EventEndInstallTypes) { if (response.kind === server.EventEndInstallTypes) {
assert.deepEqual(response.packagesToInstall, ["@types/commander"]); assert.deepEqual(response.packagesToInstall, [typingsName("commander")]);
seenTelemetryEvent = true; seenTelemetryEvent = true;
return; return;
} }

10
src/server/typingsInstaller/typingsInstaller.ts
View file

@ -295,8 +295,7 @@ namespace ts.server.typingsInstaller {
this.log.writeLine(`Installing typings ${JSON.stringify(typingsToInstall)}`); this.log.writeLine(`Installing typings ${JSON.stringify(typingsToInstall)}`);
} }
const filteredTypings = this.filterTypings(typingsToInstall); const filteredTypings = this.filterTypings(typingsToInstall);
const scopedTypings = filteredTypings.map(x => `@types/${x}`); if (filteredTypings.length === 0) {
if (scopedTypings.length === 0) {
if (this.log.isEnabled()) { if (this.log.isEnabled()) {
this.log.writeLine(`All typings are known to be missing or invalid - no need to go any further`); this.log.writeLine(`All typings are known to be missing or invalid - no need to go any further`);
} }
@ -316,6 +315,7 @@ namespace ts.server.typingsInstaller {
projectName: req.projectName projectName: req.projectName
}); });
const scopedTypings = filteredTypings.map(typingsName);
this.installTypingsAsync(requestId, scopedTypings, cachePath, ok => { this.installTypingsAsync(requestId, scopedTypings, cachePath, ok => {
try { try {
if (!ok) { if (!ok) {
@ -429,4 +429,10 @@ namespace ts.server.typingsInstaller {
protected abstract installWorker(requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void; protected abstract installWorker(requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void;
protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes): void; protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes): void;
} }
/* @internal */
export function typingsName(packageName: string): string {
return `@types/${packageName}@ts${versionMajorMinor}`;
}
const versionMajorMinor = version.split(".").slice(0, 2).join(".");
} }