From 5d99e9b0928b19c173989401a1e99ebb058f25df Mon Sep 17 00:00:00 2001 From: lukasjenicek Date: Wed, 27 Dec 2023 14:54:42 +0100 Subject: [PATCH] keep the same contract without generated changes --- _examples/node-ts/server/server.gen.ts | 2 +- _examples/node-ts/webapp/client.gen.ts | 32 +++++++++++++++----------- _examples/sse/webapp/client.gen.ts | 15 +++++++----- client.go.tmpl | 19 +++++++++------ 4 files changed, 41 insertions(+), 27 deletions(-) diff --git a/_examples/node-ts/server/server.gen.ts b/_examples/node-ts/server/server.gen.ts index 92f570f..a34f4ed 100644 --- a/_examples/node-ts/server/server.gen.ts +++ b/_examples/node-ts/server/server.gen.ts @@ -1,7 +1,7 @@ /* eslint-disable */ // node-ts v1.0.0 2167bb6fb0a186ff099cd8a309c6ffbbd7d1b9c0 // -- -// Code generated by webrpc-gen@v0.14.0 with ../../ generator. DO NOT EDIT. +// Code generated by webrpc-gen@v0.14.0-dev with ../../ generator. DO NOT EDIT. // // webrpc-gen -schema=service.ridl -target=../../ -server -out=./server/server.gen.ts diff --git a/_examples/node-ts/webapp/client.gen.ts b/_examples/node-ts/webapp/client.gen.ts index 9d42f1c..0912d87 100644 --- a/_examples/node-ts/webapp/client.gen.ts +++ b/_examples/node-ts/webapp/client.gen.ts @@ -1,7 +1,7 @@ /* eslint-disable */ // node-ts v1.0.0 2167bb6fb0a186ff099cd8a309c6ffbbd7d1b9c0 // -- -// Code generated by webrpc-gen@v0.14.0 with ../../ generator. DO NOT EDIT. +// Code generated by webrpc-gen@v0.14.0-dev with ../../ generator. DO NOT EDIT. // // webrpc-gen -schema=service.ridl -target=../../ -client -out=./webapp/client.gen.ts @@ -76,24 +76,30 @@ export class ExampleService implements ExampleService { ping = (headers?: object, signal?: AbortSignal): Promise => { return this.fetch( - this.url('Ping'), createHTTPRequest({}, headers, signal)).then((res) => { - return buildResponse(res).then(_data => { - return {} - })}, (error) => {throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })} - ) + this.url('Ping'), + createHTTPRequest({}, headers, signal) + ).then((res) => { + return buildResponse(res).then(_data => { + return {} + }) + }, (error) => { + throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` }) + }) } getUser = (args: GetUserArgs, headers?: object, signal?: AbortSignal): Promise => { return this.fetch( - this.url('GetUser'), createHTTPRequest(args, headers, signal)).then((res) => { - return buildResponse(res).then(_data => { - return { + this.url('GetUser'), + createHTTPRequest(args, headers, signal)).then((res) => { + return buildResponse(res).then(_data => { + return { code: (_data.code), - user: (_data.user), - } - })}, (error) => {throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })} - ) + user: (_data.user),} + }) + }, (error) => { + throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` }) + }) } diff --git a/_examples/sse/webapp/client.gen.ts b/_examples/sse/webapp/client.gen.ts index 88b15fa..2088d72 100644 --- a/_examples/sse/webapp/client.gen.ts +++ b/_examples/sse/webapp/client.gen.ts @@ -1,7 +1,7 @@ /* eslint-disable */ // webrpc-sse-chat v1.0.0 f3307fcc3621aa9099b8fa02f8bb22dee4263705 // -- -// Code generated by webrpc-gen@v0.14.0 with ../../ generator. DO NOT EDIT. +// Code generated by webrpc-gen@v0.14.0-dev with ../../ generator. DO NOT EDIT. // // webrpc-gen -schema=service.ridl -target=../../ -client -out=./webapp/client.gen.ts @@ -74,11 +74,14 @@ export class Chat implements Chat { sendMessage = (args: SendMessageArgs, headers?: object, signal?: AbortSignal): Promise => { return this.fetch( - this.url('SendMessage'), createHTTPRequest(args, headers, signal)).then((res) => { - return buildResponse(res).then(_data => { - return {} - })}, (error) => {throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })} - ) + this.url('SendMessage'), + createHTTPRequest(args, headers, signal)).then((res) => { + return buildResponse(res).then(_data => { + return {} + }) + }, (error) => { + throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` }) + }) } diff --git a/client.go.tmpl b/client.go.tmpl index 5937908..390a543 100644 --- a/client.go.tmpl +++ b/client.go.tmpl @@ -36,16 +36,21 @@ export class {{.Name}} implements {{.Name}} { } {{- else }} return this.fetch( - this.url('{{.Name}}'), {{ if .Inputs | len }}createHTTPRequest(args, headers, signal){{ else}}createHTTPRequest({}, headers, signal){{end }}).then((res) => { - return buildResponse(res).then(_data => { - return { + this.url('{{.Name}}'), + {{ if .Inputs | len }}createHTTPRequest(args, headers, signal)).then((res) => { {{- else }}createHTTPRequest({}, headers, signal) + ).then((res) => { {{- end }} + return buildResponse(res).then(_data => { + return { {{- range $i, $output := .Outputs }} {{$output.Name}}: <{{template "type" dict "Type" $output.Type "TypeMap" $typeMap}}>(_data.{{$output.Name}}), {{- end -}} - {{if len .Outputs}} - {{end}}} - })}, (error) => {throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })} - ) + {{if len .Outputs -}} + {{- end -}} + } + }) + }, (error) => { + throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` }) + }) } {{end}} {{end}}