Improved string enum typing try 2 #4180
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
daxpedda
requested changes
Oct 12, 2024
|
Also reverts #4175. |
daxpedda
reviewed
Oct 12, 2024
daxpedda
reviewed
Oct 12, 2024
| @@ -83,6 +83,10 @@ export const ImplicitDiscriminant = Object.freeze({ A:0,"0":"A",B:1,"1":"B",C:42 | |||
|
|
|||
| const __wbindgen_enum_ColorName = ["green", "yellow", "red"]; | |||
|
|
|||
| const __wbindgen_enum_FooBar = ["foo", "bar"]; | |||
There was a problem hiding this comment.
This isn't used so it should not be generated as well.
I don't believe this is an issue this PR caused though.
There was a problem hiding this comment.
Yes, this is a side effect of #4147 (point 3), though I also only noticed this yesterday. I'll make a PR fixing this tomorrow. I just wanted for this PR to be in, because I'll need to implement a similar usage analysis. Nothing complex, I just wanted to see would be acceptable in the first place.
daxpedda
approved these changes
Oct 12, 2024
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.
Alright, let's try again. This PR reverts most of #4174 and restores most of #4147. I just made 2 changes:
This ensures that we don't repeat #4163 and puts us in a good position to make a fix for #2153, because we just have to decide when to export the generated type (but this will be its own PR).
Code-wise, not much is different from #4147. The only new part is how usage is detected. I hocked into the function that generates function signatures to keep track of which string enums are referenced. Since we always generate the type definition for exported functions before the type definitions for string enums, this works out beautifully and ensures that we know exactly which string enums are used.
If possible, please merge #4179 before this PR, so I can update this PR and have tests to ensure that #4163 isn't repeated.