@go-avro/avro-js 0.0.22 → 0.0.24

package/dist/client/AvroQueryClientProvider.d.ts

@@ -5,11 +5,11 @@ import { AuthManager } from "../auth/AuthManager";
 export interface AvroQueryClientProviderProps {
     baseUrl: string;
     authManager: AuthManager;
-    queryClient?: QueryClient;
+    queryClient: QueryClient;
     configOverrides?: Partial<AvroQueryClientConfig>;
     children: ReactNode;
 }
-export declare const AvroQueryClientProvider: ({ baseUrl, authManager, configOverrides, children, }: AvroQueryClientProviderProps) => React.JSX.Element;
+export declare const AvroQueryClientProvider: ({ baseUrl, authManager, queryClient, 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,18 +1,7 @@
 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, }) => {
+export const AvroQueryClientProvider = ({ baseUrl, authManager, queryClient, configOverrides, children, }) => {
     const client = useMemo(() => {
         const cfg = {
             baseUrl,
@@ -22,6 +11,9 @@ export const AvroQueryClientProvider = ({ baseUrl, authManager, configOverrides,
         return new AvroQueryClient(cfg);
     }, [baseUrl, authManager, configOverrides]);
     useEffect(() => {
+        if (queryClient) {
+            client.setupSocketInvalidation(queryClient);
+        }
         return () => {
             try {
                 client.teardownSocketInvalidation();
@@ -31,10 +23,8 @@ export const AvroQueryClientProvider = ({ baseUrl, authManager, configOverrides,
                 // ignore
             }
         };
-    }, [client]);
-    return (React.createElement(AvroQueryClientContext.Provider, { value: client },
-        React.createElement(SocketInvalidationBridge, { client: client }),
-        children));
+    }, [client, queryClient]);
+    return (React.createElement(AvroQueryClientContext.Provider, { value: client }, children));
 };
 export const useAvroQueryClient = () => {
     const ctx = useContext(AvroQueryClientContext);

package/dist/client/QueryClient.d.ts

@@ -424,7 +424,7 @@ declare module '../client/QueryClient' {
             breakId: string;
             updates: Partial<Break>;
         }>>;
-        useUpdateSelf(): ReturnType<typeof useMutation<{
+        useUpdateUser(userId: string): ReturnType<typeof useMutation<{
             msg: string;
         }, StandardError, Partial<User>>>;
         useDeleteJobs(): ReturnType<typeof useMutation<{

package/dist/client/hooks/users.js

@@ -59,12 +59,12 @@ AvroQueryClient.prototype.useCreateUser = function () {
         },
     });
 };
-AvroQueryClient.prototype.useUpdateSelf = function () {
+AvroQueryClient.prototype.useUpdateUser = function (userId) {
     const queryClient = this.getQueryClient();
     return useMutation({
         mutationFn: async (data) => {
             return this.put({
-                path: `/user`,
+                path: `/user/${userId}`,
                 data: JSON.stringify(data),
                 headers: { "Content-Type": "application/json" }
             });
@@ -72,19 +72,28 @@ AvroQueryClient.prototype.useUpdateSelf = function () {
         // Optimistically update the user data in the cache
         onMutate: async (data) => {
             await queryClient.cancelQueries({ queryKey: ['user'] });
-            const previousUser = queryClient.getQueryData(['user']);
+            await queryClient.cancelQueries({ queryKey: ['users', userId] });
+            const previousSelf = queryClient.getQueryData(['user']);
+            const previousUser = queryClient.getQueryData(['users', userId]);
+            if (previousSelf && previousSelf.id === userId) {
+                queryClient.setQueryData(['user'], { ...previousSelf, ...data });
+            }
             if (previousUser) {
-                queryClient.setQueryData(['user'], { ...previousUser, ...data });
+                queryClient.setQueryData(['users', userId], { ...previousUser, ...data });
             }
-            return { previousUser };
+            return { previousSelf, previousUser };
         },
         onError: (err, _, context) => {
+            if (context?.previousSelf) {
+                queryClient.setQueryData(['user'], context.previousSelf);
+            }
             if (context?.previousUser) {
-                queryClient.setQueryData(['user'], context.previousUser);
+                queryClient.setQueryData(['users', userId], context.previousUser);
             }
         },
         onSettled: () => {
             queryClient.invalidateQueries({ queryKey: ['user'] });
+            queryClient.invalidateQueries({ queryKey: ['users', userId] });
         },
     });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-avro/avro-js",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "JS client for Avro backend integration.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -50,11 +50,7 @@
     "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"
   }
 }