@stack-spot/portal-network 0.3.1 → 0.4.0

package/src/network/ManualQuery.ts

@@ -26,6 +26,8 @@ export class ManualQuery<
       return await this.config.request(
         ...[abortController.signal, variables] as Variables extends void ? [AbortSignal] : [AbortSignal, Variables],
       )
+    } catch (error) {
+      throw this.config.transformError(error)
     } finally {
       this.abortMap.delete(variables)
       this.currentRequests.delete(variables)

package/src/network/ReactQueryNetworkClient.ts

@@ -55,16 +55,6 @@ export abstract class ReactQueryNetworkClient extends NetworkClient {
     return this.buildStackSpotError(error)
   }
 
-  #withErrorTreatment = <Args extends any[], Result>(block: (...args: Args) => Promise<Result>): ((...args: Args) => Promise<Result>) => (
-    async (...args) => {
-      try {
-        return await block(...args)
-      } catch (error: any) {
-        throw this.#transformError(error)
-      }
-    }
-  )
-
   /**
    * Receives an HttpError and returns a StackspotAPIError.
    * @param error the original HttpError created by oazapfts.
@@ -120,8 +110,9 @@ export abstract class ReactQueryNetworkClient extends NetworkClient {
       : new ManualQuery({
         ...fnOrConfig,
         apiName: this.constructor.name,
-        request: this.#withErrorTreatment(fnOrConfig.request),
-        permission: fnOrConfig.permission ? this.#withErrorTreatment(fnOrConfig.permission) : undefined,
+        request: fnOrConfig.request,
+        permission: fnOrConfig.permission,
+        transformError: error => this.#transformError(error),
       })
   }
 
@@ -205,8 +196,9 @@ export abstract class ReactQueryNetworkClient extends NetworkClient {
       : new ManualInfiniteQuery({
         ...fnOrConfig,
         apiName: this.constructor.name,
-        request: this.#withErrorTreatment(fnOrConfig.request),
-        permission: fnOrConfig.permission ? this.#withErrorTreatment(fnOrConfig.permission) : undefined,
+        request: fnOrConfig.request,
+        permission: fnOrConfig.permission,
+        transformError: error => this.#transformError(error),
       })
   }
 
@@ -245,8 +237,9 @@ export abstract class ReactQueryNetworkClient extends NetworkClient {
     return new ManualMutation({
       ...fnOrConfig,
       apiName: this.constructor.name,
-      request: this.#withErrorTreatment(fnOrConfig.request),
-      permission: fnOrConfig.permission ? this.#withErrorTreatment(fnOrConfig.permission) : undefined,
+      request: fnOrConfig.request,
+      permission: fnOrConfig.permission,
+      transformError: error => this.#transformError(error),
     })
   }
 }

package/src/network/types.ts

@@ -88,6 +88,7 @@ export interface FullOperationConfig<
    * The name of the API where this operation is called: used for composing a query key.
    */
   apiName: string,
+  transformError: (error: any) => StackspotAPIError,
 }
 
 export type InfiniteQueryConfig<