Regenerate examples (latest TypeScript example) (#207)

Follow-up for #202
webrpc · Jun 5, 2023 · bdcd995 · bdcd995
1 parent d31c49f
commit bdcd995
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 27 deletions.
diff --git a/_examples/hello-webrpc-ts/webapp/src/client.gen.ts b/_examples/hello-webrpc-ts/webapp/src/client.gen.ts
@@ -87,37 +87,45 @@ export class ExampleService implements ExampleService {
     return this.fetch(
       this.url('Ping'),
       createHTTPRequest({}, headers)
-      ).then((res) => {
+    ).then((res) => {
       return buildResponse(res).then(_data => {
         return {
-          status: <boolean>(_data.status)
+          status: <boolean>(_data.status),
         }
       })
+    }, (error) => {
+      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
     })
   }
 
   getUser = (args: GetUserArgs, headers?: object): Promise<GetUserReturn> => {
     return this.fetch(
       this.url('GetUser'),
-      createHTTPRequest(args, headers)).then((res) => {
+      createHTTPRequest(args, headers)
+    ).then((res) => {
       return buildResponse(res).then(_data => {
         return {
-          user: <User>(_data.user)
+          user: <User>(_data.user),
         }
       })
+    }, (error) => {
+      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
     })
   }
 
   findUsers = (args: FindUsersArgs, headers?: object): Promise<FindUsersReturn> => {
     return this.fetch(
       this.url('FindUsers'),
-      createHTTPRequest(args, headers)).then((res) => {
+      createHTTPRequest(args, headers)
+    ).then((res) => {
       return buildResponse(res).then(_data => {
         return {
-          page: <Page>(_data.page), 
-          users: <Array<User>>(_data.users)
+          page: <Page>(_data.page),
+          users: <Array<User>>(_data.users),
         }
       })
+    }, (error) => {
+      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
     })
   }
 
@@ -136,16 +144,15 @@ const buildResponse = (res: Response): Promise<any> => {
     let data
     try {
       data = JSON.parse(text)
-    } catch(e) {
-      WebrpcBadResponseError.throwError({
+    } catch(error) {
+      throw WebrpcBadResponseError.new({
         status: res.status,
-        cause: `JSON.parse(): ${e.message}: response text: ${text}`},
+        cause: `JSON.parse(): ${error.message || ''}: response text: ${text}`},
       )
     }
     if (!res.ok) {
       const code: number = (typeof data.code === 'number') ? data.code : 0
-      const err = webrpcErrorByCode[code] || WebrpcError
-      err.throwError(data)
+      throw (webrpcErrorByCode[code] || WebrpcError).new(data)
     }
     return data
   })
@@ -176,8 +183,8 @@ export class WebrpcError extends Error {
     Object.setPrototypeOf(this, WebrpcError.prototype)
   }
 
-  static throwError(payload: any) {
-    throw new this(payload.error, payload.code, payload.message || payload.msg, payload.status, payload.cause)
+  static new(payload: any): WebrpcError {
+    return new this(payload.error, payload.code, payload.message || payload.msg, payload.status, payload.cause)
   }
 }
 

diff --git a/_examples/node-ts/webapp/client.gen.ts b/_examples/node-ts/webapp/client.gen.ts
@@ -78,24 +78,28 @@ export class ExampleService implements ExampleService {
     return this.fetch(
       this.url('Ping'),
       createHTTPRequest({}, headers)
-      ).then((res) => {
+    ).then((res) => {
       return buildResponse(res).then(_data => {
-        return {
-        }
+        return {}
       })
+    }, (error) => {
+      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
     })
   }
 
   getUser = (args: GetUserArgs, headers?: object): Promise<GetUserReturn> => {
     return this.fetch(
       this.url('GetUser'),
-      createHTTPRequest(args, headers)).then((res) => {
+      createHTTPRequest(args, headers)
+    ).then((res) => {
       return buildResponse(res).then(_data => {
         return {
-          code: <number>(_data.code), 
-          user: <User>(_data.user)
+          code: <number>(_data.code),
+          user: <User>(_data.user),
         }
       })
+    }, (error) => {
+      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
     })
   }
 
@@ -114,16 +118,15 @@ const buildResponse = (res: Response): Promise<any> => {
     let data
     try {
       data = JSON.parse(text)
-    } catch(e) {
-      WebrpcBadResponseError.throwError({
+    } catch(error) {
+      throw WebrpcBadResponseError.new({
         status: res.status,
-        cause: `JSON.parse(): ${e.message}: response text: ${text}`},
+        cause: `JSON.parse(): ${error.message || ''}: response text: ${text}`},
       )
     }
     if (!res.ok) {
       const code: number = (typeof data.code === 'number') ? data.code : 0
-      const err = webrpcErrorByCode[code] || WebrpcError
-      err.throwError(data)
+      throw (webrpcErrorByCode[code] || WebrpcError).new(data)
     }
     return data
   })
@@ -154,8 +157,8 @@ export class WebrpcError extends Error {
     Object.setPrototypeOf(this, WebrpcError.prototype)
   }
 
-  static throwError(payload: any) {
-    throw new this(payload.error, payload.code, payload.message || payload.msg, payload.status, payload.cause)
+  static new(payload: any): WebrpcError {
+    return new this(payload.error, payload.code, payload.message || payload.msg, payload.status, payload.cause)
   }
 }