amplifyquery 1.0.19 → 1.0.20

package/dist/config.d.ts

@@ -35,3 +35,15 @@ export declare function getDefaultAuthMode(): "apiKey" | "iam" | "identityPool"
  * Reset global configuration (mainly for testing)
  */
 export declare function resetConfig(): void;
+/**
+ * Enable/disable singleton auto-create behavior for useCurrentHook().
+ */
+export declare function setSingletonAutoCreate(config: {
+    enabled?: boolean;
+    models?: string[];
+}): void;
+export declare function getSingletonAutoCreate(): {
+    enabled?: boolean;
+    models?: string[];
+} | undefined;
+export declare function isSingletonAutoCreateEnabledForModel(modelName: string): boolean;

package/dist/config.js

@@ -9,6 +9,9 @@ exports.getOwnerQueryName = getOwnerQueryName;
 exports.setDefaultAuthMode = setDefaultAuthMode;
 exports.getDefaultAuthMode = getDefaultAuthMode;
 exports.resetConfig = resetConfig;
+exports.setSingletonAutoCreate = setSingletonAutoCreate;
+exports.getSingletonAutoCreate = getSingletonAutoCreate;
+exports.isSingletonAutoCreateEnabledForModel = isSingletonAutoCreateEnabledForModel;
 // Global configuration state
 let globalConfig = {};
 /**
@@ -61,3 +64,24 @@ function resetConfig() {
     globalConfig = {};
     console.log("🔧 AmplifyQuery: Global configuration reset");
 }
+/**
+ * Enable/disable singleton auto-create behavior for useCurrentHook().
+ */
+function setSingletonAutoCreate(config) {
+    globalConfig.singletonAutoCreate = {
+        enabled: config.enabled === true,
+        models: Array.isArray(config.models) ? config.models : undefined,
+    };
+    console.log("🔧 AmplifyQuery: Singleton auto-create configured", globalConfig.singletonAutoCreate);
+}
+function getSingletonAutoCreate() {
+    return globalConfig.singletonAutoCreate;
+}
+function isSingletonAutoCreateEnabledForModel(modelName) {
+    const cfg = getSingletonAutoCreate();
+    if (!(cfg === null || cfg === void 0 ? void 0 : cfg.enabled))
+        return false;
+    if (!cfg.models || cfg.models.length === 0)
+        return true;
+    return cfg.models.includes(modelName);
+}

package/dist/index.js

@@ -69,6 +69,10 @@ function configure(config) {
     if (config.defaultAuthMode) {
         (0, config_1.setDefaultAuthMode)(config.defaultAuthMode);
     }
+    // Set singleton auto-create
+    if (config.singletonAutoCreate) {
+        (0, config_1.setSingletonAutoCreate)(config.singletonAutoCreate);
+    }
     // Apply React Query settings
     (0, query_1.configure)({
         isCachingEnabled: config.isCachingEnabled,

package/dist/service.js

@@ -1122,7 +1122,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;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
             const hookQueryClient = (0, react_query_1.useQueryClient)();
             // Determine query key
             const queryKey = (0, react_1.useMemo)(() => {
@@ -1372,10 +1372,32 @@ 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);
-                const { data } = yield refetch({ throwOnError: true }); // Throw on error
-                return data || [];
-            }), [refetch, 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.
+                try {
+                    if (options === null || options === void 0 ? void 0 : options.customList) {
+                        return yield service.customList(options.customList.queryName, options.customList.args, { forceRefresh: 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,
+                            forceRefresh: true,
+                        });
+                    }
+                    return yield service.list({ forceRefresh: true });
+                }
+                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;
+                }
+            }), [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]);
             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);
@@ -1527,9 +1549,13 @@ 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);
-                const { data } = yield refetch({ throwOnError: true }); // Throw on error
-                return data || null;
-            }), [refetch, singleItemQueryKey]); // Added queryKey dependency
+                // 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
             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 {

package/dist/singleton.js

@@ -14,6 +14,8 @@ 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");
 /**
  * Function to create an extension service for singleton models
  * @param baseService Base service
@@ -125,7 +127,7 @@ function createSingletonService(baseService, getModelId) {
             }
         }), 
         // React hook to manage the current singleton item
-        useCurrentHook: () => {
+        useCurrentHook: (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* () {
@@ -147,7 +149,8 @@ function createSingletonService(baseService, getModelId) {
                 refetchOnWindowFocus: false,
             });
             const idForItemHook = currentId !== null && currentId !== void 0 ? currentId : "";
-            const core = baseService.useItemHook(idForItemHook);
+            const core = baseService.useItemHook(idForItemHook, options);
+            const didAutoCreateRef = (0, react_1.useRef)(false);
             const item = (() => {
                 var _a;
                 if (!currentId)
@@ -161,6 +164,29 @@ function createSingletonService(baseService, getModelId) {
             })();
             const isLoading = isIdLoading || core.isLoading;
             const error = idError || core.error || null;
+            (0, react_1.useEffect)(() => {
+                if (!currentId)
+                    return;
+                if (isLoading)
+                    return;
+                if (!(0, config_1.isSingletonAutoCreateEnabledForModel)(modelName))
+                    return;
+                if (didAutoCreateRef.current)
+                    return;
+                if (item)
+                    return;
+                didAutoCreateRef.current = true;
+                // Best-effort: create { id } if missing.
+                void (() => __awaiter(this, void 0, void 0, function* () {
+                    try {
+                        yield singletonService.upsertCurrent({});
+                        yield core.refresh();
+                    }
+                    catch (e) {
+                        console.warn(`🍬 ${modelName} useCurrentHook auto-create failed:`, e);
+                    }
+                }))();
+            }, [currentId, isLoading, item, modelName]);
             const refresh = () => __awaiter(this, void 0, void 0, function* () {
                 if (!currentId) {
                     const { data } = yield refetchId({ throwOnError: false });

package/dist/types.d.ts

@@ -118,7 +118,12 @@ export interface SingletonAmplifyService<T> extends AmplifyDataService<T> {
     }) => Promise<T | null>;
     updateCurrent: (data: Partial<T>) => Promise<T | null>;
     upsertCurrent: (data: Partial<T>) => Promise<T | null>;
-    useCurrentHook: () => ItemHook<T>;
+    useCurrentHook: (options?: {
+        realtime?: {
+            enabled?: boolean;
+            observeOptions?: Record<string, any>;
+        };
+    }) => ItemHook<T>;
 }
 export interface BaseModel {
     id: string;
@@ -142,6 +147,10 @@ export interface AmplifyQueryConfig {
     client: GraphQLClient;
     defaultAuthMode?: AuthMode;
     modelOwnerQueryMap?: Record<string, string>;
+    singletonAutoCreate?: {
+        enabled?: boolean;
+        models?: string[];
+    };
     isCachingEnabled?: boolean;
     queryClientConfig?: QueryClientConfig;
     storage?: {

package/package.json

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