keep the same contract without generated changes

webrpc · Dec 27, 2023 · 3296709 · 3296709
1 parent f25d683
commit 3296709
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 41 deletions.
diff --git 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 [email protected] with ../../ generator. DO NOT EDIT.
+// Code generated by [email protected] with custom 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
@@ -1,7 +1,7 @@
 /* eslint-disable */
 // node-ts v1.0.0 2167bb6fb0a186ff099cd8a309c6ffbbd7d1b9c0
 // --
-// Code generated by [email protected] with ../../ generator. DO NOT EDIT.
+// Code generated by [email protected] with custom generator. DO NOT EDIT.
 //
 // webrpc-gen -schema=service.ridl -target=../../ -client -out=./webapp/client.gen.ts
 
@@ -76,29 +76,35 @@ export class ExampleService implements ExampleService {
 
   ping = (headers?: object, signal?: AbortSignal): Promise<PingReturn> => {
     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<GetUserReturn> => {
     return this.fetch(
-      this.url('GetUser'), createHTTPRequest(args, headers, signal)).then((res) => {
-        return buildResponse(res).then(_data => {
-          return {
-            code: <number>(_data.code),
-            user: <User>(_data.user),
-          }
-          })}, (error) => {throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })}
-      )
+      this.url('GetUser'),
+      createHTTPRequest(args, headers, signal)).then((res) => {
+      return buildResponse(res).then(_data => {
+        return {
+          code: <number>(_data.code),
+          user: <User>(_data.user),
+        }
+      })
+    }, (error) => {
+      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
+    })
   }
 
-
 }
-  const createHTTPRequest = (body: object = {}, headers?: object, signal?: AbortSignal): object => {
+
+  const createHTTPRequest = (body: object = {}, headers: object = {}, signal: AbortSignal | null = null): object => {
   return {
     method: 'POST',
     headers: { ...headers, 'Content-Type': 'application/json' },

diff --git 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 [email protected] with ../../ generator. DO NOT EDIT.
+// Code generated by [email protected] with custom generator. DO NOT EDIT.
 //
 // webrpc-gen -schema=service.ridl -target=../../ -client -out=./webapp/client.gen.ts
 
@@ -74,14 +74,16 @@ export class Chat implements Chat {
 
   sendMessage = (args: SendMessageArgs, headers?: object, signal?: AbortSignal): Promise<SendMessageReturn> => {
     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 || ''}` })
+    })
   }
 
-
   subscribeMessages = (args: SubscribeMessagesArgs, options: WebrpcStreamOptions<SubscribeMessagesReturn>): Promise<void> => {
     const _fetch = () => this.fetch(this.url('SubscribeMessages'),createHTTPRequest(args, options.headers, options.signal)
       ).then(async (res) => {
@@ -91,7 +93,6 @@ export class Chat implements Chat {
     });
     return _fetch();
   }
-
   subscribeUsers = (options: WebrpcStreamOptions<SubscribeUsersReturn>): Promise<void> => {
     const _fetch = () => this.fetch(this.url('SubscribeUsers'),createHTTPRequest({}, options.headers, options.signal)
       ).then(async (res) => {
@@ -101,7 +102,6 @@ export class Chat implements Chat {
     });
     return _fetch();
   }
-
 }
 
 const sseResponse = async (
@@ -240,7 +240,8 @@ const sseResponse = async (
 };
 
 
-  const createHTTPRequest = (body: object = {}, headers?: object, signal?: AbortSignal): object => {
+
+  const createHTTPRequest = (body: object = {}, headers: object = {}, signal: AbortSignal | null = null): object => {
   return {
     method: 'POST',
     headers: { ...headers, 'Content-Type': 'application/json' },

diff --git a/client.go.tmpl b/client.go.tmpl
@@ -36,18 +36,23 @@ 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 {
-          {{- 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 || ''}` })}
-      )
+      this.url('{{.Name}}'),
+      {{ if .Inputs | len }}createHTTPRequest(args, headers, signal)).then((res) => { {{- else }}createHTTPRequest({}, headers, signal)
+      ).then((res) => { {{- end }}
+      return buildResponse(res).then(_data => {
+        {{ if .Outputs | len -}}
+        return {
+        {{- range $i, $output := .Outputs }}
+          {{$output.Name}}: <{{template "type" dict "Type" $output.Type "TypeMap" $typeMap}}>(_data.{{$output.Name}}),
+        {{- end }}
+        }
+        {{- else }}return {}{{- end }}
+      })
+    }, (error) => {
+      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
+    })
   }
-  {{end}}
+  {{end -}}
   {{end}}
 }
 {{- end -}}

diff --git a/clientHelpers.go.tmpl b/clientHelpers.go.tmpl
@@ -2,8 +2,7 @@
 {{- $webrpcErrors := .WebrpcErrors -}}
 {{- $schemaErrors := .SchemaErrors -}}
 {{- $opts := .Opts -}}
-
-const createHTTPRequest = (body: object = {}, headers?: object, signal?: AbortSignal): object => {
+const createHTTPRequest = (body: object = {}, headers: object = {}, signal: AbortSignal | null = null): object => {
   return {
     method: 'POST',
     headers: { ...headers, 'Content-Type': 'application/json' },

diff --git a/main.go.tmpl b/main.go.tmpl
@@ -80,6 +80,7 @@ export const WebRPCSchemaHash = "{{.SchemaHash}}"
 
 {{- if $opts.client}}
   {{template "client" dict "Services" .Services "Opts" $opts "TypeMap" $typeMap}}
+
   {{template "clientHelpers" dict "WebrpcErrors" .WebrpcErrors "SchemaErrors" .Errors "Opts" $opts }}
 {{- end}}