cmd/cue/cmd: support openapi out and proto in
- Adds general support for non-CUE schema
Issue #56
Change-Id: I6ca639b2e0703cb2120f7661af24ee3111cdfe54
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/5262
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
diff --git a/internal/encoding/encoder.go b/internal/encoding/encoder.go
index 0217af9..04be952 100644
--- a/internal/encoding/encoder.go
+++ b/internal/encoding/encoder.go
@@ -27,6 +27,7 @@
"cuelang.org/go/cue/errors"
"cuelang.org/go/cue/format"
"cuelang.org/go/cue/token"
+ "cuelang.org/go/encoding/openapi"
"cuelang.org/go/internal/filetypes"
"cuelang.org/go/pkg/encoding/yaml"
)
@@ -62,12 +63,12 @@
switch f.Interpretation {
case "":
- // case build.OpenAPI:
- // // TODO: get encoding options
- // cfg := openapi.Config{}
- // i.interpret = func(inst *cue.Instance) (*ast.File, error) {
- // return openapi.Generate(inst, cfg)
- // }
+ case build.OpenAPI:
+ // TODO: get encoding options
+ cfg := &openapi.Config{}
+ e.interpret = func(i *cue.Instance) (*ast.File, error) {
+ return openapi.Generate(i, cfg)
+ }
// case build.JSONSchema:
// // TODO: get encoding options
// cfg := openapi.Config{}
@@ -131,7 +132,6 @@
e.encFile = func(f *ast.File) error { return format(f.Filename, f) }
case build.JSON, build.JSONL:
- // SetEscapeHTML
d := json.NewEncoder(w)
d.SetIndent("", " ")
d.SetEscapeHTML(cfg.EscapeHTML)
diff --git a/internal/encoding/encoding.go b/internal/encoding/encoding.go
index f2a936a..f6187e8 100644
--- a/internal/encoding/encoding.go
+++ b/internal/encoding/encoding.go
@@ -12,6 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+// TODO: make this package public in cuelang.org/go/encoding
+// once stabalized.
+
package encoding
import (
@@ -36,25 +39,47 @@
)
type Decoder struct {
- cfg *Config
- closer io.Closer
- next func() (ast.Expr, error)
- expr ast.Expr
- file *ast.File
- filename string // may change on iteration for some formats
- index int
- err error
+ cfg *Config
+ closer io.Closer
+ next func() (ast.Expr, error)
+ interpret func(*cue.Instance) (file *ast.File, id string, err error)
+ expr ast.Expr
+ file *ast.File
+ filename string // may change on iteration for some formats
+ id string
+ index int
+ err error
}
-func (i *Decoder) Expr() ast.Expr { return i.expr }
+// ID returns a canonical identifier for the decoded object or "" if no such
+// identifier could be found.
+func (i *Decoder) ID() string {
+ return i.id
+}
+
func (i *Decoder) Filename() string { return i.filename }
func (i *Decoder) Index() int { return i.index }
func (i *Decoder) Done() bool { return i.err != nil }
func (i *Decoder) Next() {
- if i.err == nil {
- i.expr, i.err = i.next()
- i.index++
+ if i.err != nil {
+ return
+ }
+ // Decoder level
+ i.expr, i.err = i.next()
+ i.index++
+ if i.err != nil {
+ return
+ }
+ // Interpretations
+ if i.interpret != nil {
+ var r cue.Runtime
+ inst, err := r.CompileFile(i.File())
+ if err != nil {
+ i.err = err
+ return
+ }
+ i.file, i.id, i.err = i.interpret(inst)
}
}
@@ -106,6 +131,8 @@
Stdin io.Reader
Stdout io.Writer
+ PkgName string // package name for files to generate
+
Force bool // overwrite existing files.
Stream bool // will potentially write more than one document per file
AllErrors bool
@@ -162,10 +189,13 @@
i.err = err
i.expr = ast.NewString(string(b))
case build.Protobuf:
- paths := &protobuf.Config{Paths: cfg.ProtoPath}
+ paths := &protobuf.Config{
+ Paths: cfg.ProtoPath,
+ PkgName: cfg.PkgName,
+ }
i.file, i.err = protobuf.Extract(path, r, paths)
default:
- i.err = fmt.Errorf("unsupported stream type %q", f.Encoding)
+ i.err = fmt.Errorf("unsupported encoding %q", f.Encoding)
}
return i
