reactjrx 1.30.0 → 1.31.1

package/dist/index.cjs

@@ -147,10 +147,8 @@ function trigger(mapper = rxjs.identity) {
 }
 const SIGNAL_RESET = Symbol("SIGNAL_RESET");
 function signal(options) {
-  const { default: defaultValue, key } = options ?? {};
+  const { default: defaultValue } = options ?? {};
   const subject = new rxjs.BehaviorSubject(defaultValue);
-  const subject$ = subject.asObservable();
-  const useValue = () => useObserve(subject$, { defaultValue: subject.getValue(), key });
   const setValue = (arg) => {
     if (arg === subject.getValue())
       return;
@@ -168,26 +166,24 @@ function signal(options) {
     subject.next(arg);
   };
   const getValue = () => subject.getValue();
-  return [
-    useValue,
-    setValue,
+  return {
+    setState: setValue,
     getValue,
+    options,
     /**
      * @important
      * We return the original behavior subject for two reasons:
      * - useObserve may return the default value directly instead of undefined
      * - the scope exist for react binding, this observable is a direct access outside of it
      */
-    subject,
-    options,
-    { setState: setValue, useState: useValue }
-  ];
+    subject
+  };
 }
 const useSetSignal = (signal2) => {
   return signal2.setState;
 };
-const useSignalValue = (signal2) => {
-  return signal2.useState();
+const useSignalValue = (signal2, key) => {
+  return useObserve(signal2.subject, { defaultValue: signal2.getValue(), key });
 };
 const useSignal = (signal2) => {
   return [useSignalValue(signal2), useSetSignal(signal2)];
@@ -287,15 +283,14 @@ const getNormalizedPersistanceValue = (unknownValue) => {
   return void 0;
 };
 function withPersistance(_signal, { version = 0 } = {}) {
-  const [hook, setValue, getState, $, options, ...rest] = _signal;
-  if (!options.key) {
+  if (!_signal.options.key) {
     console.error(
       "You need to specify a key to use persistance with this signal"
     );
   }
   const hydrateValue = async ({
     adapter,
-    key = options.key
+    key = _signal.options.key
   }) => {
     if (!key)
       return;
@@ -306,15 +301,15 @@ function withPersistance(_signal, { version = 0 } = {}) {
     if (normalizedValue.migrationVersion && version > normalizedValue.migrationVersion) {
       return;
     }
-    setValue(value.value);
+    _signal.setState(value.value);
   };
   const persistValue = async ({
     adapter,
-    key = options.key
+    key = _signal.options.key
   }) => {
     if (!key)
       return;
-    const state = getState();
+    const state = _signal.getValue();
     const value = {
       value: state,
       __key: "reactjrx_persistance",
@@ -323,13 +318,14 @@ function withPersistance(_signal, { version = 0 } = {}) {
     await adapter.setItem(key, value);
   };
   return [
-    { hydrateValue, persistValue, setValue, $, options },
-    hook,
-    setValue,
-    getState,
-    $,
-    options,
-    ...rest
+    {
+      hydrateValue,
+      persistValue,
+      setValue: _signal.setState,
+      $: _signal.subject,
+      options: _signal.options
+    },
+    _signal
   ];
 }
 const normalizeStore = (store) => {

package/dist/index.js

@@ -145,10 +145,8 @@ function trigger(mapper = identity) {
 }
 const SIGNAL_RESET = Symbol("SIGNAL_RESET");
 function signal(options) {
-  const { default: defaultValue, key } = options ?? {};
+  const { default: defaultValue } = options ?? {};
   const subject = new BehaviorSubject(defaultValue);
-  const subject$ = subject.asObservable();
-  const useValue = () => useObserve(subject$, { defaultValue: subject.getValue(), key });
   const setValue = (arg) => {
     if (arg === subject.getValue())
       return;
@@ -166,26 +164,24 @@ function signal(options) {
     subject.next(arg);
   };
   const getValue = () => subject.getValue();
-  return [
-    useValue,
-    setValue,
+  return {
+    setState: setValue,
     getValue,
+    options,
     /**
      * @important
      * We return the original behavior subject for two reasons:
      * - useObserve may return the default value directly instead of undefined
      * - the scope exist for react binding, this observable is a direct access outside of it
      */
-    subject,
-    options,
-    { setState: setValue, useState: useValue }
-  ];
+    subject
+  };
 }
 const useSetSignal = (signal2) => {
   return signal2.setState;
 };
-const useSignalValue = (signal2) => {
-  return signal2.useState();
+const useSignalValue = (signal2, key) => {
+  return useObserve(signal2.subject, { defaultValue: signal2.getValue(), key });
 };
 const useSignal = (signal2) => {
   return [useSignalValue(signal2), useSetSignal(signal2)];
@@ -285,15 +281,14 @@ const getNormalizedPersistanceValue = (unknownValue) => {
   return void 0;
 };
 function withPersistance(_signal, { version = 0 } = {}) {
-  const [hook, setValue, getState, $, options, ...rest] = _signal;
-  if (!options.key) {
+  if (!_signal.options.key) {
     console.error(
       "You need to specify a key to use persistance with this signal"
     );
   }
   const hydrateValue = async ({
     adapter,
-    key = options.key
+    key = _signal.options.key
   }) => {
     if (!key)
       return;
@@ -304,15 +299,15 @@ function withPersistance(_signal, { version = 0 } = {}) {
     if (normalizedValue.migrationVersion && version > normalizedValue.migrationVersion) {
       return;
     }
-    setValue(value.value);
+    _signal.setState(value.value);
   };
   const persistValue = async ({
     adapter,
-    key = options.key
+    key = _signal.options.key
   }) => {
     if (!key)
       return;
-    const state = getState();
+    const state = _signal.getValue();
     const value = {
       value: state,
       __key: "reactjrx_persistance",
@@ -321,13 +316,14 @@ function withPersistance(_signal, { version = 0 } = {}) {
     await adapter.setItem(key, value);
   };
   return [
-    { hydrateValue, persistValue, setValue, $, options },
-    hook,
-    setValue,
-    getState,
-    $,
-    options,
-    ...rest
+    {
+      hydrateValue,
+      persistValue,
+      setValue: _signal.setState,
+      $: _signal.subject,
+      options: _signal.options
+    },
+    _signal
   ];
 }
 const normalizeStore = (store) => {

package/dist/lib/state/persistance/withPersistance.d.ts

@@ -1,5 +1,4 @@
-import { type Observable } from "rxjs";
-import { type signal } from "../signal";
+import type { Signal } from "../signal";
 import { type Adapter } from "./types";
 export interface WithPersistanceReturn<T> {
     hydrateValue: (params: {
@@ -8,12 +7,12 @@ export interface WithPersistanceReturn<T> {
     persistValue: (params: {
         adapter: Adapter;
     }) => Promise<void>;
-    setValue: ReturnType<typeof signal<T>>[1];
-    $: Observable<T>;
+    setValue: Signal<T, T>['setState'];
+    $: Signal<T, T>['subject'];
     options: {
         key?: string;
     };
 }
-export declare function withPersistance<T>(_signal: ReturnType<typeof signal<T>>, { version }?: {
+export declare function withPersistance<T>(_signal: Signal<T, T>, { version }?: {
     version?: number;
-}): [WithPersistanceReturn<T>, ...ReturnType<typeof signal<T>>];
+}): [WithPersistanceReturn<T>, Signal<T, T>];

package/dist/lib/state/signal.d.ts

@@ -1,4 +1,4 @@
-import { type Observable } from "rxjs";
+import type { Observable } from "rxjs";
 import { SIGNAL_RESET } from "./constants";
 type Option<R = undefined> = {
     key?: string;
@@ -10,15 +10,9 @@ type Option<R = undefined> = {
 type SetState<S> = (stateOrUpdater: typeof SIGNAL_RESET | S | ((prev: S) => S)) => void;
 export interface Signal<S, R> {
     setState: SetState<S>;
-    useState: () => R;
+    getValue: () => R;
+    options: Option<S>;
+    subject: Observable<S>;
 }
-type Return<S, R> = [
-    () => R,
-    SetState<S>,
-    () => R,
-    Observable<R>,
-    Option<S>,
-    Signal<S, R>
-];
-export declare function signal<T = undefined>(options: Option<T>): Return<T, T>;
+export declare function signal<T = undefined>(options: Option<T>): Signal<T, T>;
 export {};

package/dist/lib/state/useSignal.d.ts

@@ -1,2 +1,2 @@
 import { type Signal } from "./signal";
-export declare const useSignal: <S, R>(signal: Signal<S, R>) => readonly [R, (stateOrUpdater: typeof import("./constants").SIGNAL_RESET | S | ((prev: S) => S)) => void];
+export declare const useSignal: <S, R>(signal: Signal<S, R>) => readonly [S | R, (stateOrUpdater: typeof import("./constants").SIGNAL_RESET | S | ((prev: S) => S)) => void];

package/dist/lib/state/useSignalValue.d.ts

@@ -1,2 +1,2 @@
 import { type Signal } from "./signal";
-export declare const useSignalValue: <S, R>(signal: Signal<S, R>) => R;
+export declare const useSignalValue: <S, R>(signal: Signal<S, R>, key?: string) => S | R;

package/package.json

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