@mapcreator/api 0.0.0-mc2896.0 → 0.0.0-mc2896.2

package/src/utils.ts

@@ -39,12 +39,20 @@ export const staticContext = { keysToRemove: new Set(keysToRemove), keysToAdd: [
 export const defaultTimeout = 30000;
 
 // class AuthorizationError extends Error {}
-export class NetworkError extends Error {}
+export class NetworkError extends Error {
+  constructor(error: unknown) {
+    super((error as Error)?.message ?? 'Network Error', error instanceof Error ? { cause: error } : {});
+    this.name = 'NetworkError';
+  }
+}
 
 export class TimeoutError extends Error {
   readonly timeout: number;
-  constructor(timeout: number, message?: string) {
-    super(message ?? `Request timed out after ${timeout}ms`);
+  constructor(timeout: number, error?: unknown) {
+    super(
+      (error as Error)?.message ?? `Request timed out after ${timeout}ms`,
+      error instanceof Error ? { cause: error } : {},
+    );
     this.name = 'TimeoutError';
     this.timeout = timeout;
   }
@@ -54,15 +62,19 @@ export class HTTPError extends Error {
   readonly statusCode: number;
   constructor(response: Response) {
     super(response.statusText);
+    this.name = 'HTTPError';
     this.statusCode = response.status;
   }
 }
 
 export class APIError extends Error {
-  readonly code: string;
+  readonly code: string | undefined;
+  readonly validationErrors: Record<string, string[]> | undefined;
   constructor(apiError: ApiError) {
-    super(apiError.error.message);
-    this.code = apiError.error.type;
+    super(apiError?.error?.message ?? 'API Error');
+    this.name = 'APIError';
+    this.code = apiError?.error?.type;
+    this.validationErrors = apiError?.error?.validation_errors;
   }
 }
 
@@ -159,10 +171,10 @@ export async function request<
       if (error instanceof TimeoutError) throw error;
 
       if (error?.name === 'TimeoutError' || error?.name === 'AbortError') {
-        throw new TimeoutError(timeout);
+        throw new TimeoutError(timeout, error);
       }
 
-      throw new NetworkError(error?.message ?? error);
+      throw new NetworkError(error);
     })
     .finally(cleanup);
 
@@ -237,6 +249,7 @@ export async function request<
       case 403:
       case 404:
       case 406:
+      case 422:
         throw new APIError(
           (await response.json().catch(() => ({
             success: false,
@@ -288,7 +301,7 @@ function getRequestInit<I extends ApiCommon, O extends Record<string, unknown>>(
   }
 
   const method = extraOptions?.method ?? (body != null ? 'POST' : 'GET'); // don't touch `!=` please
-  const authorization = getAuthorizationHeaders(method);
+  const authorization = getAuthorizationHeaders();
   const headers = { Accept: 'application/json', ...authorization, ...contentType, ...extraHeaders };
 
   return { body, headers, method, ...!token && { credentials: 'include' } } as RequestInit;
@@ -334,7 +347,7 @@ export function processData<I extends ApiCommon, O extends Record<string, unknow
   return result as O;
 } /* eslint-enable @typescript-eslint/prefer-for-of */
 
-function makeTimeoutSignal(timeout: number): { signal: AbortSignal; cleanup: () => void } {
+export function makeTimeoutSignal(timeout: number): { signal: AbortSignal; cleanup: () => void } {
   if (typeof AbortSignal.timeout === 'function') {
     return {
       signal: AbortSignal.timeout(timeout),
@@ -351,7 +364,7 @@ function makeTimeoutSignal(timeout: number): { signal: AbortSignal; cleanup: ()
   }
 }
 
-function combineSignals(a: AbortSignal, b: AbortSignal): AbortSignal {
+export function combineSignals(a: AbortSignal, b: AbortSignal): AbortSignal {
   if (typeof AbortSignal.any === 'function') {
     return AbortSignal.any([a, b]);
   } else {