amplifyquery 1.0.13 → 1.0.15

package/dist/query.js

@@ -134,7 +134,11 @@ function configure(options = {}) {
             maxAge: ((_a = config.storage) === null || _a === void 0 ? void 0 : _a.maxAge) || 1000 * 60 * 60 * 24 * 7, // Default 7 days
             dehydrateOptions: {
                 shouldDehydrateQuery: (query) => {
-                    // Filter for queries not to cache (implement if needed)
+                    var _a;
+                    // Only persist successful queries to reduce hydration cancellation noise
+                    if (((_a = query.state) === null || _a === void 0 ? void 0 : _a.status) !== "success")
+                        return false;
+                    // Avoid persisting mutation-like or transient keys if needed later
                     return true;
                 },
             },
@@ -169,7 +173,10 @@ function invalidateModel(modelName) {
  * @param id Item ID
  */
 function invalidateModelItem(modelName, id) {
-    exports.queryClient.invalidateQueries({ queryKey: [modelName, id] });
+    // New item key
+    exports.queryClient.invalidateQueries({ queryKey: [modelName, "item", id] });
+    // Backward cleanup (in case legacy keys exist)
+    exports.queryClient.removeQueries({ queryKey: [modelName, id], exact: true });
 }
 /**
  * Invalidate model items with a specific field value

package/dist/service.js

@@ -18,6 +18,15 @@ const react_query_1 = require("@tanstack/react-query");
 const auth_1 = require("aws-amplify/auth");
 const expo_crypto_1 = require("expo-crypto");
 const react_1 = require("react");
+// -------------------------------
+// Query key helpers
+// -------------------------------
+function itemKey(modelName, id) {
+    return [modelName, "item", id];
+}
+function isItemKeyForModel(modelName, key) {
+    return Array.isArray(key) && key[0] === modelName && key[1] === "item";
+}
 /**
  * Utility function to get owner value based on authentication mode
  * Sets owner value only in userPool auth mode, returns empty string for other auth modes
@@ -58,9 +67,12 @@ function findRelatedQueryKeys(modelName, queryClient) {
         .getQueryCache()
         .findAll({
         predicate: ({ queryKey }) => {
-            // Find all query keys starting with model name
-            // Example: ["Mission"], ["Mission", "filter", ...], ["Daily", dailyId, "Mission"]
-            return Array.isArray(queryKey) && queryKey[0] === modelName;
+            // Find all query keys for the model, but EXCLUDE single-item keys
+            // Examples kept: [model], [model, 'filter', ...], [model, 'query', ...], [model, Relation, id, ...]
+            // Excluded: [model, 'item', id]
+            return (Array.isArray(queryKey) &&
+                queryKey[0] === modelName &&
+                !isItemKeyForModel(modelName, queryKey));
         },
     })
         .map((query) => query.queryKey);
@@ -86,7 +98,7 @@ function performOptimisticUpdate(queryClient, modelName, relatedQueryKeys, itemI
             return previousDataMap; // 빈 맵 반환으로 rollback 시 영향 없음
         }
         // 1. Update individual item cache
-        const singleItemQueryKey = [modelName, itemId];
+        const singleItemQueryKey = itemKey(modelName, itemId);
         const previousItemSingle = queryClient.getQueryData(singleItemQueryKey);
         previousDataMap.set(singleItemQueryKey, previousItemSingle);
         // Merge with existing data if available, otherwise use updateData as optimistic data
@@ -96,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;
     });
@@ -136,7 +148,7 @@ function handleCacheUpdateOnSuccess(queryClient, modelName, relatedQueryKeys, it
     if (actualItemId &&
         typeof actualItemId === "string" &&
         actualItemId === itemId) {
-        queryClient.setQueryData([modelName, itemId], updatedItem);
+        queryClient.setQueryData(itemKey(modelName, itemId), updatedItem);
     }
     else {
         console.warn(`🍬 ${modelName} handleCacheUpdateOnSuccess: ID mismatch! Expected: ${itemId}, Actual: ${actualItemId}. Skipping cache update.`);
@@ -245,7 +257,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 // Backup previous data for optimistic update
                 const previousDataMap = new Map();
                 // Update individual item cache
-                const singleItemQueryKey = [modelName, newItem.id];
+                const singleItemQueryKey = itemKey(modelName, newItem.id);
                 const previousItemSingle = query_1.queryClient.getQueryData(singleItemQueryKey);
                 previousDataMap.set(singleItemQueryKey, previousItemSingle);
                 query_1.queryClient.setQueryData(singleItemQueryKey, newItem);
@@ -401,7 +413,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 });
                 // Update individual item caches
                 preparedItems.forEach((item) => {
-                    const singleItemQueryKey = [modelName, item.id];
+                    const singleItemQueryKey = itemKey(modelName, item.id);
                     const previousItemSingle = query_1.queryClient.getQueryData(singleItemQueryKey);
                     previousDataMap.set(singleItemQueryKey, previousItemSingle);
                     query_1.queryClient.setQueryData(singleItemQueryKey, item);
@@ -416,7 +428,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                                 const itemId = createdItem === null || createdItem === void 0 ? void 0 : createdItem.id;
                                 // 🔧 버그 수정: ID가 유효한 경우에만 개별 캐시에 저장
                                 if (itemId && typeof itemId === "string") {
-                                    query_1.queryClient.setQueryData([modelName, itemId], createdItem);
+                                    query_1.queryClient.setQueryData(itemKey(modelName, itemId), createdItem);
                                 }
                                 else {
                                     console.warn(`🍬 ${modelName} createList: Invalid createdItem ID found, skipping cache update:`, itemId, createdItem);
@@ -465,7 +477,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
         // Get item
         get: (id_1, ...args_1) => __awaiter(this, [id_1, ...args_1], void 0, function* (id, options = { forceRefresh: false }) {
             try {
-                const singleItemQueryKey = [modelName, id];
+                const singleItemQueryKey = itemKey(modelName, id);
                 // Check cache first (if forceRefresh is false)
                 if (!options.forceRefresh) {
                     const cachedItem = query_1.queryClient.getQueryData(singleItemQueryKey);
@@ -606,7 +618,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         const itemId = item === null || item === void 0 ? void 0 : item.id;
                         // 🔧 버그 수정: ID가 유효한 경우에만 개별 캐시에 저장
                         if (itemId && typeof itemId === "string") {
-                            query_1.queryClient.setQueryData([modelName, itemId], item);
+                            query_1.queryClient.setQueryData(itemKey(modelName, itemId), item);
                         }
                         else {
                             console.warn(`🍬 ${modelName} list: Invalid item ID found, skipping cache update:`, itemId, item);
@@ -661,7 +673,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             const itemId = item === null || item === void 0 ? void 0 : item.id;
                             // 🔧 버그 수정: ID가 유효한 경우에만 개별 캐시에 저장
                             if (itemId && typeof itemId === "string") {
-                                query_1.queryClient.setQueryData([modelName, itemId], item);
+                                query_1.queryClient.setQueryData(itemKey(modelName, itemId), item);
                             }
                             else {
                                 console.warn(`🍬 ${modelName} list fallback: Invalid item ID found, skipping cache update:`, itemId, item);
@@ -727,7 +739,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     else {
                         console.warn(`🍬 ${modelName} update API response missing. Maintaining optimistic update data.`);
                         // If no API response, return the data saved during optimistic update
-                        const singleItemQueryKey = [modelName, itemId];
+                        const singleItemQueryKey = itemKey(modelName, itemId);
                         return (previousDataMap.get(singleItemQueryKey) || null);
                     }
                 }
@@ -759,23 +771,23 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 // Backup item data before deletion (for rollback)
                 const previousDataMap = new Map();
                 // Backup previous data and perform optimistic update for individual item (set to null)
-                const singleItemQueryKey = [modelName, id];
+                const singleItemQueryKey = itemKey(modelName, id);
                 const previousItemSingle = query_1.queryClient.getQueryData(singleItemQueryKey);
                 previousDataMap.set(singleItemQueryKey, previousItemSingle);
                 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
@@ -783,8 +795,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;
@@ -823,7 +839,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 // Optimistic update - remove items from all caches
                 ids.forEach((id) => {
                     // Backup previous data and perform optimistic update for individual item (null)
-                    const singleItemQueryKey = [modelName, id];
+                    const singleItemQueryKey = itemKey(modelName, id);
                     const previousItemSingle = query_1.queryClient.getQueryData(singleItemQueryKey);
                     previousItemsCache.set(id, previousItemSingle || null);
                     previousDataMap.set(singleItemQueryKey, previousItemSingle); // Backup to map
@@ -831,17 +847,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`);
@@ -867,7 +883,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             const previousItem = previousItemsCache.get(failedId);
                             if (previousItem !== undefined) {
                                 // Restore if not undefined (was in cache)
-                                const singleItemQueryKey = [modelName, failedId];
+                                const singleItemQueryKey = itemKey(modelName, failedId);
                                 query_1.queryClient.setQueryData(singleItemQueryKey, previousItem);
                             }
                             // Restore failed item to list queries
@@ -892,7 +908,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     }
                     // Invalidate all related queries to force refresh (safety mechanism)
                     relatedQueryKeys.forEach((queryKey) => query_1.queryClient.invalidateQueries({ queryKey }));
-                    ids.forEach((id) => query_1.queryClient.invalidateQueries({ queryKey: [modelName, id] }));
+                    ids.forEach((id) => query_1.queryClient.invalidateQueries({ queryKey: itemKey(modelName, id) }));
                     console.log(`🍬 ${modelName} batch delete: ${results.success.length} items deleted, ${results.failed.length} items failed`);
                     return results;
                 }
@@ -949,7 +965,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         }
                         else {
                             console.warn(`🍬 ${modelName} upsert(update) no API response. Keeping optimistic update data.`);
-                            const singleItemQueryKey = [modelName, data.id];
+                            const singleItemQueryKey = itemKey(modelName, data.id);
                             return (previousDataMap.get(singleItemQueryKey) ||
                                 null);
                         }
@@ -965,7 +981,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         }
                         else {
                             console.warn(`🍬 ${modelName} upsert(create) no API response. Keeping optimistic update data.`);
-                            const singleItemQueryKey = [modelName, data.id];
+                            const singleItemQueryKey = itemKey(modelName, data.id);
                             return (previousDataMap.get(singleItemQueryKey) ||
                                 null);
                         }
@@ -1047,7 +1063,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     const itemId = item === null || item === void 0 ? void 0 : item.id;
                     // 🔧 버그 수정: ID가 유효한 경우에만 개별 캐시에 저장
                     if (itemId && typeof itemId === "string") {
-                        query_1.queryClient.setQueryData([modelName, itemId], item);
+                        query_1.queryClient.setQueryData(itemKey(modelName, itemId), item);
                     }
                     else {
                         console.warn(`🍬 ${modelName} customList: Invalid item ID found, skipping cache update:`, itemId, item);
@@ -1164,7 +1180,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
             // Interface functions implementation
             const getItem = (0, react_1.useCallback)((id) => {
                 // Use useQueryData to get latest single item from current cache
-                const cachedItem = hookQueryClient.getQueryData([modelName, id]);
+                const cachedItem = hookQueryClient.getQueryData(itemKey(modelName, id));
                 // 🔧 버그 수정: 캐시된 아이템의 ID가 요청한 ID와 일치하는지 검증
                 if (cachedItem) {
                     const itemId = cachedItem === null || cachedItem === void 0 ? void 0 : cachedItem.id;
@@ -1189,7 +1205,8 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     console.error(`🍬 ${modelName} useHook create error:`, _error);
                     throw _error; // Re-throw error
                 }
-            }), [service, refetch]);
+            }), [service, refetch] // Add refetch dependency
+            );
             const updateItem = (0, react_1.useCallback)((data) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield service.update(data);
@@ -1201,7 +1218,8 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     console.error(`🍬 ${modelName} useHook update error:`, _error);
                     throw _error;
                 }
-            }), [service, refetch]);
+            }), [service, refetch] // Add refetch dependency
+            );
             const deleteItem = (0, react_1.useCallback)((id) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield service.delete(id);
@@ -1213,7 +1231,8 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     console.error(`🍬 ${modelName} useHook delete error:`, error);
                     throw error;
                 }
-            }), [service, refetch]);
+            }), [service, refetch] // refetch dependency added
+            );
             const refresh = (0, react_1.useCallback)((refreshOptions) => __awaiter(this, void 0, void 0, function* () {
                 console.log(`🍬 ${modelName} useHook refresh called`, queryKey);
                 const { data } = yield refetch({ throwOnError: true }); // Throw on error
@@ -1244,7 +1263,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
         // Hook for managing single item - Reimplemented based on TanStack Query
         useItemHook: (id) => {
             const hookQueryClient = (0, react_query_1.useQueryClient)();
-            const singleItemQueryKey = [modelName, id];
+            const singleItemQueryKey = itemKey(modelName, id);
             // First check data from cache
             const rawCachedData = hookQueryClient.getQueryData(singleItemQueryKey);
             // 🔧 버그 수정: 배열이 캐시되어 있는 경우 처리

package/dist/singleton.js

@@ -126,8 +126,7 @@ function createSingletonService(baseService, getModelId) {
         }), 
         // React hook to manage the current singleton item
         useCurrentHook: () => {
-            // Resolve current singleton ID with React Query (object-style API)
-            const { data: currentId } = (0, react_query_1.useQuery)({
+            const { data: currentId, isLoading: isIdLoading, error: idError, refetch: refetchId, } = (0, react_query_1.useQuery)({
                 queryKey: [modelName, "currentId"],
                 queryFn: () => __awaiter(this, void 0, void 0, function* () {
                     var _a, _b, _c;
@@ -136,23 +135,57 @@ function createSingletonService(baseService, getModelId) {
                         return id || null;
                     }
                     catch (error) {
-                        // Safely call getStore to surface errors if available
                         try {
                             (_c = (_b = (_a = baseService
                                 .getStore) === null || _a === void 0 ? void 0 : _a.call(baseService)) === null || _b === void 0 ? void 0 : _b.setError) === null || _c === void 0 ? void 0 : _c.call(_b, error instanceof Error ? error : new Error(String(error)));
                         }
-                        catch (_storeError) {
-                            // Ignore store errors
-                        }
+                        catch (_storeError) { }
                         return null;
                     }
                 }),
                 staleTime: 1000 * 60,
                 refetchOnWindowFocus: false,
             });
-            // Delegate to base service's single item hook once ID is known
-            const resolvedId = currentId !== null && currentId !== void 0 ? currentId : "";
-            return baseService.useItemHook(resolvedId);
+            const idForItemHook = currentId !== null && currentId !== void 0 ? currentId : "";
+            const core = baseService.useItemHook(idForItemHook);
+            const item = (() => {
+                var _a;
+                if (!currentId)
+                    return null;
+                const raw = core.item;
+                if (Array.isArray(raw)) {
+                    const match = raw.find((i) => (i === null || i === void 0 ? void 0 : i.id) === currentId);
+                    return match || null;
+                }
+                return (_a = raw) !== null && _a !== void 0 ? _a : null;
+            })();
+            const isLoading = isIdLoading || core.isLoading;
+            const error = idError || core.error || null;
+            const refresh = () => __awaiter(this, void 0, void 0, function* () {
+                if (!currentId) {
+                    const { data } = yield refetchId({ throwOnError: false });
+                    if (!data)
+                        return null;
+                }
+                return core.refresh();
+            });
+            const update = (data) => __awaiter(this, void 0, void 0, function* () {
+                if (!currentId) {
+                    const { data } = yield refetchId({ throwOnError: false });
+                    if (!data)
+                        return null;
+                }
+                return core.update(data);
+            });
+            const remove = () => __awaiter(this, void 0, void 0, function* () {
+                if (!currentId) {
+                    const { data } = yield refetchId({ throwOnError: false });
+                    if (!data)
+                        return false;
+                }
+                return core.delete();
+            });
+            return { item, isLoading, error, refresh, update, delete: remove };
         } });
     return singletonService;
 }

package/package.json

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