Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to [email protected] #10

Closed
wants to merge 1 commit into from
Closed

Update to [email protected] #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 37 additions & 67 deletions _examples/node-ts/server/server.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable */
// node-ts v1.0.0 2167bb6fb0a186ff099cd8a309c6ffbbd7d1b9c0
// node-ts v1.0.0 5f4f492b238c9bb50a144d7f80c11bfffb2f0f00
// --
// Code generated by webrpc-gen@v0.11.0 with custom generator. DO NOT EDIT.
// Code generated by webrpc-gen@v0.13.0-dev with custom generator. DO NOT EDIT.
//
// webrpc-gen -schema=service.ridl -target=../../ -server -out=./server/server.gen.ts

Expand All @@ -12,7 +12,7 @@ export const WebRPCVersion = "v1"
export const WebRPCSchemaVersion = "v1.0.0"

// Schema hash generated from your RIDL schema
export const WebRPCSchemaHash = "2167bb6fb0a186ff099cd8a309c6ffbbd7d1b9c0"
export const WebRPCSchemaHash = "5f4f492b238c9bb50a144d7f80c11bfffb2f0f00"

//
// Types
Expand Down Expand Up @@ -210,78 +210,48 @@ const JS_TYPES = [
]


const validateKind = (value: any) => {


if (!("USER" in value) || !validateType(value["USER"], "number")) {
return false
}



if (!("ADMIN" in value) || !validateType(value["ADMIN"], "number")) {
return false
}



return true
const validateKind = (value: any) => {
if (!("USER" in value) || !validateType(value["USER"], "number")) {
return false
}
if (!("ADMIN" in value) || !validateType(value["ADMIN"], "number")) {
return false
}

const validateUser = (value: any) => {


if (!("id" in value) || !validateType(value["id"], "number")) {
return false
}



if (!("USERNAME" in value) || !validateType(value["USERNAME"], "string")) {
return false
}



if (!("role" in value) || !validateType(value["role"], "Kind")) {
return false
}



if (!("meta" in value) || !validateType(value["meta"], "object")) {
return false
}



if (!("-" in value) || !validateType(value["-"], "number")) {
return false
}



if ("createdAt" in value && !validateType(value["createdAt"], "string")) {
return false
}


return true
}

return true
const validateUser = (value: any) => {
if (!("id" in value) || !validateType(value["id"], "number")) {
return false
}
if (!("USERNAME" in value) || !validateType(value["USERNAME"], "string")) {
return false
}
if (!("role" in value) || !validateType(value["role"], "Kind")) {
return false
}
if (!("meta" in value) || !validateType(value["meta"], "object")) {
return false
}
if (!("-" in value) || !validateType(value["-"], "number")) {
return false
}
if ("createdAt" in value && !validateType(value["createdAt"], "string")) {
return false
}

const validatePage = (value: any) => {


if (!("num" in value) || !validateType(value["num"], "number")) {
return false
}


return true
}

return true
const validatePage = (value: any) => {
if (!("num" in value) || !validateType(value["num"], "number")) {
return false
}

return true
}


const TYPE_VALIDATORS: { [type: string]: (value: any) => boolean } = {

Expand Down
21 changes: 18 additions & 3 deletions _examples/node-ts/webapp/client.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable */
// node-ts v1.0.0 2167bb6fb0a186ff099cd8a309c6ffbbd7d1b9c0
// node-ts v1.0.0 5f4f492b238c9bb50a144d7f80c11bfffb2f0f00
// --
// Code generated by webrpc-gen@v0.11.0 with custom generator. DO NOT EDIT.
// Code generated by webrpc-gen@v0.13.0-dev with custom generator. DO NOT EDIT.
//
// webrpc-gen -schema=service.ridl -target=../../ -client -out=./webapp/client.gen.ts

Expand All @@ -12,7 +12,7 @@ export const WebRPCVersion = "v1"
export const WebRPCSchemaVersion = "v1.0.0"

// Schema hash generated from your RIDL schema
export const WebRPCSchemaHash = "2167bb6fb0a186ff099cd8a309c6ffbbd7d1b9c0"
export const WebRPCSchemaHash = "5f4f492b238c9bb50a144d7f80c11bfffb2f0f00"

//
// Types
Expand Down Expand Up @@ -259,6 +259,19 @@ export class WebrpcServerPanicError extends WebrpcError {
}
}

export class WebrpcInternalErrorError extends WebrpcError {
constructor(
name: string = 'WebrpcInternalError',
code: number = -7,
message: string = 'internal error',
status: number = 0,
cause?: string
) {
super(name, code, message, status, cause)
Object.setPrototypeOf(this, WebrpcInternalErrorError.prototype)
}
}


// Schema errors

Expand All @@ -271,6 +284,7 @@ export enum errors {
WebrpcBadRequest = 'WebrpcBadRequest',
WebrpcBadResponse = 'WebrpcBadResponse',
WebrpcServerPanic = 'WebrpcServerPanic',
WebrpcInternalError = 'WebrpcInternalError',
}

const webrpcErrorByCode: { [code: number]: any } = {
Expand All @@ -281,6 +295,7 @@ const webrpcErrorByCode: { [code: number]: any } = {
[-4]: WebrpcBadRequestError,
[-5]: WebrpcBadResponseError,
[-6]: WebrpcServerPanicError,
[-7]: WebrpcInternalErrorError,
}

export type Fetch = (input: RequestInfo, init?: RequestInit) => Promise<Response>
36 changes: 22 additions & 14 deletions serverHelpers.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,29 @@ const JS_TYPES = [
]

{{ range $_, $type := $types }}
const validate{{ $type.Name }} = (value: any) => {
{{ range $_, $field := $type.Fields }}
{{ if $field.Optional }}
if ("{{template "fieldName" dict "Field" $field }}" in value && !validateType(value["{{template "fieldName" dict "Field" $field }}"], "{{template "jsType" dict "Type" (coalesce $field.Type $type.Type) "TypeMap" $typeMap}}")) {
return false
}
{{ else }}
if (!("{{template "fieldName" dict "Field" $field }}" in value) || !validateType(value["{{template "fieldName" dict "Field" $field }}"], "{{template "jsType" dict "Type" (coalesce $field.Type $type.Type) "TypeMap" $typeMap}}")) {
return false
}
{{ end }}
{{ end }}

return true
const validate{{ $type.Name }} = (value: any) => {
{{- if isEnumType $type }}
{{- range $_, $enum := $type.Enums }}
if (!("{{$enum.Name}}" in value) || !validateType(value["{{$enum.Name}}"], "{{template "jsType" dict "Type" $type.Type "TypeMap" $typeMap}}")) {
return false
}
{{- end }}
{{- else -}}
{{- range $_, $field := $type.Fields }}
{{- if $field.Optional }}
if ("{{template "fieldName" dict "Field" $field }}" in value && !validateType(value["{{template "fieldName" dict "Field" $field }}"], "{{template "jsType" dict "Type" (coalesce $field.Type $type.Type) "TypeMap" $typeMap}}")) {
return false
}
{{- else }}
if (!("{{template "fieldName" dict "Field" $field }}" in value) || !validateType(value["{{template "fieldName" dict "Field" $field }}"], "{{template "jsType" dict "Type" (coalesce $field.Type $type.Type) "TypeMap" $typeMap}}")) {
return false
}
{{- end }}
{{- end }}
{{- end }}

return true
}
{{ end }}

const TYPE_VALIDATORS: { [type: string]: (value: any) => boolean } = {
Expand Down
2 changes: 1 addition & 1 deletion types.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

{{if isEnumType $type }}
export enum {{$type.Name}} {
{{- range $i, $field := $type.Fields}}
{{- range $i, $field := $type.Enums}}
{{- if $i}},{{end}}
{{$field.Name}} = '{{$field.Name}}'
{{- end}}
Expand Down
Loading