amplifyquery 1.0.10 → 1.0.12

package/dist/service.js

@@ -231,7 +231,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         cleanedData[key] = value;
                     }
                 });
-                const newItem = Object.assign(Object.assign({}, cleanedData), { id: (0, expo_crypto_1.randomUUID)() });
+                const newItem = Object.assign(Object.assign({}, cleanedData), { id: cleanedData.id || (0, expo_crypto_1.randomUUID)() });
                 // Extract relation fields (e.g., dailyId, userId)
                 const relationFields = new Map();
                 for (const [key, value] of Object.entries(newItem)) {
@@ -351,7 +351,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             cleanedData[key] = value;
                         }
                     });
-                    return Object.assign(Object.assign({}, cleanedData), { id: (0, expo_crypto_1.randomUUID)() });
+                    return Object.assign(Object.assign({}, cleanedData), { id: cleanedData.id || (0, expo_crypto_1.randomUUID)() });
                 })
                     .filter(Boolean);
                 const relatedQueryKeys = findRelatedQueryKeys(modelName, query_1.queryClient);
@@ -1253,8 +1253,13 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 console.warn(`🍬 ${modelName} useItemHook: Cache contains array instead of single item. Finding matching item.`);
                 const matchingItem = rawCachedData.find((item) => (item === null || item === void 0 ? void 0 : item.id) === id);
                 cachedData = matchingItem || undefined;
-                // 배열이 캐시되어 있으면 캐시를 제거하여 get 메서드가 다시 호출되도록 함
-                hookQueryClient.removeQueries({ queryKey: singleItemQueryKey });
+                // 배열이 캐시되어 있으면 조용히 캐시를 제거 (무한 루프 방지)
+                setTimeout(() => {
+                    hookQueryClient.removeQueries({
+                        queryKey: singleItemQueryKey,
+                        exact: true,
+                    });
+                }, 0);
             }
             else if (rawCachedData && (rawCachedData === null || rawCachedData === void 0 ? void 0 : rawCachedData.id) === id) {
                 cachedData = rawCachedData;
@@ -1269,7 +1274,8 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 queryFn: () => service.get(id),
                 initialData: cachedData, // Use cached data as initial value if available
                 staleTime: 1000 * 60, // Keep data "fresh" for 1 minute
-                refetchOnMount: "always", // Always attempt to refetch on mount
+                refetchOnMount: cachedData ? false : true, // Only refetch if no cached data
+                refetchOnWindowFocus: false, // Disable window focus refetch to prevent loops
                 enabled: !!id, // Only enable query when id exists
             });
             // useMutation hooks call service methods,
@@ -1314,6 +1320,17 @@ function createAmplifyService(modelName, defaultAuthMode) {
             }), [deleteMutation]);
             // Change loading state to false when isLoading is true and cached data exists
             const effectiveLoading = isLoading && !cachedData;
+            // 캐시 정리를 위한 효과 최적화 (한 번만 실행)
+            const shouldCleanCache = Array.isArray(rawCachedData);
+            if (shouldCleanCache && !isLoading) {
+                // 로딩이 완료된 후에만 캐시 정리 실행
+                setTimeout(() => {
+                    const currentCache = hookQueryClient.getQueryData(singleItemQueryKey);
+                    if (Array.isArray(currentCache)) {
+                        hookQueryClient.setQueryData(singleItemQueryKey, item);
+                    }
+                }, 100);
+            }
             return {
                 item: item || null,
                 isLoading: effectiveLoading, // Not loading if cached data exists

package/package.json

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