fix #1772: EncodeType doesn't unify embedded Go struct with struct definition

[yangzhares]

Signed-off-by: Clare Yang (zhanyang) [email protected]

[myitcv]

Thanks @yangzhares - I'll defer to @mpvl for a review here.

In the meantime, please can you take a look at the contribution guide on commit messages?

https://github.com/cue-lang/cue/blob/master/doc/contribute.md#good-commit-messages

That gives advice on the scheme we follow there. Thanks

[verdverm]

I'm curious what happens if the embedded struct does not have a json tag. A test covering this would be nice too, if it doesn't already exist somewhere

[yangzhares]

@myitcv , updated commit message.

@verdverm , added two test cases, i'm not sure that is what you want

[verdverm]

@yangzhares That looks to cover what I was thinking about, though now I'm wondering what happens with E.

type EmbeddedObj struct {
	B int `json:"b"`
	D string
	E string `json:"e",omitempty`
}

[yangzhares]

Based on current logic 1) goTypeToValueRec, https://github.com/cue-lang/cue/blob/master/internal/core/convert/go.go#L693, 2) getName, https://github.com/cue-lang/cue/blob/master/internal/core/convert/go.go#L99, 3)isOptional, https://github.com/cue-lang/cue/blob/master/internal/core/convert/go.go#L139, to handle such case, especial field E, its CUE code should be like:

{
    b: ((int & >=-9223372036854775808) & <=9223372036854775807)
    D: string
    e: string
}

[verdverm]

I'm not familiar with the code, mostly just thinking about test cases to cover all the scenarios, especially when code changes in the future

[mvdan]

@yangzhares apologies that we hadn't gotten back to this yet. It appears that other fixes have caused conflicts here. Would you be able to fix those and rebase? I'm happy to review afterwards. Thank you!