reactjrx 1.40.0 → 1.40.1

package/dist/index.cjs

@@ -242,7 +242,6 @@ const PersistSignals = react.memo(
       ).pipe(rxjs.map(() => true));
       return stream.pipe(
         rxjs.tap(() => {
-          console.log("hydration complete");
           if (onReadyRef.current != null)
             onReadyRef.current();
         }),
@@ -1053,17 +1052,17 @@ const registerResultInCache = ({
   serializedKey,
   options
 }) => (stream) => stream.pipe(
-  rxjs.tap((result) => {
-    queryStore.update(serializedKey, {
-      ...options.cacheTime !== 0 && {
-        cache_fnResult: { result }
-      }
-    });
+  rxjs.tap(({ data }) => {
+    if (data == null ? void 0 : data.result) {
+      const result = data == null ? void 0 : data.result;
+      queryStore.update(serializedKey, {
+        ...options.cacheTime !== 0 && {
+          cache_fnResult: { result }
+        }
+      });
+    }
   })
 );
-const mapWithComplete = (mapFn) => (stream) => {
-  return stream.pipe(rxjs.map(mapFn({ isComplete: false })));
-};
 const createQueryFetch = ({
   options$,
   options,
@@ -1097,12 +1096,8 @@ const createQueryFetch = ({
         lastFetchedAt: (/* @__PURE__ */ new Date()).getTime()
       });
     }),
-    registerResultInCache({ serializedKey, options, queryStore }),
-    mapWithComplete(({ isComplete }) => (result) => ({
+    rxjs.map((result) => ({
       status: "success",
-      ...isComplete && {
-        fetchStatus: "idle"
-      },
       data: { result },
       error: void 0
     })),
@@ -1121,7 +1116,8 @@ const createQueryFetch = ({
         error
       });
     }),
-    notifyQueryResult(options$)
+    notifyQueryResult(options$),
+    registerResultInCache({ serializedKey, options, queryStore })
   );
   const newCache$ = queryStore.queryEvent$.pipe(
     rxjs.filter(
@@ -1309,11 +1305,9 @@ const createQueryListener = (store, onQuery) => store.store$.pipe(
         );
         return rxjs.merge(rxjs.NEVER, rxjs.of(key)).pipe(
           rxjs.tap(() => {
-            console.log("QUERY", key, "in");
           }),
           onQuery,
           rxjs.finalize(() => {
-            console.log("QUERY", key, "complete");
           }),
           rxjs.takeUntil(deleted$)
         );
@@ -1541,7 +1535,7 @@ const createClient = () => {
     const serializedKey = serializeKey(key);
     const internalRefetch$ = new rxjs.Subject();
     const fn$ = maybeFn$ ?? (maybeFn ? rxjs.of(maybeFn) : rxjs.NEVER);
-    console.log("query$()", serializedKey);
+    Logger.log("query$()", serializedKey);
     const runner$ = options$.pipe(rxjs.map((options) => ({ options })));
     let deleteRunner = () => {
     };
@@ -1566,7 +1560,7 @@ const createClient = () => {
       }),
       rxjs.map(([value, deleteRunnerFn]) => {
         deleteRunner = deleteRunnerFn;
-        console.log("reactjrx", serializedKey, "query trigger", {
+        Logger.log("reactjrx", serializedKey, "query trigger", {
           trigger: value.trigger,
           options: value.options
         });
@@ -1604,9 +1598,6 @@ const createClient = () => {
         return !shouldStop;
       }, true),
       rxjs.map(([result]) => result),
-      rxjs.tap((result) => {
-        console.log("result", result);
-      }),
       rxjs.finalize(() => {
         deleteRunner();
       })

package/dist/index.js

@@ -240,7 +240,6 @@ const PersistSignals = memo(
       ).pipe(map(() => true));
       return stream.pipe(
         tap(() => {
-          console.log("hydration complete");
           if (onReadyRef.current != null)
             onReadyRef.current();
         }),
@@ -1051,17 +1050,17 @@ const registerResultInCache = ({
   serializedKey,
   options
 }) => (stream) => stream.pipe(
-  tap((result) => {
-    queryStore.update(serializedKey, {
-      ...options.cacheTime !== 0 && {
-        cache_fnResult: { result }
-      }
-    });
+  tap(({ data }) => {
+    if (data == null ? void 0 : data.result) {
+      const result = data == null ? void 0 : data.result;
+      queryStore.update(serializedKey, {
+        ...options.cacheTime !== 0 && {
+          cache_fnResult: { result }
+        }
+      });
+    }
   })
 );
-const mapWithComplete = (mapFn) => (stream) => {
-  return stream.pipe(map(mapFn({ isComplete: false })));
-};
 const createQueryFetch = ({
   options$,
   options,
@@ -1095,12 +1094,8 @@ const createQueryFetch = ({
         lastFetchedAt: (/* @__PURE__ */ new Date()).getTime()
       });
     }),
-    registerResultInCache({ serializedKey, options, queryStore }),
-    mapWithComplete(({ isComplete }) => (result) => ({
+    map((result) => ({
       status: "success",
-      ...isComplete && {
-        fetchStatus: "idle"
-      },
       data: { result },
       error: void 0
     })),
@@ -1119,7 +1114,8 @@ const createQueryFetch = ({
         error
       });
     }),
-    notifyQueryResult(options$)
+    notifyQueryResult(options$),
+    registerResultInCache({ serializedKey, options, queryStore })
   );
   const newCache$ = queryStore.queryEvent$.pipe(
     filter(
@@ -1307,11 +1303,9 @@ const createQueryListener = (store, onQuery) => store.store$.pipe(
         );
         return merge(NEVER, of(key)).pipe(
           tap(() => {
-            console.log("QUERY", key, "in");
           }),
           onQuery,
           finalize(() => {
-            console.log("QUERY", key, "complete");
           }),
           takeUntil(deleted$)
         );
@@ -1539,7 +1533,7 @@ const createClient = () => {
     const serializedKey = serializeKey(key);
     const internalRefetch$ = new Subject();
     const fn$ = maybeFn$ ?? (maybeFn ? of(maybeFn) : NEVER);
-    console.log("query$()", serializedKey);
+    Logger.log("query$()", serializedKey);
     const runner$ = options$.pipe(map((options) => ({ options })));
     let deleteRunner = () => {
     };
@@ -1564,7 +1558,7 @@ const createClient = () => {
       }),
       map(([value, deleteRunnerFn]) => {
         deleteRunner = deleteRunnerFn;
-        console.log("reactjrx", serializedKey, "query trigger", {
+        Logger.log("reactjrx", serializedKey, "query trigger", {
           trigger: value.trigger,
           options: value.options
         });
@@ -1602,9 +1596,6 @@ const createClient = () => {
         return !shouldStop;
       }, true),
       map(([result]) => result),
-      tap((result) => {
-        console.log("result", result);
-      }),
       finalize(() => {
         deleteRunner();
       })

package/dist/lib/queries/client/cache/registerResultInCache.d.ts

@@ -1,8 +1,8 @@
 import { type MonoTypeOperatorFunction } from "rxjs";
 import { type QueryStore } from "../store/createQueryStore";
-import { type QueryOptions } from "../types";
+import { type QueryResult, type QueryOptions } from "../types";
 export declare const registerResultInCache: <T>({ queryStore, serializedKey, options }: {
     queryStore: QueryStore;
     serializedKey: string;
     options: QueryOptions<T>;
-}) => MonoTypeOperatorFunction<T>;
+}) => MonoTypeOperatorFunction<Partial<QueryResult<T>>>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reactjrx",
   "private": false,
-  "version": "1.40.0",
+  "version": "1.40.1",
   "type": "module",
   "files": [
     "dist"

package/dist/lib/queries/client/fetch/mapWithComplete.d.ts

@@ -1,4 +0,0 @@
-import { type OperatorFunction } from "rxjs";
-export declare const mapWithComplete: <T, R>(mapFn: ({ isComplete }: {
-    isComplete: boolean;
-}) => (data: T) => R) => OperatorFunction<T, R>;