From 9d3f7f022289cc8641ab4f2544e31e3bd46b65cf Mon Sep 17 00:00:00 2001
From: a <a@a.a>
Date: Wed, 21 Sep 2022 21:28:16 -0500
Subject: [PATCH] config
---
openrpc/cmd/cli.go | 2 --
openrpc/generate/generate.go | 17 ++++++++++++++---
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/openrpc/cmd/cli.go b/openrpc/cmd/cli.go
index 27a27c4..8623612 100644
--- a/openrpc/cmd/cli.go
+++ b/openrpc/cmd/cli.go
@@ -56,8 +56,6 @@ func (c *CompileCommand) Run() error {
return err
}
return nil
-
- return nil
}
type GenerateCommand struct {
diff --git a/openrpc/generate/generate.go b/openrpc/generate/generate.go
index 52017e8..9d77308 100644
--- a/openrpc/generate/generate.go
+++ b/openrpc/generate/generate.go
@@ -9,6 +9,7 @@ import (
"path/filepath"
"text/template"
+ "gfx.cafe/open/jrpc/openrpc/templates"
"gfx.cafe/open/jrpc/openrpc/types"
"github.com/iancoleman/strcase"
)
@@ -45,9 +46,19 @@ var funcs = template.FuncMap{
func Generate(rpc *types.OpenRPC, ts string, output string) error {
var wr bytes.Buffer
- t, err := template.New(path.Base(ts)).Funcs(funcs).ParseFiles(ts)
- if err != nil {
- return err
+ var t *template.Template
+ var err error
+ if ts == "default" {
+ t, err = template.New(path.Base(ts)).Funcs(funcs).Parse(templates.TEMPLATE)
+ if err != nil {
+ return err
+ }
+ } else {
+ t, err = template.New(path.Base(ts)).Funcs(funcs).ParseFiles(ts)
+ if err != nil {
+ return err
+ }
+
}
err = t.Execute(&wr, rpc)
--
GitLab