Handle missing registry entries #24596
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
approved these changes
Jun 1, 2018
src/services/jsTyping.ts
Outdated
| @@ -160,7 +160,7 @@ namespace ts.JsTyping { | |||
| } | |||
| // Add the cached typing locations for inferred typings that are already installed | |||
| packageNameToTypingLocation.forEach((typing, name) => { | |||
| if (inferredTypings.has(name) && inferredTypings.get(name) === undefined && isTypingUpToDate(typing, typesRegistry.get(name)!)) { | |||
| if (inferredTypings.has(name) && inferredTypings.get(name) === undefined && typesRegistry.has(name) && isTypingUpToDate(typing, typesRegistry.get(name)!)) { | |||
There was a problem hiding this comment.
Nit: Better to .get() once and check against undefined, instead of using has() (in the usual case where a map shouldn't contain undefined values)
ghost
reviewed
Jun 1, 2018
src/services/jsTyping.ts
Outdated
| @@ -160,7 +160,8 @@ namespace ts.JsTyping { | |||
| } | |||
| // Add the cached typing locations for inferred typings that are already installed | |||
| packageNameToTypingLocation.forEach((typing, name) => { | |||
| if (inferredTypings.has(name) && inferredTypings.get(name) === undefined && typesRegistry.has(name) && isTypingUpToDate(typing, typesRegistry.get(name)!)) { | |||
| const registryEntry = typesRegistry.get(name); | |||
| if (inferredTypings.has(name) && inferredTypings.get(name) === undefined && registryEntry !== undefined && isTypingUpToDate(typing, typesRegistry.get(name)!)) { | |||
There was a problem hiding this comment.
Forgot to replace the second typesRegistry.get with registryEntry
ghost
approved these changes
Jun 1, 2018
mhegazy
approved these changes
Jun 3, 2018
src/services/jsTyping.ts
Outdated
| @@ -160,7 +160,8 @@ namespace ts.JsTyping { | |||
| } | |||
| // Add the cached typing locations for inferred typings that are already installed | |||
| packageNameToTypingLocation.forEach((typing, name) => { | |||
| if (inferredTypings.has(name) && inferredTypings.get(name) === undefined && isTypingUpToDate(typing, typesRegistry.get(name)!)) { | |||
| const registryEntry = typesRegistry.get(name); | |||
| if (inferredTypings.has(name) && inferredTypings.get(name) === undefined && registryEntry !== undefined && isTypingUpToDate(typing, registryEntry!)) { | |||
There was a problem hiding this comment.
Do not think u need the null assertion now.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, if a previously installed ATA package is removed from the types-registry, we throw an exception when trying to determine whether to update it on typings install.
This PR fixes that issue by reporting the package as not cached, and then appropriately does not attempt to install it (due to it being missing from the registry).