amplifyquery 1.0.11 → 1.0.13

package/dist/service.js

@@ -231,7 +231,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                         cleanedData[key] = value;
                     }
                 });
-                const newItem = Object.assign(Object.assign({}, cleanedData), { id: (0, expo_crypto_1.randomUUID)() });
+                const newItem = Object.assign(Object.assign({}, cleanedData), { id: cleanedData.id || (0, expo_crypto_1.randomUUID)() });
                 // Extract relation fields (e.g., dailyId, userId)
                 const relationFields = new Map();
                 for (const [key, value] of Object.entries(newItem)) {
@@ -351,7 +351,7 @@ function createAmplifyService(modelName, defaultAuthMode) {
                             cleanedData[key] = value;
                         }
                     });
-                    return Object.assign(Object.assign({}, cleanedData), { id: (0, expo_crypto_1.randomUUID)() });
+                    return Object.assign(Object.assign({}, cleanedData), { id: cleanedData.id || (0, expo_crypto_1.randomUUID)() });
                 })
                     .filter(Boolean);
                 const relatedQueryKeys = findRelatedQueryKeys(modelName, query_1.queryClient);

package/dist/singleton.js

@@ -13,6 +13,7 @@ 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");
 /**
  * Function to create an extension service for singleton models
  * @param baseService Base service
@@ -32,7 +33,7 @@ function createSingletonService(baseService, getModelId) {
                 return baseService.get(modelId, options);
             }
             catch (error) {
-                console.error(`${modelName} singleton instance lookup error:`, error);
+                // console.error(`${modelName} singleton instance lookup error:`, error);
                 // Safely call getStore
                 try {
                     (_c = (_b = (_a = baseService
@@ -122,7 +123,37 @@ function createSingletonService(baseService, getModelId) {
                 console.error(`${modelName} singleton instance final Upsert error:`, error);
                 return null;
             }
-        }) });
+        }), 
+        // React hook to manage the current singleton item
+        useCurrentHook: () => {
+            // Resolve current singleton ID with React Query (object-style API)
+            const { data: currentId } = (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) {
+                        // Safely call getStore to surface errors if available
+                        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 store errors
+                        }
+                        return null;
+                    }
+                }),
+                staleTime: 1000 * 60,
+                refetchOnWindowFocus: false,
+            });
+            // Delegate to base service's single item hook once ID is known
+            const resolvedId = currentId !== null && currentId !== void 0 ? currentId : "";
+            return baseService.useItemHook(resolvedId);
+        } });
     return singletonService;
 }
 /**

package/dist/types.d.ts

@@ -106,6 +106,7 @@ 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>;
 }
 export interface BaseModel {
     id: string;

package/package.json

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