amplifyquery 1.0.9 → 1.0.11

package/dist/service.js

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAmplifyService = createAmplifyService;
 const client_1 = require("./client");
+const config_1 = require("./config");
 const query_1 = require("./query");
 const utils_1 = require("./utils");
-const config_1 = require("./config");
 const react_query_1 = require("@tanstack/react-query");
 const auth_1 = require("aws-amplify/auth");
 const expo_crypto_1 = require("expo-crypto");
@@ -492,7 +492,10 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 let item = apiResponse;
                 if (Array.isArray(apiResponse)) {
                     console.warn(`🍬 ${modelName} get: API returned array instead of single item. Taking first item.`);
-                    item = apiResponse.find((i) => (i === null || i === void 0 ? void 0 : i.id) === id) || apiResponse[0] || null;
+                    item =
+                        apiResponse.find((i) => (i === null || i === void 0 ? void 0 : i.id) === id) ||
+                            apiResponse[0] ||
+                            null;
                 }
                 // Update cache
                 if (item) {
@@ -1186,8 +1189,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     console.error(`🍬 ${modelName} useHook create error:`, _error);
                     throw _error; // Re-throw error
                 }
-            }), [service, refetch] // Add refetch dependency
-            );
+            }), [service, refetch]);
             const updateItem = (0, react_1.useCallback)((data) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield service.update(data);
@@ -1199,8 +1201,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     console.error(`🍬 ${modelName} useHook update error:`, _error);
                     throw _error;
                 }
-            }), [service, refetch] // Add refetch dependency
-            );
+            }), [service, refetch]);
             const deleteItem = (0, react_1.useCallback)((id) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield service.delete(id);
@@ -1212,8 +1213,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     console.error(`🍬 ${modelName} useHook delete error:`, error);
                     throw error;
                 }
-            }), [service, refetch] // refetch dependency added
-            );
+            }), [service, refetch]);
             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
@@ -1247,12 +1247,26 @@ function createAmplifyService(modelName, defaultAuthMode) {
             const singleItemQueryKey = [modelName, id];
             // First check data from cache
             const rawCachedData = hookQueryClient.getQueryData(singleItemQueryKey);
-            // 🔧 버그 수정: 캐시된 데이터의 ID가 요청한 ID와 일치하는지 검증
-            const cachedData = rawCachedData && (rawCachedData === null || rawCachedData === void 0 ? void 0 : rawCachedData.id) === id
-                ? rawCachedData
-                : undefined;
-            if (rawCachedData && !cachedData) {
+            // 🔧 버그 수정: 배열이 캐시되어 있는 경우 처리
+            let cachedData;
+            if (Array.isArray(rawCachedData)) {
+                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;
+                // 배열이 캐시되어 있으면 조용히 캐시를 제거 (무한 루프 방지)
+                setTimeout(() => {
+                    hookQueryClient.removeQueries({
+                        queryKey: singleItemQueryKey,
+                        exact: true,
+                    });
+                }, 0);
+            }
+            else if (rawCachedData && (rawCachedData === null || rawCachedData === void 0 ? void 0 : rawCachedData.id) === id) {
+                cachedData = rawCachedData;
+            }
+            else if (rawCachedData) {
                 console.warn(`🍬 ${modelName} useItemHook: Cache ID mismatch! Requested: ${id}, Cached: ${rawCachedData === null || rawCachedData === void 0 ? void 0 : rawCachedData.id}. Ignoring cached data.`);
+                cachedData = undefined;
             }
             // Single item query
             const { data: item, isLoading, error, refetch, } = (0, react_query_1.useQuery)({
@@ -1260,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,
@@ -1305,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.9",
+  "version": "1.0.11",
   "description": "Amplify+Query",
   "keywords": [
     "Amplify",