Avoid unused definition imports from proto-loader #1826
Merged
Conversation
This file contains 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
|
|
Since proto files don't always contain all types of definition, it was possible to get into a state where generated code contained unused imports which caused TS errors. This change makes those imports conditional on the existence of the corresponding definitions in the proto file. Co-authored-by: Austin Puri <austin.puri@gmail.com> Co-authored-by: Joe Porpeglia <josephp@spotify.com> Signed-off-by: Mike Lewis <mtlewis@users.noreply.github.com>
mtlewis
force-pushed
the
conditional-definition-imports
branch
from
71d08ba
to
f289c34
Compare
mtlewis
commented
Jun 23, 2021
| @@ -617,7 +645,7 @@ function generateLoadedDefinitionTypes(formatter: TextFormatter, namespace: Prot | |||
|
|
|||
| function generateRootFile(formatter: TextFormatter, root: Protobuf.Root, options: GeneratorOptions) { | |||
| formatter.writeLine(`import type * as grpc from '${options.grpcLib}';`); | |||
| formatter.writeLine("import type { ServiceDefinition, EnumTypeDefinition, MessageTypeDefinition } from '@grpc/proto-loader';"); | |||
There was a problem hiding this comment.
Note that the ServiceDefinition import in the old version of the line appears to always be unused in the generated code.
There was a problem hiding this comment.
Right, I think it became unused in #1745.
|
The change looks good. Please run |
Signed-off-by: Mike Lewis <mtlewis@users.noreply.github.com>
murgatroid99
approved these changes
Jun 23, 2021
|
This has been published in version 0.6.3. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Since proto files don't always contain enums and messages, it was possible to get into a state where generated code contained unused imports which caused TS errors. This change makes those imports conditional on the existence of the corresponding definitions in the proto file.
Co-authored-by: Austin Puri austin.puri@gmail.com
Co-authored-by: Joe Porpeglia josephp@spotify.com