amplifyquery 2.0.5 → 2.0.7

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { getClient } from "./client";
-import { queryClient, getQueryClient, createQueryKeys, invalidateModel, invalidateModelItem, invalidateModelByField, invalidateAll, ensureMutationsFlushed } from "./query";
+import { queryClient, getQueryClient, attachQueryClient, detachQueryClient, createQueryKeys, invalidateModel, invalidateModelItem, invalidateModelByField, invalidateAll, ensureMutationsFlushed } from "./query";
 import { createAmplifyService } from "./service";
 import { createSingletonService } from "./singleton";
 import { AmplifyQueryConfig } from "./types";
@@ -30,7 +30,7 @@ import { setModelOwnerQueryMap, setDefaultAuthMode, getModelOwnerQueryMap, getDe
  */
 export declare function configure(config: AmplifyQueryConfig): void;
 export * from "./types";
-export { queryClient, getQueryClient, invalidateModel, invalidateModelItem, invalidateModelByField, invalidateAll, ensureMutationsFlushed, createQueryKeys, };
+export { queryClient, getQueryClient, attachQueryClient, detachQueryClient, invalidateModel, invalidateModelItem, invalidateModelByField, invalidateAll, ensureMutationsFlushed, createQueryKeys, };
 export { getClient };
 export * from "./provider";
 export declare const Utils: {

package/dist/index.js

@@ -14,13 +14,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AmplifyQuery = exports.getAppUrl = exports.setAppUrl = exports.Auth = exports.Utils = exports.getClient = exports.createQueryKeys = exports.ensureMutationsFlushed = exports.invalidateAll = exports.invalidateModelByField = exports.invalidateModelItem = exports.invalidateModel = exports.getQueryClient = exports.queryClient = void 0;
+exports.AmplifyQuery = exports.getAppUrl = exports.setAppUrl = exports.Auth = exports.Utils = exports.getClient = exports.createQueryKeys = exports.ensureMutationsFlushed = exports.invalidateAll = exports.invalidateModelByField = exports.invalidateModelItem = exports.invalidateModel = exports.detachQueryClient = exports.attachQueryClient = exports.getQueryClient = exports.queryClient = void 0;
 exports.configure = configure;
 const client_1 = require("./client");
 Object.defineProperty(exports, "getClient", { enumerable: true, get: function () { return client_1.getClient; } });
 const query_1 = require("./query");
 Object.defineProperty(exports, "queryClient", { enumerable: true, get: function () { return query_1.queryClient; } });
 Object.defineProperty(exports, "getQueryClient", { enumerable: true, get: function () { return query_1.getQueryClient; } });
+Object.defineProperty(exports, "attachQueryClient", { enumerable: true, get: function () { return query_1.attachQueryClient; } });
+Object.defineProperty(exports, "detachQueryClient", { enumerable: true, get: function () { return query_1.detachQueryClient; } });
 Object.defineProperty(exports, "createQueryKeys", { enumerable: true, get: function () { return query_1.createQueryKeys; } });
 Object.defineProperty(exports, "invalidateModel", { enumerable: true, get: function () { return query_1.invalidateModel; } });
 Object.defineProperty(exports, "invalidateModelItem", { enumerable: true, get: function () { return query_1.invalidateModelItem; } });

package/dist/query.d.ts

@@ -17,6 +17,22 @@ export declare let queryClient: QueryClient;
  * @returns The QueryClient instance
  */
 export declare function getQueryClient(): QueryClient;
+/**
+ * Attach an external QueryClient (e.g. app-level QueryClientProvider client).
+ *
+ * Why:
+ * - `useHook` uses the app's QueryClient from context.
+ * - Direct service calls (e.g. `AmplifyService.Model.create()`) historically updated ONLY the internal singleton client,
+ *   so hook caches would not update.
+ *
+ * Attaching lets BOTH direct service calls and hooks operate on the same QueryClient.
+ */
+export declare function attachQueryClient(externalClient: QueryClient): void;
+/**
+ * Detach and revert to the internal QueryClient.
+ * (Mostly useful for tests or advanced setups.)
+ */
+export declare function detachQueryClient(): void;
 /**
  * AmplifyQuery configuration
  * @param options Configuration options

package/dist/query.js

@@ -11,6 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryClient = void 0;
 exports.getQueryClient = getQueryClient;
+exports.attachQueryClient = attachQueryClient;
+exports.detachQueryClient = detachQueryClient;
 exports.configure = configure;
 exports.createQueryKeys = createQueryKeys;
 exports.invalidateModel = invalidateModel;
@@ -118,10 +120,46 @@ function createMmkvPersister() {
         },
     };
 }
+function setupPersistenceFor(client) {
+    var _a;
+    if (!config.isCachingEnabled) {
+        (0, config_1.debugLog)("🏃‍♀️ React Query offline cache is disabled via flag.");
+        return;
+    }
+    (0, config_1.debugLog)("🏃‍♀️ React Query offline cache is enabled with MMKV.");
+    // Create new persister if config changed
+    const mmkvPersister = createMmkvPersister();
+    try {
+        // Lazy-load persistQueryClient to avoid hard dependency resolution at build time.
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const { persistQueryClient } = require("@tanstack/react-query-persist-client");
+        persistQueryClient({
+            queryClient: client,
+            persister: mmkvPersister,
+            // Additional options
+            maxAge: ((_a = config.storage) === null || _a === void 0 ? void 0 : _a.maxAge) || 1000 * 60 * 60 * 24 * 7, // Default 7 days
+            dehydrateOptions: {
+                shouldDehydrateQuery: (query) => {
+                    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;
+                },
+            },
+        });
+    }
+    catch (e) {
+        console.error("Error setting up React Query persistence:", e);
+    }
+}
 /**
  * TanStack Query client
  */
 exports.queryClient = new react_query_1.QueryClient(config.queryClientConfig);
+let internalQueryClient = exports.queryClient;
+let isExternalClientAttached = false;
 /**
  * Get the current query client instance
  * @returns The QueryClient instance
@@ -129,12 +167,41 @@ exports.queryClient = new react_query_1.QueryClient(config.queryClientConfig);
 function getQueryClient() {
     return exports.queryClient;
 }
+/**
+ * Attach an external QueryClient (e.g. app-level QueryClientProvider client).
+ *
+ * Why:
+ * - `useHook` uses the app's QueryClient from context.
+ * - Direct service calls (e.g. `AmplifyService.Model.create()`) historically updated ONLY the internal singleton client,
+ *   so hook caches would not update.
+ *
+ * Attaching lets BOTH direct service calls and hooks operate on the same QueryClient.
+ */
+function attachQueryClient(externalClient) {
+    if (!externalClient)
+        return;
+    if (exports.queryClient === externalClient)
+        return;
+    exports.queryClient = externalClient;
+    isExternalClientAttached = true;
+    // Best-effort: also enable persistence on the external client if configured.
+    setupPersistenceFor(exports.queryClient);
+}
+/**
+ * Detach and revert to the internal QueryClient.
+ * (Mostly useful for tests or advanced setups.)
+ */
+function detachQueryClient() {
+    if (!isExternalClientAttached)
+        return;
+    exports.queryClient = internalQueryClient;
+    isExternalClientAttached = false;
+}
 /**
  * AmplifyQuery configuration
  * @param options Configuration options
  */
 function configure(options = {}) {
-    var _a;
     // Backup previous config
     const prevConfig = Object.assign({}, config);
     // Apply new config
@@ -143,41 +210,14 @@ function configure(options = {}) {
     if (options.queryClientConfig &&
         JSON.stringify(options.queryClientConfig) !==
             JSON.stringify(prevConfig.queryClientConfig)) {
-        exports.queryClient = new react_query_1.QueryClient(config.queryClientConfig);
-    }
-    // Apply caching config
-    if (config.isCachingEnabled) {
-        (0, config_1.debugLog)("🏃‍♀️ React Query offline cache is enabled with MMKV.");
-        // Create new persister if config changed
-        const mmkvPersister = createMmkvPersister();
-        try {
-            // Lazy-load persistQueryClient to avoid hard dependency resolution at build time.
-            // eslint-disable-next-line @typescript-eslint/no-var-requires
-            const { persistQueryClient } = require("@tanstack/react-query-persist-client");
-            persistQueryClient({
-                queryClient: exports.queryClient,
-                persister: mmkvPersister,
-                // Additional options
-                maxAge: ((_a = config.storage) === null || _a === void 0 ? void 0 : _a.maxAge) || 1000 * 60 * 60 * 24 * 7, // Default 7 days
-                dehydrateOptions: {
-                    shouldDehydrateQuery: (query) => {
-                        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;
-                    },
-                },
-            });
-        }
-        catch (e) {
-            console.error("Error setting up React Query persistence:", e);
+        internalQueryClient = new react_query_1.QueryClient(config.queryClientConfig);
+        // Only swap the exported client if we aren't bound to an external one.
+        if (!isExternalClientAttached) {
+            exports.queryClient = internalQueryClient;
         }
     }
-    else {
-        (0, config_1.debugLog)("🏃‍♀️ React Query offline cache is disabled via flag.");
-    }
+    // Apply caching config
+    setupPersistenceFor(exports.queryClient);
 }
 /**
  * Create query keys from model names

package/dist/service.js

@@ -31,7 +31,47 @@ 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}`;
+    // Some list/customList queries may not include `updatedAt` depending on the selection set.
+    // If we only compare by (id, updatedAt|createdAt), we can incorrectly treat real updates
+    // (e.g. status changes) as "no-op" and skip cache updates.
+    //
+    // Use a cheap "version-ish" marker when available, otherwise include a shallow signature.
+    const versionMarker = typeof (item === null || item === void 0 ? void 0 : item._lastChangedAt) === "number"
+        ? String(item._lastChangedAt)
+        : typeof (item === null || item === void 0 ? void 0 : item._version) === "number"
+            ? String(item._version)
+            : typeof (item === null || item === void 0 ? void 0 : item.version) === "number"
+                ? String(item.version)
+                : "";
+    const shallowSig = (() => {
+        if (!item || typeof item !== "object")
+            return "";
+        const keys = Object.keys(item).sort();
+        const parts = [];
+        for (const key of keys) {
+            if (key === "__typename")
+                continue;
+            const v = item[key];
+            if (v === null || v === undefined) {
+                parts.push(`${key}=null`);
+                continue;
+            }
+            const t = typeof v;
+            if (t === "string" || t === "number" || t === "boolean") {
+                parts.push(`${key}=${String(v)}`);
+                continue;
+            }
+            if (Array.isArray(v)) {
+                parts.push(`${key}=[${v.length}]`);
+                continue;
+            }
+            // Object (nested) - avoid deep/large stringify, just mark presence
+            parts.push(`${key}={}`);
+        }
+        // Keep it bounded to avoid huge signatures
+        return parts.join("|").slice(0, 500);
+    })();
+    return `${id}::${updatedAt || ""}::${createdAt || ""}::${versionMarker}::${shallowSig}`;
 }
 function areItemArraysEquivalentById(a, b) {
     if (a === b)
@@ -349,7 +389,11 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 try {
                     // Attempt API call - apply auth mode
                     (0, config_1.debugLog)(`🍬 ${modelName} creation attempt [Auth: ${authMode}]:`, newItem.id);
-                    const { data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(newItem, authModeParams);
+                    // Some Amplify clients return `{ data, errors }` without throwing on errors.
+                    // If `data` is null/undefined, treat it as a failure and rollback.
+                    const res = yield (0, client_1.getClient)().models[modelName].create(newItem, authModeParams);
+                    const createdItem = res === null || res === void 0 ? void 0 : res.data;
+                    const errors = res === null || res === void 0 ? void 0 : res.errors;
                     if (createdItem) {
                         // Update cache on API success
                         query_1.queryClient.setQueryData(singleItemQueryKey, createdItem);
@@ -373,9 +417,10 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         (0, config_1.debugLog)(`🍬 ${modelName} creation successful:`, newItem.id);
                         return createdItem;
                     }
-                    // Keep optimistic update data even if no API response
-                    console.warn(`🍬 ${modelName} creation API no response. Keeping optimistic update data.`);
-                    return newItem;
+                    // No data returned -> treat as error (don't silently keep optimistic item)
+                    console.error(`🍬 ${modelName} creation failed: empty response`, errors ? { errors } : undefined);
+                    rollbackCache(query_1.queryClient, previousDataMap);
+                    throw new Error(`🍬 ${modelName} create returned no data${errors ? " (has errors)" : ""}`);
                 }
                 catch (apiError) {
                     // Rollback and log error on API failure
@@ -471,7 +516,9 @@ 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 res = yield (0, client_1.getClient)().models[modelName].create(newItem, authModeParams);
+                            const createdItem = res === null || res === void 0 ? void 0 : res.data;
+                            const errors = res === null || res === void 0 ? void 0 : res.errors;
                             // Update individual item cache on API success
                             if (createdItem) {
                                 const itemId = createdItem === null || createdItem === void 0 ? void 0 : createdItem.id;
@@ -483,11 +530,21 @@ function createAmplifyService(modelName, defaultAuthMode) {
                                     console.warn(`🍬 ${modelName} createList: Invalid createdItem ID found, skipping cache update:`, itemId, createdItem);
                                 }
                             }
-                            return createdItem || newItem;
+                            if (!createdItem) {
+                                // Treat empty data as failure (Amplify can return { data: null, errors } without throwing)
+                                if (errors === null || errors === void 0 ? void 0 : errors.length) {
+                                    console.error(`🍬 ${modelName} createList: create returned no data (has errors)`, { errors });
+                                }
+                                else {
+                                    console.error(`🍬 ${modelName} createList: create returned no data`);
+                                }
+                                return null;
+                            }
+                            return createdItem;
                         }
                         catch (error) {
                             console.error(`🍬 ${modelName} batch creation failed for ID ${newItem.id}:`, error);
-                            return newItem;
+                            return null;
                         }
                     }));
                     const results = yield Promise.all(createPromises);
@@ -548,7 +605,12 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 // Get parameters based on auth mode
                 const { authModeParams } = yield getOwnerByAuthMode(authMode);
                 // API call - apply auth mode
-                const { data: apiResponse } = yield (0, client_1.getClient)().models[modelName].get({ id }, authModeParams);
+                const res = yield (0, client_1.getClient)().models[modelName].get({ id }, authModeParams);
+                const apiResponse = res === null || res === void 0 ? void 0 : res.data;
+                const errors = res === null || res === void 0 ? void 0 : res.errors;
+                if (!apiResponse && (errors === null || errors === void 0 ? void 0 : errors.length)) {
+                    throw new Error(`🍬 ${modelName} get returned no data (has errors)`);
+                }
                 // Handle case where API returns array instead of single item
                 let item = apiResponse;
                 if (Array.isArray(apiResponse)) {
@@ -633,7 +695,12 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         (0, config_1.debugLog)(`🍬 Debug - Available methods for ${modelName}:`, Object.keys(client.models[modelName] || {}));
                     }
                     // Execute owner query (old-AmplifyQuery behavior)
-                    const { data: result } = yield (0, client_1.getClient)().models[modelName][ownerQueryName]({ owner, authMode }, authModeParams);
+                    const res = yield (0, client_1.getClient)().models[modelName][ownerQueryName]({ owner, authMode }, authModeParams);
+                    const result = res === null || res === void 0 ? void 0 : res.data;
+                    const errors = res === null || res === void 0 ? void 0 : res.errors;
+                    if (!result && (errors === null || errors === void 0 ? void 0 : errors.length)) {
+                        throw new Error(`🍬 ${modelName} ${ownerQueryName} returned no data (has errors)`);
+                    }
                     // 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)
@@ -686,7 +753,12 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         ((_d = error === null || error === void 0 ? void 0 : error.message) === null || _d === void 0 ? void 0 : _d.includes("is undefined"))) {
                         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);
+                        const res = yield (0, client_1.getClient)().models[modelName].list({}, authModeParams);
+                        const result = res === null || res === void 0 ? void 0 : res.data;
+                        const errors = res === null || res === void 0 ? void 0 : res.errors;
+                        if (!result && (errors === null || errors === void 0 ? void 0 : errors.length)) {
+                            throw new Error(`🍬 ${modelName} list fallback returned no data (has errors)`);
+                        }
                         // Extract and process result data
                         const items = ((result === null || result === void 0 ? void 0 : result.items) ||
                             (result === null || result === void 0 ? void 0 : result.data) ||
@@ -779,7 +851,9 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 try {
                     // Attempt API call - apply auth mode
                     (0, config_1.debugLog)(`🍬 ${modelName} update attempt [Auth: ${authMode}]:`, itemId);
-                    const { data: updatedItem } = yield (0, client_1.getClient)().models[modelName].update(cleanedData, authModeParams);
+                    const res = yield (0, client_1.getClient)().models[modelName].update(cleanedData, authModeParams);
+                    const updatedItem = res === null || res === void 0 ? void 0 : res.data;
+                    const errors = res === null || res === void 0 ? void 0 : res.errors;
                     if (updatedItem) {
                         // Update cache on API success
                         handleCacheUpdateOnSuccess(query_1.queryClient, modelName, relatedQueryKeys, itemId, updatedItem);
@@ -791,12 +865,10 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         (0, config_1.debugLog)(`🍬 ${modelName} update success:`, itemId);
                         return updatedItem;
                     }
-                    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 = itemKey(modelName, itemId);
-                        return (previousDataMap.get(singleItemQueryKey) || null);
-                    }
+                    // No data returned -> treat as error and rollback
+                    console.error(`🍬 ${modelName} update failed: empty response`, errors ? { errors } : undefined);
+                    rollbackCache(query_1.queryClient, previousDataMap);
+                    throw new Error(`🍬 ${modelName} update returned no data${errors ? " (has errors)" : ""}`);
                 }
                 catch (apiError) {
                     // Rollback and log error on API failure
@@ -847,7 +919,12 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 try {
                     // API call - apply auth mode
                     (0, config_1.debugLog)(`🍬 ${modelName} delete attempt [Auth: ${authMode}]:`, id);
-                    yield (0, client_1.getClient)().models[modelName].delete({ id }, authModeParams);
+                    const res = yield (0, client_1.getClient)().models[modelName].delete({ id }, authModeParams);
+                    const errors = res === null || res === void 0 ? void 0 : res.errors;
+                    // Delete can return no data on success; only treat explicit errors as failure.
+                    if (errors === null || errors === void 0 ? void 0 : errors.length) {
+                        throw new Error(`🍬 ${modelName} delete returned errors without throwing`);
+                    }
                     (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({
@@ -919,7 +996,11 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     // Parallel API calls - apply auth mode
                     const deletePromises = ids.map((id) => __awaiter(this, void 0, void 0, function* () {
                         try {
-                            yield (0, client_1.getClient)().models[modelName].delete({ id }, authModeParams);
+                            const res = yield (0, client_1.getClient)().models[modelName].delete({ id }, authModeParams);
+                            const errors = res === null || res === void 0 ? void 0 : res.errors;
+                            if (errors === null || errors === void 0 ? void 0 : errors.length) {
+                                throw new Error(`🍬 ${modelName} delete returned errors without throwing`);
+                            }
                             results.success.push(id);
                             return { id, success: true };
                         }
@@ -1012,34 +1093,34 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     if (existingItem) {
                         // Use update logic if item exists - apply auth mode
                         (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);
+                        const res = yield (0, client_1.getClient)().models[modelName].update(cleanedData, authModeParams);
+                        const updatedItem = res === null || res === void 0 ? void 0 : res.data;
+                        const errors = res === null || res === void 0 ? void 0 : res.errors;
                         if (updatedItem) {
                             handleCacheUpdateOnSuccess(query_1.queryClient, modelName, relatedQueryKeys, data.id, updatedItem);
                             (0, config_1.debugLog)(`🍬 ${modelName} upsert(update) success:`, data.id);
                             return updatedItem;
                         }
-                        else {
-                            console.warn(`🍬 ${modelName} upsert(update) no API response. Keeping optimistic update data.`);
-                            const singleItemQueryKey = itemKey(modelName, data.id);
-                            return (previousDataMap.get(singleItemQueryKey) ||
-                                null);
-                        }
+                        // No data -> treat as error and rollback
+                        console.error(`🍬 ${modelName} upsert(update) failed: empty response`, errors ? { errors } : undefined);
+                        rollbackCache(query_1.queryClient, previousDataMap);
+                        throw new Error(`🍬 ${modelName} upsert(update) returned no data${errors ? " (has errors)" : ""}`);
                     }
                     else {
                         // Use create logic if item doesn't exist - apply auth mode
                         (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);
+                        const res = yield (0, client_1.getClient)().models[modelName].create(cleanedData, authModeParams);
+                        const createdItem = res === null || res === void 0 ? void 0 : res.data;
+                        const errors = res === null || res === void 0 ? void 0 : res.errors;
                         if (createdItem) {
                             handleCacheUpdateOnSuccess(query_1.queryClient, modelName, relatedQueryKeys, data.id, createdItem);
                             (0, config_1.debugLog)(`🍬 ${modelName} upsert(create) success:`, data.id);
                             return createdItem;
                         }
-                        else {
-                            console.warn(`🍬 ${modelName} upsert(create) no API response. Keeping optimistic update data.`);
-                            const singleItemQueryKey = itemKey(modelName, data.id);
-                            return (previousDataMap.get(singleItemQueryKey) ||
-                                null);
-                        }
+                        // No data -> treat as error and rollback
+                        console.error(`🍬 ${modelName} upsert(create) failed: empty response`, errors ? { errors } : undefined);
+                        rollbackCache(query_1.queryClient, previousDataMap);
+                        throw new Error(`🍬 ${modelName} upsert(create) returned no data${errors ? " (has errors)" : ""}`);
                     }
                 }
                 catch (apiError) {
@@ -1105,7 +1186,12 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     throw new Error(`🍬 Query ${queryName} does not exist.`);
                 }
                 // Execute index query - apply auth mode
-                const { data: result } = yield (0, client_1.getClient)().models[modelName][queryName](enhancedArgs, authModeParams);
+                const res = yield (0, client_1.getClient)().models[modelName][queryName](enhancedArgs, authModeParams);
+                const result = res === null || res === void 0 ? void 0 : res.data;
+                const errors = res === null || res === void 0 ? void 0 : res.errors;
+                if (!result && (errors === null || errors === void 0 ? void 0 : errors.length)) {
+                    throw new Error(`🍬 ${modelName} ${queryName} returned no data (has errors)`);
+                }
                 // Extract result data
                 const items = (result === null || result === void 0 ? void 0 : result.items) || (result === null || result === void 0 ? void 0 : result.data) || result || [];
                 (0, config_1.debugLog)(`🍬 ${modelName} ${queryName} result:`, items.length, "items");
@@ -1178,6 +1264,11 @@ function createAmplifyService(modelName, defaultAuthMode) {
         useHook: (options) => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             const hookQueryClient = (0, react_query_1.useQueryClient)();
+            // Ensure direct service calls (create/update/delete) use the same QueryClient
+            // as hooks, so caches stay consistent.
+            (0, react_1.useEffect)(() => {
+                (0, query_1.attachQueryClient)(hookQueryClient);
+            }, [hookQueryClient]);
             // Determine query key
             const queryKey = (0, react_1.useMemo)(() => {
                 var _a;
@@ -1339,6 +1430,10 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 }
                 let isMounted = true;
                 let lastSynced = undefined;
+                // observeQuery can temporarily emit an empty list during initial sync/reconnect.
+                // If we immediately overwrite a non-empty cache with [], list UIs "flicker" (items disappear then reappear).
+                // Keep the last known non-empty list until isSynced is true.
+                const lastNonEmptyItemsRef = { current: [] };
                 const subscription = model.observeQuery(observeOptions).subscribe({
                     next: ({ items: nextItems, isSynced: synced }) => {
                         if (!isMounted)
@@ -1352,6 +1447,14 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             lastSynced = nextSynced;
                             setIsSynced(nextSynced);
                         }
+                        if (safeItems.length > 0) {
+                            lastNonEmptyItemsRef.current = safeItems;
+                        }
+                        // ✅ Guard: if we're not synced yet and observeQuery emits an empty list,
+                        // do NOT clobber a previously non-empty cache.
+                        if (!nextSynced && safeItems.length === 0 && previousItems.length > 0) {
+                            return;
+                        }
                         // Avoid cache thrash: observeQuery can emit repeatedly even when data didn't change.
                         if (areItemArraysEquivalentById(previousItems, safeItems)) {
                             return;
@@ -1498,6 +1601,11 @@ function createAmplifyService(modelName, defaultAuthMode) {
         useItemHook: (id, options) => {
             var _a, _b;
             const hookQueryClient = (0, react_query_1.useQueryClient)();
+            // Ensure direct service calls (create/update/delete) use the same QueryClient
+            // as hooks, so caches stay consistent.
+            (0, react_1.useEffect)(() => {
+                (0, query_1.attachQueryClient)(hookQueryClient);
+            }, [hookQueryClient]);
             // 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 : "";

package/package.json

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