Skip to content

Commit 4a2449c

Browse files
klaidliadonklaidliadon
committed
fix: map core types through typeMap in succinct method return types
Succinct method outputs used .Type directly (Go Stringer) instead of routing through the typeMap, producing 'bool' instead of 'boolean', 'int64' instead of 'number', etc. Use the 'type' template with typeMap for all succinct output references in client, clientInterface, and serverInterface templates.
1 parent 51a7ad2 commit 4a2449c

8 files changed

Lines changed: 16 additions & 13 deletions

File tree

‎_examples/node-ts/server-fastify/server.gen.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable */
22
// node-ts v1.0.0 83e44adec2381759b0925cfad2f5e25da97ad163
33
// --
4-
// Code generated by Webrpc-gen@v0.36.0 with ../../../gen-typescript generator. DO NOT EDIT.
4+
// Code generated by Webrpc-gen@v0.36.1-1-g48c32f9 with ../../../gen-typescript generator. DO NOT EDIT.
55
//
66
// webrpc-gen -schema=service.ridl -target=../../../gen-typescript -server -out=./server-fastify/server.gen.ts
77

@@ -555,7 +555,7 @@ export const webrpcErrorByCode: { [code: number]: any } = {
555555

556556
export const WebrpcHeader = "Webrpc"
557557

558-
export const WebrpcHeaderValue = "webrpc@v0.36.0;gen-typescript@unknown;node-ts@v1.0.0"
558+
export const WebrpcHeaderValue = "webrpc@v0.36.1-1-g48c32f9;gen-typescript@unknown;node-ts@v1.0.0"
559559

560560
type WebrpcGenVersions = {
561561
WebrpcGenVersion: string;

‎_examples/node-ts/server-hono/server.gen.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable */
22
// node-ts v1.0.0 83e44adec2381759b0925cfad2f5e25da97ad163
33
// --
4-
// Code generated by Webrpc-gen@v0.36.0 with ../../../gen-typescript generator. DO NOT EDIT.
4+
// Code generated by Webrpc-gen@v0.36.1-1-g48c32f9 with ../../../gen-typescript generator. DO NOT EDIT.
55
//
66
// webrpc-gen -schema=service.ridl -target=../../../gen-typescript -server -out=./server-hono/server.gen.ts
77

@@ -555,7 +555,7 @@ export const webrpcErrorByCode: { [code: number]: any } = {
555555

556556
export const WebrpcHeader = "Webrpc"
557557

558-
export const WebrpcHeaderValue = "webrpc@v0.36.0;gen-typescript@unknown;node-ts@v1.0.0"
558+
export const WebrpcHeaderValue = "webrpc@v0.36.1-1-g48c32f9;gen-typescript@unknown;node-ts@v1.0.0"
559559

560560
type WebrpcGenVersions = {
561561
WebrpcGenVersion: string;

‎_examples/node-ts/server/server.gen.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable */
22
// node-ts v1.0.0 83e44adec2381759b0925cfad2f5e25da97ad163
33
// --
4-
// Code generated by Webrpc-gen@v0.36.0 with ../../../gen-typescript generator. DO NOT EDIT.
4+
// Code generated by Webrpc-gen@v0.36.1-1-g48c32f9 with ../../../gen-typescript generator. DO NOT EDIT.
55
//
66
// webrpc-gen -schema=service.ridl -target=../../../gen-typescript -server -out=./server/server.gen.ts
77

@@ -555,7 +555,7 @@ export const webrpcErrorByCode: { [code: number]: any } = {
555555

556556
export const WebrpcHeader = "Webrpc"
557557

558-
export const WebrpcHeaderValue = "webrpc@v0.36.0;gen-typescript@unknown;node-ts@v1.0.0"
558+
export const WebrpcHeaderValue = "webrpc@v0.36.1-1-g48c32f9;gen-typescript@unknown;node-ts@v1.0.0"
559559

560560
type WebrpcGenVersions = {
561561
WebrpcGenVersion: string;

‎_examples/node-ts/webapp/client.gen.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable */
22
// node-ts v1.0.0 83e44adec2381759b0925cfad2f5e25da97ad163
33
// --
4-
// Code generated by Webrpc-gen@v0.36.0 with ../../../gen-typescript generator. DO NOT EDIT.
4+
// Code generated by Webrpc-gen@v0.36.1-1-g48c32f9 with ../../../gen-typescript generator. DO NOT EDIT.
55
//
66
// webrpc-gen -schema=service.ridl -target=../../../gen-typescript -client -out=./webapp/client.gen.ts
77

@@ -496,7 +496,7 @@ export const webrpcErrorByCode: { [code: number]: any } = {
496496

497497
export const WebrpcHeader = "Webrpc"
498498

499-
export const WebrpcHeaderValue = "webrpc@v0.36.0;gen-typescript@unknown;node-ts@v1.0.0"
499+
export const WebrpcHeaderValue = "webrpc@v0.36.1-1-g48c32f9;gen-typescript@unknown;node-ts@v1.0.0"
500500

501501
type WebrpcGenVersions = {
502502
WebrpcGenVersion: string;

‎_examples/sse/webapp/client.gen.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable */
22
// webrpc-sse-chat v1.0.0 8b6b6e0df6c23832e31534594d32955c3383689b
33
// --
4-
// Code generated by Webrpc-gen@v0.36.0 with ../../ generator. DO NOT EDIT.
4+
// Code generated by Webrpc-gen@v0.36.1-1-g48c32f9 with ../../ generator. DO NOT EDIT.
55
//
66
// webrpc-gen -schema=service.ridl -target=../../ -client -out=./webapp/client.gen.ts
77

@@ -565,7 +565,7 @@ export const webrpcErrorByCode: { [code: number]: any } = {
565565

566566
export const WebrpcHeader = "Webrpc"
567567

568-
export const WebrpcHeaderValue = "webrpc@v0.36.0;@unknown;webrpc-sse-chat@v1.0.0"
568+
export const WebrpcHeaderValue = "webrpc@v0.36.1-1-g48c32f9;@unknown;webrpc-sse-chat@v1.0.0"
569569

570570
type WebrpcGenVersions = {
571571
WebrpcGenVersion: string;

‎client.go.tmpl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ export class {{$service.Name}} implements {{$service.Name}}Client {
4747
{{- if $method.Succinct -}}
4848
{{- $methodReqName = (index $method.Inputs 0).Type -}}
4949
{{- $methodRespName = (index $method.Outputs 0).Type -}}
50+
{{- if isCoreType (index $method.Outputs 0).Type -}}
51+
{{- $methodRespName = get $typeMap (index $method.Outputs 0).Type -}}
52+
{{- end -}}
5053
{{- else -}}
5154
{{- if $opts.compat -}}
5255
{{- $methodReqName = printf "%sArgs" $method.Name -}}
@@ -56,7 +59,7 @@ export class {{$service.Name}} implements {{$service.Name}}Client {
5659
{{- $methodRespName = printf "%sResponse" $method.Name -}}
5760
{{- end -}}
5861
{{- end}}
59-
{{firstLetterToLower .Name}} = ({{template "methodInputs" dict "Method" . "Opts" $opts "TypeMap" $typeMap}}): {{if $method.StreamOutput}}WebrpcStreamController{{else}}{{if $method.Succinct}}Promise<{{(index $method.Outputs 0).Type}}>{{else}}Promise<{{$method.Name}}{{if $opts.compat}}Return{{else}}Response{{end}}>{{end}}{{end}} => {
62+
{{firstLetterToLower .Name}} = ({{template "methodInputs" dict "Method" . "Opts" $opts "TypeMap" $typeMap}}): {{if $method.StreamOutput}}WebrpcStreamController{{else}}{{if $method.Succinct}}Promise<{{template "type" dict "Type" (index $method.Outputs 0).Type "TypeMap" $typeMap}}>{{else}}Promise<{{$method.Name}}{{if $opts.compat}}Return{{else}}Response{{end}}>{{end}}{{end}} => {
6063
{{- if $method.StreamOutput }}
6164
const abortController = new AbortController()
6265
const abortSignal = abortController.signal

‎clientInterface.go.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export interface {{$service.Name}}Client {
2828
* @deprecated {{ $deprecated.Value }}
2929
*/
3030
{{- end }}
31-
{{firstLetterToLower $method.Name}}({{template "methodInputs" dict "Method" $method "TypeMap" $typeMap "Opts" $opts}}): {{if $method.StreamOutput}}WebrpcStreamController{{else}}{{if $method.Succinct}}Promise<{{(index $method.Outputs 0).Type}}>{{else}}Promise<{{$method.Name}}{{if $opts.compat}}Return{{else}}Response{{end}}>{{end}}{{end}}
31+
{{firstLetterToLower $method.Name}}({{template "methodInputs" dict "Method" $method "TypeMap" $typeMap "Opts" $opts}}): {{if $method.StreamOutput}}WebrpcStreamController{{else}}{{if $method.Succinct}}Promise<{{template "type" dict "Type" (index $method.Outputs 0).Type "TypeMap" $typeMap}}>{{else}}Promise<{{$method.Name}}{{if $opts.compat}}Return{{else}}Response{{end}}>{{end}}{{end}}
3232
{{- if lt (add $i 1) (len $service.Methods)}}{{"\n"}}{{end}}
3333
{{- end}}
3434
}

‎serverInterface.go.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
export interface {{$service.Name}}Server<Context = unknown> {
1414
{{- range $_, $method := $service.Methods}}
1515
{{- if $method.Succinct }}
16-
{{firstLetterToLower $method.Name}}(ctx: Context, req: {{(index $method.Inputs 0).Type}}): Promise<{{(index $method.Outputs 0).Type}}>
16+
{{firstLetterToLower $method.Name}}(ctx: Context, req: {{(index $method.Inputs 0).Type}}): Promise<{{template "type" dict "Type" (index $method.Outputs 0).Type "TypeMap" $typeMap}}>
1717
{{- else}}
1818
{{- if $opts.compat }}
1919
{{firstLetterToLower $method.Name}}(ctx: Context, req: {{$method.Name}}Args): Promise<{{$method.Name}}Return>

0 commit comments

Comments
 (0)