Conversation
…enums
OpenAPI 3.1 expresses string/number/boolean enums as `oneOf` of scalar
`const` values (e.g. oneOf: [ {const: available}, {const: pending} ]).
The model generator treated those as raw json.RawMessage unions,
discarding the values, so enum constants were never emitted.
Recognize a union whose non-null variants are all scalar consts and build
it as a KindEnum instead (honouring null-of variants as nullable and mixed
value types as `any`), so `WithEnumConstants` can render typed aliases and
constants. Object/array/union/disambiguation variants that carry consts as
properties are left as unions.
Adds coverage for const enums, anyOf const, integer const enums, nullable
const enums, mixed const types, and guards the object union from being
collapsed into an enum.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #617 +/- ##
==========================================
+ Coverage 99.78% 99.87% +0.09%
==========================================
Files 283 296 +13
Lines 34456 37221 +2765
==========================================
+ Hits 34382 37175 +2793
+ Misses 46 27 -19
+ Partials 28 19 -9
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
…aths Add a table-driven unit test that hits every veto branch of constScalarEnumFromVariants: nil/empty variant lists, a nil member, a variant without a const, declared object/array types, , nested composition keywords, explicit enum, properties/patternProperties, items, prefixItems, and a null-only list. Raises the function to 100% coverage so the codecov patch gate stays green.
| nullable = true | ||
| continue | ||
| } | ||
| if v.Const == nil { |
There was a problem hiding this comment.
P1: constScalarEnumFromVariants must reject non-scalar const nodes. Untyped mapping and sequence constants pass these guards and become string enums with empty constants, so valid object/array JSON cannot unmarshal. Check v.Const.Kind == yaml.ScalarNode (and supported scalar tags) after null handling, with public render regressions for untyped object and array constants.
|
Follow-up: restrict folding to scalar |
…olding P1: constScalarEnumFromVariants folded untyped object/array consts into a KindEnum as an empty string enum, producing a type that cannot unmarshal the declared object/array JSON. Reject any const that is not a scalar node and not one of the enum-emittable scalar families (str/int/float/bool) after null handling. Adds public render regressions for untyped object and array constants and unit coverage for the mapping/sequence guard.
2 participants
Problem
OpenAPI 3.1 expresses string/number/boolean enums as
oneOfof scalarconstvalues, e.g.The go model generator routes this through
populateUnionand emits araw
XXXXUnion{Raw json.RawMessage}; the enum values and names are lost,and
WithEnumConstantscan generate nothing.Fix
In
populateUnion, before settlingKindUnion, fold the union into aKindEnumwhen every non-null variant is a scalarconst(new helperconstScalarEnumFromVariants). Null-valued variants becomeNullable,object/array/union/disambiguation variants are left as unions.
Effects
XXXXUnion{Raw json.RawMessage}type PetStatus string+ typed constantsTests
TestJSONSchema202012ConstScalarEnumVariants— const enum, string/int,anyOf, nullable, mixed->any, compile-check.TestJSONSchemaSchemaObjectUnionNotEnum— object variants stay unions.Verified:
go build ./generator/...,go vet ./generator/golang/,go test ./generator/golang/— all green.