amplifyquery 1.0.14 → 1.0.16

package/dist/service.js

@@ -108,27 +108,27 @@ function performOptimisticUpdate(queryClient, modelName, relatedQueryKeys, itemI
         queryClient.setQueryData(singleItemQueryKey, optimisticData);
         // 2. Update list queries
         relatedQueryKeys.forEach((queryKey) => {
-            // Process only list query keys since single item key is handled above
-            if (queryKey.length > 1 && queryKey[1] !== itemId) {
-                const previousItems = queryClient.getQueryData(queryKey);
-                previousDataMap.set(queryKey, previousItems); // Backup previous data
-                queryClient.setQueryData(queryKey, (oldData) => {
-                    // Safely handle if oldData is null, undefined or not an array
-                    const oldItems = Array.isArray(oldData) ? oldData : [];
-                    const hasItem = oldItems.some((item) => item && item.id === itemId);
-                    if (hasItem) {
-                        // Update if existing item found
-                        return oldItems.map((item) => item && item.id === itemId
-                            ? Object.assign(Object.assign({}, item), updateData) : item);
-                    }
-                    else if (optimisticData && queryKey.length < 3) {
-                        // Only consider adding created item for top-level list queries
-                        // Add if no existing item and optimistic update data available (for create/upsert)
-                        return [...oldItems, optimisticData];
-                    }
-                    return oldItems; // No changes
-                });
+            // Skip single-item keys (handled above)
+            if (isItemKeyForModel(modelName, queryKey)) {
+                return;
             }
+            const previousItems = queryClient.getQueryData(queryKey);
+            previousDataMap.set(queryKey, previousItems); // Backup previous data
+            queryClient.setQueryData(queryKey, (oldData) => {
+                // Safely handle if oldData is null, undefined or not an array
+                const oldItems = Array.isArray(oldData) ? oldData : [];
+                const hasItem = oldItems.some((item) => item && item.id === itemId);
+                if (hasItem) {
+                    // Update if existing item found
+                    return oldItems.map((item) => item && item.id === itemId
+                        ? Object.assign(Object.assign({}, item), updateData) : item);
+                }
+                // Only add created item to top-level list queries (e.g. [modelName])
+                if (optimisticData && queryKey.length === 1) {
+                    return [...oldItems, optimisticData];
+                }
+                return oldItems; // No changes
+            });
         });
         return previousDataMap;
     });
@@ -559,7 +559,10 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 // Check cache first (if forceRefresh is false)
                 if (!options.forceRefresh) {
                     const cachedItems = query_1.queryClient.getQueryData(queryKey);
-                    if (cachedItems && cachedItems.length > 0) {
+                    const queryState = query_1.queryClient.getQueryState(queryKey);
+                    if (cachedItems &&
+                        cachedItems.length > 0 &&
+                        !(queryState === null || queryState === void 0 ? void 0 : queryState.isInvalidated)) {
                         console.log(`🍬 ${modelName} list using cache`, queryKey);
                         return cachedItems.filter((item) => item !== null);
                     }
@@ -777,17 +780,17 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 query_1.queryClient.setQueryData(singleItemQueryKey, null);
                 // Backup and perform optimistic update for list queries (remove item)
                 relatedQueryKeys.forEach((queryKey) => {
-                    if (queryKey.length > 1 && queryKey[1] !== id) {
-                        // Exclude single item keys
-                        const data = query_1.queryClient.getQueryData(queryKey);
-                        if (data) {
-                            previousDataMap.set(queryKey, data);
-                        }
-                        query_1.queryClient.setQueryData(queryKey, (oldData) => {
-                            const oldItems = Array.isArray(oldData) ? oldData : [];
-                            return oldItems.filter((item) => (item === null || item === void 0 ? void 0 : item.id) !== id);
-                        });
+                    if (isItemKeyForModel(modelName, queryKey)) {
+                        return;
+                    }
+                    const data = query_1.queryClient.getQueryData(queryKey);
+                    if (data) {
+                        previousDataMap.set(queryKey, data);
                     }
+                    query_1.queryClient.setQueryData(queryKey, (oldData) => {
+                        const oldItems = Array.isArray(oldData) ? oldData : [];
+                        return oldItems.filter((item) => (item === null || item === void 0 ? void 0 : item.id) !== id);
+                    });
                 });
                 try {
                     // API call - apply auth mode
@@ -795,8 +798,12 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     yield (0, client_1.getClient)().models[modelName].delete({ id }, authModeParams);
                     console.log(`🍬 ${modelName} delete success:`, id);
                     // On API success, invalidate all related queries to automatically refresh
+                    relatedQueryKeys.forEach((queryKey) => query_1.queryClient.invalidateQueries({
+                        queryKey,
+                        refetchType: "active",
+                    }));
                     query_1.queryClient.invalidateQueries({
-                        queryKey: [modelName],
+                        queryKey: itemKey(modelName, id),
                         refetchType: "active",
                     });
                     return true;
@@ -843,17 +850,17 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 });
                 // Update all list query caches (remove items included in id list)
                 relatedQueryKeys.forEach((queryKey) => {
-                    if (queryKey.length > 1 && !ids.includes(queryKey[1])) {
-                        // Exclude single item keys and list keys where id is second element (handled individually)
-                        const data = query_1.queryClient.getQueryData(queryKey);
-                        if (data) {
-                            previousDataMap.set(queryKey, data);
-                        }
-                        query_1.queryClient.setQueryData(queryKey, (oldData) => {
-                            const oldItems = Array.isArray(oldData) ? oldData : [];
-                            return oldItems.filter((item) => item && !ids.includes(item.id));
-                        });
+                    if (isItemKeyForModel(modelName, queryKey)) {
+                        return;
+                    }
+                    const data = query_1.queryClient.getQueryData(queryKey);
+                    if (data) {
+                        previousDataMap.set(queryKey, data);
                     }
+                    query_1.queryClient.setQueryData(queryKey, (oldData) => {
+                        const oldItems = Array.isArray(oldData) ? oldData : [];
+                        return oldItems.filter((item) => item && !ids.includes(item.id));
+                    });
                 });
                 try {
                     console.log(`🍬 ${modelName} batch delete attempt [Auth: ${authMode}]: ${ids.length} items`);
@@ -1193,6 +1200,17 @@ function createAmplifyService(modelName, defaultAuthMode) {
             const createItem = (0, react_1.useCallback)((data) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield service.create(data);
+                    if (result) {
+                        // Keep hook cache in sync immediately
+                        hookQueryClient.setQueryData(queryKey, (oldData) => {
+                            const oldItems = Array.isArray(oldData) ? oldData : [];
+                            if (oldItems.some((item) => (item === null || item === void 0 ? void 0 : item.id) === result.id)) {
+                                return oldItems;
+                            }
+                            return [...oldItems, result];
+                        });
+                        hookQueryClient.setQueryData(itemKey(modelName, result.id), result);
+                    }
                     // Automatically refresh list after successful create
                     yield refetch();
                     return result;
@@ -1206,6 +1224,14 @@ function createAmplifyService(modelName, defaultAuthMode) {
             const updateItem = (0, react_1.useCallback)((data) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield service.update(data);
+                    if (result) {
+                        // Keep hook cache in sync immediately
+                        hookQueryClient.setQueryData(queryKey, (oldData) => {
+                            const oldItems = Array.isArray(oldData) ? oldData : [];
+                            return oldItems.map((item) => item && item.id === result.id ? result : item);
+                        });
+                        hookQueryClient.setQueryData(itemKey(modelName, result.id), result);
+                    }
                     // Automatically refresh list after successful update
                     yield refetch();
                     return result;
@@ -1219,6 +1245,14 @@ function createAmplifyService(modelName, defaultAuthMode) {
             const deleteItem = (0, react_1.useCallback)((id) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield service.delete(id);
+                    if (result) {
+                        // Keep hook cache in sync immediately
+                        hookQueryClient.setQueryData(queryKey, (oldData) => {
+                            const oldItems = Array.isArray(oldData) ? oldData : [];
+                            return oldItems.filter((item) => (item === null || item === void 0 ? void 0 : item.id) !== id);
+                        });
+                        hookQueryClient.setQueryData(itemKey(modelName, id), null);
+                    }
                     // Automatically refresh list after successful delete
                     yield refetch();
                     return result;
@@ -1326,13 +1360,25 @@ function createAmplifyService(modelName, defaultAuthMode) {
             const deleteItem = (0, react_1.useCallback)(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield deleteMutation.mutateAsync();
+                    if (result) {
+                        // Ensure the hook's query cache reflects deletion immediately
+                        hookQueryClient.setQueryData(singleItemQueryKey, null);
+                        hookQueryClient.invalidateQueries({
+                            queryKey: [modelName],
+                            refetchType: "active",
+                        });
+                        hookQueryClient.invalidateQueries({
+                            queryKey: singleItemQueryKey,
+                            refetchType: "active",
+                        });
+                    }
                     return result;
                 }
                 catch (error) {
                     console.error(`🍬 ${modelName} useItemHook delete error:`, error);
                     throw error;
                 }
-            }), [deleteMutation]);
+            }), [deleteMutation, hookQueryClient, modelName, singleItemQueryKey]);
             // Change loading state to false when isLoading is true and cached data exists
             const effectiveLoading = isLoading && !cachedData;
             // 캐시 정리를 위한 효과 최적화 (한 번만 실행)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplifyquery",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Amplify+Query",
   "keywords": [
     "Amplify",