generates

go.mod

@@ -5,6 +5,7 @@ go 1.18
 require (
 	gfx.cafe/util/go/bufpool v0.0.0-20220917152604-80373e5a2c51
 	git.tuxpa.in/a/zlog v1.32.0
+	github.com/alecthomas/kong v0.6.1
 	github.com/davecgh/go-spew v1.1.1
 	github.com/deckarep/golang-set v1.8.0
 	github.com/ethereum/go-ethereum v1.10.22
@@ -21,7 +22,6 @@ require (
 
 require (
 	github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
-	github.com/alecthomas/kong v0.6.1 // indirect
 	github.com/go-ole/go-ole v1.2.1 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
 	github.com/go-openapi/jsonreference v0.20.0 // indirect

go.sum

@@ -47,6 +47,7 @@ github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIO
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/alecthomas/kong v0.6.1 h1:1kNhcFepkR+HmasQpbiKDLylIL8yh5B5y1zPp5bJimA=
 github.com/alecthomas/kong v0.6.1/go.mod h1:JfHWDzLmbh/puW6I3V7uWenoh56YNVONW+w8eKeUr9I=
+github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 h1:8Uy0oSf5co/NZXje7U1z8Mpep++QJOldL2hs/sBQf48=
 github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142/go.mod h1:2kn6fqh/zIyPLmm3ugklbEi5hg5wS435eygvNfaDQL8=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=

openrpc/generate/generate.go

@@ -184,9 +184,6 @@ type object struct {
 
 func funcMap(openrpc *types.OpenRPCSpec1) template.FuncMap {
 	return template.FuncMap{
-		"fixName": func(s string) string {
-			return "Type" + strings.ReplaceAll(s, " ", "")
-		},
 		"programName":             getProgramName,
 		"derefSchema":             derefSchemaRecurse,
 		"schemaHasRef":            schemaHazRef,

openrpc/out/server.go

@@ -495,3 +495,25 @@ func WriteData(w http.ResponseWriter, id interface{}, result interface{}) {
 	w.WriteHeader(http.StatusOK)
 	w.Write(data)
 }
+nil {
+		panic(err)
+	}
+	w.Header().Set("Content-Type", "application/json")
+	w.Write(data)
+}
+
+func WriteData(w http.ResponseWriter, id interface{}, result interface{}) {
+	resp := &RPCResultResponse{
+		JSONRPC: JSONRPC,
+		ID:      id,
+		Result:  StructToResult(result),
+	}
+	data, err := json.Marshal(resp)
+	if err != nil {
+		WriteError(w, id, ErrInternal.RPCError())
+		return
+	}
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+	w.Write(data)
+}

openrpc/templates/types.gotmpl

@@ -24,13 +24,13 @@ type GoOpenRPCService interface {
 }
 
 {{- range (getObjects .Objects) }}
-{{ printf "type %s struct {" (fixName .Name) }}
+{{ printf "type %s struct {" .Name }}
 {{- range (getFields .Fields) }}
 {{ maybeFieldComment .Desc }}
 {{- if (eq .Name .Type) }}
-{{ printf "%s" (fixName .Name) }}
+{{ printf "%s" .Name }}
 {{- else }}
-{{ printf "%s %s `json:\"%s\"`" (fixName .Name) .Type (fixName (lowerFirst .Name)) }}
+{{ printf "Field%s %s `json:\"%s\"`" .Name .Type (lowerFirst .Name) }}
 {{- end }}
 {{- end }}
 {{ printf "}" }}

openrpc/util/common.go

@@ -26,7 +26,12 @@ func Inpect(val interface{}) string {
 }
 
 func CamelCase(name string) string {
-	in := strings.Split(name, "_")
+	var in []string
+	if strings.Contains(name, " ") {
+		in = strings.Split(name, " ")
+	} else {
+		in = strings.Split(name, "_")
+	}
 	if len(in) == 0 {
 		return strings.Title(name)
 	}