reactjrx 1.101.1 → 1.105.1

package/dist/index.cjs

@@ -14,6 +14,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const React = require("react");
 const rxjs = require("rxjs");
 const operators = require("rxjs/operators");
+const reactQuery = require("@tanstack/react-query");
 const jsxRuntime = require("react/jsx-runtime");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -202,13 +203,20 @@ const useObservableState = (defaultValue) => {
   );
   return [subject$.current, setState, subject.current.getValue()];
 };
+const useLiveBehaviorSubject = (state) => {
+  const subject = useBehaviorSubject(state);
+  React.useEffect(() => {
+    subject.current.next(state);
+  }, [state, subject]);
+  return subject;
+};
 const SIGNAL_RESET = Symbol("SIGNAL_RESET");
 function signal(config = {}) {
   const normalizedConfig = {
     default: config.default,
     key: config.key
   };
-  const { default: defaultValue } = normalizedConfig ?? {};
+  const { default: defaultValue } = normalizedConfig;
   const subject = new rxjs.BehaviorSubject(defaultValue);
   const setValue = (arg) => {
     const update = (value) => {
@@ -356,13 +364,6 @@ const createLocalStorageAdapter = ({
     }
   };
 };
-const useLiveBehaviorSubject = (state) => {
-  const subject = useBehaviorSubject(state);
-  React.useEffect(() => {
-    subject.current.next(state);
-  }, [state, subject]);
-  return subject;
-};
 const IDENTIFIER_PERSISTANCE_KEY = "__reactjrx";
 const getNormalizedPersistanceValue = (unknownValue) => {
   if (typeof unknownValue === "object" && unknownValue !== null && IDENTIFIER_PERSISTANCE_KEY in unknownValue && unknownValue[IDENTIFIER_PERSISTANCE_KEY] === IDENTIFIER_PERSISTANCE_KEY) {
@@ -652,6 +653,90 @@ function isDefined(arg) {
 }
 const arrayEqual = (a, b) => a.length === b.length && a.every((v, i) => v === b[i]);
 const isServer = typeof window === "undefined" || "Deno" in window;
+function useQuery$(options, queryClient) {
+  const sub = React.useRef();
+  const _queryClient = reactQuery.useQueryClient(queryClient);
+  const queryFnAsync = (context) => {
+    let isResolved = false;
+    return new Promise((resolve, reject) => {
+      let lastData = void 0;
+      if (sub.current) {
+        sub.current.unsubscribe();
+        sub.current = void 0;
+      }
+      const unsub = _queryClient.getQueryCache().subscribe((d) => {
+        var _a;
+        if (d.type === "observerRemoved" && d.query.observers.length === 0) {
+          unsub();
+          _queryClient.cancelQueries({ queryKey: context.queryKey });
+          (_a = sub.current) == null ? void 0 : _a.unsubscribe();
+        }
+      });
+      const source = rxjs.defer(
+        () => typeof options.queryFn === "function" ? options.queryFn(context) : options.queryFn
+      );
+      sub.current = source.pipe(
+        rxjs.finalize(() => {
+          unsub();
+          isResolved = true;
+        })
+      ).subscribe({
+        next: (data) => {
+          lastData = data;
+          _queryClient == null ? void 0 : _queryClient.setQueryData(context.queryKey, data);
+        },
+        error: (error) => {
+          isResolved = true;
+          reject(error);
+        },
+        complete: () => {
+          if (lastData === void 0)
+            return reject(new Error("Stream completed without any data"));
+          if (isResolved) return;
+          isResolved = true;
+          resolve(lastData);
+        }
+      });
+    });
+  };
+  const result = reactQuery.useQuery(
+    {
+      ...options,
+      queryFn: queryFnAsync
+    },
+    queryClient
+  );
+  return result;
+}
+function useMutation$(options, queryClient) {
+  const mutationFnAsync = (variables) => {
+    let lastData;
+    return new Promise((resolve, reject) => {
+      const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
+      source.pipe(rxjs.take(1)).subscribe({
+        next: (data) => {
+          lastData = data;
+        },
+        error: (error) => {
+          reject(error);
+        },
+        complete: () => {
+          if (lastData === void 0)
+            return reject(new Error("Stream completed without any data"));
+          resolve(lastData);
+        }
+      });
+    });
+  };
+  const result = reactQuery.useMutation(
+    {
+      ...options,
+      mutationFn: mutationFnAsync
+    },
+    queryClient
+  );
+  return result;
+}
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
 }
@@ -3416,14 +3501,17 @@ exports.signal = signal;
 exports.useBehaviorSubject = useBehaviorSubject;
 exports.useEffectOnce = useEffectOnce;
 exports.useForeverQuery = useForeverQuery;
+exports.useLiveBehaviorSubject = useLiveBehaviorSubject;
 exports.useLiveRef = useLiveRef;
 exports.useMount = useMount;
 exports.useMutation = useMutation;
+exports.useMutation$ = useMutation$;
 exports.useObservableState = useObservableState;
 exports.useObserve = useObserve;
 exports.useObserveCallback = useObserveCallback;
 exports.usePersistSignals = usePersistSignals;
 exports.useQuery = useQuery;
+exports.useQuery$ = useQuery$;
 exports.useQueryClient = useQueryClient;
 exports.useSignal = useSignal;
 exports.useSignalValue = useSignalValue;

package/dist/index.d.ts

@@ -4,6 +4,7 @@ export * from './lib/binding/useObservableEvent';
 export * from './lib/binding/useObservableState';
 export * from './lib/binding/useSubject';
 export * from './lib/binding/useBehaviorSubject';
+export * from './lib/binding/useLiveBehaviorSubject';
 export * from './lib/state/signal';
 export * from './lib/state/react/useSignalValue';
 export * from './lib/state/react/useSignal';
@@ -13,12 +14,14 @@ export * from './lib/state/persistance/adapters/createLocalStorageAdapter';
 export * from './lib/state/react/usePersistSignals';
 export { type SignalPersistenceConfig } from './lib/state/persistance/types';
 export * from './lib/utils';
-export * from './lib/queries/react/mutations/useMutation';
-export * from './lib/queries/react/queries/useQuery';
-export * from './lib/queries/react/useQueryClient';
-export * from './lib/queries/react/queries/useForeverQuery';
+export * from './lib/queries/useQuery$';
+export * from './lib/queries/useMutation$';
+export * from './lib/deprecated/react/mutations/useMutation';
+export * from './lib/deprecated/react/queries/useQuery';
+export * from './lib/deprecated/react/useQueryClient';
+export * from './lib/deprecated/react/queries/useForeverQuery';
 export * from './lib/binding/useSubscribeEffect';
-export * from './lib/queries/client/QueryClient';
-export { QueryCache } from './lib/queries/client/queries/cache/QueryCache';
-export { QueryClientProvider } from './lib/queries/react/QueryClientProvider';
-export { MutationCache } from './lib/queries/client/mutations/cache/MutationCache';
+export * from './lib/deprecated/client/QueryClient';
+export { QueryCache } from './lib/deprecated/client/queries/cache/QueryCache';
+export { QueryClientProvider } from './lib/deprecated/react/QueryClientProvider';
+export { MutationCache } from './lib/deprecated/client/mutations/cache/MutationCache';

package/dist/index.js

@@ -11,8 +11,9 @@ var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "
 var _trigger$, _mutationRunner, _currentMutationSubject, _visibility$, _focusedSubject, _client, _currentQuery, _fetchSubject, _currentQueryInitialState, _lastResult, _lastQueryWithDefinedData, _observers, _observerCount, _cancelSubject, _executeSubject, _store, _defaultOptions, _initialState, _notifySubject, _store2, _mutationCache, _queryCache, _mutationDefaults, _queryDefaults, _defaultOptions2;
 import * as React from "react";
 import { useRef, useMemo, useCallback, useSyncExternalStore, useEffect, useState, createContext, memo, useContext } from "react";
-import { isObservable, from, of, defer, startWith, identity, distinctUntilChanged, tap, catchError, EMPTY, Subject, BehaviorSubject, skip, first, map, switchMap, zip, share, merge, throttleTime, asyncScheduler, concatMap, scan, throwError, timer, Observable, takeWhile, filter, last, mergeMap as mergeMap$1, takeUntil, shareReplay, ignoreElements, fromEvent, noop as noop$1, pairwise, NEVER, delay, interval, withLatestFrom, retry, iif, isEmpty, concat, toArray, take, combineLatest, endWith, lastValueFrom } from "rxjs";
+import { isObservable, from, of, defer, startWith, identity, distinctUntilChanged, tap, catchError, EMPTY, Subject, BehaviorSubject, skip, first, map, switchMap, zip, share, merge, throttleTime, asyncScheduler, concatMap, scan, throwError, timer, finalize, take, Observable, takeWhile, filter, last, mergeMap as mergeMap$1, takeUntil, shareReplay, ignoreElements, fromEvent, noop as noop$1, pairwise, NEVER, delay, interval, withLatestFrom, retry, iif, isEmpty, concat, toArray, combineLatest, endWith, lastValueFrom } from "rxjs";
 import { catchError as catchError$1, mergeMap, retryWhen, concatMap as concatMap$1, first as first$1, tap as tap$1 } from "rxjs/operators";
+import { useQueryClient as useQueryClient$1, useQuery as useQuery$1, useMutation as useMutation$1 } from "@tanstack/react-query";
 import { jsxs, jsx } from "react/jsx-runtime";
 const useLiveRef = (value) => {
   const ref = useRef(value);
@@ -184,13 +185,20 @@ const useObservableState = (defaultValue) => {
   );
   return [subject$.current, setState, subject.current.getValue()];
 };
+const useLiveBehaviorSubject = (state) => {
+  const subject = useBehaviorSubject(state);
+  useEffect(() => {
+    subject.current.next(state);
+  }, [state, subject]);
+  return subject;
+};
 const SIGNAL_RESET = Symbol("SIGNAL_RESET");
 function signal(config = {}) {
   const normalizedConfig = {
     default: config.default,
     key: config.key
   };
-  const { default: defaultValue } = normalizedConfig ?? {};
+  const { default: defaultValue } = normalizedConfig;
   const subject = new BehaviorSubject(defaultValue);
   const setValue = (arg) => {
     const update = (value) => {
@@ -338,13 +346,6 @@ const createLocalStorageAdapter = ({
     }
   };
 };
-const useLiveBehaviorSubject = (state) => {
-  const subject = useBehaviorSubject(state);
-  useEffect(() => {
-    subject.current.next(state);
-  }, [state, subject]);
-  return subject;
-};
 const IDENTIFIER_PERSISTANCE_KEY = "__reactjrx";
 const getNormalizedPersistanceValue = (unknownValue) => {
   if (typeof unknownValue === "object" && unknownValue !== null && IDENTIFIER_PERSISTANCE_KEY in unknownValue && unknownValue[IDENTIFIER_PERSISTANCE_KEY] === IDENTIFIER_PERSISTANCE_KEY) {
@@ -634,6 +635,90 @@ function isDefined(arg) {
 }
 const arrayEqual = (a, b) => a.length === b.length && a.every((v, i) => v === b[i]);
 const isServer = typeof window === "undefined" || "Deno" in window;
+function useQuery$(options, queryClient) {
+  const sub = useRef();
+  const _queryClient = useQueryClient$1(queryClient);
+  const queryFnAsync = (context) => {
+    let isResolved = false;
+    return new Promise((resolve, reject) => {
+      let lastData = void 0;
+      if (sub.current) {
+        sub.current.unsubscribe();
+        sub.current = void 0;
+      }
+      const unsub = _queryClient.getQueryCache().subscribe((d) => {
+        var _a;
+        if (d.type === "observerRemoved" && d.query.observers.length === 0) {
+          unsub();
+          _queryClient.cancelQueries({ queryKey: context.queryKey });
+          (_a = sub.current) == null ? void 0 : _a.unsubscribe();
+        }
+      });
+      const source = defer(
+        () => typeof options.queryFn === "function" ? options.queryFn(context) : options.queryFn
+      );
+      sub.current = source.pipe(
+        finalize(() => {
+          unsub();
+          isResolved = true;
+        })
+      ).subscribe({
+        next: (data) => {
+          lastData = data;
+          _queryClient == null ? void 0 : _queryClient.setQueryData(context.queryKey, data);
+        },
+        error: (error) => {
+          isResolved = true;
+          reject(error);
+        },
+        complete: () => {
+          if (lastData === void 0)
+            return reject(new Error("Stream completed without any data"));
+          if (isResolved) return;
+          isResolved = true;
+          resolve(lastData);
+        }
+      });
+    });
+  };
+  const result = useQuery$1(
+    {
+      ...options,
+      queryFn: queryFnAsync
+    },
+    queryClient
+  );
+  return result;
+}
+function useMutation$(options, queryClient) {
+  const mutationFnAsync = (variables) => {
+    let lastData;
+    return new Promise((resolve, reject) => {
+      const source = typeof options.mutationFn === "function" ? options.mutationFn(variables) : options.mutationFn;
+      source.pipe(take(1)).subscribe({
+        next: (data) => {
+          lastData = data;
+        },
+        error: (error) => {
+          reject(error);
+        },
+        complete: () => {
+          if (lastData === void 0)
+            return reject(new Error("Stream completed without any data"));
+          resolve(lastData);
+        }
+      });
+    });
+  };
+  const result = useMutation$1(
+    {
+      ...options,
+      mutationFn: mutationFnAsync
+    },
+    queryClient
+  );
+  return result;
+}
 function hasObjectPrototype(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
 }
@@ -3399,14 +3484,17 @@ export {
   useBehaviorSubject,
   useEffectOnce,
   useForeverQuery,
+  useLiveBehaviorSubject,
   useLiveRef,
   useMount,
   useMutation,
+  useMutation$,
   useObservableState,
   useObserve,
   useObserveCallback,
   usePersistSignals,
   useQuery,
+  useQuery$,
   useQueryClient,
   useSignal,
   useSignalValue,

package/dist/lib/{queries → deprecated}/client/mutations/mutation/executeMutation.d.ts

@@ -1,4 +1,5 @@
 import { MutationOptions, MutationState } from './types';
+import { DefaultError } from '../../types';
 export declare const executeMutation: <TData = unknown, TError = Error, TVariables = void, TContext = unknown>({ variables, state, options }: {
     variables: TVariables;
     state: MutationState<TData, TError, TVariables, TContext>;

package/dist/lib/{queries → deprecated}/client/mutations/utils/filters.d.ts

@@ -1,2 +1,3 @@
+import { DefaultError } from '../../types';
 import { MutationFilters } from '../types';
 export declare const createPredicateForFilters: <TData = unknown, TError = Error, TVariables = any, TContext = unknown>({ mutationKey, status, predicate, exact }?: MutationFilters<TData, TError, TVariables, TContext>) => (mutation: import('../mutation/Mutation').Mutation<TData, TError, TVariables, TContext>) => boolean;

package/dist/lib/{queries → deprecated}/client/queries/query/execution/executeQuery.d.ts

@@ -1,5 +1,6 @@
 import { Observable } from 'rxjs';
 import { QueryKey } from '../../../keys/types';
+import { DefaultError } from '../../../types';
 import { QueryState } from '../types';
 import { QueryOptions } from '../../types';
 export declare const executeQuery: <TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: QueryOptions<TQueryFnData, TError, TData, TQueryKey> & {

package/dist/lib/{queries → deprecated}/client/queries/query/operators.d.ts

@@ -1,3 +1,4 @@
+import { DefaultError } from '../../types';
 import { Observable } from 'rxjs';
 import { QueryOptions } from '../types';
 import { QueryState } from './types';

package/dist/lib/{queries → deprecated}/client/queries/query/state/whenNewData.d.ts

@@ -1,4 +1,5 @@
 import { Observable } from 'rxjs';
+import { DefaultError } from '../../../types';
 import { QueryState } from '../types';
 export declare const whenNewData: <TQueryFnData = unknown, TError = Error, TData = TQueryFnData>(source: Observable<Partial<QueryState<TData, TError>>>) => Observable<{
     data: TData | undefined;

package/dist/lib/logger.d.ts

@@ -9,18 +9,18 @@ export declare function createLogger(env: string): {
     namespace(name: string, style?: {
         backgroundColor: string;
         color: string;
-    }): any;
+    }): /*elided*/ any;
     printNamespaces(): {
         namespaces: string;
         styles: string[];
     };
-    print(method: "log" | "warn" | "error" | "group", ...message: any[]): any;
-    printWithoutNamespace(method: "log" | "warn" | "error" | "group", ...message: any[]): any;
-    log(...message: any): any;
-    warn(...message: any): any;
-    error(...message: any): any;
-    group(...message: any): any;
-    groupEnd(): any;
+    print(method: "log" | "warn" | "error" | "group", ...message: any[]): /*elided*/ any;
+    printWithoutNamespace(method: "log" | "warn" | "error" | "group", ...message: any[]): /*elided*/ any;
+    log(...message: any): /*elided*/ any;
+    warn(...message: any): /*elided*/ any;
+    error(...message: any): /*elided*/ any;
+    group(...message: any): /*elided*/ any;
+    groupEnd(): /*elided*/ any;
 };
 export declare const Logger: {
     namespaces: {
@@ -33,16 +33,16 @@ export declare const Logger: {
     namespace(name: string, style?: {
         backgroundColor: string;
         color: string;
-    }): any;
+    }): /*elided*/ any;
     printNamespaces(): {
         namespaces: string;
         styles: string[];
     };
-    print(method: "log" | "warn" | "error" | "group", ...message: any[]): any;
-    printWithoutNamespace(method: "log" | "warn" | "error" | "group", ...message: any[]): any;
-    log(...message: any): any;
-    warn(...message: any): any;
-    error(...message: any): any;
-    group(...message: any): any;
-    groupEnd(): any;
+    print(method: "log" | "warn" | "error" | "group", ...message: any[]): /*elided*/ any;
+    printWithoutNamespace(method: "log" | "warn" | "error" | "group", ...message: any[]): /*elided*/ any;
+    log(...message: any): /*elided*/ any;
+    warn(...message: any): /*elided*/ any;
+    error(...message: any): /*elided*/ any;
+    group(...message: any): /*elided*/ any;
+    groupEnd(): /*elided*/ any;
 };

package/dist/lib/queries/useMutation$.d.ts

@@ -0,0 +1,5 @@
+import { DefaultError, QueryClient, UseMutationOptions } from '@tanstack/react-query';
+import { Observable } from 'rxjs';
+export declare function useMutation$<TData = unknown, TError = DefaultError, TVariables = void, TContext = unknown>(options: Omit<UseMutationOptions<TData, TError, TVariables, TContext>, "mutationFn"> & {
+    mutationFn: ((variables: TVariables) => Observable<TData>) | Observable<TData>;
+}, queryClient?: QueryClient): import('@tanstack/react-query').UseMutationResult<TData, TError, TVariables, TContext>;

package/dist/lib/queries/useMutation.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/queries/useQuery$.d.ts

@@ -0,0 +1,5 @@
+import { DefaultError, QueryClient, QueryFunctionContext, QueryKey, UseQueryOptions } from '@tanstack/react-query';
+import { Observable } from 'rxjs';
+export declare function useQuery$<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: Omit<UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>, "queryFn"> & {
+    queryFn: ((context: QueryFunctionContext<TQueryKey>) => Observable<TQueryFnData>) | Observable<TQueryFnData>;
+}, queryClient?: QueryClient): import('@tanstack/react-query').UseQueryResult<TData, TError>;

package/dist/lib/queries/useQuery.cleanup.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/queries/useQuery.deduplication.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/queries/useQuery.invalidation.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/queries/useQuery.keys.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/queries/useQuery.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/utils.d.ts

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react';
-import { QueryClient, QueryClientConfig } from '../lib/queries/client/QueryClient';
+import { QueryClient, QueryClientConfig } from '../lib/deprecated/client/QueryClient';
 import { default as React } from 'react';
 export declare const waitForTimeout: (timeout: number) => Promise<undefined>;
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "reactjrx",
   "private": false,
-  "version": "1.101.1",
+  "version": "1.105.1",
   "type": "module",
   "files": [
     "dist"
@@ -14,9 +14,6 @@
       "require": "./dist/index.umd.cjs"
     }
   },
-  "engines": {
-    "node": "20"
-  },
   "types": "./dist/index.d.ts",
   "publishConfig": {
     "access": "public"
@@ -37,10 +34,10 @@
   "peerDependencies": {
     "react": "18",
     "react-dom": "18",
-    "rxjs": "*"
+    "rxjs": "*",
+    "@tanstack/react-query": "^5.8.4"
   },
   "devDependencies": {
-    "@tanstack/react-query": "^5.8.4",
     "@testing-library/jest-dom": "^6.2.0",
     "@testing-library/react": "^16.0.0",
     "@types/node": "^20.0.0",