From dfad5cefe74626f8a851c2f4a2fb8f8adba72f35 Mon Sep 17 00:00:00 2001 From: Lukas Jenicek Date: Thu, 17 Oct 2024 10:49:17 +0200 Subject: [PATCH] rename all occurences to Webrpc --- _examples/golang-basics/example.gen.go | 20 ++++++++++---------- _examples/golang-basics/example.ridl | 2 +- _examples/golang-basics/main.go | 4 ++-- _examples/golang-imports/api.gen.go | 14 +++++++------- main.go.tmpl | 14 +++++++------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/_examples/golang-basics/example.gen.go b/_examples/golang-basics/example.gen.go index 2db9594..f355e4d 100644 --- a/_examples/golang-basics/example.gen.go +++ b/_examples/golang-basics/example.gen.go @@ -1,4 +1,4 @@ -// example v0.0.1 2db765b19259f44cace36cd0355cd637d6fead72 +// example v0.0.1 ccd12408e7dd53252d6e605ae1619666287d960e // -- // Code generated by webrpc-gen@v0.20.3 with ../../../gen-golang generator. DO NOT EDIT. // @@ -37,23 +37,23 @@ func WebRPCSchemaVersion() string { // Schema hash generated from your RIDL schema func WebRPCSchemaHash() string { - return "2db765b19259f44cace36cd0355cd637d6fead72" + return "ccd12408e7dd53252d6e605ae1619666287d960e" } -type WebRpcGenVersions struct { - WebRpcGenVersion string +type WebrpcGenVersions struct { + WebrpcGenVersion string CodeGenName string CodeGenVersion string SchemaName string SchemaVersion string } -func VersionFromHeader(h http.Header) (*WebRpcGenVersions, error) { +func VersionFromHeader(h http.Header) (*WebrpcGenVersions, error) { if h.Get(WebrpcHeader) == "" { return nil, fmt.Errorf("header is empty or missing") } - versions, err := parseWebRpcGenVersions(h.Get(WebrpcHeader)) + versions, err := parseWebrpcGenVersions(h.Get(WebrpcHeader)) if err != nil { return nil, fmt.Errorf("webrpc header is invalid: %w", err) } @@ -61,7 +61,7 @@ func VersionFromHeader(h http.Header) (*WebRpcGenVersions, error) { return versions, nil } -func parseWebRpcGenVersions(header string) (*WebRpcGenVersions, error) { +func parseWebrpcGenVersions(header string) (*WebrpcGenVersions, error) { versions := strings.Split(header, ";") if len(versions) < 3 { return nil, fmt.Errorf("expected at least 3 parts while parsing webrpc header: %v", header) @@ -82,8 +82,8 @@ func parseWebRpcGenVersions(header string) (*WebRpcGenVersions, error) { return nil, fmt.Errorf("schema name and schema version could not be parsed from: %s", versions[2]) } - return &WebRpcGenVersions{ - WebRpcGenVersion: webrpcGenVersion, + return &WebrpcGenVersions{ + WebrpcGenVersion: webrpcGenVersion, CodeGenName: tmplTarget, CodeGenVersion: tmplVersion, SchemaName: schemaName, @@ -218,7 +218,7 @@ type ComplexType struct { } type GenVersions struct { - WebRpcGenVersion string `json:"WebRpcGenVersion"` + WebrpcGenVersion string `json:"WebrpcGenVersion"` TmplTarget string `json:"TmplTarget"` TmplVersion string `json:"TmplVersion"` SchemaVersion string `json:"SchemaVersion"` diff --git a/_examples/golang-basics/example.ridl b/_examples/golang-basics/example.ridl index b976a51..87c0da2 100644 --- a/_examples/golang-basics/example.ridl +++ b/_examples/golang-basics/example.ridl @@ -83,7 +83,7 @@ struct ComplexType - user: User struct GenVersions - - WebRpcGenVersion: string + - WebrpcGenVersion: string - TmplTarget: string - TmplVersion: string - SchemaVersion: string diff --git a/_examples/golang-basics/main.go b/_examples/golang-basics/main.go index 7e805b3..d28857b 100644 --- a/_examples/golang-basics/main.go +++ b/_examples/golang-basics/main.go @@ -65,13 +65,13 @@ func (rpc *ExampleServiceRPC) Version(ctx context.Context) (*Version, error) { SchemaVersion: WebRPCSchemaVersion(), SchemaHash: WebRPCSchemaHash(), ClientGenVersion: &GenVersions{ - WebRpcGenVersion: clientVersions.WebRpcGenVersion, + WebrpcGenVersion: clientVersions.WebrpcGenVersion, TmplTarget: clientVersions.CodeGenName, TmplVersion: clientVersions.CodeGenVersion, SchemaVersion: clientVersions.CodeGenVersion, }, ServerGenVersion: &GenVersions{ - WebRpcGenVersion: serverVersions.WebRpcGenVersion, + WebrpcGenVersion: serverVersions.WebrpcGenVersion, TmplTarget: serverVersions.CodeGenName, TmplVersion: serverVersions.CodeGenVersion, SchemaVersion: serverVersions.CodeGenVersion, diff --git a/_examples/golang-imports/api.gen.go b/_examples/golang-imports/api.gen.go index 7c4692a..6b4bc7e 100644 --- a/_examples/golang-imports/api.gen.go +++ b/_examples/golang-imports/api.gen.go @@ -37,20 +37,20 @@ func WebRPCSchemaHash() string { return "cae4e128f4fb4c938bfe1ea312deeea3dfd6b6af" } -type WebRpcGenVersions struct { - WebRpcGenVersion string +type WebrpcGenVersions struct { + WebrpcGenVersion string CodeGenName string CodeGenVersion string SchemaName string SchemaVersion string } -func VersionFromHeader(h http.Header) (*WebRpcGenVersions, error) { +func VersionFromHeader(h http.Header) (*WebrpcGenVersions, error) { if h.Get(WebrpcHeader) == "" { return nil, fmt.Errorf("header is empty or missing") } - versions, err := parseWebRpcGenVersions(h.Get(WebrpcHeader)) + versions, err := parseWebrpcGenVersions(h.Get(WebrpcHeader)) if err != nil { return nil, fmt.Errorf("webrpc header is invalid: %w", err) } @@ -58,7 +58,7 @@ func VersionFromHeader(h http.Header) (*WebRpcGenVersions, error) { return versions, nil } -func parseWebRpcGenVersions(header string) (*WebRpcGenVersions, error) { +func parseWebrpcGenVersions(header string) (*WebrpcGenVersions, error) { versions := strings.Split(header, ";") if len(versions) < 3 { return nil, fmt.Errorf("expected at least 3 parts while parsing webrpc header: %v", header) @@ -79,8 +79,8 @@ func parseWebRpcGenVersions(header string) (*WebRpcGenVersions, error) { return nil, fmt.Errorf("schema name and schema version could not be parsed from: %s", versions[2]) } - return &WebRpcGenVersions{ - WebRpcGenVersion: webrpcGenVersion, + return &WebrpcGenVersions{ + WebrpcGenVersion: webrpcGenVersion, CodeGenName: tmplTarget, CodeGenVersion: tmplVersion, SchemaName: schemaName, diff --git a/main.go.tmpl b/main.go.tmpl index 34b4ffa..bd5d61f 100644 --- a/main.go.tmpl +++ b/main.go.tmpl @@ -101,20 +101,20 @@ func WebRPCSchemaHash() string { return "{{.SchemaHash}}" } -type WebRpcGenVersions struct { - WebRpcGenVersion string +type WebrpcGenVersions struct { + WebrpcGenVersion string CodeGenName string CodeGenVersion string SchemaName string SchemaVersion string } -func VersionFromHeader(h http.Header) (*WebRpcGenVersions, error) { +func VersionFromHeader(h http.Header) (*WebrpcGenVersions, error) { if h.Get(WebrpcHeader) == "" { return nil, fmt.Errorf("header is empty or missing") } - versions, err := parseWebRpcGenVersions(h.Get(WebrpcHeader)) + versions, err := parseWebrpcGenVersions(h.Get(WebrpcHeader)) if err != nil { return nil, fmt.Errorf("webrpc header is invalid: %w", err) } @@ -122,7 +122,7 @@ func VersionFromHeader(h http.Header) (*WebRpcGenVersions, error) { return versions, nil } -func parseWebRpcGenVersions(header string) (*WebRpcGenVersions, error) { +func parseWebrpcGenVersions(header string) (*WebrpcGenVersions, error) { versions := strings.Split(header, ";") if len(versions) < 3 { return nil, fmt.Errorf("expected at least 3 parts while parsing webrpc header: %v", header) @@ -143,8 +143,8 @@ func parseWebRpcGenVersions(header string) (*WebRpcGenVersions, error) { return nil, fmt.Errorf("schema name and schema version could not be parsed from: %s", versions[2]) } - return &WebRpcGenVersions{ - WebRpcGenVersion: webrpcGenVersion, + return &WebrpcGenVersions{ + WebrpcGenVersion: webrpcGenVersion, CodeGenName: tmplTarget, CodeGenVersion: tmplVersion, SchemaName: schemaName,