diff --git a/lib/tsc.js b/lib/tsc.js index ee5f3dc73a7..de88f56798e 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -152,7 +152,7 @@ var ts; var ts; (function (ts) { ts.versionMajorMinor = "2.6"; - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) { diff --git a/lib/tsserver.js b/lib/tsserver.js index 43515961797..f10e1d6f877 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -1182,7 +1182,7 @@ var ts; var ts; (function (ts) { ts.versionMajorMinor = "2.6"; - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) { @@ -81335,8 +81335,8 @@ var ts; (function (server) { server.ActionSet = "action::set"; server.ActionInvalidate = "action::invalidate"; + server.ActionPackageInstalled = "action::packageInstalled"; server.EventTypesRegistry = "event::typesRegistry"; - server.EventPackageInstalled = "event::packageInstalled"; server.EventBeginInstallTypes = "event::beginInstallTypes"; server.EventEndInstallTypes = "event::endInstallTypes"; server.EventInitializationFailed = "event::initializationFailed"; @@ -82871,7 +82871,7 @@ var ts; return this.typingsCache.isKnownTypesPackageName(name); }; Project.prototype.installPackage = function (options) { - return this.typingsCache.installPackage(__assign({}, options, { projectRootPath: this.toPath(this.currentDirectory) })); + return this.typingsCache.installPackage(__assign({}, options, { projectName: this.projectName, projectRootPath: this.toPath(this.currentDirectory) })); }; Object.defineProperty(Project.prototype, "typingsCache", { get: function () { @@ -88088,7 +88088,7 @@ var ts; case server.EventTypesRegistry: this.typesRegistryCache = ts.createMapFromTemplate(response.typesRegistry); break; - case server.EventPackageInstalled: { + case server.ActionPackageInstalled: { var success = response.success, message = response.message; if (success) { this.packageInstalledPromise.resolve({ successMessage: message }); @@ -88097,6 +88097,10 @@ var ts; this.packageInstalledPromise.reject(message); } this.packageInstalledPromise = undefined; + this.projectService.updateTypingsForProject(response); + if (this.socket) { + this.sendEvent(0, "setTypings", response); + } break; } case server.EventInitializationFailed: diff --git a/lib/tsserverlibrary.d.ts b/lib/tsserverlibrary.d.ts index 522cfc906c0..c4266d82b15 100644 --- a/lib/tsserverlibrary.d.ts +++ b/lib/tsserverlibrary.d.ts @@ -4699,7 +4699,7 @@ declare namespace ts.server { interface TypesRegistryRequest { readonly kind: "typesRegistry"; } - interface InstallPackageRequest { + interface InstallPackageRequest extends TypingInstallerRequestWithProjectName { readonly kind: "installPackage"; readonly fileName: Path; readonly packageName: string; @@ -4707,13 +4707,18 @@ declare namespace ts.server { } type ActionSet = "action::set"; type ActionInvalidate = "action::invalidate"; + type ActionPackageInstalled = "action::packageInstalled"; type EventTypesRegistry = "event::typesRegistry"; - type EventPackageInstalled = "event::packageInstalled"; type EventBeginInstallTypes = "event::beginInstallTypes"; type EventEndInstallTypes = "event::endInstallTypes"; type EventInitializationFailed = "event::initializationFailed"; interface TypingInstallerResponse { - readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | EventPackageInstalled | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed; + readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed; + } + interface PackageInstalledResponse extends ProjectResponse { + readonly kind: ActionPackageInstalled; + readonly success: boolean; + readonly message: string; } interface InitializationFailedResponse extends TypingInstallerResponse { readonly kind: EventInitializationFailed; @@ -4749,8 +4754,8 @@ declare namespace ts.server { declare namespace ts.server { const ActionSet: ActionSet; const ActionInvalidate: ActionInvalidate; + const ActionPackageInstalled: ActionPackageInstalled; const EventTypesRegistry: EventTypesRegistry; - const EventPackageInstalled: EventPackageInstalled; const EventBeginInstallTypes: EventBeginInstallTypes; const EventEndInstallTypes: EventEndInstallTypes; const EventInitializationFailed: EventInitializationFailed; @@ -7092,12 +7097,13 @@ declare namespace ts.server { } } declare namespace ts.server { - interface InstallPackageOptionsWithProjectRootPath extends InstallPackageOptions { + interface InstallPackageOptionsWithProject extends InstallPackageOptions { + projectName: string; projectRootPath: Path; } interface ITypingsInstaller { isKnownTypesPackageName(name: string): boolean; - installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise; + installPackage(options: InstallPackageOptionsWithProject): Promise; enqueueInstallTypingsRequest(p: Project, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray): void; attach(projectService: ProjectService): void; onProjectClosed(p: Project): void; @@ -7109,7 +7115,7 @@ declare namespace ts.server { private readonly perProjectCache; constructor(installer: ITypingsInstaller); isKnownTypesPackageName(name: string): boolean; - installPackage(options: InstallPackageOptionsWithProjectRootPath): Promise; + installPackage(options: InstallPackageOptionsWithProject): Promise; getTypingsForProject(project: Project, unresolvedImports: SortedReadonlyArray, forceRefresh: boolean): SortedReadonlyArray; updateTypingsForProject(projectName: string, compilerOptions: CompilerOptions, typeAcquisition: TypeAcquisition, unresolvedImports: SortedReadonlyArray, newTypings: string[]): void; deleteTypingsForProject(projectName: string): void; @@ -7537,7 +7543,7 @@ declare namespace ts.server { private createWatcherLog(watchType, project); toPath(fileName: string): Path; private loadTypesMap(); - updateTypingsForProject(response: SetTypings | InvalidateCachedTypings): void; + updateTypingsForProject(response: SetTypings | InvalidateCachedTypings | PackageInstalledResponse): void; private delayInferredProjectsRefresh(); private delayUpdateProjectGraph(project); private sendProjectsUpdatedInBackgroundEvent(); diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index e279d2020df..2914fbc5c5b 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -1368,7 +1368,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "2.6"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) { @@ -97193,8 +97193,8 @@ var ts; (function (server) { server.ActionSet = "action::set"; server.ActionInvalidate = "action::invalidate"; + server.ActionPackageInstalled = "action::packageInstalled"; server.EventTypesRegistry = "event::typesRegistry"; - server.EventPackageInstalled = "event::packageInstalled"; server.EventBeginInstallTypes = "event::beginInstallTypes"; server.EventEndInstallTypes = "event::endInstallTypes"; server.EventInitializationFailed = "event::initializationFailed"; @@ -101509,7 +101509,7 @@ var ts; return this.typingsCache.isKnownTypesPackageName(name); }; Project.prototype.installPackage = function (options) { - return this.typingsCache.installPackage(__assign({}, options, { projectRootPath: this.toPath(this.currentDirectory) })); + return this.typingsCache.installPackage(__assign({}, options, { projectName: this.projectName, projectRootPath: this.toPath(this.currentDirectory) })); }; Object.defineProperty(Project.prototype, "typingsCache", { get: function () { diff --git a/lib/typescript.js b/lib/typescript.js index a1d0b8ad25b..e0ec7754218 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -1368,7 +1368,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "2.6"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) { diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index a1d0b8ad25b..e0ec7754218 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -1368,7 +1368,7 @@ var ts; // If changing the text in this section, be sure to test `configureNightly` too. ts.versionMajorMinor = "2.6"; /** The version of the TypeScript compiler release */ - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) { diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index 62b632b773b..e0b2de8eb05 100644 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -162,7 +162,7 @@ var ts; var ts; (function (ts) { ts.versionMajorMinor = "2.6"; - ts.version = ts.versionMajorMinor + ".2"; + ts.version = ts.versionMajorMinor + ".3"; })(ts || (ts = {})); (function (ts) { function isExternalModuleNameRelative(moduleName) { @@ -17445,8 +17445,8 @@ var ts; (function (server) { server.ActionSet = "action::set"; server.ActionInvalidate = "action::invalidate"; + server.ActionPackageInstalled = "action::packageInstalled"; server.EventTypesRegistry = "event::typesRegistry"; - server.EventPackageInstalled = "event::packageInstalled"; server.EventBeginInstallTypes = "event::beginInstallTypes"; server.EventEndInstallTypes = "event::endInstallTypes"; server.EventInitializationFailed = "event::initializationFailed"; @@ -18509,8 +18509,9 @@ var ts; var filteredTypings = this.filterTypings(typingsToInstall); if (filteredTypings.length === 0) { 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 install more typings"); } + this.sendResponse(this.createSetTypings(req, currentlyCachedTypings)); return; } this.ensurePackageDirectoryExists(cachePath); @@ -18757,17 +18758,17 @@ var ts; break; } case "installPackage": { - var fileName = req.fileName, packageName_1 = req.packageName, projectRootPath = req.projectRootPath; + var fileName = req.fileName, packageName_1 = req.packageName, projectName_1 = req.projectName, projectRootPath = req.projectRootPath; var cwd = getDirectoryOfPackageJson(fileName, _this.installTypingHost) || projectRootPath; if (cwd) { _this.installWorker(-1, [packageName_1], cwd, function (success) { var message = success ? "Package " + packageName_1 + " installed." : "There was an error installing " + packageName_1 + "."; - var response = { kind: server.EventPackageInstalled, success: success, message: message }; + var response = { kind: server.ActionPackageInstalled, projectName: projectName_1, success: success, message: message }; _this.sendResponse(response); }); } else { - var response = { kind: server.EventPackageInstalled, success: false, message: "Could not determine a project root path." }; + var response = { kind: server.ActionPackageInstalled, projectName: projectName_1, success: false, message: "Could not determine a project root path." }; _this.sendResponse(response); } break;