shelflife-react-hooks 1.0.18 → 1.0.20

package/src/context/api/storageMemberApi.ts

@@ -1,84 +1,84 @@
-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';
-import { runWithRequestState, type RequestStateHandlers } from './requestState.js';
-
-type StorageMemberApiConfig = RequestStateHandlers & {
-    baseUrl: string;
-    token: string | null;
-    setMembers: (value: StorageMember[] | ((items: StorageMember[]) => StorageMember[])) => void;
-};
-
-export const fetchMembersRequest = async (
-    config: StorageMemberApiConfig,
-    storageId: number
-): Promise<StorageMember[]> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/storages/${storageId}/members`, {
-        headers: buildAuthHeaders(config.token)
-    });
-
-    if (!response.ok) {
-        throw new Error('Failed to fetch storage members');
-    }
-
-    const payload = await readJson<StorageMember[]>(response);
-    if (payload) {
-        config.setMembers(payload);
-        return payload;
-    }
-
-    return [];
-});
-
-export const inviteMemberRequest = async (
-    config: StorageMemberApiConfig,
-    storageId: number,
-    dto: InviteMemberRequest
-): Promise<StorageMember> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/storages/${storageId}/members`, {
-        method: 'POST',
-        headers: {
-            ...buildAuthHeaders(config.token),
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(dto)
-    });
-
-    if (!response.ok) {
-        const err = await readJson<InviteMemberError>(response);
-
-        if(err?.email)
-            throw err;
-
-        throw new Error('Failed to invite member');
-    }
-
-    const payload = await readJson<StorageMember>(response);
-    if (!payload) {
-        throw new Error('Invite member response missing data');
-    }
-
-    config.setMembers((previous) => [payload, ...previous]);
-    return payload;
-});
-
-export const removeMemberRequest = async (
-    config: StorageMemberApiConfig,
-    storageId: number,
-    userId: number
-): Promise<void> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/storages/${storageId}/members/${userId}`, {
-        method: 'DELETE',
-        headers: buildAuthHeaders(config.token)
-    });
-
-    if (!response.ok) {
-        throw new Error('Failed to remove member');
-    }
-
-    config.setMembers((previous) => previous.filter((member) => member.user.id !== userId));
-});
+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';
+import { runWithRequestState, type RequestStateHandlers } from './requestState.js';
+
+type StorageMemberApiConfig = RequestStateHandlers & {
+    baseUrl: string;
+    token: string | null;
+    setMembers: (value: StorageMember[] | ((items: StorageMember[]) => StorageMember[])) => void;
+};
+
+export const fetchMembersRequest = async (
+    config: StorageMemberApiConfig,
+    storageId: number
+): Promise<StorageMember[]> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/storages/${storageId}/members`, {
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to fetch storage members');
+    }
+
+    const payload = await readJson<StorageMember[]>(response);
+    if (payload) {
+        config.setMembers(payload);
+        return payload;
+    }
+
+    return [];
+});
+
+export const inviteMemberRequest = async (
+    config: StorageMemberApiConfig,
+    storageId: number,
+    dto: InviteMemberRequest
+): Promise<StorageMember> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/storages/${storageId}/members`, {
+        method: 'POST',
+        headers: {
+            ...buildAuthHeaders(config.token),
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(dto)
+    });
+
+    if (!response.ok) {
+        const err = await readJson<InviteMemberError>(response);
+
+        if(err?.email)
+            throw err;
+
+        throw new Error('Failed to invite member');
+    }
+
+    const payload = await readJson<StorageMember>(response);
+    if (!payload) {
+        throw new Error('Invite member response missing data');
+    }
+
+    config.setMembers((previous) => [payload, ...previous]);
+    return payload;
+});
+
+export const removeMemberRequest = async (
+    config: StorageMemberApiConfig,
+    storageId: number,
+    userId: number
+): Promise<void> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/storages/${storageId}/members/${userId}`, {
+        method: 'DELETE',
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to remove member');
+    }
+
+    config.setMembers((previous) => previous.filter((member) => member.user.id !== userId));
+});

package/src/context/api/userApi.ts

@@ -1,161 +1,161 @@
-import type { User } from '../../type/models.js';
-import type { ChangeUserDataRequest } from '../../type/requests.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 & {
-    baseUrl: string;
-    token: string | null;
-    setUsers: (value: User[] | ((items: User[]) => User[])) => void;
-    setUser: (value: User | null | ((prev: User | null) => User | null)) => void;
-};
-
-const updateById = (items: User[], updated: User): User[] => {
-    const index = items.findIndex((item) => item.id === updated.id);
-    if (index === -1) {
-        return [updated, ...items];
-    }
-
-    const next = [...items];
-    next[index] = updated;
-    return next;
-};
-
-export const fetchUsersRequest = async (config: UserApiConfig): Promise<User[]> => runWithRequestState(
-    config,
-    async () => {
-        const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-        const response = await fetch(`${normalizedBaseUrl}/api/users`, {
-            headers: buildAuthHeaders(config.token)
-        });
-
-        if (!response.ok) {
-            throw new Error('Failed to fetch users');
-        }
-
-        const payload = await readJson<User[]>(response);
-        if (payload) {
-            config.setUsers(payload);
-            return payload;
-        }
-
-        return [];
-    }
-);
-
-export const fetchUserRequest = async (
-    config: UserApiConfig,
-    id: number
-): Promise<User | null> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/users/${id}`, {
-        headers: buildAuthHeaders(config.token)
-    });
-
-    if (response.status === 404) {
-        config.setUser(null);
-        return null;
-    }
-
-    if (!response.ok) {
-        throw new Error('Failed to fetch user');
-    }
-
-    const payload = await readJson<User>(response);
-    if (!payload) {
-        throw new Error('User response missing data');
-    }
-
-    config.setUser(payload);
-    config.setUsers((previous) => updateById(previous, payload));
-    return payload;
-});
-
-export const updateUserRequest = async (
-    config: UserApiConfig,
-    id: number,
-    dto: ChangeUserDataRequest
-): Promise<User> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/users/${id}`, {
-        method: 'PATCH',
-        headers: {
-            ...buildAuthHeaders(config.token),
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(dto)
-    });
-
-    if (!response.ok) {
-        const update = await readJson<UpdateUserError>(response);
-
-        if (update?.email || update?.username)
-            throw update;
-
-        throw new Error('Failed to update user');
-    }
-
-    const payload = await readJson<User>(response);
-    if (!payload) {
-        throw new Error('Update user response missing data');
-    }
-
-    config.setUsers((previous) => updateById(previous, payload));
-    config.setUser(payload);
-    return payload;
-});
-
-export const deleteUserRequest = async (
-    config: UserApiConfig,
-    id: number
-): Promise<void> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/users/${id}`, {
-        method: 'DELETE',
-        headers: buildAuthHeaders(config.token)
-    });
-
-    if (!response.ok) {
-        throw new Error('Failed to delete user');
-    }
-
-    config.setUsers((previous) => previous.filter((item) => item.id !== id));
-    config.setUser((current) => (current?.id === id ? null : current));
-});
-
-export const getUserPfpRequest = async (
-    config: UserApiConfig,
-    id: number
-): Promise<Blob> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/users/${id}/pfp`, {
-        headers: buildAuthHeaders(config.token)
-    });
-
-    if (!response.ok) {
-        throw new Error('Failed to fetch user pfp');
-    }
-
-    return response.blob();
-});
-
-export const uploadUserPfpRequest = async (
-    config: UserApiConfig,
-    id: number,
-    file: Blob
-): Promise<void> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const formData = new FormData();
-    formData.append('pfp', file);
-
-    const response = await fetch(`${normalizedBaseUrl}/api/users/${id}/pfp`, {
-        method: 'POST',
-        headers: buildAuthHeaders(config.token),
-        body: formData
-    });
-
-    if (!response.ok) {
-        throw new Error('Failed to upload user pfp');
-    }
-});
+import type { User } from '../../type/models.js';
+import type { ChangeUserDataRequest } from '../../type/requests.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 & {
+    baseUrl: string;
+    token: string | null;
+    setUsers: (value: User[] | ((items: User[]) => User[])) => void;
+    setUser: (value: User | null | ((prev: User | null) => User | null)) => void;
+};
+
+const updateById = (items: User[], updated: User): User[] => {
+    const index = items.findIndex((item) => item.id === updated.id);
+    if (index === -1) {
+        return [updated, ...items];
+    }
+
+    const next = [...items];
+    next[index] = updated;
+    return next;
+};
+
+export const fetchUsersRequest = async (config: UserApiConfig): Promise<User[]> => runWithRequestState(
+    config,
+    async () => {
+        const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+        const response = await fetch(`${normalizedBaseUrl}/api/users`, {
+            headers: buildAuthHeaders(config.token)
+        });
+
+        if (!response.ok) {
+            throw new Error('Failed to fetch users');
+        }
+
+        const payload = await readJson<User[]>(response);
+        if (payload) {
+            config.setUsers(payload);
+            return payload;
+        }
+
+        return [];
+    }
+);
+
+export const fetchUserRequest = async (
+    config: UserApiConfig,
+    id: number
+): Promise<User | null> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/users/${id}`, {
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (response.status === 404) {
+        config.setUser(null);
+        return null;
+    }
+
+    if (!response.ok) {
+        throw new Error('Failed to fetch user');
+    }
+
+    const payload = await readJson<User>(response);
+    if (!payload) {
+        throw new Error('User response missing data');
+    }
+
+    config.setUser(payload);
+    config.setUsers((previous) => updateById(previous, payload));
+    return payload;
+});
+
+export const updateUserRequest = async (
+    config: UserApiConfig,
+    id: number,
+    dto: ChangeUserDataRequest
+): Promise<User> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/users/${id}`, {
+        method: 'PATCH',
+        headers: {
+            ...buildAuthHeaders(config.token),
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(dto)
+    });
+
+    if (!response.ok) {
+        const update = await readJson<UpdateUserError>(response);
+
+        if (update?.email || update?.username)
+            throw update;
+
+        throw new Error('Failed to update user');
+    }
+
+    const payload = await readJson<User>(response);
+    if (!payload) {
+        throw new Error('Update user response missing data');
+    }
+
+    config.setUsers((previous) => updateById(previous, payload));
+    config.setUser(payload);
+    return payload;
+});
+
+export const deleteUserRequest = async (
+    config: UserApiConfig,
+    id: number
+): Promise<void> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/users/${id}`, {
+        method: 'DELETE',
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to delete user');
+    }
+
+    config.setUsers((previous) => previous.filter((item) => item.id !== id));
+    config.setUser((current) => (current?.id === id ? null : current));
+});
+
+export const getUserPfpRequest = async (
+    config: UserApiConfig,
+    id: number
+): Promise<Blob> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/users/${id}/pfp`, {
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to fetch user pfp');
+    }
+
+    return response.blob();
+});
+
+export const uploadUserPfpRequest = async (
+    config: UserApiConfig,
+    id: number,
+    file: Blob
+): Promise<void> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const formData = new FormData();
+    formData.append('pfp', file);
+
+    const response = await fetch(`${normalizedBaseUrl}/api/users/${id}/pfp`, {
+        method: 'POST',
+        headers: buildAuthHeaders(config.token),
+        body: formData
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to upload user pfp');
+    }
+});

package/src/context/http.ts

@@ -1,22 +1,22 @@
-export const normalizeBaseUrl = (baseUrl: string): string => baseUrl.replace(/\/+$/, '');
-
-export const buildAuthHeaders = (token: string | null): HeadersInit => {
-    if (!token) {
-        return {};
-    }
-
-    return {
-        Authorization: `Bearer ${token}`
-    };
-};
-
-export const readJson = async <T,>(response: Response): Promise<T | null> => {
-    const contentType = response.headers.get('content-type');
-    if (!contentType || !contentType.includes('application/json')) {
-        return null;
-    }
-
-    return (await response.json()) as T;
-};
-
-export const readArrayBuffer = async (response: Response): Promise<ArrayBuffer> => response.arrayBuffer();
+export const normalizeBaseUrl = (baseUrl: string): string => baseUrl.replace(/\/+$/, '');
+
+export const buildAuthHeaders = (token: string | null): HeadersInit => {
+    if (!token) {
+        return {};
+    }
+
+    return {
+        Authorization: `Bearer ${token}`
+    };
+};
+
+export const readJson = async <T,>(response: Response): Promise<T | null> => {
+    const contentType = response.headers.get('content-type');
+    if (!contentType || !contentType.includes('application/json')) {
+        return null;
+    }
+
+    return (await response.json()) as T;
+};
+
+export const readArrayBuffer = async (response: Response): Promise<ArrayBuffer> => response.arrayBuffer();

package/src/index.ts

@@ -1,22 +1,22 @@
-export * from './type/auth.js';
-export * from './type/base.js';
-export * from './type/item.js';
-export * from './type/member.js';
-export * from './type/models.js';
-export * from './type/PaginatedResponse.js';
-export * from './type/product.js';
-export * from './type/requests.js';
-export * from './type/runninglow.js';
-export * from './type/shoppingList.js';
-export * from './type/storage.js';
-export * from './type/user.js';
-export * from './context/AuthContext.js';
-export * from './context/http.js';
-export * from './context/InviteContext.js';
-export * from './context/ProductContext.js';
-export * from './context/RunningLowContext.js';
-export * from './context/StorageContext.js';
-export * from './context/StorageItemContext.js';
-export * from './context/StorageMemberContext.js';
-export * from './context/UserContext.js';
+export * from './type/auth.js';
+export * from './type/base.js';
+export * from './type/item.js';
+export * from './type/member.js';
+export * from './type/models.js';
+export * from './type/PaginatedResponse.js';
+export * from './type/product.js';
+export * from './type/requests.js';
+export * from './type/runninglow.js';
+export * from './type/shoppingList.js';
+export * from './type/storage.js';
+export * from './type/user.js';
+export * from './context/AuthContext.js';
+export * from './context/http.js';
+export * from './context/InviteContext.js';
+export * from './context/ProductContext.js';
+export * from './context/RunningLowContext.js';
+export * from './context/StorageContext.js';
+export * from './context/StorageItemContext.js';
+export * from './context/StorageMemberContext.js';
+export * from './context/UserContext.js';
 export * from './context/ShoppingListContext.js';

package/src/type/PaginatedResponse.ts

@@ -1,9 +1,9 @@
-export type PaginatedResponse<T> = {
-    data: T[];
-    currentPage: number;
-    totalPages: number;
-    totalItems: number;
-    pageSize: number;
-    hasNext: boolean;
-    hasPrevious: boolean;
+export type PaginatedResponse<T> = {
+    data: T[];
+    currentPage: number;
+    totalPages: number;
+    totalItems: number;
+    pageSize: number;
+    hasNext: boolean;
+    hasPrevious: boolean;
 }