amplifyquery 1.0.12 → 1.0.14

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
@@ -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,7 +771,7 @@ 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);
@@ -823,7 +835,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
@@ -867,7 +879,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 +904,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 +961,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 +977,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 +1059,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 +1176,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 +1201,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 +1214,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 +1227,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 +1259,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

@@ -13,6 +13,7 @@ exports.getModelIds = void 0;
 exports.createSingletonService = createSingletonService;
 const client_1 = require("./client");
 const auth_1 = require("aws-amplify/auth");
+const react_query_1 = require("@tanstack/react-query");
 /**
  * Function to create an extension service for singleton models
  * @param baseService Base service
@@ -32,7 +33,7 @@ function createSingletonService(baseService, getModelId) {
                 return baseService.get(modelId, options);
             }
             catch (error) {
-                console.error(`${modelName} singleton instance lookup error:`, error);
+                // console.error(`${modelName} singleton instance lookup error:`, error);
                 // Safely call getStore
                 try {
                     (_c = (_b = (_a = baseService
@@ -122,7 +123,70 @@ function createSingletonService(baseService, getModelId) {
                 console.error(`${modelName} singleton instance final Upsert error:`, error);
                 return null;
             }
-        }) });
+        }), 
+        // React hook to manage the current singleton item
+        useCurrentHook: () => {
+            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;
+                    try {
+                        const id = yield getModelId();
+                        return id || null;
+                    }
+                    catch (error) {
+                        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) { }
+                        return null;
+                    }
+                }),
+                staleTime: 1000 * 60,
+                refetchOnWindowFocus: false,
+            });
+            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/dist/types.d.ts

@@ -106,6 +106,7 @@ export interface SingletonAmplifyService<T> extends AmplifyDataService<T> {
     }) => Promise<T | null>;
     updateCurrent: (data: Partial<T>) => Promise<T | null>;
     upsertCurrent: (data: Partial<T>) => Promise<T | null>;
+    useCurrentHook: () => ItemHook<T>;
 }
 export interface BaseModel {
     id: string;

package/package.json

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