From de00b44be2a649f74cac9dce99294557835ef9bc Mon Sep 17 00:00:00 2001
From: Trevor Judice <tjudice@gfx.io>
Date: Mon, 17 Jul 2023 13:03:45 -0500
Subject: [PATCH] fix generation template
---
openrpc/out/generated_api.go | 6 +++---
openrpc/out/gogenerate.go | 4 ++--
openrpc/templates/template.go | 8 ++++----
openrpc/templates/types.gotmpl | 16 +++++++++-------
template.go | 0
5 files changed, 18 insertions(+), 16 deletions(-)
create mode 100644 template.go
diff --git a/openrpc/out/generated_api.go b/openrpc/out/generated_api.go
index 67208e1..5f57dd3 100755
--- a/openrpc/out/generated_api.go
+++ b/openrpc/out/generated_api.go
@@ -6,10 +6,10 @@ import (
"context"
"errors"
"fmt"
- "gfx.cafe/open/jrpc"
+
+ "gfx.cafe/open/jrpc/contrib/jmux"
)
-var _ = jrpc.Version
var _ = context.Background
var _ = errors.New
var _ = fmt.Sprintf
@@ -1107,7 +1107,7 @@ type GoOpenRPCService interface {
) (ReceiptInformation ReceiptInfo, err error)
}
-func (h *GoOpenRPCHandler) RouteRPC(r jrpc.Router) {
+func (h *GoOpenRPCHandler) RouteRPC(r jmux.Router) {
// Returns an RLP-encoded header.
if err := r.RegisterFunc("debug_getRawHeader", h.Srv.DebugGetRawHeader); err != nil {
diff --git a/openrpc/out/gogenerate.go b/openrpc/out/gogenerate.go
index 9c8e8f7..833ab4e 100644
--- a/openrpc/out/gogenerate.go
+++ b/openrpc/out/gogenerate.go
@@ -1,4 +1,4 @@
package out
-//go:generate go run gfx.cafe/open/jrpc/openrpc/cmd compile -s api-spec/schemas -m api-spec/methods -o spec.json
-//go:generate go run gfx.cafe/open/jrpc/openrpc/cmd generate -p out -s spec.json -o generated_api.go -t ../templates/types.gotmpl
+//go:generate go run ./../cmd compile -s api-spec/schemas -m api-spec/methods -o spec.json
+//go:generate go run ./../cmd generate -p out -s spec.json -o generated_api.go -t ../templates/types.gotmpl
diff --git a/openrpc/templates/template.go b/openrpc/templates/template.go
index 5d18449..0e6485d 100644
--- a/openrpc/templates/template.go
+++ b/openrpc/templates/template.go
@@ -1,6 +1,5 @@
-package templates
-
-const TEMPLATE = `// Code generated by jrpc. DO NOT EDIT.
+package templates
+const TEMPLATE=`// Code generated by jrpc. DO NOT EDIT.
package {{ .Package }}
@@ -19,6 +18,7 @@ var _ = fmt.Sprintf
+
{{- range $name, $component := .Components.Schemas }}
type {{camelCase $name}} {{template "schemaType" $component}}
{{- end }}
@@ -34,7 +34,7 @@ var _ = fmt.Sprintf
-}}
struct {
{{range $name, $property := .Properties -}}
- {{camelCase $name}} {{template "schemaType" $property}} ` + "`" + `json:"{{$name}}"` + "`" + `
+ {{camelCase $name}} {{template "schemaType" $property}} `+"`"+`json:"{{$name}}"`+"`"+`
{{end -}}
{{range $idx, $property := .OneOf -}}
Option{{$idx}} {{template "schemaType" $property}}
diff --git a/openrpc/templates/types.gotmpl b/openrpc/templates/types.gotmpl
index 53b835d..c1553ea 100644
--- a/openrpc/templates/types.gotmpl
+++ b/openrpc/templates/types.gotmpl
@@ -3,19 +3,21 @@
package {{ .Package }}
import (
- "context"
- "gfx.cafe/open/jrpc"
- "errors"
- "fmt"
- )
+ "context"
+ "errors"
+ "fmt"
+
+ "gfx.cafe/open/jrpc/contrib/jmux"
+)
+
-var _ = jrpc.Version
var _ = context.Background
var _ = errors.New
var _ = fmt.Sprintf
+
{{- range $name, $component := .Components.Schemas }}
type {{camelCase $name}} {{template "schemaType" $component}}
{{- end }}
@@ -84,7 +86,7 @@ type GoOpenRPCService interface {
-func (h *GoOpenRPCHandler) RouteRPC(r jrpc.Router) {
+func (h *GoOpenRPCHandler) RouteRPC(r jmux.Router) {
{{range .Methods -}}
// {{.Summary}}
{{if .Namespace}}
diff --git a/template.go b/template.go
new file mode 100644
index 0000000..e69de29
--
GitLab