shelflife-react-hooks 1.0.6 → 1.0.8

package/src/context/api/storageItemApi.ts

@@ -1,3 +1,4 @@
+import type { AddItemError, EditItemError } from '../../type/item.js';
 import type { RunningLowNotification, StorageItem } from '../../type/models.js';
 import type { AddItemRequest, EditItemRequest } from '../../type/requests.js';
 import { buildAuthHeaders, normalizeBaseUrl, readJson } from '../http.js';
@@ -61,6 +62,11 @@ export const addItemRequest = async (
     });
 
     if (!response.ok) {
+        const err = await readJson<AddItemError>(response);
+
+        if (err?.productId || err?.expiresAt)
+            throw err;
+
         throw new Error('Failed to add storage item');
     }
 
@@ -90,6 +96,11 @@ export const editItemRequest = async (
     });
 
     if (!response.ok) {
+        const err = await readJson<EditItemError>(response);
+
+        if (err?.expiresAt)
+            throw err;
+
         throw new Error('Failed to edit storage item');
     }
 

package/src/context/api/storageMemberApi.ts

@@ -1,3 +1,4 @@
+import type { InviteMemberError } from '../../type/member.js';
 import type { StorageMember } from '../../type/models.js';
 import type { InviteMemberRequest } from '../../type/requests.js';
 import { buildAuthHeaders, normalizeBaseUrl, readJson } from '../http.js';
@@ -47,6 +48,11 @@ export const inviteMemberRequest = async (
     });
 
     if (!response.ok) {
+        const err = await readJson<InviteMemberError>(response);
+
+        if(err?.email)
+            throw err;
+
         throw new Error('Failed to invite member');
     }
 

package/src/context/api/userApi.ts

@@ -1,6 +1,7 @@
 import type { User } from '../../type/models.js';
 import type { ChangeUserDataRequest } from '../../type/requests.js';
-import { buildAuthHeaders, normalizeBaseUrl, readArrayBuffer, readJson } from '../http.js';
+import type { UpdateUserError } from '../../type/user.js';
+import { buildAuthHeaders, normalizeBaseUrl, readJson } from '../http.js';
 import { runWithRequestState, type RequestStateHandlers } from './requestState.js';
 
 type UserApiConfig = RequestStateHandlers & {
@@ -87,6 +88,11 @@ export const updateUserRequest = async (
     });
 
     if (!response.ok) {
+        const update = await readJson<UpdateUserError>(response);
+
+        if (update?.email || update?.username)
+            throw update;
+
         throw new Error('Failed to update user');
     }
 

package/src/type/auth.ts

@@ -47,6 +47,7 @@ type LogoutResponse = EmptyResponse | LogoutErrorResponse;
 
 type ChangePasswordErrorResponse = {
     oldPassword?: string;
+    newPassword?: string;
     newPasswordRepeat?: string;
 };
 

package/src/type/item.ts

@@ -0,0 +1,13 @@
+type AddItemError = {
+    productId?: string;
+    expiresAt?: string;
+}
+
+type EditItemError = {
+    expiresAt?: string;
+}
+
+export type {
+    AddItemError,
+    EditItemError
+}

package/src/type/member.ts

@@ -0,0 +1,7 @@
+type InviteMemberError = {
+    email?: string;
+}
+
+export type {
+    InviteMemberError
+}

package/src/type/product.ts

@@ -1,29 +1,10 @@
-import type { EmptyResponse, ErrorResponse, FieldErrorMap, ImageResponse } from './base.js';
-import type { Product } from './models.js';
-
-type ProductListResponse = Product[];
-
-type ProductResponse = Product | EmptyResponse;
-
-type ProductIconResponse = ImageResponse;
-
-type ProductUploadIconError = ErrorResponse | { pfp: string };
-
-type ProductUploadIconResponse = EmptyResponse | ProductUploadIconError;
-
-type ProductCreateResponse = Product | FieldErrorMap | EmptyResponse;
-
-type ProductUpdateResponse = Product | FieldErrorMap | EmptyResponse;
-
-type ProductDeleteResponse = EmptyResponse;
+type ProductCreateError = {
+    name?: string;
+    category?: string;
+    barcode?: string;
+    expirationDaysDelta?: number;
+}
 
 export type {
-    ProductListResponse,
-    ProductResponse,
-    ProductIconResponse,
-    ProductUploadIconError,
-    ProductUploadIconResponse,
-    ProductCreateResponse,
-    ProductUpdateResponse,
-    ProductDeleteResponse
+    ProductCreateError
 };

package/src/type/runninglow.ts

@@ -1,23 +1,13 @@
-import type { EmptyResponse, FieldErrorMap } from './base.js';
-import type { RunningLowNotification, RunningLowSetting } from './models.js';
+type CreateRunningLowSettingError = {
+    productId?: string;
+    runningLow?: string;
+}
 
-type RunningLowSettingListResponse = RunningLowSetting[];
-
-type RunningLowSettingResponse = RunningLowSetting | EmptyResponse;
-
-type RunningLowCreateResponse = RunningLowSetting | FieldErrorMap | EmptyResponse;
-
-type RunningLowEditResponse = RunningLowSetting | FieldErrorMap | EmptyResponse;
-
-type RunningLowDeleteResponse = EmptyResponse;
-
-type RunningLowNotificationListResponse = RunningLowNotification[];
+type EditRunningLowSettingError = {
+    runningLow?: string;
+}
 
 export type {
-    RunningLowSettingListResponse,
-    RunningLowSettingResponse,
-    RunningLowCreateResponse,
-    RunningLowEditResponse,
-    RunningLowDeleteResponse,
-    RunningLowNotificationListResponse
+    CreateRunningLowSettingError,
+    EditRunningLowSettingError
 };

package/src/type/storage.ts

@@ -1,70 +1,7 @@
-import type { EmptyResponse, FieldErrorMap } from './base.js';
-import type {
-    RunningLowNotification,
-    Storage,
-    StorageItem,
-    StorageMember
-} from './models.js';
-
-type StorageListResponse = Storage[];
-
-type StorageResponse = Storage | EmptyResponse;
-
-type StorageCreateResponse = Storage | FieldErrorMap | EmptyResponse;
-
-type StorageChangeNameResponse = Storage | FieldErrorMap | EmptyResponse;
-
-type StorageDeleteResponse = EmptyResponse;
-
-type StorageItemListResponse = StorageItem[];
-
-type StorageItemResponse = StorageItem | EmptyResponse;
-
-type StorageItemAddResponse = StorageItem | FieldErrorMap | EmptyResponse;
-
-type StorageItemEditResponse = StorageItem | FieldErrorMap | EmptyResponse;
-
-type StorageItemDeleteResponse = EmptyResponse;
-
-type StorageExpiredItemsResponse = StorageItem[];
-
-type StorageAboutToExpireItemsResponse = StorageItem[];
-
-type StorageRunningLowResponse = RunningLowNotification[];
-
-type StorageMemberListResponse = StorageMember[];
-
-type StorageMemberResponse = StorageMember | EmptyResponse;
-
-type StorageMemberInviteResponse = StorageMember | FieldErrorMap | EmptyResponse;
-
-type StorageMemberDeleteResponse = EmptyResponse | FieldErrorMap;
-
-type InviteListResponse = StorageMember[];
-
-type InviteAcceptResponse = EmptyResponse;
-
-type InviteDeclineResponse = EmptyResponse;
+type CreateStorageError = {
+    name?: string;
+}
 
 export type {
-    StorageListResponse,
-    StorageResponse,
-    StorageCreateResponse,
-    StorageChangeNameResponse,
-    StorageDeleteResponse,
-    StorageItemListResponse,
-    StorageItemResponse,
-    StorageItemAddResponse,
-    StorageItemEditResponse,
-    StorageItemDeleteResponse,
-    StorageExpiredItemsResponse,
-    StorageAboutToExpireItemsResponse,
-    StorageRunningLowResponse,
-    StorageMemberListResponse,
-    StorageMemberResponse,
-    StorageMemberInviteResponse,
-    StorageMemberDeleteResponse,
-    InviteListResponse,
-    InviteAcceptResponse,
-    InviteDeclineResponse
+    CreateStorageError
 };

package/src/type/user.ts

@@ -1,23 +1,11 @@
 import type { EmptyResponse, FieldErrorMap, ImageResponse } from './base.js';
 import type { User } from './models.js';
 
-type UserListResponse = User[];
-
-type UserResponse = User | EmptyResponse;
-
-type UserPfpResponse = ImageResponse;
-
-type UserUploadPfpResponse = EmptyResponse | FieldErrorMap | string;
-
-type UserDeleteResponse = EmptyResponse;
-
-type UserUpdateResponse = User | FieldErrorMap | EmptyResponse;
+type UpdateUserError = {
+    username?: string;
+    email?: string;
+}
 
 export type {
-    UserListResponse,
-    UserResponse,
-    UserPfpResponse,
-    UserUploadPfpResponse,
-    UserDeleteResponse,
-    UserUpdateResponse
+    UpdateUserError
 };