fix: Only generate files in fileToGenerate #283
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
emil-e
changed the title
stephenh
requested changes
Apr 24, 2021
integration/codegen.ts
Outdated
| @@ -31,7 +31,7 @@ async function generate(binFile: string, baseDir: string, parameter: string) { | |||
| const options = optionsFromParameter(parameter || ''); | |||
| const typeMap = createTypeMap(request, options); | |||
|
|
|||
| for (let file of request.protoFile) { | |||
| for (let file of request.fileToGenerate) { | |||
There was a problem hiding this comment.
This causes compile errors due to the generateFile call on line 38 still wanting the FileDescriptorProto but fileToGenerate is just a string[].
emil-e
force-pushed
the
only-files-to-generate
branch
from
eae93e4
to
4909095
Compare
|
@stephenh How about that? |
stephenh
reviewed
Apr 27, 2021
src/plugin.ts
Outdated
| if (descriptor === undefined) { | ||
| throw new Error(`Cannot find descriptor for file-to-generate: ${fileName}`); | ||
| } | ||
| const [path, code] = generateFile(ctx, descriptor); |
There was a problem hiding this comment.
Cool, this looks good. Just to make sure src/plugin.ts and integration/codegen.ts stay in sync (I've had bugs come up from them drifting before), how about:
- Add a new
function protoFilesToGenerate(request): FileDescriptorProto[]insrc/plugin.tsthat returnsrequest.protoFile.filter(f => request.filesToGenerate.includes(f.name)); - Make line 23 in
src/plugin.tsbeprotoFilesToGenerate(request).map(async file => - Make line 34 in
codegen.tsbefor (let file of protoFilesToGenerate(request)) {
?
There was a problem hiding this comment.
That sounds reasonable, will make the change.
emil-e
force-pushed
the
only-files-to-generate
branch
from
4909095
to
7acf283
Compare
|
🎉 This PR is included in version 1.79.8 🎉 The release is available on: Your semantic-release bot 📦🚀 |
doochik
added a commit
to doochik/ts-proto
that referenced
this pull request
May 22, 2021
Fixes stephenh#294. This commit puts changes from stephenh#283 behind the flag.
doochik
added a commit
to doochik/ts-proto
that referenced
this pull request
May 23, 2021
stephenh
pushed a commit
that referenced
this pull request
May 23, 2021
stephenh
pushed a commit
that referenced
this pull request
May 23, 2021
zfy0701
added a commit
to sentioxyz/ts-proto
that referenced
this pull request
Jan 5, 2023
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.
According to doc comments in
plugin.protofrom Google: