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.

Sign up for GitHub

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

Jump to bottom

Implement proper support for scalar or "discriminated" disjunctions in Go jenny #19

Merged
merged 17 commits into from
Sep 21, 2023
Merged

Implement proper support for scalar or "discriminated" disjunctions in Go jenny #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
919bc3b
Implement proper support for scalar+array only disjunctions in Go jenny
K-Phoen Sep 13, 2023
bc8a7d1
First pass at implementing generic support for disjunction of referen…
K-Phoen Sep 14, 2023
f63669d
Disable an annoying linting rule
K-Phoen Sep 14, 2023
1307604
Return an error when unmarshaling a disjunction with unexpected discr…
K-Phoen Sep 14, 2023
84c41f2
Return errors when something goes wrong while handling a disjunction
K-Phoen Sep 14, 2023
517b67d
More defensive checks when building a discriminator mapping
K-Phoen Sep 14, 2023
9462a98
Little code cleanup
K-Phoen Sep 14, 2023
57760be
Little cosmetic rearrangement
K-Phoen Sep 17, 2023
c2c4063
Update a couple of txtar tests outputs
K-Phoen Sep 17, 2023
e99c8d1
Write a few unit tests for disjunctions of scalars
K-Phoen Sep 18, 2023
c7b2fd9
Write a few unit tests for disjunctions of refs
K-Phoen Sep 18, 2023
0d72d26
Update a few comments
K-Phoen Sep 18, 2023
9c1f79a
Finish Types.HasOnlyScalarOrArray() implementation
K-Phoen Sep 18, 2023
581cfea
Properly handle required/nullable types and fields
K-Phoen Sep 19, 2023
7129109
Use some syntactic sugar on disjunction unit tests
K-Phoen Sep 19, 2023
99b8591
Add a couple of unit tests for `type | null` disjunctions handling in…
K-Phoen Sep 19, 2023
0d1e455
Handle disjunctions defined in a map value type
K-Phoen Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ linters:
- gocognit
- gomnd
- tagliatelle
- nlreturn
# deprecated
- deadcode
- scopelint
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.21

require (
cuelang.org/go v0.5.0
github.com/google/go-cmp v0.5.9
github.com/grafana/codejen v0.0.4-0.20221122220907-a5e7cc5407b3
github.com/grafana/kindsys v0.0.0-20230615185749-1424263c17c7
github.com/grafana/thema v0.0.0-20230628103417-8f63313207a5
Expand All @@ -24,7 +25,6 @@ require (
github.com/emicklei/proto v1.11.2 // indirect
github.com/getsentry/sentry-go v0.22.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
Expand Down
6 changes: 3 additions & 3 deletions internal/ast/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ type Assignment struct {
Constraints []TypeConstraint

// Some more context on the what
IntoOptionalField bool
IntoNullableField bool
}

type BuilderGenerator struct {
Expand Down Expand Up @@ -106,7 +106,7 @@ func (generator *BuilderGenerator) structFieldToStaticInitialization(field Struc
Path: field.Name,
Value: field.Type.AsScalar().Value,
ValueType: field.Type,
IntoOptionalField: !field.Required,
IntoNullableField: field.Type.Nullable,
}
}

Expand All @@ -131,7 +131,7 @@ func (generator *BuilderGenerator) structFieldToOption(field StructField) Option
ArgumentName: field.Name,
ValueType: field.Type,
Constraints: constraints,
IntoOptionalField: !field.Required,
IntoNullableField: field.Type.Nullable,
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion internal/ast/compiler/anonymous_enum.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (pass *AnonymousEnumToExplicitType) processStruct(def ast.StructType) ast.T
})
}

return ast.NewStruct(processedFields)
return ast.NewStruct(processedFields...)
}

func (pass *AnonymousEnumToExplicitType) processAnonymousEnum(parentName string, def ast.EnumType) ast.Type {
Expand Down
Loading