amplifyquery 1.0.20 → 1.0.21

package/dist/singleton.js

@@ -11,11 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModelIds = void 0;
 exports.createSingletonService = createSingletonService;
-const client_1 = require("./client");
 const auth_1 = require("aws-amplify/auth");
 const react_query_1 = require("@tanstack/react-query");
 const config_1 = require("./config");
 const react_1 = require("react");
+const config_2 = require("./config");
 /**
  * Function to create an extension service for singleton models
  * @param baseService Base service
@@ -29,93 +29,68 @@ function createSingletonService(baseService, getModelId) {
     const singletonService = Object.assign(Object.assign({}, baseService), { 
         // Add singleton instance management methods
         getCurrent: (options) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
             try {
                 const modelId = yield getModelId();
+                (0, config_2.debugLog)(`🍬 ${modelName} singleton.getCurrent`, {
+                    modelId,
+                    forceRefresh: (options === null || options === void 0 ? void 0 : options.forceRefresh) === true,
+                });
                 return baseService.get(modelId, options);
             }
             catch (error) {
+                // Keep singleton reads soft-failing (null) like base get().
+                // (Do not call getStore here: TanStack Query service doesn't support it.)
                 // console.error(`${modelName} singleton instance lookup error:`, error);
-                // Safely call getStore
-                try {
-                    (_c = (_b = (_a = baseService
-                        .getStore) === null || _a === void 0 ? void 0 : _a.call(baseService)) === null || _b === void 0 ? void 0 : _b.setError) === null || _c === void 0 ? void 0 : _c.call(_b, error instanceof Error ? error : new Error(String(error)));
-                }
-                catch (storeError) {
-                    // Ignore if getStore doesn't exist or call fails
-                }
                 return null;
             }
         }), updateCurrent: (data) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
             try {
                 const modelId = yield getModelId();
                 return baseService.update(Object.assign(Object.assign({}, data), { id: modelId }));
             }
             catch (error) {
                 console.error(`${modelName} singleton instance update error:`, error);
-                // Safely call getStore
-                try {
-                    (_c = (_b = (_a = baseService
-                        .getStore) === null || _a === void 0 ? void 0 : _a.call(baseService)) === null || _b === void 0 ? void 0 : _b.setError) === null || _c === void 0 ? void 0 : _c.call(_b, error instanceof Error ? error : new Error(String(error)));
-                }
-                catch (storeError) {
-                    // Ignore if getStore doesn't exist or call fails
-                }
                 return null;
             }
         }), upsertCurrent: (data) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
             try {
                 const modelId = yield getModelId();
                 // Check the latest status by forced refresh
+                (0, config_2.debugLog)(`🍬 ${modelName} singleton.upsertCurrent check existing`, {
+                    modelId,
+                });
                 const existingItem = yield baseService.get(modelId, {
                     forceRefresh: true,
                 });
                 if (existingItem) {
                     // Update
+                    (0, config_2.debugLog)(`🍬 ${modelName} singleton.upsertCurrent -> update`, {
+                        modelId,
+                    });
                     return baseService.update(Object.assign(Object.assign({}, data), { id: modelId }));
                 }
                 else {
-                    // Create (Direct call to Amplify Client - prevents random ID generation of generic create)
+                    // Create using baseService so authMode/owner handling stays consistent.
+                    // (We still pass a fixed id to guarantee singleton identity.)
+                    (0, config_2.debugWarn)(`🍬 ${modelName} singleton.upsertCurrent missing -> create`, {
+                        modelId,
+                    });
                     const modelData = Object.assign(Object.assign({}, data), { id: modelId });
-                    // Safely call getStore
                     try {
-                        (_c = (_b = (_a = baseService.getStore) === null || _a === void 0 ? void 0 : _a.call(baseService)) === null || _b === void 0 ? void 0 : _b.setLoading) === null || _c === void 0 ? void 0 : _c.call(_b, true);
-                    }
-                    catch (storeError) {
-                        // Ignore if getStore doesn't exist or call fails
-                    }
-                    try {
-                        // Call appropriate model from Amplify Models
-                        const { data: createdItem } = yield (0, client_1.getClient)().models[modelName].create(modelData);
-                        if (createdItem) {
-                            try {
-                                (_f = (_e = (_d = baseService.getStore) === null || _d === void 0 ? void 0 : _d.call(baseService)) === null || _e === void 0 ? void 0 : _e.setItem) === null || _f === void 0 ? void 0 : _f.call(_e, createdItem);
-                            }
-                            catch (storeError) {
-                                // Ignore if getStore doesn't exist or call fails
-                            }
-                        }
+                        // Use service.create to keep cache + auth mode consistent
+                        const createdItem = yield baseService.create(modelData, {
+                            authMode: baseService.getAuthMode(),
+                        });
+                        // Ensure cache is synced to latest server state
                         try {
-                            (_j = (_h = (_g = baseService.getStore) === null || _g === void 0 ? void 0 : _g.call(baseService)) === null || _h === void 0 ? void 0 : _h.setLoading) === null || _j === void 0 ? void 0 : _j.call(_h, false);
+                            yield baseService.get(modelId, { forceRefresh: true });
                         }
-                        catch (storeError) {
-                            // Ignore if getStore doesn't exist or call fails
+                        catch (_a) {
+                            // ignore cache sync failures
                         }
                         return createdItem !== null && createdItem !== void 0 ? createdItem : null;
                     }
                     catch (apiError) {
-                        try {
-                            (_m = (_l = (_k = baseService.getStore) === null || _k === void 0 ? void 0 : _k.call(baseService)) === null || _l === void 0 ? void 0 : _l.setLoading) === null || _m === void 0 ? void 0 : _m.call(_l, false);
-                            (_q = (_p = (_o = baseService
-                                .getStore) === null || _o === void 0 ? void 0 : _o.call(baseService)) === null || _p === void 0 ? void 0 : _p.setError) === null || _q === void 0 ? void 0 : _q.call(_p, apiError instanceof Error
-                                ? apiError
-                                : new Error(String(apiError)));
-                        }
-                        catch (storeError) {
-                            // Ignore if getStore doesn't exist or call fails
-                        }
                         console.error(`${modelName} singleton instance Upsert error:`, apiError);
                         throw apiError; // Propagate error upwards
                     }
@@ -127,21 +102,15 @@ function createSingletonService(baseService, getModelId) {
             }
         }), 
         // React hook to manage the current singleton item
-        useCurrentHook: (options) => {
+        useSigletoneHook: (options) => {
             const { data: currentId, isLoading: isIdLoading, error: idError, refetch: refetchId, } = (0, react_query_1.useQuery)({
                 queryKey: [modelName, "currentId"],
                 queryFn: () => __awaiter(this, void 0, void 0, function* () {
-                    var _a, _b, _c;
                     try {
                         const id = yield getModelId();
                         return id || null;
                     }
                     catch (error) {
-                        try {
-                            (_c = (_b = (_a = baseService
-                                .getStore) === null || _a === void 0 ? void 0 : _a.call(baseService)) === null || _b === void 0 ? void 0 : _b.setError) === null || _c === void 0 ? void 0 : _c.call(_b, error instanceof Error ? error : new Error(String(error)));
-                        }
-                        catch (_storeError) { }
                         return null;
                     }
                 }),
@@ -149,70 +118,91 @@ function createSingletonService(baseService, getModelId) {
                 refetchOnWindowFocus: false,
             });
             const idForItemHook = currentId !== null && currentId !== void 0 ? currentId : "";
-            const core = baseService.useItemHook(idForItemHook, options);
-            const didAutoCreateRef = (0, react_1.useRef)(false);
-            const item = (() => {
-                var _a;
-                if (!currentId)
-                    return null;
-                const raw = core.item;
-                if (Array.isArray(raw)) {
-                    const match = raw.find((i) => (i === null || i === void 0 ? void 0 : i.id) === currentId);
-                    return match || null;
-                }
-                return (_a = raw) !== null && _a !== void 0 ? _a : null;
-            })();
+            (0, config_2.debugLog)(`🍬 ${modelName} useSigletoneHook currentId`, {
+                currentId,
+                idForItemHook,
+            });
+            const core = baseService.useItemHook(idForItemHook, (options === null || options === void 0 ? void 0 : options.realtime) ? { realtime: options.realtime } : undefined);
+            const attemptedAutoCreateForIdRef = (0, react_1.useRef)(null);
+            const cfg = (0, config_1.getSingletonAutoCreate)();
+            const autoCreateEnabled = typeof (options === null || options === void 0 ? void 0 : options.autoCreate) === "boolean"
+                ? options.autoCreate
+                : cfg
+                    ? (0, config_1.isSingletonAutoCreateEnabledForModel)(modelName)
+                    : true;
+            const item = currentId ? core.item : null;
             const isLoading = isIdLoading || core.isLoading;
             const error = idError || core.error || null;
             (0, react_1.useEffect)(() => {
+                (0, config_2.debugLog)(`🍬 ${modelName} useSigletoneHook effect check`, {
+                    currentId,
+                    isLoading,
+                    autoCreateEnabled,
+                    attemptedFor: attemptedAutoCreateForIdRef.current,
+                    hasError: Boolean(error),
+                    hasItem: Boolean(item),
+                });
                 if (!currentId)
                     return;
                 if (isLoading)
                     return;
-                if (!(0, config_1.isSingletonAutoCreateEnabledForModel)(modelName))
+                if (!autoCreateEnabled)
                     return;
-                if (didAutoCreateRef.current)
+                if (attemptedAutoCreateForIdRef.current === currentId)
+                    return;
+                if (error)
                     return;
                 if (item)
                     return;
-                didAutoCreateRef.current = true;
+                attemptedAutoCreateForIdRef.current = currentId;
                 // Best-effort: create { id } if missing.
                 void (() => __awaiter(this, void 0, void 0, function* () {
                     try {
+                        (0, config_2.debugWarn)(`🍬 ${modelName} useSigletoneHook auto-create starting`, {
+                            currentId,
+                        });
                         yield singletonService.upsertCurrent({});
-                        yield core.refresh();
+                        yield singletonService.getCurrent({ forceRefresh: true });
+                        (0, config_2.debugLog)(`🍬 ${modelName} useSigletoneHook auto-create done`, {
+                            currentId,
+                        });
                     }
                     catch (e) {
-                        console.warn(`🍬 ${modelName} useCurrentHook auto-create failed:`, e);
+                        attemptedAutoCreateForIdRef.current = null; // allow retry later
+                        (0, config_2.debugWarn)(`🍬 ${modelName} useSigletoneHook auto-create failed:`, e);
                     }
                 }))();
-            }, [currentId, isLoading, item, modelName]);
+            }, [currentId, isLoading, item, modelName, autoCreateEnabled, error]);
             const refresh = () => __awaiter(this, void 0, void 0, function* () {
-                if (!currentId) {
-                    const { data } = yield refetchId({ throwOnError: false });
-                    if (!data)
-                        return null;
-                }
-                return core.refresh();
+                var _a;
+                const latest = yield singletonService.getCurrent({ forceRefresh: true });
+                if (latest)
+                    return latest;
+                if (!autoCreateEnabled)
+                    return null;
+                // If missing, create then re-fetch to sync cache.
+                yield singletonService.upsertCurrent({});
+                return (_a = (yield singletonService.getCurrent({ forceRefresh: true }))) !== null && _a !== void 0 ? _a : null;
             });
             const update = (data) => __awaiter(this, void 0, void 0, function* () {
-                if (!currentId) {
-                    const { data } = yield refetchId({ throwOnError: false });
-                    if (!data)
-                        return null;
-                }
-                return core.update(data);
+                var _a;
+                // Upsert to satisfy "create if missing" behavior.
+                yield singletonService.upsertCurrent(data);
+                return (_a = (yield singletonService.getCurrent({ forceRefresh: true }))) !== null && _a !== void 0 ? _a : null;
             });
             const remove = () => __awaiter(this, void 0, void 0, function* () {
-                if (!currentId) {
-                    const { data } = yield refetchId({ throwOnError: false });
-                    if (!data)
-                        return false;
+                try {
+                    const modelId = yield getModelId();
+                    return baseService.delete(modelId);
+                }
+                catch (e) {
+                    return false;
                 }
-                return core.delete();
             });
             return { item, isLoading, error, refresh, update, delete: remove };
-        } });
+        }, 
+        // Backward-compatible alias
+        useCurrentHook: (options) => singletonService.useSigletoneHook(options) });
     return singletonService;
 }
 /**

package/dist/types.d.ts

@@ -33,6 +33,7 @@ export type ModelHook<T> = {
     delete: (id: string) => Promise<boolean>;
     customList: (queryName: string, args: Record<string, any>, options?: {
         forceRefresh?: boolean;
+        throwOnError?: boolean;
     }) => Promise<T[]>;
 };
 /**
@@ -65,10 +66,12 @@ export interface AmplifyDataService<T> {
         filter?: Record<string, any>;
         forceRefresh?: boolean;
         authMode?: AuthMode;
+        throwOnError?: boolean;
     }) => Promise<T[]>;
     customList: (queryName: string, args: Record<string, any>, options?: {
         forceRefresh?: boolean;
         authMode?: AuthMode;
+        throwOnError?: boolean;
     }) => Promise<T[]>;
     update: (data: Partial<T> & {
         id: string;
@@ -118,7 +121,22 @@ export interface SingletonAmplifyService<T> extends AmplifyDataService<T> {
     }) => Promise<T | null>;
     updateCurrent: (data: Partial<T>) => Promise<T | null>;
     upsertCurrent: (data: Partial<T>) => Promise<T | null>;
+    useSigletoneHook: (options?: {
+        /**
+         * When true (default), if the singleton item does not exist it will be created.
+         * You can set false to disable auto-create for this hook call.
+         */
+        autoCreate?: boolean;
+        realtime?: {
+            enabled?: boolean;
+            observeOptions?: Record<string, any>;
+        };
+    }) => ItemHook<T>;
+    /**
+     * @deprecated Use useSigletoneHook() instead.
+     */
     useCurrentHook: (options?: {
+        autoCreate?: boolean;
         realtime?: {
             enabled?: boolean;
             observeOptions?: Record<string, any>;
@@ -146,6 +164,11 @@ import { QueryClientConfig } from "@tanstack/react-query";
 export interface AmplifyQueryConfig {
     client: GraphQLClient;
     defaultAuthMode?: AuthMode;
+    /**
+     * Enable AmplifyQuery internal debug logs.
+     * Default: false.
+     */
+    debug?: boolean;
     modelOwnerQueryMap?: Record<string, string>;
     singletonAutoCreate?: {
         enabled?: boolean;

package/dist/utils.d.ts

@@ -33,78 +33,6 @@ export declare const Utils: {
      */
     removeOwnerField: <T extends Record<string, any>>(data: T, operation: "create" | "update" | "upsert") => Omit<T, "owner">;
 };
-/**
- * Storage related utilities
- */
-export declare const StorageService: {
-    _types: {
-        Item: {
-            url: string;
-            expiresAt: number;
-        };
-        CacheData: {
-            [key: string]: {
-                url: string;
-                expiresAt: number;
-            };
-        };
-    };
-    _urlCache: Map<string, {
-        url: string;
-        expiresAt: number;
-    }>;
-    _CACHE_KEY: string;
-    _initialized: boolean;
-    /**
-     * Initialize the memory cache.
-     * Loads URL cache from MMKV storage.
-     */
-    _initCache: () => void;
-    /**
-     * Save cache to MMKV storage.
-     */
-    _saveCache: () => void;
-    /**
-     * Upload an image file to Storage.
-     * @param file File to upload (Blob or File object)
-     * @param key Path and filename to save as (auto-generated if not specified)
-     * @returns Key of the uploaded file
-     */
-    uploadImage: (file: Blob | File, key?: string) => Promise<string>;
-    /**
-     * Get the URL of a stored file. (Auto-caching)
-     * @param key File key
-     * @param options Caching options (forceRefresh: ignore cache and fetch new URL)
-     * @returns File URL
-     */
-    getFileUrl: (key: string, options?: {
-        forceRefresh?: boolean;
-    }) => Promise<string>;
-    /**
-     * Delete a stored file.
-     * @param key Key of the file to delete
-     */
-    deleteFile: (key: string) => Promise<void>;
-    /**
-     * Clear the URL cache.
-     */
-    clearUrlCache: () => void;
-    /**
-     * Remove a specific key's URL cache.
-     * @param key Key of the URL to remove
-     */
-    clearUrlCacheForKey: (key: string) => void;
-    /**
-     * Remove only expired URL caches.
-     */
-    clearExpiredUrlCache: () => void;
-    /**
-     * Download an audio file.
-     * @param audioKey Key of the audio file to download
-     * @returns Local file system path of the downloaded file
-     */
-    downloadAudioFile: (audioKey: string) => Promise<string>;
-};
 /**
  * Authentication related utilities
  */