amplifyquery 1.0.20 → 1.0.21

package/dist/service.js

@@ -27,6 +27,37 @@ function itemKey(modelName, id) {
 function isItemKeyForModel(modelName, key) {
     return Array.isArray(key) && key[0] === modelName && key[1] === "item";
 }
+function signatureForModelItem(item) {
+    const id = typeof (item === null || item === void 0 ? void 0 : item.id) === "string" ? item.id : "";
+    const updatedAt = typeof (item === null || item === void 0 ? void 0 : item.updatedAt) === "string" ? item.updatedAt : "";
+    const createdAt = typeof (item === null || item === void 0 ? void 0 : item.createdAt) === "string" ? item.createdAt : "";
+    return `${id}::${updatedAt || createdAt}`;
+}
+function areItemArraysEquivalentById(a, b) {
+    if (a === b)
+        return true;
+    if (!Array.isArray(a) || !Array.isArray(b))
+        return false;
+    if (a.length !== b.length)
+        return false;
+    const mapA = new Map();
+    for (const item of a) {
+        const sig = signatureForModelItem(item);
+        const [id, ts] = sig.split("::");
+        if (!id)
+            continue;
+        mapA.set(id, ts || "");
+    }
+    for (const item of b) {
+        const sig = signatureForModelItem(item);
+        const [id, ts] = sig.split("::");
+        if (!id)
+            return false;
+        if (mapA.get(id) !== (ts || ""))
+            return false;
+    }
+    return true;
+}
 /**
  * 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
@@ -37,11 +68,22 @@ function isItemKeyForModel(modelName, key) {
 function getOwnerByAuthMode(authMode) {
     return __awaiter(this, void 0, void 0, function* () {
         let owner = "";
+        let ownerCandidates = [];
         // Set owner value only in userPool auth mode
         if (authMode === "userPool") {
             try {
                 const { username, userId } = yield (0, auth_1.getCurrentUser)();
-                owner = userId + "::" + username;
+                // Canonical "owner" in Amplify is typically the Cognito user sub / userId.
+                // Some legacy codepaths used `${userId}::${username}`. We keep it as a fallback
+                // candidate so list-by-owner can still find older records.
+                const canonicalOwner = userId;
+                // Avoid useless legacy candidates like `${userId}::${userId}` (can happen depending on username config).
+                const legacyOwner = username && userId && username !== userId ? `${userId}::${username}` : "";
+                owner = canonicalOwner;
+                ownerCandidates = [canonicalOwner].filter(Boolean);
+                if (legacyOwner && legacyOwner !== canonicalOwner) {
+                    ownerCandidates.push(legacyOwner);
+                }
             }
             catch (error) {
                 console.error("Error getting user authentication info:", error);
@@ -51,6 +93,7 @@ function getOwnerByAuthMode(authMode) {
         // Return with auth mode parameters
         return {
             owner,
+            ownerCandidates,
             authModeParams: { authMode },
         };
     });
@@ -66,13 +109,16 @@ function findRelatedQueryKeys(modelName, queryClient) {
     return queryClient
         .getQueryCache()
         .findAll({
-        predicate: ({ queryKey }) => {
+        predicate: (query) => {
+            const { queryKey } = query;
             // 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));
+                !isItemKeyForModel(modelName, queryKey) &&
+                // Also exclude internal singleton key(s) like ["User", "currentId"]
+                queryKey[1] !== "currentId");
         },
     })
         .map((query) => query.queryKey);
@@ -197,6 +243,14 @@ function rollbackCache(queryClient, previousDataMap) {
         queryClient.setQueryData(queryKey, previousData);
     });
 }
+function isOwnerNotInSchemaError(err) {
+    const msg = typeof (err === null || err === void 0 ? void 0 : err.message) === "string"
+        ? err.message
+        : String(err);
+    // Typical GraphQL validation/input errors mention the field and that it isn't defined.
+    return (/owner/i.test(msg) &&
+        /(not defined|does not exist|unknown|not a valid|not allowed|defined for input)/i.test(msg));
+}
 /**
  * Create model-specific Amplify service
  * @param modelName Model name
@@ -213,7 +267,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
         // Set authentication mode method
         setAuthMode: (authMode) => {
             currentAuthMode = authMode;
-            console.log(`🔐 ${modelName} service auth mode changed: ${authMode}`);
+            (0, config_1.debugLog)(`🔐 ${modelName} service auth mode changed: ${authMode}`);
         },
         // Get current authentication mode
         getAuthMode: () => {
@@ -235,7 +289,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 // Determine auth mode (use provided option if available)
                 const authMode = (options === null || options === void 0 ? void 0 : options.authMode) || currentAuthMode;
                 // Get owner and parameters based on auth mode
-                const { authModeParams } = yield getOwnerByAuthMode(authMode);
+                const { owner, authModeParams } = yield getOwnerByAuthMode(authMode);
                 const dataWithoutOwner = utils_1.Utils.removeOwnerField(data, "create");
                 const cleanedData = {};
                 Object.entries(dataWithoutOwner).forEach(([key, value]) => {
@@ -286,8 +340,8 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             });
                         }
                     }
-                    else if (queryKey.length < 3) {
-                        // Regular list query
+                    else if (queryKey.length === 1) {
+                        // Regular list query (e.g. ["User"]). Avoid internal keys like ["User","currentId"].
                         const data = query_1.queryClient.getQueryData(queryKey);
                         if (data) {
                             previousDataMap.set(queryKey, data);
@@ -300,8 +354,22 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 });
                 try {
                     // Attempt API call - apply auth mode
-                    console.log(`🍬 ${modelName} creation attempt [Auth: ${authMode}]:`, newItem.id);
-                    const { data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(newItem, authModeParams);
+                    (0, config_1.debugLog)(`🍬 ${modelName} creation attempt [Auth: ${authMode}]:`, newItem.id);
+                    // Many schemas use an owner field for auth. Prefer adding owner when available,
+                    // but retry without it if the model doesn't define it.
+                    const createPayload = owner ? Object.assign(Object.assign({}, newItem), { owner }) : newItem;
+                    let createdItem = null;
+                    try {
+                        ({ data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(createPayload, authModeParams));
+                    }
+                    catch (e) {
+                        if (owner && isOwnerNotInSchemaError(e)) {
+                            ({ data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(newItem, authModeParams));
+                        }
+                        else {
+                            throw e;
+                        }
+                    }
                     if (createdItem) {
                         // Update cache on API success
                         query_1.queryClient.setQueryData(singleItemQueryKey, createdItem);
@@ -322,7 +390,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             queryKey: [modelName],
                             refetchType: "active",
                         });
-                        console.log(`🍬 ${modelName} creation successful:`, newItem.id);
+                        (0, config_1.debugLog)(`🍬 ${modelName} creation successful:`, newItem.id);
                         return createdItem;
                     }
                     // Keep optimistic update data even if no API response
@@ -351,7 +419,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 // Determine auth mode (use provided option if available)
                 const authMode = (options === null || options === void 0 ? void 0 : options.authMode) || currentAuthMode;
                 // Get owner and parameters based on auth mode
-                const { authModeParams } = yield getOwnerByAuthMode(authMode);
+                const { owner, authModeParams } = yield getOwnerByAuthMode(authMode);
                 const preparedItems = dataList
                     .map((data) => {
                     if (!data)
@@ -378,7 +446,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         }
                     }
                 }
-                console.log(`🍬 ${modelName} batch creation attempt: ${preparedItems.length} items`);
+                (0, config_1.debugLog)(`🍬 ${modelName} batch creation attempt: ${preparedItems.length} items`);
                 // Batch optimistic update - with relation filtering
                 relatedQueryKeys.forEach((queryKey) => {
                     // Check if this query key is a relational query (e.g., ["Mission", "Daily", "daily-id", ...])
@@ -403,8 +471,8 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             return oldItems; // No change if no items match relation ID
                         });
                     }
-                    else if (queryKey.length < 3) {
-                        // Regular list query - add all items
+                    else if (queryKey.length === 1) {
+                        // Regular list query - add all items (e.g. ["User"]). Avoid internal keys like ["User","currentId"].
                         query_1.queryClient.setQueryData(queryKey, (oldData) => {
                             const oldItems = Array.isArray(oldData) ? oldData : [];
                             return [...oldItems, ...preparedItems];
@@ -422,7 +490,20 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     // Parallel API calls - apply auth mode
                     const createPromises = preparedItems.map((newItem) => __awaiter(this, void 0, void 0, function* () {
                         try {
-                            const { data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(newItem, authModeParams);
+                            const createPayload = owner
+                                ? Object.assign(Object.assign({}, newItem), { owner }) : newItem;
+                            let createdItem = null;
+                            try {
+                                ({ data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(createPayload, authModeParams));
+                            }
+                            catch (e) {
+                                if (owner && isOwnerNotInSchemaError(e)) {
+                                    ({ data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(newItem, authModeParams));
+                                }
+                                else {
+                                    throw e;
+                                }
+                            }
                             // Update individual item cache on API success
                             if (createdItem) {
                                 const itemId = createdItem === null || createdItem === void 0 ? void 0 : createdItem.id;
@@ -442,7 +523,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         }
                     }));
                     const results = yield Promise.all(createPromises);
-                    console.log(`🍬 ${modelName} batch creation completed: ${results.length} items`);
+                    (0, config_1.debugLog)(`🍬 ${modelName} batch creation completed: ${results.length} items`);
                     // After creation, invalidate all related queries to ensure exact server data
                     // This is important as it prevents side effects of optimistic updates by invalidating related queries
                     for (const [field, value] of relationFields) {
@@ -549,8 +630,8 @@ function createAmplifyService(modelName, defaultAuthMode) {
             }
         }),
         // Batch get items
-        list: (...args_1) => __awaiter(this, [...args_1], void 0, function* (options = { filter: undefined, forceRefresh: false }) {
-            var _a, _b, _c, _d;
+        list: (...args_1) => __awaiter(this, [...args_1], void 0, function* (options = { filter: undefined, forceRefresh: false, throwOnError: false }) {
+            var _a, _b, _c, _d, _e, _f, _g;
             try {
                 // Determine query key
                 const queryKey = options.filter
@@ -563,27 +644,55 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     if (cachedItems &&
                         cachedItems.length > 0 &&
                         !(queryState === null || queryState === void 0 ? void 0 : queryState.isInvalidated)) {
-                        console.log(`🍬 ${modelName} list using cache`, queryKey);
+                        (0, config_1.debugLog)(`🍬 ${modelName} list using cache`, queryKey);
                         return cachedItems.filter((item) => item !== null);
                     }
                 }
                 // Determine auth mode (use provided option if available)
                 const authMode = (options === null || options === void 0 ? void 0 : options.authMode) || currentAuthMode;
                 // Get owner and parameters based on auth mode
-                const { owner, authModeParams } = yield getOwnerByAuthMode(authMode);
+                const { owner, ownerCandidates, authModeParams } = yield getOwnerByAuthMode(authMode);
                 // Get owner-based query name from global config
                 const ownerQueryName = (0, config_1.getOwnerQueryName)(modelName);
                 // Try query call
                 try {
-                    console.log(`🍬 ${modelName} list API call`, queryKey, `by ${ownerQueryName}`, `[Auth: ${authMode}]`);
-                    // Debug: Check if model and query exist
+                    (0, config_1.debugLog)(`🍬 ${modelName} list API call`, queryKey, `by ${ownerQueryName}`, `[Auth: ${authMode}]`);
+                    if ((0, config_1.isDebugEnabled)()) {
+                        // Debug: Check if model and query exist
+                        const client = (0, client_1.getClient)();
+                        (0, config_1.debugLog)(`🍬 Debug - client.models exists:`, !!client.models);
+                        (0, config_1.debugLog)(`🍬 Debug - client.models[${modelName}] exists:`, !!client.models[modelName]);
+                        (0, config_1.debugLog)(`🍬 Debug - client.models[${modelName}][${ownerQueryName}] exists:`, !!((_a = client.models[modelName]) === null || _a === void 0 ? void 0 : _a[ownerQueryName]));
+                        (0, config_1.debugLog)(`🍬 Debug - Available methods for ${modelName}:`, Object.keys(client.models[modelName] || {}));
+                    }
                     const client = (0, client_1.getClient)();
-                    console.log(`🍬 Debug - client.models exists:`, !!client.models);
-                    console.log(`🍬 Debug - client.models[${modelName}] exists:`, !!client.models[modelName]);
-                    console.log(`🍬 Debug - client.models[${modelName}][${ownerQueryName}] exists:`, !!((_a = client.models[modelName]) === null || _a === void 0 ? void 0 : _a[ownerQueryName]));
-                    console.log(`🍬 Debug - Available methods for ${modelName}:`, Object.keys(client.models[modelName] || {}));
-                    // Execute owner query
-                    const { data: result } = yield (0, client_1.getClient)().models[modelName][ownerQueryName]({ owner, authMode }, authModeParams);
+                    const model = (_b = client.models) === null || _b === void 0 ? void 0 : _b[modelName];
+                    // Execute owner query (try canonical owner first, then legacy owner formats)
+                    const ownersToTry = Array.isArray(ownerCandidates) && ownerCandidates.length > 0
+                        ? ownerCandidates
+                        : owner
+                            ? [owner]
+                            : [];
+                    if (!(model === null || model === void 0 ? void 0 : model[ownerQueryName]) || ownersToTry.length === 0) {
+                        throw new Error(`owner query not available or owner missing: ${modelName}.${ownerQueryName}`);
+                    }
+                    let result = null;
+                    let usedOwner = null;
+                    for (const candidateOwner of ownersToTry) {
+                        (0, config_1.debugLog)(`🍬 ${modelName} list owner-query attempt`, `[${ownerQueryName}]`, { owner: candidateOwner, authMode });
+                        // Generated secondary index query typically expects { owner } only.
+                        const { data } = yield model[ownerQueryName]({ owner: candidateOwner }, authModeParams);
+                        const items = ((data === null || data === void 0 ? void 0 : data.items) || (data === null || data === void 0 ? void 0 : data.data) || data || []).filter((item) => item !== null);
+                        if (items.length > 0) {
+                            result = data;
+                            usedOwner = candidateOwner;
+                            break;
+                        }
+                        // If empty, try next candidate (legacy owner format)
+                    }
+                    if (usedOwner && usedOwner !== ownersToTry[0]) {
+                        (0, config_1.debugWarn)(`🍬 ${modelName} list: owner-query returned results only for legacy owner format`, { tried: ownersToTry, usedOwner });
+                    }
                     // Extract result data + filter null values
                     const items = ((result === null || result === void 0 ? void 0 : result.items) || (result === null || result === void 0 ? void 0 : result.data) || result || []).filter((item) => item !== null);
                     // Apply filter (if client-side filtering needed)
@@ -631,9 +740,11 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 }
                 catch (error) {
                     // Check if the error is because the owner query doesn't exist
-                    if (((_b = error === null || error === void 0 ? void 0 : error.message) === null || _b === void 0 ? void 0 : _b.includes("not found")) ||
-                        ((_c = error === null || error === void 0 ? void 0 : error.message) === null || _c === void 0 ? void 0 : _c.includes("is not a function")) ||
-                        ((_d = error === null || error === void 0 ? void 0 : error.message) === null || _d === void 0 ? void 0 : _d.includes("is undefined"))) {
+                    if (((_c = error === null || error === void 0 ? void 0 : error.message) === null || _c === void 0 ? void 0 : _c.includes("not found")) ||
+                        ((_d = error === null || error === void 0 ? void 0 : error.message) === null || _d === void 0 ? void 0 : _d.includes("is not a function")) ||
+                        ((_e = error === null || error === void 0 ? void 0 : error.message) === null || _e === void 0 ? void 0 : _e.includes("is undefined")) ||
+                        ((_f = error === null || error === void 0 ? void 0 : error.message) === null || _f === void 0 ? void 0 : _f.includes("owner query not available")) ||
+                        ((_g = error === null || error === void 0 ? void 0 : error.message) === null || _g === void 0 ? void 0 : _g.includes("owner missing"))) {
                         console.warn(`🍬 ${ownerQueryName} query not found. Trying default list query...`);
                         // Try default list query if owner query not found
                         const { data: result } = yield (0, client_1.getClient)().models[modelName].list({}, authModeParams);
@@ -688,7 +799,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 }
             }
             catch (error) {
-                console.log("🍬 error", error);
+                (0, config_1.debugLog)("🍬 error", error);
                 console.error(`🍬 ${modelName} list error:`, error);
                 // Invalidate list query cache on error
                 const queryKey = [
@@ -697,6 +808,8 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     JSON.stringify(options.filter),
                 ];
                 query_1.queryClient.invalidateQueries({ queryKey });
+                if (options === null || options === void 0 ? void 0 : options.throwOnError)
+                    throw error;
                 return [];
             }
         }),
@@ -726,7 +839,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 const previousDataMap = yield performOptimisticUpdate(query_1.queryClient, modelName, relatedQueryKeys, itemId, cleanedData);
                 try {
                     // Attempt API call - apply auth mode
-                    console.log(`🍬 ${modelName} update attempt [Auth: ${authMode}]:`, itemId);
+                    (0, config_1.debugLog)(`🍬 ${modelName} update attempt [Auth: ${authMode}]:`, itemId);
                     const { data: updatedItem } = yield (0, client_1.getClient)().models[modelName].update(cleanedData, authModeParams);
                     if (updatedItem) {
                         // Update cache on API success
@@ -736,7 +849,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             queryKey: [modelName],
                             refetchType: "active",
                         });
-                        console.log(`🍬 ${modelName} update success:`, itemId);
+                        (0, config_1.debugLog)(`🍬 ${modelName} update success:`, itemId);
                         return updatedItem;
                     }
                     else {
@@ -794,9 +907,9 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 });
                 try {
                     // API call - apply auth mode
-                    console.log(`🍬 ${modelName} delete attempt [Auth: ${authMode}]:`, id);
+                    (0, config_1.debugLog)(`🍬 ${modelName} delete attempt [Auth: ${authMode}]:`, id);
                     yield (0, client_1.getClient)().models[modelName].delete({ id }, authModeParams);
-                    console.log(`🍬 ${modelName} delete success:`, id);
+                    (0, config_1.debugLog)(`🍬 ${modelName} delete success:`, id);
                     // On API success, invalidate all related queries to automatically refresh
                     relatedQueryKeys.forEach((queryKey) => query_1.queryClient.invalidateQueries({
                         queryKey,
@@ -863,7 +976,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     });
                 });
                 try {
-                    console.log(`🍬 ${modelName} batch delete attempt [Auth: ${authMode}]: ${ids.length} items`);
+                    (0, config_1.debugLog)(`🍬 ${modelName} batch delete attempt [Auth: ${authMode}]: ${ids.length} items`);
                     // Parallel API calls - apply auth mode
                     const deletePromises = ids.map((id) => __awaiter(this, void 0, void 0, function* () {
                         try {
@@ -912,7 +1025,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: itemKey(modelName, id) }));
-                    console.log(`🍬 ${modelName} batch delete: ${results.success.length} items deleted, ${results.failed.length} items failed`);
+                    (0, config_1.debugLog)(`🍬 ${modelName} batch delete: ${results.success.length} items deleted, ${results.failed.length} items failed`);
                     return results;
                 }
                 catch (generalError) {
@@ -959,11 +1072,11 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 try {
                     if (existingItem) {
                         // Use update logic if item exists - apply auth mode
-                        console.log(`🍬 ${modelName} upsert(update) attempt [Auth: ${authMode}]:`, data.id);
+                        (0, config_1.debugLog)(`🍬 ${modelName} upsert(update) attempt [Auth: ${authMode}]:`, data.id);
                         const { data: updatedItem } = yield (0, client_1.getClient)().models[modelName].update(cleanedData, authModeParams);
                         if (updatedItem) {
                             handleCacheUpdateOnSuccess(query_1.queryClient, modelName, relatedQueryKeys, data.id, updatedItem);
-                            console.log(`🍬 ${modelName} upsert(update) success:`, data.id);
+                            (0, config_1.debugLog)(`🍬 ${modelName} upsert(update) success:`, data.id);
                             return updatedItem;
                         }
                         else {
@@ -975,11 +1088,11 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     }
                     else {
                         // Use create logic if item doesn't exist - apply auth mode
-                        console.log(`🍬 ${modelName} upsert(create) attempt [Auth: ${authMode}]:`, data.id);
+                        (0, config_1.debugLog)(`🍬 ${modelName} upsert(create) attempt [Auth: ${authMode}]:`, data.id);
                         const { data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(cleanedData, authModeParams);
                         if (createdItem) {
                             handleCacheUpdateOnSuccess(query_1.queryClient, modelName, relatedQueryKeys, data.id, createdItem);
-                            console.log(`🍬 ${modelName} upsert(create) success:`, data.id);
+                            (0, config_1.debugLog)(`🍬 ${modelName} upsert(create) success:`, data.id);
                             return createdItem;
                         }
                         else {
@@ -1003,7 +1116,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
             }
         }),
         // Index-based query (added method)
-        customList: (queryName_1, args_1, ...args_2) => __awaiter(this, [queryName_1, args_1, ...args_2], void 0, function* (queryName, args, options = { forceRefresh: false }) {
+        customList: (queryName_1, args_1, ...args_2) => __awaiter(this, [queryName_1, args_1, ...args_2], void 0, function* (queryName, args, options = { forceRefresh: false, throwOnError: false }) {
             var _a;
             try {
                 // Determine auth mode (use provided options if available)
@@ -1043,11 +1156,11 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 if (!options.forceRefresh) {
                     const cachedItems = query_1.queryClient.getQueryData(queryKey);
                     if (cachedItems && cachedItems.length > 0) {
-                        console.log(`🍬 ${modelName} ${queryName} using cache`);
+                        (0, config_1.debugLog)(`🍬 ${modelName} ${queryName} using cache`);
                         return cachedItems.filter((item) => item !== null);
                     }
                 }
-                console.log(`🍬 ${modelName} customList call [Auth: ${authMode}]:`, queryName, enhancedArgs);
+                (0, config_1.debugLog)(`🍬 ${modelName} customList call [Auth: ${authMode}]:`, queryName, enhancedArgs);
                 // Check if index query method exists
                 if (!((_a = (0, client_1.getClient)().models[modelName]) === null || _a === void 0 ? void 0 : _a[queryName])) {
                     throw new Error(`🍬 Query ${queryName} does not exist.`);
@@ -1056,7 +1169,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 const { data: result } = yield (0, client_1.getClient)().models[modelName][queryName](enhancedArgs, authModeParams);
                 // Extract result data
                 const items = (result === null || result === void 0 ? void 0 : result.items) || (result === null || result === void 0 ? void 0 : result.data) || result || [];
-                console.log(`🍬 ${modelName} ${queryName} result:`, items.length, "items");
+                (0, config_1.debugLog)(`🍬 ${modelName} ${queryName} result:`, items.length, "items");
                 // Filter null values
                 const filteredItems = items.filter((item) => item !== null);
                 // Update cache
@@ -1104,6 +1217,8 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         query_1.queryClient.invalidateQueries({ queryKey });
                     }
                 }
+                if (options === null || options === void 0 ? void 0 : options.throwOnError)
+                    throw error;
                 return [];
             }
         }),
@@ -1151,24 +1266,37 @@ function createAmplifyService(modelName, defaultAuthMode) {
             ]);
             // Determine query function
             const queryFn = (0, react_1.useCallback)((context) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
+                var _a, _b, _c;
+                (0, config_1.debugLog)(`🍬 ${modelName} useHook queryFn called`, {
+                    queryKey,
+                    isRefetch: (_a = context.meta) === null || _a === void 0 ? void 0 : _a.refetch,
+                    customList: (_b = options === null || options === void 0 ? void 0 : options.customList) === null || _b === void 0 ? void 0 : _b.queryName,
+                });
                 if (options === null || options === void 0 ? void 0 : options.customList) {
-                    console.log(`🍬 ${modelName} useHook customList call:`, options.customList.queryName, options.customList.args, options.customList.forceRefresh);
-                    return service.customList(options.customList.queryName, options.customList.args, { forceRefresh: options.customList.forceRefresh });
+                    (0, config_1.debugLog)(`🍬 ${modelName} useHook customList call:`, options.customList.queryName, options.customList.args, options.customList.forceRefresh);
+                    const result = yield service.customList(options.customList.queryName, options.customList.args, { forceRefresh: options.customList.forceRefresh });
+                    (0, config_1.debugLog)(`🍬 ${modelName} useHook customList result:`, (result === null || result === void 0 ? void 0 : result.length) || 0, "items");
+                    return result;
                 }
-                if ((_a = options === null || options === void 0 ? void 0 : options.initialFetchOptions) === null || _a === void 0 ? void 0 : _a.filter) {
-                    return service.list({
+                if ((_c = options === null || options === void 0 ? void 0 : options.initialFetchOptions) === null || _c === void 0 ? void 0 : _c.filter) {
+                    const result = yield service.list({
                         filter: options.initialFetchOptions.filter,
                         forceRefresh: true,
                     });
+                    (0, config_1.debugLog)(`🍬 ${modelName} useHook list (filtered) result:`, (result === null || result === void 0 ? void 0 : result.length) || 0, "items");
+                    return result;
                 }
-                return service.list();
+                const result = yield service.list();
+                (0, config_1.debugLog)(`🍬 ${modelName} useHook list result:`, (result === null || result === void 0 ? void 0 : result.length) || 0, "items");
+                return result;
             }), [
                 (_d = options === null || options === void 0 ? void 0 : options.initialFetchOptions) === null || _d === void 0 ? void 0 : _d.filter,
                 (_e = options === null || options === void 0 ? void 0 : options.customList) === null || _e === void 0 ? void 0 : _e.queryName,
                 (_f = options === null || options === void 0 ? void 0 : options.customList) === null || _f === void 0 ? void 0 : _f.args,
                 (_g = options === null || options === void 0 ? void 0 : options.customList) === null || _g === void 0 ? void 0 : _g.forceRefresh,
                 service,
+                modelName,
+                queryKey,
             ]);
             const realtimeEnabled = ((_h = options === null || options === void 0 ? void 0 : options.realtime) === null || _h === void 0 ? void 0 : _h.enabled) === true;
             const realtimeEvents = (_k = (_j = options === null || options === void 0 ? void 0 : options.realtime) === null || _j === void 0 ? void 0 : _j.events) !== null && _k !== void 0 ? _k : ["create", "update", "delete"];
@@ -1177,12 +1305,39 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 queryFn,
                 enabled: ((_l = options === null || options === void 0 ? void 0 : options.initialFetchOptions) === null || _l === void 0 ? void 0 : _l.fetch) !== false && !realtimeEnabled,
                 staleTime: 1000 * 30, // Keep fresh for 30 seconds (refresh more frequently)
+                gcTime: 1000 * 60 * 5, // Keep in cache for 5 minutes (prevents data from being garbage collected)
                 refetchOnMount: true, // Refetch on component mount
                 refetchOnWindowFocus: false, // Don't auto-refetch on window focus
                 refetchOnReconnect: true, // Refetch on network reconnect
+                // Keep previous data during refetch to prevent UI flicker
+                // This ensures data persists during refetch operations
+                placeholderData: (previousData) => {
+                    (0, config_1.debugLog)(`🍬 ${modelName} useHook placeholderData called - previous data:`, (previousData === null || previousData === void 0 ? void 0 : previousData.length) || 0, "items");
+                    return previousData;
+                },
             };
             const [isSynced, setIsSynced] = (0, react_1.useState)(undefined);
             const { data: items = [], isLoading, error, refetch, } = (0, react_query_1.useQuery)(queryOptions);
+            // Log data changes (debug only) - avoid spamming when nothing changed
+            const lastDebugStateRef = (0, react_1.useRef)(null);
+            (0, react_1.useEffect)(() => {
+                if (!(0, config_1.isDebugEnabled)())
+                    return;
+                const nextState = {
+                    itemsCount: (items === null || items === void 0 ? void 0 : items.length) || 0,
+                    isLoading: Boolean(isLoading),
+                    hasError: Boolean(error),
+                };
+                const prev = lastDebugStateRef.current;
+                if (prev &&
+                    prev.itemsCount === nextState.itemsCount &&
+                    prev.isLoading === nextState.isLoading &&
+                    prev.hasError === nextState.hasError) {
+                    return;
+                }
+                lastDebugStateRef.current = nextState;
+                (0, config_1.debugLog)(`🍬 ${modelName} useHook data changed:`, Object.assign(Object.assign({}, nextState), { queryKey }));
+            }, [items === null || items === void 0 ? void 0 : items.length, isLoading, error, modelName, queryKey]);
             (0, react_1.useEffect)(() => {
                 var _a, _b, _c, _d, _e, _f;
                 if (!realtimeEnabled)
@@ -1244,6 +1399,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     observeOptions.filter = options.initialFetchOptions.filter;
                 }
                 let isMounted = true;
+                let lastSynced = undefined;
                 const subscription = model.observeQuery(observeOptions).subscribe({
                     next: ({ items: nextItems, isSynced: synced }) => {
                         if (!isMounted)
@@ -1252,23 +1408,21 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             ? nextItems.filter(Boolean)
                             : [];
                         const previousItems = hookQueryClient.getQueryData(queryKey) || [];
-                        const previousIds = new Set(previousItems.map((item) => item === null || item === void 0 ? void 0 : item.id).filter(Boolean));
-                        const nextIds = new Set(safeItems.map((item) => item === null || item === void 0 ? void 0 : item.id).filter(Boolean));
-                        previousIds.forEach((id) => {
-                            if (!nextIds.has(id)) {
-                                hookQueryClient.removeQueries({
-                                    queryKey: itemKey(modelName, id),
-                                    exact: true,
-                                });
-                            }
-                        });
+                        const nextSynced = Boolean(synced);
+                        if (lastSynced !== nextSynced) {
+                            lastSynced = nextSynced;
+                            setIsSynced(nextSynced);
+                        }
+                        // Avoid cache thrash: observeQuery can emit repeatedly even when data didn't change.
+                        if (areItemArraysEquivalentById(previousItems, safeItems)) {
+                            return;
+                        }
                         hookQueryClient.setQueryData(queryKey, safeItems);
                         safeItems.forEach((item) => {
                             if (item === null || item === void 0 ? void 0 : item.id) {
                                 hookQueryClient.setQueryData(itemKey(modelName, item.id), item);
                             }
                         });
-                        setIsSynced(Boolean(synced));
                     },
                     error: (err) => {
                         console.error(`🍬 ${modelName} useHook realtime subscribe error:`, err);
@@ -1372,32 +1526,57 @@ function createAmplifyService(modelName, defaultAuthMode) {
             }), [service, refetch] // refetch dependency added
             );
             const refresh = (0, react_1.useCallback)((refreshOptions) => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
-                console.log(`🍬 ${modelName} useHook refresh called`, queryKey);
-                // IMPORTANT:
-                // TanStack Query's refetch() re-runs queryFn, but our service.list/customList can short-circuit
-                // and return cached data unless forceRefresh is true.
-                // refresh() must guarantee a network fetch to reflect server-side updates.
+                var _a;
+                (0, config_1.debugLog)(`🍬 ${modelName} useHook refresh called`, queryKey);
+                // IMPORTANT: refresh must always fetch from server (no cache).
+                // We do this by calling service.list/customList with forceRefresh: true.
+                const currentData = hookQueryClient.getQueryData(queryKey);
+                (0, config_1.debugLog)(`🍬 ${modelName} useHook refresh - current data before server refresh:`, (currentData === null || currentData === void 0 ? void 0 : currentData.length) || 0, "items");
                 try {
+                    // If filter is provided and different from current filter, we'd need a new query key.
+                    // For now, we ignore refreshOptions.filter and refresh the current hook query only.
+                    if (refreshOptions === null || refreshOptions === void 0 ? void 0 : refreshOptions.filter) {
+                        console.warn(`🍬 ${modelName} useHook refresh: refreshOptions.filter is currently ignored (queryKey is fixed per hook instance).`);
+                    }
+                    let newData = [];
                     if (options === null || options === void 0 ? void 0 : options.customList) {
-                        return yield service.customList(options.customList.queryName, options.customList.args, { forceRefresh: true });
+                        newData = yield service.customList(options.customList.queryName, options.customList.args, { forceRefresh: true, throwOnError: true });
+                    }
+                    else if ((_a = options === null || options === void 0 ? void 0 : options.initialFetchOptions) === null || _a === void 0 ? void 0 : _a.filter) {
+                        newData = yield service.list({
+                            filter: options.initialFetchOptions.filter,
+                            forceRefresh: true,
+                            throwOnError: true,
+                        });
                     }
-                    const mergedFilter = (_a = refreshOptions === null || refreshOptions === void 0 ? void 0 : refreshOptions.filter) !== null && _a !== void 0 ? _a : (_b = options === null || options === void 0 ? void 0 : options.initialFetchOptions) === null || _b === void 0 ? void 0 : _b.filter;
-                    if (mergedFilter) {
-                        return yield service.list({
-                            filter: mergedFilter,
+                    else {
+                        newData = yield service.list({
                             forceRefresh: true,
+                            throwOnError: true,
                         });
                     }
-                    return yield service.list({ forceRefresh: true });
+                    (0, config_1.debugLog)(`🍬 ${modelName} useHook refresh - server refresh result:`, (newData === null || newData === void 0 ? void 0 : newData.length) || 0, "items");
+                    // Keep hook cache in sync with hook's queryKey.
+                    hookQueryClient.setQueryData(queryKey, newData);
+                    return newData || [];
                 }
                 catch (e) {
-                    // Keep previous behavior of surfacing errors via refetch when desired
-                    // while still logging consistently.
                     console.error(`🍬 ${modelName} useHook refresh error:`, e);
-                    throw e;
+                    // On error, restore previous data if available (prevents list flashing empty)
+                    if (currentData && currentData.length > 0) {
+                        hookQueryClient.setQueryData(queryKey, currentData);
+                        return currentData;
+                    }
+                    return [];
                 }
-            }), [modelName, options === null || options === void 0 ? void 0 : options.customList, (_p = options === null || options === void 0 ? void 0 : options.initialFetchOptions) === null || _p === void 0 ? void 0 : _p.filter, queryKey, service]);
+            }), [
+                modelName,
+                queryKey,
+                hookQueryClient,
+                service,
+                options === null || options === void 0 ? void 0 : options.customList,
+                (_p = options === null || options === void 0 ? void 0 : options.initialFetchOptions) === null || _p === void 0 ? void 0 : _p.filter,
+            ]);
             const customListFn = (0, react_1.useCallback)((queryName, args, options) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const result = yield service.customList(queryName, args, options);
@@ -1425,7 +1604,10 @@ function createAmplifyService(modelName, defaultAuthMode) {
         useItemHook: (id, options) => {
             var _a, _b;
             const hookQueryClient = (0, react_query_1.useQueryClient)();
-            const singleItemQueryKey = itemKey(modelName, id);
+            // Runtime safety: avoid non-string ids creating broken query keys like
+            // ["User","item",[...]] which can cause cache thrash/flicker.
+            const safeId = typeof id === "string" ? id : "";
+            const singleItemQueryKey = itemKey(modelName, safeId);
             const realtimeEnabled = ((_a = options === null || options === void 0 ? void 0 : options.realtime) === null || _a === void 0 ? void 0 : _a.enabled) === true;
             // First check data from cache
             const rawCachedData = hookQueryClient.getQueryData(singleItemQueryKey);
@@ -1433,32 +1615,27 @@ function createAmplifyService(modelName, defaultAuthMode) {
             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);
+                const matchingItem = rawCachedData.find((item) => (item === null || item === void 0 ? void 0 : item.id) === safeId);
                 cachedData = matchingItem || undefined;
-                // 배열이 캐시되어 있으면 조용히 캐시를 제거 (무한 루프 방지)
-                setTimeout(() => {
-                    hookQueryClient.removeQueries({
-                        queryKey: singleItemQueryKey,
-                        exact: true,
-                    });
-                }, 0);
+                // Normalize the cache in-place instead of deleting it (deleting causes UI flicker).
+                hookQueryClient.setQueryData(singleItemQueryKey, matchingItem !== null && matchingItem !== void 0 ? matchingItem : null);
             }
             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.`);
+                console.warn(`🍬 ${modelName} useItemHook: Cache ID mismatch! Requested: ${safeId}, 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)({
                 queryKey: singleItemQueryKey,
-                queryFn: () => service.get(id),
+                queryFn: () => service.get(safeId),
                 initialData: cachedData, // Use cached data as initial value if available
                 staleTime: 1000 * 60, // Keep data "fresh" for 1 minute
                 refetchOnMount: cachedData ? false : true, // Only refetch if no cached data
                 refetchOnWindowFocus: false, // Disable window focus refetch to prevent loops
-                enabled: !!id && !realtimeEnabled, // Only enable query when id exists
+                enabled: !!safeId && !realtimeEnabled, // Only enable query when id exists
             });
             const [isSynced, setIsSynced] = (0, react_1.useState)(undefined);
             (0, react_1.useEffect)(() => {
@@ -1476,6 +1653,11 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     observeOptions.filter = { id: { eq: id } };
                 }
                 let isMounted = true;
+                let lastSynced = undefined;
+                // observeQuery can temporarily emit empty items during sync/reconnect, even when the item
+                // still exists on the server. If we immediately set the cache to null, UI flickers.
+                // When observeQuery reports "missing", confirm with a server get (forceRefresh) before clearing.
+                let lastMissingConfirmAt = 0;
                 const subscription = model.observeQuery(observeOptions).subscribe({
                     next: ({ items: nextItems, isSynced: synced }) => {
                         if (!isMounted)
@@ -1484,6 +1666,44 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             ? nextItems.filter(Boolean)
                             : [];
                         const nextItem = safeItems.find((entry) => (entry === null || entry === void 0 ? void 0 : entry.id) === id) || null;
+                        const nextSynced = Boolean(synced);
+                        if (lastSynced !== nextSynced) {
+                            lastSynced = nextSynced;
+                            setIsSynced(nextSynced);
+                        }
+                        const prevItem = hookQueryClient.getQueryData(singleItemQueryKey);
+                        if (!nextItem) {
+                            // Never clear immediately. During sync/reconnect observeQuery can be temporarily empty.
+                            if (!nextSynced)
+                                return;
+                            const now = Date.now();
+                            // Throttle server confirmations to avoid loops.
+                            if (now - lastMissingConfirmAt < 2000)
+                                return;
+                            lastMissingConfirmAt = now;
+                            void (() => __awaiter(this, void 0, void 0, function* () {
+                                try {
+                                    const latest = yield service.get(id, { forceRefresh: true });
+                                    if (!isMounted)
+                                        return;
+                                    if (latest) {
+                                        hookQueryClient.setQueryData(singleItemQueryKey, latest);
+                                    }
+                                    else {
+                                        hookQueryClient.setQueryData(singleItemQueryKey, null);
+                                    }
+                                }
+                                catch (e) {
+                                    // If confirm fails, keep existing cache (avoid flicker)
+                                    (0, config_1.debugWarn)(`🍬 ${modelName} useItemHook realtime missing confirm error:`, e);
+                                }
+                            }))();
+                            return;
+                        }
+                        if (signatureForModelItem(prevItem) === signatureForModelItem(nextItem)) {
+                            // Avoid thrashing caches when observeQuery emits identical item repeatedly
+                            return;
+                        }
                         const relatedQueryKeys = findRelatedQueryKeys(modelName, hookQueryClient);
                         if (nextItem) {
                             hookQueryClient.setQueryData(singleItemQueryKey, nextItem);
@@ -1504,19 +1724,6 @@ function createAmplifyService(modelName, defaultAuthMode) {
                                 });
                             });
                         }
-                        else {
-                            hookQueryClient.setQueryData(singleItemQueryKey, null);
-                            relatedQueryKeys.forEach((queryKey) => {
-                                if (isItemKeyForModel(modelName, queryKey)) {
-                                    return;
-                                }
-                                hookQueryClient.setQueryData(queryKey, (oldData) => {
-                                    const oldItems = Array.isArray(oldData) ? oldData : [];
-                                    return oldItems.filter((entry) => (entry === null || entry === void 0 ? void 0 : entry.id) !== id);
-                                });
-                            });
-                        }
-                        setIsSynced(Boolean(synced));
                     },
                     error: (err) => {
                         console.error(`🍬 ${modelName} useItemHook realtime subscribe error:`, err);
@@ -1548,14 +1755,31 @@ function createAmplifyService(modelName, defaultAuthMode) {
             });
             // Interface function implementations
             const refreshItem = (0, react_1.useCallback)(() => __awaiter(this, void 0, void 0, function* () {
-                console.log(`🍬 ${modelName} useItemHook refresh called`, singleItemQueryKey);
-                // IMPORTANT:
-                // refetch() re-runs queryFn which calls service.get(id) (default forceRefresh=false).
-                // If cache exists, service.get will return cached data and never hit the network.
-                // refresh() must guarantee a network fetch to reflect server-side updates.
-                const latest = yield service.get(id, { forceRefresh: true });
-                return latest || null;
-            }), [id, modelName, service, singleItemQueryKey]); // Added id/modelName for correctness
+                (0, config_1.debugLog)(`🍬 ${modelName} useItemHook refresh called`, singleItemQueryKey);
+                // IMPORTANT: Use hookQueryClient.refetchQueries() or refetch() instead of service.get()
+                // to ensure we're updating the same QueryClient instance that useQuery uses.
+                // This prevents data from disappearing during refetch.
+                try {
+                    // First, fetch fresh data with forceRefresh
+                    const latest = yield service.get(id, { forceRefresh: true });
+                    // Update the hookQueryClient cache to sync with the fetched data
+                    if (latest) {
+                        hookQueryClient.setQueryData(singleItemQueryKey, latest);
+                    }
+                    else {
+                        hookQueryClient.setQueryData(singleItemQueryKey, null);
+                    }
+                    // Also trigger refetch to ensure UI updates
+                    yield refetch();
+                    return latest || null;
+                }
+                catch (error) {
+                    console.error(`🍬 ${modelName} useItemHook refresh error:`, error);
+                    // On error, still try to refetch to get current state
+                    const refetchResult = yield refetch();
+                    return refetchResult.data || null;
+                }
+            }), [id, modelName, service, singleItemQueryKey, hookQueryClient, refetch]);
             const updateItem = (0, react_1.useCallback)((data) => __awaiter(this, void 0, void 0, function* () {
                 // No additional work needed here as cache is already updated in service.update
                 try {