amplifyquery 2.0.2 → 2.0.4

package/dist/service.js

@@ -68,30 +68,14 @@ function areItemArraysEquivalentById(a, b) {
 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)();
-                // IMPORTANT:
-                // Amplify "owner" authorization commonly uses `cognito:username` by default,
-                // but some projects store `sub` (userId) instead. To avoid "refetch clears list"
-                // issues when using list-by-owner secondary indexes, we try multiple candidates.
-                //
-                // Candidates priority (unique, non-empty):
-                // - userId (sub)
-                // - username (cognito:username)
-                // - legacy `${userId}::${username}` (older patterns)
-                const canonicalSub = typeof userId === "string" ? userId : "";
-                const canonicalUsername = typeof username === "string" ? username : "";
-                const legacyOwner = canonicalSub && canonicalUsername && canonicalUsername !== canonicalSub
-                    ? `${canonicalSub}::${canonicalUsername}`
-                    : "";
-                // Keep `owner` for compatibility (used in some create/update paths), prefer sub.
-                owner = canonicalSub || canonicalUsername;
-                const candidates = [canonicalSub, canonicalUsername, legacyOwner].filter((v) => typeof v === "string" && v.length > 0);
-                // De-dupe while preserving order
-                ownerCandidates = Array.from(new Set(candidates));
+                // Keep behavior consistent with old-AmplifyQuery:
+                // owner = `${userId}::${username}`
+                owner = `${userId}::${username}`;
+                (0, config_1.debugLog)(`🍬 Auth identity resolved`, { authMode, username, userId, owner });
             }
             catch (error) {
                 console.error("Error getting user authentication info:", error);
@@ -101,7 +85,6 @@ function getOwnerByAuthMode(authMode) {
         // Return with auth mode parameters
         return {
             owner,
-            ownerCandidates,
             authModeParams: { authMode },
         };
     });
@@ -296,8 +279,8 @@ 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 { owner, authModeParams } = yield getOwnerByAuthMode(authMode);
+                // Get parameters based on auth mode
+                const { authModeParams } = yield getOwnerByAuthMode(authMode);
                 const dataWithoutOwner = utils_1.Utils.removeOwnerField(data, "create");
                 const cleanedData = {};
                 Object.entries(dataWithoutOwner).forEach(([key, value]) => {
@@ -348,8 +331,11 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             });
                         }
                     }
-                    else if (queryKey.length === 1) {
-                        // Regular list query (e.g. ["User"]). Avoid internal keys like ["User","currentId"].
+                    else if (queryKey.length < 3 && queryKey[1] !== "currentId") {
+                        // Regular list query (old-AmplifyQuery behavior: update all short list keys)
+                        // - [Model]
+                        // - [Model, ...] (length 2)
+                        // But avoid internal singleton keys like ["User","currentId"].
                         const data = query_1.queryClient.getQueryData(queryKey);
                         if (data) {
                             previousDataMap.set(queryKey, data);
@@ -363,21 +349,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 try {
                     // Attempt API call - apply auth mode
                     (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;
-                        }
-                    }
+                    const { data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(newItem, authModeParams);
                     if (createdItem) {
                         // Update cache on API success
                         query_1.queryClient.setQueryData(singleItemQueryKey, createdItem);
@@ -426,8 +398,8 @@ 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 { owner, authModeParams } = yield getOwnerByAuthMode(authMode);
+                // Get parameters based on auth mode
+                const { authModeParams } = yield getOwnerByAuthMode(authMode);
                 const preparedItems = dataList
                     .map((data) => {
                     if (!data)
@@ -479,8 +451,9 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             return oldItems; // No change if no items match relation ID
                         });
                     }
-                    else if (queryKey.length === 1) {
-                        // Regular list query - add all items (e.g. ["User"]). Avoid internal keys like ["User","currentId"].
+                    else if (queryKey.length < 3 && queryKey[1] !== "currentId") {
+                        // Regular list query - add all items (old-AmplifyQuery behavior)
+                        // Avoid internal singleton keys like ["User","currentId"].
                         query_1.queryClient.setQueryData(queryKey, (oldData) => {
                             const oldItems = Array.isArray(oldData) ? oldData : [];
                             return [...oldItems, ...preparedItems];
@@ -498,20 +471,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                     // Parallel API calls - apply auth mode
                     const createPromises = preparedItems.map((newItem) => __awaiter(this, void 0, void 0, function* () {
                         try {
-                            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;
-                                }
-                            }
+                            const { data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(newItem, authModeParams);
                             // Update individual item cache on API success
                             if (createdItem) {
                                 const itemId = createdItem === null || createdItem === void 0 ? void 0 : createdItem.id;
@@ -639,7 +599,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
         }),
         // Batch get items
         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;
+            var _a, _b, _c, _d;
             try {
                 // Determine query key
                 const queryKey = options.filter
@@ -659,63 +619,21 @@ 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 { owner, ownerCandidates, authModeParams } = yield getOwnerByAuthMode(authMode);
+                const { owner, authModeParams } = yield getOwnerByAuthMode(authMode);
                 // Get owner-based query name from global config
                 const ownerQueryName = (0, config_1.getOwnerQueryName)(modelName);
                 // Try query call
                 try {
                     (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)();
-                    const model = (_b = client.models) === null || _b === void 0 ? void 0 : _b[modelName];
-                    // Execute owner query (try multiple owner candidates)
-                    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 owner-query returns empty for all candidates, fall back to default list().
-                    // This prevents "data disappears on refetch" when the project stores owner using
-                    // a different identity claim than expected (e.g., username vs sub) OR when the
-                    // owner secondary index exists but doesn't match stored owner values.
-                    if (!result) {
-                        (0, config_1.debugWarn)(`🍬 ${modelName} list: owner-query returned 0 items for all candidates, falling back to model.list()`, { ownersToTry, authMode });
-                        const { data: fallback } = yield model.list({}, authModeParams);
-                        const fallbackItems = ((fallback === null || fallback === void 0 ? void 0 : fallback.items) ||
-                            (fallback === null || fallback === void 0 ? void 0 : fallback.data) ||
-                            fallback ||
-                            []).filter((item) => item !== null);
-                        // Use the same shape below by setting `result` to array-ish
-                        result = fallbackItems;
-                        usedOwner = null;
-                    }
-                    if (usedOwner && usedOwner !== ownersToTry[0]) {
-                        (0, config_1.debugWarn)(`🍬 ${modelName} list: owner-query returned results only for legacy owner format`, { tried: ownersToTry, usedOwner });
-                    }
+                    // Execute owner query (old-AmplifyQuery behavior)
+                    const { data: result } = yield (0, client_1.getClient)().models[modelName][ownerQueryName]({ owner, authMode }, authModeParams);
                     // 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)
@@ -763,11 +681,9 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 }
                 catch (error) {
                     // Check if the error is because the owner query doesn't exist
-                    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"))) {
+                    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"))) {
                         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);
@@ -1145,13 +1061,14 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 // Determine auth mode (use provided options if available)
                 const authMode = (options === null || options === void 0 ? void 0 : options.authMode) || currentAuthMode;
                 // Get owner and parameters based on auth mode
-                const { owner, ownerCandidates, authModeParams } = yield getOwnerByAuthMode(authMode);
-                // Add owner value to queries requiring owner field when userPool auth.
-                // IMPORTANT: many projects store owner as `cognito:username`, not `sub`.
-                // If this is an owner-based index query, try multiple owner candidates to
-                // avoid returning empty results and accidentally clearing UI state on refetch.
-                const isOwnerQuery = authMode === "userPool" && queryName.toLowerCase().includes("owner");
+                const { owner, authModeParams } = yield getOwnerByAuthMode(authMode);
+                // Add owner value to queries requiring owner field when userPool auth
                 const enhancedArgs = Object.assign({}, args);
+                if (owner &&
+                    authMode === "userPool" &&
+                    queryName.toLowerCase().includes("owner")) {
+                    enhancedArgs.owner = owner;
+                }
                 // Detect relational query (if fields like dailyId, userId exist)
                 const relationField = Object.keys(enhancedArgs).find((key) => key.endsWith("Id"));
                 const isRelationalQuery = !!relationField;
@@ -1187,40 +1104,8 @@ function createAmplifyService(modelName, defaultAuthMode) {
                 if (!((_a = (0, client_1.getClient)().models[modelName]) === null || _a === void 0 ? void 0 : _a[queryName])) {
                     throw new Error(`🍬 Query ${queryName} does not exist.`);
                 }
-                const model = (0, client_1.getClient)().models[modelName];
-                // Execute index query - apply auth mode (with owner-candidate fallback)
-                let result = null;
-                if (isOwnerQuery) {
-                    const candidates = [
-                        // If caller explicitly passed owner, try that first
-                        typeof (args === null || args === void 0 ? void 0 : args.owner) === "string" ? args.owner : "",
-                        ...(Array.isArray(ownerCandidates) ? ownerCandidates : []),
-                        typeof owner === "string" ? owner : "",
-                    ].filter((v) => typeof v === "string" && v.length > 0);
-                    const ownersToTry = Array.from(new Set(candidates));
-                    if (ownersToTry.length === 0) {
-                        throw new Error(`🍬 owner is missing for ${modelName}.${queryName}`);
-                    }
-                    for (const candidateOwner of ownersToTry) {
-                        const nextArgs = Object.assign(Object.assign({}, enhancedArgs), { owner: candidateOwner });
-                        const { data } = yield model[queryName](nextArgs, 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;
-                            if (candidateOwner !== ownersToTry[0]) {
-                                (0, config_1.debugWarn)(`🍬 ${modelName} ${queryName}: returned results only for non-primary owner candidate`, { tried: ownersToTry, usedOwner: candidateOwner });
-                            }
-                            break;
-                        }
-                    }
-                    // If still empty, return empty list (do not throw unless requested)
-                    if (!result) {
-                        result = [];
-                    }
-                }
-                else {
-                    ({ data: result } = yield model[queryName](enhancedArgs, authModeParams));
-                }
+                // Execute index query - apply auth mode
+                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 || [];
                 (0, config_1.debugLog)(`🍬 ${modelName} ${queryName} result:`, items.length, "items");
@@ -1291,7 +1176,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
         },
         // React Hook returning method - Reimplemented based on TanStack Query
         useHook: (options) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             const hookQueryClient = (0, react_query_1.useQueryClient)();
             // Determine query key
             const queryKey = (0, react_1.useMemo)(() => {
@@ -1580,57 +1465,12 @@ 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;
                 (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) {
-                        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,
-                        });
-                    }
-                    else {
-                        newData = yield service.list({
-                            forceRefresh: true,
-                            throwOnError: 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) {
-                    console.error(`🍬 ${modelName} useHook refresh error:`, 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,
-                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,
-            ]);
+                // Keep behavior consistent with old-AmplifyQuery:
+                // refresh == refetch() (same queryFn as initial load)
+                const { data } = yield refetch({ throwOnError: true });
+                return data || [];
+            }), [refetch, queryKey, modelName]);
             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);

package/package.json

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