@justins-home/api-services 1.1.1 → 1.1.2

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
  WARN  Issue while reading "/home/runner/work/justins-home-platform-ui/justins-home-platform-ui/.npmrc". Failed to replace env in config: ${NODE_AUTH_TOKEN}
 
-> @justins-home/api-services@1.1.1 build /home/runner/work/justins-home-platform-ui/justins-home-platform-ui/packages/api-services
+> @justins-home/api-services@1.1.2 build /home/runner/work/justins-home-platform-ui/justins-home-platform-ui/packages/api-services
 > tsup src/index.ts --format esm,cjs
 
 CLI Building entry: src/index.ts
@@ -8,7 +8,7 @@
 CLI Target: node16
 ESM Build start
 CJS Build start
-ESM dist/index.mjs 24.05 KB
-ESM ⚡️ Build success in 70ms
-CJS dist/index.js 25.62 KB
-CJS ⚡️ Build success in 72ms
+CJS dist/index.js 25.90 KB
+CJS ⚡️ Build success in 45ms
+ESM dist/index.mjs 24.30 KB
+ESM ⚡️ Build success in 45ms

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @justins-home/api-services
 
+## 1.1.2
+
+### Patch Changes
+
+- added ApiError to normalizeError
+- Updated dependencies
+  - @justins-home/http-client@1.0.1
+
 ## 1.1.1
 
 ### Patch Changes

package/dist/index.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
+  ApiError: () => ApiError,
   admin: () => admin,
   agent: () => agent,
   api: () => api,
@@ -45,23 +46,34 @@ module.exports = __toCommonJS(index_exports);
 
 // src/api-client.ts
 var import_http_client = require("@justins-home/http-client");
-function normalizeError(error) {
+var ApiError = class extends Error {
+  status;
+  data;
+  operation;
+  constructor(message, status, data, operation) {
+    super(message);
+    this.name = "ApiError";
+    this.status = status;
+    this.data = data;
+    this.operation = operation;
+  }
+};
+function normalizeError(error, operation) {
   const response = error == null ? void 0 : error.response;
   if (!response) {
-    throw new Error((error == null ? void 0 : error.message) || "Network error");
+    throw new ApiError("Network error", void 0, void 0, operation);
   }
-  const data = response.data;
+  const { status, data } = response;
+  let message = "Request failed";
   if (data == null ? void 0 : data.errors) {
     const firstError = Object.values(data.errors)[0];
     if (Array.isArray(firstError)) {
-      throw new Error(firstError[0]);
+      message = firstError[0];
     }
-    throw new Error("Validation error");
-  }
-  if (data == null ? void 0 : data.message) {
-    throw new Error(data.message);
+  } else if (data == null ? void 0 : data.message) {
+    message = data.message;
   }
-  throw new Error(`Request failed with status ${response.status}`);
+  throw new ApiError(message, status, data, operation);
 }
 var api = {
   async post(operation, url, payload) {
@@ -69,7 +81,7 @@ var api = {
       const res = await import_http_client.authClient.post(url, payload ?? {});
       return res.data;
     } catch (error) {
-      normalizeError(error);
+      normalizeError(error, operation);
     }
   },
   async get(operation, url, query) {
@@ -79,7 +91,7 @@ var api = {
       });
       return res.data;
     } catch (error) {
-      normalizeError(error);
+      normalizeError(error, operation);
     }
   }
 };
@@ -621,6 +633,7 @@ var wishlist = {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ApiError,
   admin,
   agent,
   api,

package/dist/index.mjs

@@ -1,22 +1,33 @@
 // src/api-client.ts
 import { authClient } from "@justins-home/http-client";
-function normalizeError(error) {
+var ApiError = class extends Error {
+  status;
+  data;
+  operation;
+  constructor(message, status, data, operation) {
+    super(message);
+    this.name = "ApiError";
+    this.status = status;
+    this.data = data;
+    this.operation = operation;
+  }
+};
+function normalizeError(error, operation) {
   const response = error == null ? void 0 : error.response;
   if (!response) {
-    throw new Error((error == null ? void 0 : error.message) || "Network error");
+    throw new ApiError("Network error", void 0, void 0, operation);
   }
-  const data = response.data;
+  const { status, data } = response;
+  let message = "Request failed";
   if (data == null ? void 0 : data.errors) {
     const firstError = Object.values(data.errors)[0];
     if (Array.isArray(firstError)) {
-      throw new Error(firstError[0]);
+      message = firstError[0];
     }
-    throw new Error("Validation error");
-  }
-  if (data == null ? void 0 : data.message) {
-    throw new Error(data.message);
+  } else if (data == null ? void 0 : data.message) {
+    message = data.message;
   }
-  throw new Error(`Request failed with status ${response.status}`);
+  throw new ApiError(message, status, data, operation);
 }
 var api = {
   async post(operation, url, payload) {
@@ -24,7 +35,7 @@ var api = {
       const res = await authClient.post(url, payload ?? {});
       return res.data;
     } catch (error) {
-      normalizeError(error);
+      normalizeError(error, operation);
     }
   },
   async get(operation, url, query) {
@@ -34,7 +45,7 @@ var api = {
       });
       return res.data;
     } catch (error) {
-      normalizeError(error);
+      normalizeError(error, operation);
     }
   }
 };
@@ -575,6 +586,7 @@ var wishlist = {
   }
 };
 export {
+  ApiError,
   admin,
   agent,
   api,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@justins-home/api-services",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": false,
   "main": "src/index.ts",
   "dependencies": {
-    "@justins-home/types": "1.0.0",
-    "@justins-home/http-client": "1.0.0"
+    "@justins-home/http-client": "1.0.1",
+    "@justins-home/types": "1.0.0"
   },
   "publishConfig": {
     "access": "public"

package/src/api-client.ts

@@ -1,6 +1,20 @@
 import { authClient } from '@justins-home/http-client';
 import type { operations } from '@justins-home/types/generated/api-types';
 
+export class ApiError<T = unknown> extends Error {
+  status?: number;
+  data?: T;
+  operation?: string;
+
+  constructor(message: string, status?: number, data?: T, operation?: string) {
+    super(message);
+    this.name = 'ApiError';
+    this.status = status;
+    this.data = data;
+    this.operation = operation;
+  }
+}
+
 type OperationId = keyof operations;
 
 type ApiRequest<T extends OperationId> = operations[T] extends {
@@ -19,35 +33,47 @@ type ApiResponse<T extends OperationId> = operations[T] extends {
   ? R
   : unknown;
 
+type ApiErrorResponse<T extends OperationId> = operations[T] extends {
+  responses: infer R;
+}
+  ? {
+      [K in keyof R]: K extends 200
+        ? never
+        : R[K] extends {
+              content: { 'application/json': infer E };
+            }
+          ? E
+          : never;
+    }[keyof R]
+  : unknown;
+
 /**
  * Normalizes Laravel API errors
  */
-function normalizeError(error: any): never {
+function normalizeError<T extends OperationId>(
+  error: any,
+  operation: T,
+): never {
   const response = error?.response;
 
   if (!response) {
-    throw new Error(error?.message || 'Network error');
+    throw new ApiError('Network error', undefined, undefined, operation);
   }
 
-  const data = response.data;
+  const { status, data } = response;
+
+  let message = 'Request failed';
 
-  // Laravel validation errors
   if (data?.errors) {
     const firstError = Object.values(data.errors)[0];
-
     if (Array.isArray(firstError)) {
-      throw new Error(firstError[0]);
+      message = firstError[0];
     }
-
-    throw new Error('Validation error');
-  }
-
-  // Standard Laravel API error
-  if (data?.message) {
-    throw new Error(data.message);
+  } else if (data?.message) {
+    message = data.message;
   }
 
-  throw new Error(`Request failed with status ${response.status}`);
+  throw new ApiError<ApiErrorResponse<T>>(message, status, data, operation);
 }
 
 export const api = {
@@ -60,7 +86,7 @@ export const api = {
       const res = await authClient.post(url, payload ?? {});
       return res.data;
     } catch (error) {
-      normalizeError(error);
+      normalizeError(error, operation);
     }
   },
 
@@ -76,7 +102,7 @@ export const api = {
 
       return res.data;
     } catch (error) {
-      normalizeError(error);
+      normalizeError(error, operation);
     }
   },
 };

package/src/index.ts

@@ -1,4 +1,3 @@
-
 /**
  * Core API utilities
  */