encoding/openapi: supported nested definitions
Change-Id: I2c79b5d02fdc9ac22fa93f5e06be46f73cf0be51
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/5341
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
diff --git a/encoding/openapi/build.go b/encoding/openapi/build.go
index c3c485d..da14cf0 100644
--- a/encoding/openapi/build.go
+++ b/encoding/openapi/build.go
@@ -657,14 +657,18 @@
properties = &OrderedMap{}
}
- for i, _ := v.Fields(cue.Optional(true)); i.Next(); {
+ for i, _ := v.Fields(cue.Optional(true), cue.Definitions(true)); i.Next(); {
label := i.Label()
var core *builder
if b.core != nil {
core = b.core.properties[label]
}
schema := b.schema(core, label, i.Value())
- if !b.isNonCore() || len(schema.Elts) > 0 {
+ switch {
+ case i.IsDefinition():
+ ref := strings.Join(append(b.ctx.path, label), ".")
+ b.ctx.schemas.Set(ref, schema)
+ case !b.isNonCore() || len(schema.Elts) > 0:
properties.Set(label, schema)
}
}
@@ -1144,7 +1148,7 @@
} else {
a = append(a, ref...)
}
- return path.Join(a...)
+ return strings.Join(a, ".")
}
func (b *builder) int64(v cue.Value) int64 {
