@go-avro/avro-js 0.0.20 → 0.0.22

package/dist/client/AvroQueryClientProvider.d.ts

@@ -11,4 +11,5 @@ export interface AvroQueryClientProviderProps {
 }
 export declare const AvroQueryClientProvider: ({ baseUrl, authManager, configOverrides, children, }: AvroQueryClientProviderProps) => React.JSX.Element;
 export declare const useAvroQueryClient: () => AvroQueryClient;
+export declare const useSocketEvent: (eventName: string, callback: (data: Record<string, unknown>) => void) => void;
 export default AvroQueryClientProvider;

package/dist/client/AvroQueryClientProvider.js

@@ -1,6 +1,17 @@
-import React, { createContext, useContext, useMemo, useEffect } from "react";
+import React, { createContext, useContext, useMemo, useEffect, useRef, useCallback } from "react";
+import { useQueryClient } from "@tanstack/react-query";
 import { AvroQueryClient } from "./QueryClient";
 const AvroQueryClientContext = createContext(null);
+const SocketInvalidationBridge = ({ client }) => {
+    const queryClient = useQueryClient();
+    useEffect(() => {
+        client.setupSocketInvalidation(queryClient);
+        return () => {
+            client.teardownSocketInvalidation();
+        };
+    }, [client, queryClient]);
+    return null;
+};
 export const AvroQueryClientProvider = ({ baseUrl, authManager, configOverrides, children, }) => {
     const client = useMemo(() => {
         const cfg = {
@@ -13,6 +24,7 @@ export const AvroQueryClientProvider = ({ baseUrl, authManager, configOverrides,
     useEffect(() => {
         return () => {
             try {
+                client.teardownSocketInvalidation();
                 client.socket?.disconnect();
             }
             catch (e) {
@@ -20,7 +32,9 @@ export const AvroQueryClientProvider = ({ baseUrl, authManager, configOverrides,
             }
         };
     }, [client]);
-    return (React.createElement(AvroQueryClientContext.Provider, { value: client }, children));
+    return (React.createElement(AvroQueryClientContext.Provider, { value: client },
+        React.createElement(SocketInvalidationBridge, { client: client }),
+        children));
 };
 export const useAvroQueryClient = () => {
     const ctx = useContext(AvroQueryClientContext);
@@ -29,4 +43,16 @@ export const useAvroQueryClient = () => {
     }
     return ctx;
 };
+export const useSocketEvent = (eventName, callback) => {
+    const client = useAvroQueryClient();
+    const callbackRef = useRef(callback);
+    callbackRef.current = callback;
+    const stableHandler = useCallback((data) => callbackRef.current(data), []);
+    useEffect(() => {
+        client.on(eventName, stableHandler);
+        return () => {
+            client.off(eventName, stableHandler);
+        };
+    }, [client, eventName, stableHandler]);
+};
 export default AvroQueryClientProvider;

package/dist/client/QueryClient.d.ts

@@ -513,10 +513,23 @@ export declare class AvroQueryClient {
     companyId: string | undefined;
     company: Company | undefined;
     private authStateListeners;
+    private _queryClient;
+    private _socketInvalidationCleanup;
     constructor(config: AvroQueryClientConfig);
     emit(eventName: string, data: unknown): void;
     on<T>(eventName: string, callback: (data: T) => void): void;
     off(eventName: string, callback?: Function): void;
+    /**
+     * Wire up automatic query invalidation for socket events.
+     * Called once from AvroQueryClientProvider when the tanstack
+     * QueryClient is available.  Also handles auto-joining the
+     * company room on connect so consumer apps don't have to.
+     */
+    setupSocketInvalidation(queryClient: QueryClient): void;
+    /**
+     * Remove all invalidation listeners. Called on provider unmount.
+     */
+    teardownSocketInvalidation(): void;
     get<T>({ path, cancelToken, headers, progressUpdateCallback }: {
         path: string;
         cancelToken?: CancelToken;

package/dist/client/QueryClient.js

@@ -3,12 +3,91 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { LoginResponse } from '../types/api';
 import { AuthState } from '../types/auth';
 import { StandardError } from '../types/error';
+/**
+ * Maps socket event names to the query keys that should be invalidated
+ * when that event is received. Chat events are excluded — they carry
+ * their own data and are handled separately by consumer apps.
+ */
+const SOCKET_INVALIDATION_MAP = {
+    // Company
+    create_company: [['companies']],
+    update_company: [['companies']],
+    delete_company: [['companies']],
+    // Users
+    user_updated: [['users']],
+    update_users: [['users']],
+    // Jobs
+    create_job: [['jobs']],
+    update_job: [['jobs']],
+    update_jobs: [['jobs']],
+    delete_job: [['jobs']],
+    delete_jobs: [['jobs']],
+    // Routes
+    create_route: [['routes']],
+    update_route: [['routes']],
+    delete_route: [['routes']],
+    // Events
+    create_event: [['events']],
+    update_event: [['events']],
+    update_events: [['events']],
+    delete_event: [['events']],
+    // Teams
+    create_team: [['teams']],
+    update_team: [['teams']],
+    update_teams: [['teams']],
+    delete_team: [['teams']],
+    // Bills
+    create_bill: [['bills']],
+    update_bills: [['bills']],
+    delete_bill: [['bills']],
+    // Sessions
+    create_session: [['sessions']],
+    update_session: [['sessions']],
+    // Catalog
+    create_catalog_item: [['catalog_items']],
+    update_catalog_item: [['catalog_items']],
+    delete_catalog_item: [['catalog_items']],
+    // Groups
+    create_group: [['groups']],
+    update_group: [['groups']],
+    delete_group: [['groups']],
+    // Labels
+    create_label: [['labels']],
+    update_label: [['labels']],
+    delete_label: [['labels']],
+    // Skills
+    create_skill: [['skills']],
+    update_skill: [['skills']],
+    delete_skill: [['skills']],
+    // Proposals
+    create_proposal: [['proposals']],
+    update_proposal: [['proposals']],
+    delete_proposal: [['proposals']],
+    // Service Months
+    create_month: [['months']],
+    update_months: [['months']],
+    delete_months: [['months']],
+    // Tasks
+    create_task: [['jobs']],
+    update_task: [['jobs']],
+    delete_task: [['jobs']],
+    // Scheduling
+    schedule_complete: [['routes'], ['jobs']],
+    // Location
+    location_update: [['teams']],
+    // Prepayments
+    update_prepayments: [['prepayments']],
+    // Chats
+    new_message: [['chats'], ['messages']],
+};
 export class AvroQueryClient {
     constructor(config) {
         this._authState = AuthState.UNKNOWN;
         this.companyId = undefined;
         this.company = undefined;
         this.authStateListeners = [];
+        this._queryClient = null;
+        this._socketInvalidationCleanup = null;
         this.config = {
             baseUrl: config.baseUrl,
             authManager: config.authManager,
@@ -70,6 +149,58 @@ export class AvroQueryClient {
     off(eventName, callback) {
         this.socket?.off(eventName, callback);
     }
+    /**
+     * Wire up automatic query invalidation for socket events.
+     * Called once from AvroQueryClientProvider when the tanstack
+     * QueryClient is available.  Also handles auto-joining the
+     * company room on connect so consumer apps don't have to.
+     */
+    setupSocketInvalidation(queryClient) {
+        // Prevent double-setup
+        if (this._queryClient)
+            return;
+        this._queryClient = queryClient;
+        const handlers = [];
+        // Register invalidation listeners for every mapped event
+        for (const [event, queryKeys] of Object.entries(SOCKET_INVALIDATION_MAP)) {
+            const handler = () => {
+                for (const key of queryKeys) {
+                    queryClient.invalidateQueries({ queryKey: key });
+                }
+            };
+            this.socket.on(event, handler);
+            handlers.push({ event, handler });
+        }
+        // Auto join/leave company room
+        const joinCompanyRoom = () => {
+            if (this.companyId) {
+                this.socket.emit('join_company', { company_id: this.companyId });
+            }
+        };
+        this.socket.on('connect', joinCompanyRoom);
+        handlers.push({ event: 'connect', handler: joinCompanyRoom });
+        // If already connected, join immediately
+        if (this.socket.connected && this.companyId) {
+            joinCompanyRoom();
+        }
+        this._socketInvalidationCleanup = () => {
+            for (const { event, handler } of handlers) {
+                this.socket.off(event, handler);
+            }
+            // Leave company room on teardown
+            if (this.socket.connected && this.companyId) {
+                this.socket.emit('leave_company', { company_id: this.companyId });
+            }
+            this._queryClient = null;
+        };
+    }
+    /**
+     * Remove all invalidation listeners. Called on provider unmount.
+     */
+    teardownSocketInvalidation() {
+        this._socketInvalidationCleanup?.();
+        this._socketInvalidationCleanup = null;
+    }
     get({ path, cancelToken, headers, progressUpdateCallback }) {
         return this._xhr('GET', path, null, cancelToken, headers, true, this.config.maxRetries, progressUpdateCallback);
     }

package/dist/client/hooks/bills.js

@@ -22,7 +22,7 @@ AvroQueryClient.prototype.useGetBills = function (body) {
     if (result.data) {
         result.data.pages.forEach((data_page) => {
             data_page.forEach((bill) => {
-                queryClient.setQueryData(['bill', bill.id], bill);
+                queryClient.setQueryData(['bills', bill.id], bill);
             });
         });
     }
@@ -30,7 +30,7 @@ AvroQueryClient.prototype.useGetBills = function (body) {
 };
 AvroQueryClient.prototype.useGetBill = function (billId) {
     return useQuery({
-        queryKey: ['bill', billId],
+        queryKey: ['bills', billId],
         queryFn: () => this.get({ path: `/bill/${billId}` }),
         enabled: Boolean(billId),
     });
@@ -72,7 +72,7 @@ AvroQueryClient.prototype.useCreateBill = function () {
             queryClient.invalidateQueries({ queryKey: ['bills', this.companyId] });
             queryClient.invalidateQueries({ queryKey: ['events', this.companyId] });
             queryClient.invalidateQueries({ queryKey: ['months', this.companyId] });
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
         },
     });
 };
@@ -90,10 +90,10 @@ AvroQueryClient.prototype.useUpdateBill = function () {
         },
         onMutate: async ({ billId, updates }) => {
             await queryClient.cancelQueries({ queryKey: ['bills'] });
-            await queryClient.cancelQueries({ queryKey: ['bill', billId] });
+            await queryClient.cancelQueries({ queryKey: ['bills', billId] });
             const previousBills = queryClient.getQueryData(['bills']);
-            const previousBill = queryClient.getQueryData(['bill', billId]);
-            queryClient.setQueryData(['bill', billId], (oldData) => oldData ? { ...oldData, ...updates } : undefined);
+            const previousBill = queryClient.getQueryData(['bills', billId]);
+            queryClient.setQueryData(['bills', billId], (oldData) => oldData ? { ...oldData, ...updates } : undefined);
             queryClient.setQueriesData({ queryKey: ['bills'] }, (oldData) => {
                 if (!oldData)
                     return oldData;
@@ -116,13 +116,12 @@ AvroQueryClient.prototype.useUpdateBill = function () {
                 queryClient.setQueryData(['bills'], context.previousBills);
             }
             if (context?.previousBill) {
-                queryClient.setQueryData(['bill', billId], context.previousBill);
+                queryClient.setQueryData(['bills', billId], context.previousBill);
             }
         },
         onSettled: (data, error, variables) => {
             const { billId } = variables;
             queryClient.invalidateQueries({ queryKey: ['bills'] });
-            queryClient.invalidateQueries({ queryKey: ['bill', billId] });
         },
     });
 };
@@ -159,19 +158,19 @@ AvroQueryClient.prototype.useSyncBillToIntuit = function () {
             });
         },
         onMutate: async ({ billId }) => {
-            await queryClient.cancelQueries({ queryKey: ['bill', billId] });
-            const previousBill = queryClient.getQueryData(['bill', billId]);
+            await queryClient.cancelQueries({ queryKey: ['bills', billId] });
+            const previousBill = queryClient.getQueryData(['bills', billId]);
             return { previousBill };
         },
         onError: (_err, variables, context) => {
             const { billId } = variables;
             if (context?.previousBill) {
-                queryClient.setQueryData(['bill', billId], context.previousBill);
+                queryClient.setQueryData(['bills', billId], context.previousBill);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { billId } = variables;
-            queryClient.invalidateQueries({ queryKey: ['bill', billId] });
+            queryClient.invalidateQueries({ queryKey: ['bills', billId] });
         },
     });
 };
@@ -185,7 +184,7 @@ AvroQueryClient.prototype.useImportBillsFromIntuit = function () {
         },
         onSettled: () => {
             queryClient.invalidateQueries({ queryKey: ['bills', this.companyId] });
-            queryClient.invalidateQueries({ queryKey: ['company', 'current'] });
+            queryClient.invalidateQueries({ queryKey: ['companies', 'current'] });
         },
     });
 };

package/dist/client/hooks/catalog_items.js

@@ -41,10 +41,10 @@ AvroQueryClient.prototype.useUpdateCatalogItem = function () {
         },
         onMutate: async ({ catalogItemId, data }) => {
             await queryClient.cancelQueries({ queryKey: ['catalog_items'] });
-            await queryClient.cancelQueries({ queryKey: ['catalog_item', catalogItemId] });
+            await queryClient.cancelQueries({ queryKey: ['catalog_items', catalogItemId] });
             const previousItems = queryClient.getQueryData(['catalog_items']);
-            const previousItem = queryClient.getQueryData(['catalog_item', catalogItemId]);
-            queryClient.setQueryData(['catalog_item', catalogItemId], (oldData) => oldData ? { ...oldData, ...data } : undefined);
+            const previousItem = queryClient.getQueryData(['catalog_items', catalogItemId]);
+            queryClient.setQueryData(['catalog_items', catalogItemId], (oldData) => oldData ? { ...oldData, ...data } : undefined);
             queryClient.setQueriesData({ queryKey: ['catalog_items'] }, (oldData) => {
                 if (!oldData)
                     return oldData;
@@ -67,19 +67,18 @@ AvroQueryClient.prototype.useUpdateCatalogItem = function () {
                 queryClient.setQueryData(['catalog_items'], context.previousItems);
             }
             if (context?.previousItem) {
-                queryClient.setQueryData(['catalog_item', catalogItemId], context.previousItem);
+                queryClient.setQueryData(['catalog_items', catalogItemId], context.previousItem);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { catalogItemId } = variables;
             queryClient.invalidateQueries({ queryKey: ['catalog_items'] });
-            queryClient.invalidateQueries({ queryKey: ['catalog_item', catalogItemId] });
         },
     });
 };
 AvroQueryClient.prototype.useGetCatalogItem = function (catalogItemId) {
     return useQuery({
-        queryKey: ['catalog_item', catalogItemId],
+        queryKey: ['catalog_items', catalogItemId],
         queryFn: () => this.get({ path: `/catalog_item/${catalogItemId}` }),
         enabled: Boolean(catalogItemId),
     });

package/dist/client/hooks/chats.js

@@ -22,7 +22,7 @@ AvroQueryClient.prototype.useGetChats = function (body) {
     if (result.data) {
         result.data.pages.forEach((data_page) => {
             data_page.forEach((chat) => {
-                queryClient.setQueryData(['chat', chat.id], chat);
+                queryClient.setQueryData(['chats', chat.id], chat);
             });
         });
     }
@@ -30,7 +30,7 @@ AvroQueryClient.prototype.useGetChats = function (body) {
 };
 AvroQueryClient.prototype.useGetChat = function (chatId) {
     return useQuery({
-        queryKey: ['chat', chatId],
+        queryKey: ['chats', chatId],
         queryFn: () => this.get({ path: `/chat/${chatId}` }),
         enabled: Boolean(chatId),
     });

package/dist/client/hooks/companies.js

@@ -19,14 +19,14 @@ AvroQueryClient.prototype.useGetCompanies = function (options = {}) {
 };
 AvroQueryClient.prototype.useGetCompany = function (companyId) {
     return useQuery({
-        queryKey: ['company', companyId],
+        queryKey: ['companies', companyId],
         queryFn: () => this.get({ path: `/company/${companyId}` }),
         enabled: Boolean(companyId),
     });
 };
 AvroQueryClient.prototype.useGetCurrentCompany = function () {
     return useQuery({
-        queryKey: ['company', 'current'],
+        queryKey: ['companies', 'current'],
         queryFn: async () => {
             if (!this.companyId) {
                 this.companyId = await this.config.authManager.getCompanyId();
@@ -72,11 +72,11 @@ AvroQueryClient.prototype.useUpdateCompany = function () {
             });
         },
         onMutate: async ({ companyId, companyData }) => {
-            await queryClient.cancelQueries({ queryKey: ['company', companyId] });
+            await queryClient.cancelQueries({ queryKey: ['companies', companyId] });
             await queryClient.cancelQueries({ queryKey: ['/company/list'] });
-            const previousCompany = queryClient.getQueryData(['company', companyId]);
+            const previousCompany = queryClient.getQueryData(['companies', companyId]);
             const previousCompanyList = queryClient.getQueryData(['/company/list']);
-            queryClient.setQueryData(['company', companyId], (oldData) => oldData ? { ...oldData, ...companyData } : undefined);
+            queryClient.setQueryData(['companies', companyId], (oldData) => oldData ? { ...oldData, ...companyData } : undefined);
             queryClient.setQueryData(['/company/list'], (oldList) => {
                 if (!oldList)
                     return oldList;
@@ -87,7 +87,7 @@ AvroQueryClient.prototype.useUpdateCompany = function () {
         onError: (_err, variables, context) => {
             const { companyId } = variables;
             if (context?.previousCompany) {
-                queryClient.setQueryData(['company', companyId], context.previousCompany);
+                queryClient.setQueryData(['companies', companyId], context.previousCompany);
             }
             if (context?.previousCompanyList) {
                 queryClient.setQueryData(['/company/list'], context.previousCompanyList);
@@ -95,7 +95,7 @@ AvroQueryClient.prototype.useUpdateCompany = function () {
         },
         onSettled: (_data, _error, variables) => {
             const { companyId } = variables;
-            queryClient.invalidateQueries({ queryKey: ['company', companyId] });
+            queryClient.invalidateQueries({ queryKey: ['companies', companyId] });
             queryClient.invalidateQueries({ queryKey: ['/company/list'] });
         },
     });
@@ -114,9 +114,9 @@ AvroQueryClient.prototype.useCreateUserCompany = function () {
             });
         },
         onMutate: async ({ user_id }) => {
-            await queryClient.cancelQueries({ queryKey: ['company', this.companyId] });
-            const previousCompany = queryClient.getQueryData(['company', this.companyId]);
-            queryClient.setQueryData(['company', this.companyId], (oldData) => {
+            await queryClient.cancelQueries({ queryKey: ['companies', this.companyId] });
+            const previousCompany = queryClient.getQueryData(['companies', this.companyId]);
+            queryClient.setQueryData(['companies', this.companyId], (oldData) => {
                 if (!oldData)
                     return oldData;
                 return {
@@ -128,13 +128,13 @@ AvroQueryClient.prototype.useCreateUserCompany = function () {
         },
         onError: (err, variables, context) => {
             if (context?.previousCompany) {
-                queryClient.setQueryData(['company', this.companyId], context.previousCompany);
+                queryClient.setQueryData(['companies', this.companyId], context.previousCompany);
             }
         },
         onSettled: (_data, _error, variables) => {
-            queryClient.invalidateQueries({ queryKey: ['company', this.companyId] });
+            queryClient.invalidateQueries({ queryKey: ['companies', this.companyId] });
             queryClient.invalidateQueries({ queryKey: ['/company/list'] });
-            queryClient.invalidateQueries({ queryKey: ['company', 'current'] });
+            queryClient.invalidateQueries({ queryKey: ['companies', 'current'] });
         },
     });
 };
@@ -147,9 +147,9 @@ AvroQueryClient.prototype.useRemoveUserCompany = function () {
             });
         },
         onMutate: async ({ userId }) => {
-            await queryClient.cancelQueries({ queryKey: ['company', this.companyId] });
-            const previousCompany = queryClient.getQueryData(['company', this.companyId]);
-            queryClient.setQueryData(['company', this.companyId], (oldData) => {
+            await queryClient.cancelQueries({ queryKey: ['companies', this.companyId] });
+            const previousCompany = queryClient.getQueryData(['companies', this.companyId]);
+            queryClient.setQueryData(['companies', this.companyId], (oldData) => {
                 if (!oldData)
                     return oldData;
                 return {
@@ -161,11 +161,11 @@ AvroQueryClient.prototype.useRemoveUserCompany = function () {
         },
         onError: (err, variables, context) => {
             if (context?.previousCompany) {
-                queryClient.setQueryData(['company', this.companyId], context.previousCompany);
+                queryClient.setQueryData(['companies', this.companyId], context.previousCompany);
             }
         },
         onSettled: (_data, _error, variables) => {
-            queryClient.invalidateQueries({ queryKey: ['company', this.companyId] });
+            queryClient.invalidateQueries({ queryKey: ['companies', this.companyId] });
         },
     });
 };
@@ -179,7 +179,7 @@ AvroQueryClient.prototype.useDeleteCompany = function () {
         },
         onMutate: async ({ companyId }) => {
             await queryClient.cancelQueries({ queryKey: ['/company/list'] });
-            await queryClient.cancelQueries({ queryKey: ['company', companyId] });
+            await queryClient.cancelQueries({ queryKey: ['companies', companyId] });
             const previousCompanyList = queryClient.getQueryData(['/company/list']);
             queryClient.setQueryData(['/company/list'], (oldList) => {
                 if (!oldList)
@@ -195,7 +195,7 @@ AvroQueryClient.prototype.useDeleteCompany = function () {
         },
         onSettled: (_data, _error, companyId) => {
             queryClient.invalidateQueries({ queryKey: ['/company/list'] });
-            queryClient.invalidateQueries({ queryKey: ['company', companyId] });
+            queryClient.invalidateQueries({ queryKey: ['companies', companyId] });
         },
     });
 };

package/dist/client/hooks/events.js

@@ -29,7 +29,7 @@ AvroQueryClient.prototype.useGetEvents = function (body) {
     if (result.data) {
         result.data.pages.forEach((data_page) => {
             data_page.forEach((event) => {
-                queryClient.setQueryData(['event', event.id], event);
+                queryClient.setQueryData(['events', event.id], event);
             });
         });
     }
@@ -37,7 +37,7 @@ AvroQueryClient.prototype.useGetEvents = function (body) {
 };
 AvroQueryClient.prototype.useGetEvent = function (eventId) {
     return useQuery({
-        queryKey: ['event', eventId],
+        queryKey: ['events', eventId],
         queryFn: () => this.get({ path: `/event/${eventId}` }).then((event) => new _Event(event)),
         enabled: Boolean(eventId),
     });
@@ -55,7 +55,7 @@ AvroQueryClient.prototype.useCreateEvent = function () {
         onMutate: async ({ eventData }) => {
             await queryClient.cancelQueries({ queryKey: ['events'] });
             const previousEvents = queryClient.getQueryData(['events']);
-            const previousJob = queryClient.getQueryData(['job', eventData.job_id]);
+            const previousJob = queryClient.getQueryData(['jobs', eventData.job_id]);
             const previousJobs = queryClient.getQueryData(['jobs']);
             const optimisticEvent = new _Event({
                 ...eventData,
@@ -79,7 +79,7 @@ AvroQueryClient.prototype.useCreateEvent = function () {
                     return task;
                 });
                 const updatedJobs = previousJobs?.map((job) => job.id === updatedJob.id ? updatedJob : job);
-                queryClient.setQueryData(['job', previousJob.id], updatedJob);
+                queryClient.setQueryData(['jobs', previousJob.id], updatedJob);
                 queryClient.setQueryData(['jobs'], updatedJobs);
             }
             queryClient.setQueryData(['events'], (oldData) => {
@@ -113,7 +113,7 @@ AvroQueryClient.prototype.useCreateEvent = function () {
                 queryClient.setQueryData(['events'], context.previousEvents);
             }
             if (context?.previousJob) {
-                queryClient.setQueryData(['job', context.previousJob.id], context.previousJob);
+                queryClient.setQueryData(['jobs', context.previousJob.id], context.previousJob);
             }
             if (context?.previousJobs) {
                 queryClient.setQueryData(['jobs'], context.previousJobs);
@@ -121,9 +121,8 @@ AvroQueryClient.prototype.useCreateEvent = function () {
         },
         onSettled: () => {
             queryClient.invalidateQueries({ queryKey: ['events'] });
-            queryClient.invalidateQueries({ queryKey: ['job'] });
             queryClient.invalidateQueries({ queryKey: ['jobs'] });
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
         },
     });
 };
@@ -138,11 +137,11 @@ AvroQueryClient.prototype.useUpdateEvent = function () {
             });
         },
         onMutate: async ({ eventId, updates }) => {
-            await queryClient.cancelQueries({ queryKey: ['event', eventId] });
+            await queryClient.cancelQueries({ queryKey: ['events', eventId] });
             await queryClient.cancelQueries({ queryKey: ['events'] });
-            const previousEvent = queryClient.getQueryData(['event', eventId]);
+            const previousEvent = queryClient.getQueryData(['events', eventId]);
             const previousEvents = queryClient.getQueryData(['events']);
-            const previousJob = queryClient.getQueryData(['job', previousEvent?.job_id]);
+            const previousJob = queryClient.getQueryData(['jobs', previousEvent?.job_id]);
             const previousJobs = queryClient.getQueryData(['jobs']);
             if (previousJob) {
                 const updatedJob = {
@@ -162,10 +161,10 @@ AvroQueryClient.prototype.useUpdateEvent = function () {
                     return task;
                 });
                 const updatedJobs = previousJobs?.map((job) => job.id === updatedJob.id ? updatedJob : job);
-                queryClient.setQueryData(['job', previousJob.id], updatedJob);
+                queryClient.setQueryData(['jobs', previousJob.id], updatedJob);
                 queryClient.setQueryData(['jobs'], updatedJobs);
             }
-            queryClient.setQueryData(['event', eventId], (oldData) => oldData ? { ...oldData, ...updates } : undefined);
+            queryClient.setQueryData(['events', eventId], (oldData) => oldData ? { ...oldData, ...updates } : undefined);
             queryClient.setQueriesData({ queryKey: ['events'] }, (oldData) => {
                 if (!oldData)
                     return oldData;
@@ -183,13 +182,13 @@ AvroQueryClient.prototype.useUpdateEvent = function () {
         onError: (_err, variables, context) => {
             const { eventId } = variables;
             if (context?.previousEvent) {
-                queryClient.setQueryData(['event', eventId], context.previousEvent);
+                queryClient.setQueryData(['events', eventId], context.previousEvent);
             }
             if (context?.previousEvents) {
                 queryClient.setQueryData(['events'], context.previousEvents);
             }
             if (context?.previousJob) {
-                queryClient.setQueryData(['job', context.previousJob.id], context.previousJob);
+                queryClient.setQueryData(['jobs', context.previousJob.id], context.previousJob);
             }
             if (context?.previousJobs) {
                 queryClient.setQueryData(['jobs'], context.previousJobs);
@@ -197,9 +196,7 @@ AvroQueryClient.prototype.useUpdateEvent = function () {
         },
         onSettled: (_data, _error, variables) => {
             const { eventId } = variables;
-            queryClient.invalidateQueries({ queryKey: ['event', eventId] });
             queryClient.invalidateQueries({ queryKey: ['events'] });
-            queryClient.invalidateQueries({ queryKey: ['job'] });
             queryClient.invalidateQueries({ queryKey: ['jobs'] });
         },
     });
@@ -221,13 +218,13 @@ AvroQueryClient.prototype.useUpdateEvents = function () {
         },
         onMutate: async ({ events, action }) => {
             await queryClient.cancelQueries({ queryKey: ['events'] });
-            await queryClient.cancelQueries({ queryKey: ['event'] });
+            await queryClient.cancelQueries({ queryKey: ['events'] });
             const previousEvents = queryClient.getQueryData(['events']);
-            const previousEventObjs = events.map(event => queryClient.getQueryData(['event', event.id]));
+            const previousEventObjs = events.map(event => queryClient.getQueryData(['events', event.id]));
             const eventIds = events.map(event => event.id);
             // Optimistically update individual event cache
             eventIds.forEach((eventId, idx) => {
-                queryClient.setQueryData(['event', eventId], (oldData) => {
+                queryClient.setQueryData(['events', eventId], (oldData) => {
                     return oldData
                         ? { ...oldData, billed: true, status: action === "billed" ? LineItemStatus.EXTERNALLY_BILLED : LineItemStatus.EXTERNALLY_PAID }
                         : oldData;
@@ -258,13 +255,12 @@ AvroQueryClient.prototype.useUpdateEvents = function () {
             }
             if (context?.previousEventObjs) {
                 context.previousEventObjs.forEach((eventObj) => {
-                    queryClient.setQueryData(['event', eventObj.id], eventObj);
+                    queryClient.setQueryData(['events', eventObj.id], eventObj);
                 });
             }
         },
         onSettled: () => {
             queryClient.invalidateQueries({ queryKey: ['events'] });
-            queryClient.invalidateQueries({ queryKey: ['event'] });
         },
     });
 };
@@ -279,10 +275,10 @@ AvroQueryClient.prototype.useDeleteEvent = function () {
         },
         onMutate: async ({ eventId }) => {
             await queryClient.cancelQueries({ queryKey: ['events'] });
-            await queryClient.cancelQueries({ queryKey: ['event', eventId] });
+            await queryClient.cancelQueries({ queryKey: ['events', eventId] });
             const previousEvents = queryClient.getQueryData(['events']);
-            const previousEvent = queryClient.getQueryData(['event', eventId]);
-            queryClient.setQueryData(['event', eventId], undefined);
+            const previousEvent = queryClient.getQueryData(['events', eventId]);
+            queryClient.setQueryData(['events', eventId], undefined);
             queryClient.setQueriesData({ queryKey: ['events'] }, (oldData) => {
                 if (!oldData)
                     return oldData;
@@ -303,13 +299,12 @@ AvroQueryClient.prototype.useDeleteEvent = function () {
                 queryClient.setQueryData(['events'], context.previousEvents);
             }
             if (context?.previousEvent) {
-                queryClient.setQueryData(['event', eventId], context.previousEvent);
+                queryClient.setQueryData(['events', eventId], context.previousEvent);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { eventId } = variables;
             queryClient.invalidateQueries({ queryKey: ['events'] });
-            queryClient.invalidateQueries({ queryKey: ['event', eventId] });
         },
     });
 };

package/dist/client/hooks/groups.js

@@ -37,7 +37,7 @@ AvroQueryClient.prototype.useCreateGroup = function () {
             });
         },
         onSettled: () => {
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
             queryClient.invalidateQueries({ queryKey: ['groups'] });
         },
     });
@@ -54,10 +54,10 @@ AvroQueryClient.prototype.useUpdateGroup = function () {
         },
         onMutate: async ({ groupId, groupData }) => {
             await queryClient.cancelQueries({ queryKey: ['groups'] });
-            await queryClient.cancelQueries({ queryKey: ['group', groupId] });
+            await queryClient.cancelQueries({ queryKey: ['groups', groupId] });
             const previousGroups = queryClient.getQueryData(['groups']);
-            const previousGroup = queryClient.getQueryData(['group', groupId]);
-            queryClient.setQueryData(['group', groupId], (oldData) => {
+            const previousGroup = queryClient.getQueryData(['groups', groupId]);
+            queryClient.setQueryData(['groups', groupId], (oldData) => {
                 if (!oldData)
                     return oldData;
                 return { ...oldData, ...groupData };
@@ -82,14 +82,13 @@ AvroQueryClient.prototype.useUpdateGroup = function () {
                 queryClient.setQueryData(['groups'], context.previousGroups);
             }
             if (context?.previousGroup) {
-                queryClient.setQueryData(['group', groupId], context.previousGroup);
+                queryClient.setQueryData(['groups', groupId], context.previousGroup);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { groupId } = variables;
             queryClient.invalidateQueries({ queryKey: ['groups'] });
-            queryClient.invalidateQueries({ queryKey: ['group', groupId] });
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
         },
     });
 };
@@ -103,10 +102,10 @@ AvroQueryClient.prototype.useDeleteGroup = function () {
         },
         onMutate: async ({ groupId }) => {
             await queryClient.cancelQueries({ queryKey: ['groups'] });
-            await queryClient.cancelQueries({ queryKey: ['group', groupId] });
+            await queryClient.cancelQueries({ queryKey: ['groups', groupId] });
             const previousGroups = queryClient.getQueryData(['groups']);
-            const previousGroup = queryClient.getQueryData(['group', groupId]);
-            queryClient.setQueryData(['group', groupId], undefined);
+            const previousGroup = queryClient.getQueryData(['groups', groupId]);
+            queryClient.setQueryData(['groups', groupId], undefined);
             queryClient.setQueriesData({ queryKey: ['groups'] }, (oldData) => {
                 if (!oldData)
                     return oldData;
@@ -127,14 +126,13 @@ AvroQueryClient.prototype.useDeleteGroup = function () {
                 queryClient.setQueryData(['groups'], context.previousGroups);
             }
             if (context?.previousGroup) {
-                queryClient.setQueryData(['group', groupId], context.previousGroup);
+                queryClient.setQueryData(['groups', groupId], context.previousGroup);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { groupId } = variables;
             queryClient.invalidateQueries({ queryKey: ['groups'] });
-            queryClient.invalidateQueries({ queryKey: ['group', groupId] });
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
         },
     });
 };

package/dist/client/hooks/jobs.js

@@ -34,7 +34,7 @@ AvroQueryClient.prototype.useGetJobs = function (params) {
                 job.last_completed_event = job.tasks.reduce((latest, task) => {
                     return task.last_completed_event && (!latest || task.last_completed_event.time_started > latest.time_started) ? task.last_completed_event : latest;
                 }, job.last_completed_event);
-                queryClient.setQueryData(['job', job.id], job);
+                queryClient.setQueryData(['jobs', job.id], job);
             });
             return jobs;
         },
@@ -63,7 +63,7 @@ AvroQueryClient.prototype.useGetInfiniteJobs = function (body, onProgress) {
     if (result.data) {
         result.data.pages.forEach((data_page) => {
             data_page.forEach((job) => {
-                queryClient.setQueryData(['job', job.id], job);
+                queryClient.setQueryData(['jobs', job.id], job);
             });
         });
     }
@@ -71,7 +71,7 @@ AvroQueryClient.prototype.useGetInfiniteJobs = function (body, onProgress) {
 };
 AvroQueryClient.prototype.useGetJob = function (jobId) {
     return useQuery({
-        queryKey: ['job', jobId],
+        queryKey: ['jobs', jobId],
         queryFn: async () => {
             const job = await this.get({
                 path: `/job/${jobId}`
@@ -94,8 +94,7 @@ AvroQueryClient.prototype.useCreateJob = function () {
         onSettled: (data) => {
             const { id: jobId } = data ?? {};
             queryClient.invalidateQueries({ queryKey: ['jobs'] });
-            queryClient.invalidateQueries({ queryKey: ['job', jobId] });
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
         },
     });
 };
@@ -111,7 +110,6 @@ AvroQueryClient.prototype.useManageJobs = function () {
         },
         onSettled: (_data, _error, _variables) => {
             queryClient.invalidateQueries({ queryKey: ['jobs'] });
-            queryClient.invalidateQueries({ queryKey: ['job'] });
         },
     });
 };
@@ -128,7 +126,6 @@ AvroQueryClient.prototype.useUpdateJob = function () {
         onSettled: (data, error, variables) => {
             const { jobId } = variables;
             queryClient.invalidateQueries({ queryKey: ['jobs'] });
-            queryClient.invalidateQueries({ queryKey: ['job', jobId] });
         },
     });
 };
@@ -145,8 +142,6 @@ AvroQueryClient.prototype.useDeleteJobs = function () {
         onSettled: (_data, _error, _variables) => {
             queryClient.invalidateQueries({ queryKey: ['jobs'] });
             queryClient.invalidateQueries({ queryKey: ['routes'] });
-            queryClient.invalidateQueries({ queryKey: ['job'] });
-            queryClient.invalidateQueries({ queryKey: ['route'] });
         },
     });
 };
@@ -165,8 +160,6 @@ AvroQueryClient.prototype.useDeleteJob = function () {
             const { jobId } = variables;
             queryClient.invalidateQueries({ queryKey: ['jobs'] });
             queryClient.invalidateQueries({ queryKey: ['routes'] });
-            queryClient.invalidateQueries({ queryKey: ['job', jobId] });
-            queryClient.invalidateQueries({ queryKey: ['route'] });
         },
     });
 };

package/dist/client/hooks/labels.js

@@ -37,7 +37,7 @@ AvroQueryClient.prototype.useCreateLabel = function () {
             });
         },
         onSettled: () => {
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
             queryClient.invalidateQueries({ queryKey: ['labels'] });
         },
     });
@@ -54,10 +54,10 @@ AvroQueryClient.prototype.useUpdateLabel = function () {
         },
         onMutate: async ({ labelId, labelData }) => {
             await queryClient.cancelQueries({ queryKey: ['labels'] });
-            await queryClient.cancelQueries({ queryKey: ['label', labelId] });
+            await queryClient.cancelQueries({ queryKey: ['labels', labelId] });
             const previousLabels = queryClient.getQueryData(['labels']);
-            const previousLabel = queryClient.getQueryData(['label', labelId]);
-            queryClient.setQueryData(['label', labelId], (oldData) => {
+            const previousLabel = queryClient.getQueryData(['labels', labelId]);
+            queryClient.setQueryData(['labels', labelId], (oldData) => {
                 if (!oldData)
                     return oldData;
                 return { ...oldData, ...labelData };
@@ -82,14 +82,13 @@ AvroQueryClient.prototype.useUpdateLabel = function () {
                 queryClient.setQueryData(['labels'], context.previousLabels);
             }
             if (context?.previousLabel) {
-                queryClient.setQueryData(['label', labelId], context.previousLabel);
+                queryClient.setQueryData(['labels', labelId], context.previousLabel);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { labelId } = variables;
             queryClient.invalidateQueries({ queryKey: ['labels'] });
-            queryClient.invalidateQueries({ queryKey: ['label', labelId] });
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
         },
     });
 };
@@ -101,10 +100,10 @@ AvroQueryClient.prototype.useDeleteLabel = function () {
         },
         onMutate: async ({ labelId }) => {
             await queryClient.cancelQueries({ queryKey: ['labels'] });
-            await queryClient.cancelQueries({ queryKey: ['label', labelId] });
+            await queryClient.cancelQueries({ queryKey: ['labels', labelId] });
             const previousLabels = queryClient.getQueryData(['labels']);
-            const previousLabel = queryClient.getQueryData(['label', labelId]);
-            queryClient.setQueryData(['label', labelId], undefined);
+            const previousLabel = queryClient.getQueryData(['labels', labelId]);
+            queryClient.setQueryData(['labels', labelId], undefined);
             queryClient.setQueriesData({ queryKey: ['labels'] }, (oldData) => {
                 if (!oldData)
                     return oldData;
@@ -125,14 +124,13 @@ AvroQueryClient.prototype.useDeleteLabel = function () {
                 queryClient.setQueryData(['labels'], context.previousLabels);
             }
             if (context?.previousLabel) {
-                queryClient.setQueryData(['label', labelId], context.previousLabel);
+                queryClient.setQueryData(['labels', labelId], context.previousLabel);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { labelId } = variables;
             queryClient.invalidateQueries({ queryKey: ['labels'] });
-            queryClient.invalidateQueries({ queryKey: ['label', labelId] });
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
         },
     });
 };

package/dist/client/hooks/months.js

@@ -53,7 +53,7 @@ AvroQueryClient.prototype.useUpdateMonths = function () {
         },
         onMutate: async ({ months, action }) => {
             await queryClient.cancelQueries({ queryKey: ['months'] });
-            await queryClient.cancelQueries({ queryKey: ['month'] });
+            await queryClient.cancelQueries({ queryKey: ['months'] });
             const previousMonths = queryClient.getQueryData(['months']);
             const previousMonthObjs = months.map(month => queryClient.getQueryData(['month', month.id]));
             const monthIds = months.map(month => month.id);
@@ -92,8 +92,7 @@ AvroQueryClient.prototype.useUpdateMonths = function () {
         },
         onSettled: () => {
             queryClient.invalidateQueries({ queryKey: ['months'] });
-            queryClient.invalidateQueries({ queryKey: ['month'] });
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
         },
     });
 };

package/dist/client/hooks/prepayments.js

@@ -53,7 +53,7 @@ AvroQueryClient.prototype.useUpdatePrepayments = function () {
         },
         onMutate: async ({ prepayments, action }) => {
             await queryClient.cancelQueries({ queryKey: ['prepayments'] });
-            await queryClient.cancelQueries({ queryKey: ['prepayment'] });
+            await queryClient.cancelQueries({ queryKey: ['prepayments'] });
             const previousPrepayments = queryClient.getQueryData(['prepayments']);
             const previousPrepaymentObjs = prepayments.map(prepayment => queryClient.getQueryData(['prepayment', prepayment.id]));
             const prepaymentIds = prepayments.map(prepayment => prepayment.id);
@@ -92,8 +92,7 @@ AvroQueryClient.prototype.useUpdatePrepayments = function () {
         },
         onSettled: () => {
             queryClient.invalidateQueries({ queryKey: ['prepayments'] });
-            queryClient.invalidateQueries({ queryKey: ['prepayment'] });
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
         },
     });
 };

package/dist/client/hooks/proposal.js

@@ -25,7 +25,7 @@ AvroQueryClient.prototype.useReviewProposal = function (proposal_id) {
 };
 AvroQueryClient.prototype.useGetProposal = function (proposal_id) {
     return useQuery({
-        queryKey: ['proposal', proposal_id],
+        queryKey: ['proposals', proposal_id],
         queryFn: async () => {
             const proposal = await this.get({ path: `/proposal/${proposal_id}` });
             if (proposal && Array.isArray(proposal.tasks)) {

package/dist/client/hooks/routes.js

@@ -31,7 +31,7 @@ AvroQueryClient.prototype.useGetRoutes = function (body, total, onProgress) {
 AvroQueryClient.prototype.useGetRoute = function (routeId) {
     const queryClient = this.getQueryClient();
     return useQuery({
-        queryKey: ['route', routeId],
+        queryKey: ['routes', routeId],
         queryFn: async () => {
             const route = await this.get({ path: `/route/${routeId}` });
             return new Route(route);
@@ -79,8 +79,7 @@ AvroQueryClient.prototype.useCreateRoute = function () {
         onSettled: (_data, _error, _variables) => {
             queryClient.invalidateQueries({ queryKey: ['routes'] });
             queryClient.invalidateQueries({ queryKey: ['jobs'] });
-            queryClient.invalidateQueries({ queryKey: ['job'] });
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
         },
     });
 };
@@ -106,11 +105,11 @@ AvroQueryClient.prototype.useUpdateRoute = function () {
             });
         },
         onMutate: async ({ routeId, updates }) => {
-            await queryClient.cancelQueries({ queryKey: ['route', routeId] });
+            await queryClient.cancelQueries({ queryKey: ['routes', routeId] });
             await queryClient.cancelQueries({ queryKey: ['routes'] });
-            const previousRoute = queryClient.getQueryData(['route', routeId]);
+            const previousRoute = queryClient.getQueryData(['routes', routeId]);
             const previousRoutes = queryClient.getQueryData(['routes']);
-            queryClient.setQueryData(['route', routeId], (oldData) => oldData ? new Route({ ...oldData, ...updates }) : undefined);
+            queryClient.setQueryData(['routes', routeId], (oldData) => oldData ? new Route({ ...oldData, ...updates }) : undefined);
             queryClient.setQueriesData({ queryKey: ['routes'] }, (oldData) => {
                 if (!oldData)
                     return oldData;
@@ -130,7 +129,7 @@ AvroQueryClient.prototype.useUpdateRoute = function () {
         onError: (_err, variables, context) => {
             const { routeId } = variables;
             if (context?.previousRoute) {
-                queryClient.setQueryData(['route', routeId], context.previousRoute);
+                queryClient.setQueryData(['routes', routeId], context.previousRoute);
             }
             if (context?.previousRoutes) {
                 queryClient.setQueryData(['routes'], context.previousRoutes);
@@ -140,8 +139,6 @@ AvroQueryClient.prototype.useUpdateRoute = function () {
             const { routeId } = variables;
             queryClient.invalidateQueries({ queryKey: ['routes'] });
             queryClient.invalidateQueries({ queryKey: ['jobs'] });
-            queryClient.invalidateQueries({ queryKey: ['route', routeId] });
-            queryClient.invalidateQueries({ queryKey: ['job'] });
         },
     });
 };
@@ -153,10 +150,10 @@ AvroQueryClient.prototype.useDeleteRoute = function () {
         },
         onMutate: async ({ routeId }) => {
             await queryClient.cancelQueries({ queryKey: ['routes'] });
-            await queryClient.cancelQueries({ queryKey: ['route', routeId] });
+            await queryClient.cancelQueries({ queryKey: ['routes', routeId] });
             const previousRoutes = queryClient.getQueryData(['routes']);
-            const previousRoute = queryClient.getQueryData(['route', routeId]);
-            queryClient.setQueryData(['route', routeId], undefined);
+            const previousRoute = queryClient.getQueryData(['routes', routeId]);
+            queryClient.setQueryData(['routes', routeId], undefined);
             queryClient.setQueriesData({ queryKey: ['routes'] }, (oldData) => {
                 if (!oldData)
                     return oldData;
@@ -177,15 +174,13 @@ AvroQueryClient.prototype.useDeleteRoute = function () {
                 queryClient.setQueryData(['routes'], context.previousRoutes);
             }
             if (context?.previousRoute) {
-                queryClient.setQueryData(['route', routeId], context.previousRoute);
+                queryClient.setQueryData(['routes', routeId], context.previousRoute);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { routeId } = variables;
             queryClient.invalidateQueries({ queryKey: ['routes'] });
             queryClient.invalidateQueries({ queryKey: ['jobs'] });
-            queryClient.invalidateQueries({ queryKey: ['route', routeId] });
-            queryClient.invalidateQueries({ queryKey: ['job'] });
         },
     });
 };

package/dist/client/hooks/skills.js

@@ -11,7 +11,7 @@ AvroQueryClient.prototype.useCreateSkill = function () {
             });
         },
         onSettled: () => {
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
             queryClient.invalidateQueries({ queryKey: ['skills'] });
         },
     });
@@ -54,10 +54,10 @@ AvroQueryClient.prototype.useUpdateSkill = function () {
         },
         onMutate: async ({ skillId, updates }) => {
             await queryClient.cancelQueries({ queryKey: ['skills'] });
-            await queryClient.cancelQueries({ queryKey: ['skill', skillId] });
+            await queryClient.cancelQueries({ queryKey: ['skills', skillId] });
             const previousSkills = queryClient.getQueryData(['skills']);
-            const previousSkill = queryClient.getQueryData(['skill', skillId]);
-            queryClient.setQueryData(['skill', skillId], (oldData) => {
+            const previousSkill = queryClient.getQueryData(['skills', skillId]);
+            queryClient.setQueryData(['skills', skillId], (oldData) => {
                 if (!oldData)
                     return oldData;
                 return { ...oldData, ...updates };
@@ -82,13 +82,12 @@ AvroQueryClient.prototype.useUpdateSkill = function () {
                 queryClient.setQueryData(['skills'], context.previousSkills);
             }
             if (context?.previousSkill) {
-                queryClient.setQueryData(['skill', skillId], context.previousSkill);
+                queryClient.setQueryData(['skills', skillId], context.previousSkill);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { skillId } = variables;
             queryClient.invalidateQueries({ queryKey: ['skills'] });
-            queryClient.invalidateQueries({ queryKey: ['skill', skillId] });
         },
     });
 };

package/dist/client/hooks/teams.js

@@ -37,7 +37,7 @@ AvroQueryClient.prototype.useCreateTeam = function () {
             });
         },
         onSettled: () => {
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
             queryClient.invalidateQueries({ queryKey: ['teams'] });
         },
     });
@@ -54,10 +54,10 @@ AvroQueryClient.prototype.useUpdateTeam = function () {
         },
         onMutate: async ({ teamId, teamData }) => {
             await queryClient.cancelQueries({ queryKey: ['teams'] });
-            await queryClient.cancelQueries({ queryKey: ['team', teamId] });
+            await queryClient.cancelQueries({ queryKey: ['teams', teamId] });
             const previousTeams = queryClient.getQueryData(['teams']);
-            const previousTeam = queryClient.getQueryData(['team', teamId]);
-            queryClient.setQueryData(['team', teamId], (oldData) => {
+            const previousTeam = queryClient.getQueryData(['teams', teamId]);
+            queryClient.setQueryData(['teams', teamId], (oldData) => {
                 if (!oldData)
                     return oldData;
                 return { ...oldData, ...teamData };
@@ -82,13 +82,12 @@ AvroQueryClient.prototype.useUpdateTeam = function () {
                 queryClient.setQueryData(['teams'], context.previousTeams);
             }
             if (context?.previousTeam) {
-                queryClient.setQueryData(['team', teamId], context.previousTeam);
+                queryClient.setQueryData(['teams', teamId], context.previousTeam);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { teamId } = variables;
             queryClient.invalidateQueries({ queryKey: ['teams'] });
-            queryClient.invalidateQueries({ queryKey: ['team', teamId] });
         },
     });
 };
@@ -100,10 +99,10 @@ AvroQueryClient.prototype.useDeleteTeam = function () {
         },
         onMutate: async ({ teamId }) => {
             await queryClient.cancelQueries({ queryKey: ['teams'] });
-            await queryClient.cancelQueries({ queryKey: ['team', teamId] });
+            await queryClient.cancelQueries({ queryKey: ['teams', teamId] });
             const previousRoutes = queryClient.getQueryData(['teams']);
-            const previousRoute = queryClient.getQueryData(['team', teamId]);
-            queryClient.setQueryData(['team', teamId], undefined);
+            const previousRoute = queryClient.getQueryData(['teams', teamId]);
+            queryClient.setQueryData(['teams', teamId], undefined);
             queryClient.setQueriesData({ queryKey: ['teams'] }, (oldData) => {
                 if (!oldData)
                     return oldData;
@@ -124,13 +123,12 @@ AvroQueryClient.prototype.useDeleteTeam = function () {
                 queryClient.setQueryData(['teams'], context.previousRoutes);
             }
             if (context?.previousRoute) {
-                queryClient.setQueryData(['team', teamId], context.previousRoute);
+                queryClient.setQueryData(['teams', teamId], context.previousRoute);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { teamId } = variables;
             queryClient.invalidateQueries({ queryKey: ['teams'] });
-            queryClient.invalidateQueries({ queryKey: ['team', teamId] });
         },
     });
 };

package/dist/client/hooks/timecards.js

@@ -32,7 +32,7 @@ AvroQueryClient.prototype.useGetCompanyTimecards = function (params = {}) {
 };
 AvroQueryClient.prototype.useGetTimecard = function (timecardId, enabled = true) {
     return useQuery({
-        queryKey: ["timecard", timecardId],
+        queryKey: ["timecards", timecardId],
         queryFn: async () => {
             const rsp = await this.get({
                 path: `/timecard/${timecardId}`,
@@ -70,7 +70,6 @@ AvroQueryClient.prototype.useUpdateTimecard = function () {
         },
         onSettled: async (_data, _err, variables) => {
             await queryClient.invalidateQueries({ queryKey: ["timecards"] });
-            await queryClient.invalidateQueries({ queryKey: ["timecard", variables.timecardId] });
         },
     });
 };

package/dist/client/hooks/users.js

@@ -3,14 +3,14 @@ import { AvroQueryClient } from "../../client/QueryClient";
 import { AuthState } from "../../types/auth";
 AvroQueryClient.prototype.useGetUser = function (userId) {
     return useQuery({
-        queryKey: ['user', userId],
+        queryKey: ['users', userId],
         queryFn: () => this.get({ path: `/user/${userId}` }),
         enabled: Boolean(userId),
     });
 };
 AvroQueryClient.prototype.useSearchUsers = function (searchUsername) {
     return useQuery({
-        queryKey: ['user', 'search', searchUsername],
+        queryKey: ['users', 'search', searchUsername],
         queryFn: () => {
             if (!searchUsername)
                 return Promise.resolve([]);
@@ -101,26 +101,26 @@ AvroQueryClient.prototype.useUpdateUserCompany = function () {
         // Optimistically update the user data and company data in the cache
         onMutate: async (data) => {
             await queryClient.cancelQueries({ queryKey: ['user'] });
-            await queryClient.cancelQueries({ queryKey: ['company', this.companyId] });
-            const previousCompany = queryClient.getQueryData(['company', this.companyId]);
+            await queryClient.cancelQueries({ queryKey: ['companies', this.companyId] });
+            const previousCompany = queryClient.getQueryData(['companies', this.companyId]);
             if (previousCompany) {
                 let oldCompanyUser = previousCompany.users?.find((u) => u.user.id === data.user_id);
                 if (oldCompanyUser) {
                     oldCompanyUser = { ...oldCompanyUser, ...data.data };
                     const newUsers = previousCompany.users?.map((u) => u.user.id === data.user_id ? oldCompanyUser : u) ?? [];
-                    queryClient.setQueryData(['company', this.companyId], { ...previousCompany, users: newUsers });
+                    queryClient.setQueryData(['companies', this.companyId], { ...previousCompany, users: newUsers });
                 }
             }
             return { previousCompany };
         },
         onError: (err, _, context) => {
             if (context?.previousCompany) {
-                queryClient.setQueryData(['company', this.companyId], context.previousCompany);
+                queryClient.setQueryData(['companies', this.companyId], context.previousCompany);
             }
         },
         onSettled: (data, error, variables) => {
             queryClient.invalidateQueries({ queryKey: ['user'] });
-            queryClient.invalidateQueries({ queryKey: ['company', this.companyId] });
+            queryClient.invalidateQueries({ queryKey: ['companies', this.companyId] });
         },
     });
 };

package/dist/client/hooks/waivers.js

@@ -11,7 +11,7 @@ AvroQueryClient.prototype.useCreateWaiver = function () {
             });
         },
         onSettled: () => {
-            queryClient.invalidateQueries({ queryKey: ['company'] });
+            queryClient.invalidateQueries({ queryKey: ['companies'] });
             queryClient.invalidateQueries({ queryKey: ['waivers'] });
         },
     });
@@ -54,10 +54,10 @@ AvroQueryClient.prototype.useUpdateWaiver = function () {
         },
         onMutate: async ({ waiverId, updates }) => {
             await queryClient.cancelQueries({ queryKey: ['waivers'] });
-            await queryClient.cancelQueries({ queryKey: ['waiver', waiverId] });
+            await queryClient.cancelQueries({ queryKey: ['waivers', waiverId] });
             const previousWaivers = queryClient.getQueryData(['waivers']);
-            const previousWaiver = queryClient.getQueryData(['waiver', waiverId]);
-            queryClient.setQueryData(['waiver', waiverId], (oldData) => {
+            const previousWaiver = queryClient.getQueryData(['waivers', waiverId]);
+            queryClient.setQueryData(['waivers', waiverId], (oldData) => {
                 if (!oldData)
                     return oldData;
                 return { ...oldData, ...updates };
@@ -82,13 +82,12 @@ AvroQueryClient.prototype.useUpdateWaiver = function () {
                 queryClient.setQueryData(['waivers'], context.previousWaivers);
             }
             if (context?.previousWaiver) {
-                queryClient.setQueryData(['waiver', waiverId], context.previousWaiver);
+                queryClient.setQueryData(['waivers', waiverId], context.previousWaiver);
             }
         },
         onSettled: (_data, _error, variables) => {
             const { waiverId } = variables;
             queryClient.invalidateQueries({ queryKey: ['waivers'] });
-            queryClient.invalidateQueries({ queryKey: ['waiver', waiverId] });
         },
     });
 };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { AvroQueryClientConfig, AvroQueryClient } from './client/QueryClient';
-export { AvroQueryClientProvider, useAvroQueryClient } from './client/AvroQueryClientProvider';
+export { AvroQueryClientProvider, useAvroQueryClient, useSocketEvent } from './client/AvroQueryClientProvider';
 export { AuthManager } from './auth/AuthManager';
 export { MemoryStorage, LocalStorage } from './auth/storage';
 import './client/core/xhr';

package/dist/index.js

@@ -1,5 +1,5 @@
 export { AvroQueryClient } from './client/QueryClient';
-export { AvroQueryClientProvider, useAvroQueryClient } from './client/AvroQueryClientProvider';
+export { AvroQueryClientProvider, useAvroQueryClient, useSocketEvent } from './client/AvroQueryClientProvider';
 export { AuthManager } from './auth/AuthManager';
 export { MemoryStorage, LocalStorage } from './auth/storage';
 import './client/core/xhr';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-avro/avro-js",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "JS client for Avro backend integration.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,7 +50,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@tanstack/react-query": "^5.90.2",
     "socket.io-client": "^4.8.1"
+  },
+  "peerDependencies": {
+    "react": "^18.0.0 || ^19.0.0",
+    "react-dom": "^18.0.0 || ^19.0.0",
+    "@tanstack/react-query": "^5.0.0"
   }
 }