@justins-home/api-services 1.1.0 → 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.0 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
-CJS dist/index.js 24.88 KB
-CJS ⚡️ Build success in 36ms
-ESM dist/index.mjs 23.31 KB
-ESM ⚡️ Build success in 36ms
+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,19 @@
 # @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
+
+- feat(api-client): normalize Laravel API errors for all consumers
+
 ## 1.1.0
 
 ### Minor 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,16 +46,53 @@ module.exports = __toCommonJS(index_exports);
 
 // src/api-client.ts
 var import_http_client = require("@justins-home/http-client");
+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 ApiError("Network error", void 0, void 0, operation);
+  }
+  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)) {
+      message = firstError[0];
+    }
+  } else if (data == null ? void 0 : data.message) {
+    message = data.message;
+  }
+  throw new ApiError(message, status, data, operation);
+}
 var api = {
   async post(operation, url, payload) {
-    const res = await import_http_client.authClient.post(url, payload ?? {});
-    return res.data;
+    try {
+      const res = await import_http_client.authClient.post(url, payload ?? {});
+      return res.data;
+    } catch (error) {
+      normalizeError(error, operation);
+    }
   },
   async get(operation, url, query) {
-    const res = await import_http_client.authClient.get(url, {
-      params: query
-    });
-    return res.data;
+    try {
+      const res = await import_http_client.authClient.get(url, {
+        params: query
+      });
+      return res.data;
+    } catch (error) {
+      normalizeError(error, operation);
+    }
   }
 };
 
@@ -595,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,15 +1,52 @@
 // src/api-client.ts
 import { authClient } from "@justins-home/http-client";
+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 ApiError("Network error", void 0, void 0, operation);
+  }
+  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)) {
+      message = firstError[0];
+    }
+  } else if (data == null ? void 0 : data.message) {
+    message = data.message;
+  }
+  throw new ApiError(message, status, data, operation);
+}
 var api = {
   async post(operation, url, payload) {
-    const res = await authClient.post(url, payload ?? {});
-    return res.data;
+    try {
+      const res = await authClient.post(url, payload ?? {});
+      return res.data;
+    } catch (error) {
+      normalizeError(error, operation);
+    }
   },
   async get(operation, url, query) {
-    const res = await authClient.get(url, {
-      params: query
-    });
-    return res.data;
+    try {
+      const res = await authClient.get(url, {
+        params: query
+      });
+      return res.data;
+    } catch (error) {
+      normalizeError(error, operation);
+    }
   }
 };
 
@@ -549,6 +586,7 @@ var wishlist = {
   }
 };
 export {
+  ApiError,
   admin,
   agent,
   api,

package/package.json

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

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,14 +33,61 @@ 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<T extends OperationId>(
+  error: any,
+  operation: T,
+): never {
+  const response = error?.response;
+
+  if (!response) {
+    throw new ApiError('Network error', undefined, undefined, operation);
+  }
+
+  const { status, data } = response;
+
+  let message = 'Request failed';
+
+  if (data?.errors) {
+    const firstError = Object.values(data.errors)[0];
+    if (Array.isArray(firstError)) {
+      message = firstError[0];
+    }
+  } else if (data?.message) {
+    message = data.message;
+  }
+
+  throw new ApiError<ApiErrorResponse<T>>(message, status, data, operation);
+}
+
 export const api = {
   async post<T extends OperationId>(
     operation: T,
     url: string,
     payload?: ApiRequest<T>,
   ): Promise<ApiResponse<T>> {
-    const res = await authClient.post(url, payload ?? {});
-    return res.data;
+    try {
+      const res = await authClient.post(url, payload ?? {});
+      return res.data;
+    } catch (error) {
+      normalizeError(error, operation);
+    }
   },
 
   async get<T extends OperationId>(
@@ -34,10 +95,14 @@ export const api = {
     url: string,
     query?: ApiRequest<T>,
   ): Promise<ApiResponse<T>> {
-    const res = await authClient.get(url, {
-      params: query,
-    });
+    try {
+      const res = await authClient.get(url, {
+        params: query,
+      });
 
-    return res.data;
+      return res.data;
+    } catch (error) {
+      normalizeError(error, operation);
+    }
   },
 };

package/src/index.ts

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

package/src/authService.ts

@@ -1,11 +0,0 @@
-import { publicClient, request } from '@justins-home/http-client';
-
-export const authService = {
-  async login(data: { email: string; password: string }) {
-    return request(publicClient, publicClient.post('/auth/login', data));
-  },
-
-  async logout() {
-    return request(publicClient, publicClient.post('/auth/logout'));
-  },
-};

package/src/inspectionService.ts

@@ -1,8 +0,0 @@
-import { authClient, request } from '@justins-home/http-client';
-import { InspectionResource } from '@justins-home/types';
-
-export const inspectionService = {
-  async getInspections(): Promise<InspectionResource[]> {
-    return request(authClient, authClient.get('/inspections'));
-  },
-};

package/src/listingService.ts

@@ -1,12 +0,0 @@
-import { authClient, request } from '@justins-home/http-client';
-import { ListingResource } from '@justins-home/types';
-
-export const listingService = {
-  async getListings(): Promise<ListingResource[]> {
-    return request(authClient, authClient.get('/listings'));
-  },
-
-  async getListing(uid: string): Promise<ListingResource> {
-    return request(authClient, authClient.get(`/listings/${uid}`));
-  },
-};

package/src/maintenanceService.ts

@@ -1,8 +0,0 @@
-import { authClient, request } from '@justins-home/http-client';
-import { MaintenanceRequestResource } from '@justins-home/types';
-
-export const maintenanceService = {
-  async getRequests(): Promise<MaintenanceRequestResource[]> {
-    return request(authClient, authClient.get('/maintenance'));
-  },
-};

package/src/notificationService.ts

@@ -1,8 +0,0 @@
-import { authClient, request } from '@justins-home/http-client';
-import { NotificationResource } from '@justins-home/types';
-
-export const notificationService = {
-  async getNotifications(): Promise<NotificationResource[]> {
-    return request(authClient, authClient.get('/notifications'));
-  },
-};

package/src/tenancyService.ts

@@ -1,8 +0,0 @@
-import { authClient, request } from '@justins-home/http-client';
-import { TenancyResource } from '@justins-home/types';
-
-export const tenancyService = {
-  async getTenancies(): Promise<TenancyResource[]> {
-    return request(authClient, authClient.get('/tenancies'));
-  },
-};