Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add typescript definition for Oneof fields #460

Merged
merged 1 commit into from
Feb 26, 2019

Conversation

yangjian
Copy link
Contributor

@yangjian yangjian commented Feb 10, 2019

ATT

@stanley-cheung
Copy link
Collaborator

Sorry for the late look at this. There had been some work to re-sync this repo with our internal codebase so it looks like there are some new conflicts.

Can you please resolve them and rebase to the latest master please? Thanks

@yangjian
Copy link
Contributor Author

Just resolved conflicts, and rebased to latest master. Please let me know if there is any issue in the change.

@stanley-cheung
Copy link
Collaborator

Ah, sorry, some more conflicts after a merge. Please rebase again. This PR will be next.

@yangjian
Copy link
Contributor Author

Just resolved conflicts, and rebased again.

Copy link
Collaborator

@stanley-cheung stanley-cheung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contributions!

@stanley-cheung stanley-cheung merged commit cfe789f into grpc:master Feb 26, 2019
@rogchap
Copy link
Contributor

rogchap commented Mar 28, 2019

I have a weird side effect of this: it seems the hasXXX() method is being defined twice; our example:

getLogicfield(): LogicfieldTemplateItem | undefined;
setLogicfield(value?: LogicfieldTemplateItem): void;
hasLogicfield(): boolean;
clearLogicfield(): void;
hasLogicfield(): boolean;

getItemCase(): TemplateItem.ItemCase;

@yangjian
Copy link
Contributor Author

Sorry. I didn't noticed that this method has be defined during resolving conflicts: https://github.com/grpc/grpc-web/blob/master/javascript/net/grpc/web/grpc_generator.cc#L863

submitted PR #519 to fix this issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants