@oscarpalmer/mora 0.19.0 → 0.21.0

package/src/value/store.ts

@@ -1,5 +1,9 @@
 import {isKey, isPlainObject} from '@oscarpalmer/atoms/is';
-import type {Key, PlainObject} from '@oscarpalmer/atoms/models';
+import type {
+	GenericCallback,
+	Key,
+	PlainObject,
+} from '@oscarpalmer/atoms/models';
 import {storeName} from '../helpers/is';
 import {
 	getReactiveValueInProxy,
@@ -7,6 +11,7 @@ import {
 	setValueInProxy,
 } from '../helpers/proxy';
 import {getValue} from '../helpers/value';
+import {type Unsubscribe, noop, subscribe} from '../subscription';
 import type {Computed} from './computed';
 import {Reactive, type ReactiveOptions} from './reactive';
 
@@ -41,7 +46,7 @@ export class Store<Value extends PlainObject> extends Reactive<Value, Value> {
 
 	get(key?: unknown): unknown {
 		return isKey(key)
-			? getReactiveValueInProxy(this, this.#keyed, key, false)
+			? getReactiveValueInProxy(this, this.#keyed, key, false).get()
 			: getValue(this.state);
 	}
 
@@ -86,6 +91,48 @@ export class Store<Value extends PlainObject> extends Reactive<Value, Value> {
 			setProxyValue(this.state.value, first ?? {});
 		}
 	}
+
+	/**
+	 * @inheritdoc
+	 */
+	subscribe(callback: (value: Value) => void): Unsubscribe;
+
+	/**
+	 * Subscribe to changes for a specific key
+	 */
+	subscribe<Key extends keyof Value>(
+		key: Key,
+		callback: (value: Value[Key] | undefined) => void,
+	): Unsubscribe;
+
+	/**
+	 * Subscribe to changes for a specific key
+	 */
+	subscribe(key: Key, callback: (value: unknown) => void): Unsubscribe;
+
+	subscribe(
+		first: Key | GenericCallback,
+		second?: GenericCallback,
+	): Unsubscribe {
+		if (isKey(first) && typeof second === 'function') {
+			return getReactiveValueInProxy(this, this.#keyed, first, false).subscribe(
+				second,
+			);
+		}
+
+		return typeof first === 'function' ? subscribe(this.state, first) : noop;
+	}
+
+	/**
+	 * Update the value _(based on the current value)_
+	 */
+	update(callback: (value: Value) => Value): void {
+		const updated = callback({...this.state.value});
+
+		if (updated == null || isPlainObject(updated)) {
+			setProxyValue(this.state.value, updated ?? {});
+		}
+	}
 }
 
 /**

package/types/batch.d.cts

@@ -52,13 +52,13 @@ export type ReactiveState<Value, Equal> = {
 	computeds: Set<Computed<unknown>>;
 	effects: Set<Effect>;
 	equal: (first: Equal, second: Equal) => boolean;
-	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+	subscriptions: Map<GenericCallback, Subscription>;
 	value: Value;
 };
-declare class Subscription<Value> {
-	state: ReactiveState<Value, never>;
+declare class Subscription {
+	state: ReactiveState<unknown, never>;
 	callback: GenericCallback;
-	constructor(state: ReactiveState<Value, never>, callback: GenericCallback);
+	constructor(state: ReactiveState<unknown, never>, callback: GenericCallback);
 }
 /**
  * Unsubscribe from changes
@@ -73,7 +73,7 @@ export declare function startBatch(): void;
  * Stop batching effects and flush _(run)_ them
  */
 export declare function stopBatch(): void;
-export declare const batchedHandlers: Set<Effect | Subscription<unknown>>;
+export declare const batchedHandlers: Set<Effect | Subscription>;
 export declare let batchDepth: number;
 
 export {};

package/types/batch.d.ts

@@ -9,5 +9,5 @@ export declare function startBatch(): void;
  * Stop batching effects and flush _(run)_ them
  */
 export declare function stopBatch(): void;
-export declare const batchedHandlers: Set<Effect | Subscription<unknown>>;
+export declare const batchedHandlers: Set<Subscription | Effect>;
 export declare let batchDepth: number;

package/types/helpers/is.d.cts

@@ -60,13 +60,13 @@ export type ReactiveState<Value, Equal> = {
 	computeds: Set<Computed<unknown>>;
 	effects: Set<Effect>;
 	equal: (first: Equal, second: Equal) => boolean;
-	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+	subscriptions: Map<GenericCallback, Subscription>;
 	value: Value;
 };
-declare class Subscription<Value> {
-	state: ReactiveState<Value, never>;
+declare class Subscription {
+	state: ReactiveState<unknown, never>;
 	callback: GenericCallback;
-	constructor(state: ReactiveState<Value, never>, callback: GenericCallback);
+	constructor(state: ReactiveState<unknown, never>, callback: GenericCallback);
 }
 /**
  * Unsubscribe from changes
@@ -91,7 +91,13 @@ declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * @inheritdoc
 	 */
 	get(): Item[];
+	/**
+	 * Get the value at an index
+	 */
 	get(index: number): Item | undefined;
+	/**
+	 * Get the length of the array
+	 */
 	get(property: "length"): number;
 	/**
 	 * Create a computed, filtered array
@@ -105,6 +111,7 @@ declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * @inheritdoc
 	 */
 	peek(): Item[];
+	peek(index: number): Item | undefined;
 	/**
 	 * Get the length of the array _(without reactivity)_
 	 */
@@ -120,7 +127,7 @@ declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	/**
 	 * Set the value
 	 */
-	set(value: Item[]): void;
+	set(value?: Item[]): void;
 	/**
 	 * Set the value at an index
 	 */
@@ -137,10 +144,22 @@ declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * Remove and return items from the array _(and optionally add new items)_
 	 */
 	splice(from: number, to?: number, ...items: Item[]): Item[];
+	/**
+	 * @inheritdoc
+	 */
+	subscribe(callback: (value: Item[]) => void): Unsubscribe;
+	/**
+	 * Subscribe to changes at a specific index
+	 */
+	subscribe(index: number, callback: (value: Item | undefined) => void): Unsubscribe;
 	/**
 	 * Add items to the beginning of the array
 	 */
 	unshift(...items: Item[]): number;
+	/**
+	 * Update the value _(based on the current value)_
+	 */
+	update(callback: (value: Item[]) => Item[]): void;
 }
 declare class Signal<Value> extends Reactive<Value> {
 	constructor(value: Value, options?: ReactiveOptions<Value>);
@@ -153,7 +172,7 @@ declare class Signal<Value> extends Reactive<Value> {
 	 */
 	set(value: Value): void;
 	/**
-	 * Update the value
+	 * Update the value _(based on the current value)_
 	 */
 	update(callback: (value: Value) => Value): void;
 }
@@ -196,6 +215,22 @@ declare class Store<Value extends PlainObject> extends Reactive<Value, Value> {
 	 * Set a value by key
 	 */
 	set(key: Key, value: unknown): void;
+	/**
+	 * @inheritdoc
+	 */
+	subscribe(callback: (value: Value) => void): Unsubscribe;
+	/**
+	 * Subscribe to changes for a specific key
+	 */
+	subscribe<Key extends keyof Value>(key: Key, callback: (value: Value[Key] | undefined) => void): Unsubscribe;
+	/**
+	 * Subscribe to changes for a specific key
+	 */
+	subscribe(key: Key, callback: (value: unknown) => void): Unsubscribe;
+	/**
+	 * Update the value _(based on the current value)_
+	 */
+	update(callback: (value: Value) => Value): void;
 }
 /**
  * Is the value a reactive array?

package/types/helpers/proxy.d.cts

@@ -64,13 +64,13 @@ export type ReactiveState<Value, Equal> = {
 	computeds: Set<Computed<unknown>>;
 	effects: Set<Effect>;
 	equal: (first: Equal, second: Equal) => boolean;
-	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+	subscriptions: Map<GenericCallback, Subscription>;
 	value: Value;
 };
-declare class Subscription<Value> {
-	state: ReactiveState<Value, never>;
+declare class Subscription {
+	state: ReactiveState<unknown, never>;
 	callback: GenericCallback;
-	constructor(state: ReactiveState<Value, never>, callback: GenericCallback);
+	constructor(state: ReactiveState<unknown, never>, callback: GenericCallback);
 }
 /**
  * Unsubscribe from changes
@@ -95,7 +95,13 @@ declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * @inheritdoc
 	 */
 	get(): Item[];
+	/**
+	 * Get the value at an index
+	 */
 	get(index: number): Item | undefined;
+	/**
+	 * Get the length of the array
+	 */
 	get(property: "length"): number;
 	/**
 	 * Create a computed, filtered array
@@ -109,6 +115,7 @@ declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * @inheritdoc
 	 */
 	peek(): Item[];
+	peek(index: number): Item | undefined;
 	/**
 	 * Get the length of the array _(without reactivity)_
 	 */
@@ -124,7 +131,7 @@ declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	/**
 	 * Set the value
 	 */
-	set(value: Item[]): void;
+	set(value?: Item[]): void;
 	/**
 	 * Set the value at an index
 	 */
@@ -141,10 +148,22 @@ declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * Remove and return items from the array _(and optionally add new items)_
 	 */
 	splice(from: number, to?: number, ...items: Item[]): Item[];
+	/**
+	 * @inheritdoc
+	 */
+	subscribe(callback: (value: Item[]) => void): Unsubscribe;
+	/**
+	 * Subscribe to changes at a specific index
+	 */
+	subscribe(index: number, callback: (value: Item | undefined) => void): Unsubscribe;
 	/**
 	 * Add items to the beginning of the array
 	 */
 	unshift(...items: Item[]): number;
+	/**
+	 * Update the value _(based on the current value)_
+	 */
+	update(callback: (value: Item[]) => Item[]): void;
 }
 declare class Signal<Value> extends Reactive<Value> {
 	constructor(value: Value, options?: ReactiveOptions<Value>);
@@ -157,7 +176,7 @@ declare class Signal<Value> extends Reactive<Value> {
 	 */
 	set(value: Value): void;
 	/**
-	 * Update the value
+	 * Update the value _(based on the current value)_
 	 */
 	update(callback: (value: Value) => Value): void;
 }
@@ -200,9 +219,25 @@ declare class Store<Value extends PlainObject> extends Reactive<Value, Value> {
 	 * Set a value by key
 	 */
 	set(key: Key, value: unknown): void;
+	/**
+	 * @inheritdoc
+	 */
+	subscribe(callback: (value: Value) => void): Unsubscribe;
+	/**
+	 * Subscribe to changes for a specific key
+	 */
+	subscribe<Key extends keyof Value>(key: Key, callback: (value: Value[Key] | undefined) => void): Unsubscribe;
+	/**
+	 * Subscribe to changes for a specific key
+	 */
+	subscribe(key: Key, callback: (value: unknown) => void): Unsubscribe;
+	/**
+	 * Update the value _(based on the current value)_
+	 */
+	update(callback: (value: Value) => Value): void;
 }
-export declare function getReactiveValueInProxy<Value>(array: ReactiveArray<Value>, mapped: Map<Key, Computed<unknown>>, index: number, isArray: true): unknown;
-export declare function getReactiveValueInProxy<Value extends PlainObject>(store: Store<Value>, mapped: Map<Key, Computed<unknown>>, key: Key, isArray: false): unknown;
+export declare function getReactiveValueInProxy<Value>(array: ReactiveArray<Value>, mapped: Map<Key, Computed<unknown>>, index: number, isArray: true): Computed<unknown>;
+export declare function getReactiveValueInProxy<Value extends PlainObject>(store: Store<Value>, mapped: Map<Key, Computed<unknown>>, key: Key, isArray: false): Computed<unknown>;
 export declare function setProxyValue(proxy: ArrayOrPlainObject, value: ArrayOrPlainObject): void;
 export declare function setValueInProxy<Value extends ArrayOrPlainObject, Equal>(target: Value, property: PropertyKey, value: unknown, state: ReactiveState<Value, Equal>, isArray: boolean, length?: Signal<number>): boolean;
 

package/types/helpers/proxy.d.ts

@@ -4,7 +4,7 @@ import { type Computed } from '../value/computed';
 import type { ReactiveState } from '../value/reactive';
 import type { Signal } from '../value/signal';
 import type { Store } from '../value/store';
-export declare function getReactiveValueInProxy<Value>(array: ReactiveArray<Value>, mapped: Map<Key, Computed<unknown>>, index: number, isArray: true): unknown;
-export declare function getReactiveValueInProxy<Value extends PlainObject>(store: Store<Value>, mapped: Map<Key, Computed<unknown>>, key: Key, isArray: false): unknown;
+export declare function getReactiveValueInProxy<Value>(array: ReactiveArray<Value>, mapped: Map<Key, Computed<unknown>>, index: number, isArray: true): Computed<unknown>;
+export declare function getReactiveValueInProxy<Value extends PlainObject>(store: Store<Value>, mapped: Map<Key, Computed<unknown>>, key: Key, isArray: false): Computed<unknown>;
 export declare function setProxyValue(proxy: ArrayOrPlainObject, value: ArrayOrPlainObject): void;
 export declare function setValueInProxy<Value extends ArrayOrPlainObject, Equal>(target: Value, property: PropertyKey, value: unknown, state: ReactiveState<Value, Equal>, isArray: boolean, length?: Signal<number>): boolean;

package/types/helpers/value.d.cts

@@ -52,13 +52,13 @@ export type ReactiveState<Value, Equal> = {
 	computeds: Set<Computed<unknown>>;
 	effects: Set<Effect>;
 	equal: (first: Equal, second: Equal) => boolean;
-	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+	subscriptions: Map<GenericCallback, Subscription>;
 	value: Value;
 };
-declare class Subscription<Value> {
-	state: ReactiveState<Value, never>;
+declare class Subscription {
+	state: ReactiveState<unknown, never>;
 	callback: GenericCallback;
-	constructor(state: ReactiveState<Value, never>, callback: GenericCallback);
+	constructor(state: ReactiveState<unknown, never>, callback: GenericCallback);
 }
 /**
  * Unsubscribe from changes

package/types/index.d.cts

@@ -68,13 +68,13 @@ export type ReactiveState<Value, Equal> = {
 	computeds: Set<Computed<unknown>>;
 	effects: Set<Effect>;
 	equal: (first: Equal, second: Equal) => boolean;
-	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+	subscriptions: Map<GenericCallback, Subscription>;
 	value: Value;
 };
-declare class Subscription<Value> {
-	state: ReactiveState<Value, never>;
+declare class Subscription {
+	state: ReactiveState<unknown, never>;
 	callback: GenericCallback;
-	constructor(state: ReactiveState<Value, never>, callback: GenericCallback);
+	constructor(state: ReactiveState<unknown, never>, callback: GenericCallback);
 }
 /**
  * Unsubscribe from changes
@@ -107,7 +107,13 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * @inheritdoc
 	 */
 	get(): Item[];
+	/**
+	 * Get the value at an index
+	 */
 	get(index: number): Item | undefined;
+	/**
+	 * Get the length of the array
+	 */
 	get(property: "length"): number;
 	/**
 	 * Create a computed, filtered array
@@ -121,6 +127,7 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * @inheritdoc
 	 */
 	peek(): Item[];
+	peek(index: number): Item | undefined;
 	/**
 	 * Get the length of the array _(without reactivity)_
 	 */
@@ -136,7 +143,7 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	/**
 	 * Set the value
 	 */
-	set(value: Item[]): void;
+	set(value?: Item[]): void;
 	/**
 	 * Set the value at an index
 	 */
@@ -153,10 +160,22 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * Remove and return items from the array _(and optionally add new items)_
 	 */
 	splice(from: number, to?: number, ...items: Item[]): Item[];
+	/**
+	 * @inheritdoc
+	 */
+	subscribe(callback: (value: Item[]) => void): Unsubscribe;
+	/**
+	 * Subscribe to changes at a specific index
+	 */
+	subscribe(index: number, callback: (value: Item | undefined) => void): Unsubscribe;
 	/**
 	 * Add items to the beginning of the array
 	 */
 	unshift(...items: Item[]): number;
+	/**
+	 * Update the value _(based on the current value)_
+	 */
+	update(callback: (value: Item[]) => Item[]): void;
 }
 /**
  * Create a reactive array
@@ -173,7 +192,7 @@ export declare class Signal<Value> extends Reactive<Value> {
 	 */
 	set(value: Value): void;
 	/**
-	 * Update the value
+	 * Update the value _(based on the current value)_
 	 */
 	update(callback: (value: Value) => Value): void;
 }
@@ -220,6 +239,22 @@ export declare class Store<Value extends PlainObject> extends Reactive<Value, Va
 	 * Set a value by key
 	 */
 	set(key: Key, value: unknown): void;
+	/**
+	 * @inheritdoc
+	 */
+	subscribe(callback: (value: Value) => void): Unsubscribe;
+	/**
+	 * Subscribe to changes for a specific key
+	 */
+	subscribe<Key extends keyof Value>(key: Key, callback: (value: Value[Key] | undefined) => void): Unsubscribe;
+	/**
+	 * Subscribe to changes for a specific key
+	 */
+	subscribe(key: Key, callback: (value: unknown) => void): Unsubscribe;
+	/**
+	 * Update the value _(based on the current value)_
+	 */
+	update(callback: (value: Value) => Value): void;
 }
 /**
  * Create a reactive store

package/types/subscription.d.cts

@@ -52,13 +52,13 @@ export type ReactiveState<Value, Equal> = {
 	computeds: Set<Computed<unknown>>;
 	effects: Set<Effect>;
 	equal: (first: Equal, second: Equal) => boolean;
-	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+	subscriptions: Map<GenericCallback, Subscription>;
 	value: Value;
 };
-export declare class Subscription<Value> {
-	state: ReactiveState<Value, never>;
+export declare class Subscription {
+	state: ReactiveState<unknown, never>;
 	callback: GenericCallback;
-	constructor(state: ReactiveState<Value, never>, callback: GenericCallback);
+	constructor(state: ReactiveState<unknown, never>, callback: GenericCallback);
 }
 /**
  * Unsubscribe from changes

package/types/subscription.d.ts

@@ -1,9 +1,9 @@
 import type { GenericCallback } from '@oscarpalmer/atoms/models';
 import type { ReactiveState } from './value/reactive';
-export declare class Subscription<Value> {
-    state: ReactiveState<Value, never>;
+export declare class Subscription {
+    state: ReactiveState<unknown, never>;
     callback: GenericCallback;
-    constructor(state: ReactiveState<Value, never>, callback: GenericCallback);
+    constructor(state: ReactiveState<unknown, never>, callback: GenericCallback);
 }
 /**
  * Unsubscribe from changes

package/types/value/array.d.cts

@@ -52,13 +52,13 @@ export type ReactiveState<Value, Equal> = {
 	computeds: Set<Computed<unknown>>;
 	effects: Set<Effect>;
 	equal: (first: Equal, second: Equal) => boolean;
-	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+	subscriptions: Map<GenericCallback, Subscription>;
 	value: Value;
 };
-declare class Subscription<Value> {
-	state: ReactiveState<Value, never>;
+declare class Subscription {
+	state: ReactiveState<unknown, never>;
 	callback: GenericCallback;
-	constructor(state: ReactiveState<Value, never>, callback: GenericCallback);
+	constructor(state: ReactiveState<unknown, never>, callback: GenericCallback);
 }
 /**
  * Unsubscribe from changes
@@ -83,7 +83,13 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * @inheritdoc
 	 */
 	get(): Item[];
+	/**
+	 * Get the value at an index
+	 */
 	get(index: number): Item | undefined;
+	/**
+	 * Get the length of the array
+	 */
 	get(property: "length"): number;
 	/**
 	 * Create a computed, filtered array
@@ -97,6 +103,7 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * @inheritdoc
 	 */
 	peek(): Item[];
+	peek(index: number): Item | undefined;
 	/**
 	 * Get the length of the array _(without reactivity)_
 	 */
@@ -112,7 +119,7 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	/**
 	 * Set the value
 	 */
-	set(value: Item[]): void;
+	set(value?: Item[]): void;
 	/**
 	 * Set the value at an index
 	 */
@@ -129,10 +136,22 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 * Remove and return items from the array _(and optionally add new items)_
 	 */
 	splice(from: number, to?: number, ...items: Item[]): Item[];
+	/**
+	 * @inheritdoc
+	 */
+	subscribe(callback: (value: Item[]) => void): Unsubscribe;
+	/**
+	 * Subscribe to changes at a specific index
+	 */
+	subscribe(index: number, callback: (value: Item | undefined) => void): Unsubscribe;
 	/**
 	 * Add items to the beginning of the array
 	 */
 	unshift(...items: Item[]): number;
+	/**
+	 * Update the value _(based on the current value)_
+	 */
+	update(callback: (value: Item[]) => Item[]): void;
 }
 /**
  * Create a reactive array

package/types/value/array.d.ts

@@ -1,3 +1,4 @@
+import { type Unsubscribe } from '../subscription';
 import { type Computed } from './computed';
 import { Reactive, type ReactiveOptions } from './reactive';
 export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
@@ -19,7 +20,13 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
      * @inheritdoc
      */
     get(): Item[];
+    /**
+     * Get the value at an index
+     */
     get(index: number): Item | undefined;
+    /**
+     * Get the length of the array
+     */
     get(property: 'length'): number;
     /**
      * Create a computed, filtered array
@@ -33,6 +40,7 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
      * @inheritdoc
      */
     peek(): Item[];
+    peek(index: number): Item | undefined;
     /**
      * Get the length of the array _(without reactivity)_
      */
@@ -48,7 +56,7 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
     /**
      * Set the value
      */
-    set(value: Item[]): void;
+    set(value?: Item[]): void;
     /**
      * Set the value at an index
      */
@@ -65,10 +73,22 @@ export declare class ReactiveArray<Item> extends Reactive<Item[], Item> {
      * Remove and return items from the array _(and optionally add new items)_
      */
     splice(from: number, to?: number, ...items: Item[]): Item[];
+    /**
+     * @inheritdoc
+     */
+    subscribe(callback: (value: Item[]) => void): Unsubscribe;
+    /**
+     * Subscribe to changes at a specific index
+     */
+    subscribe(index: number, callback: (value: Item | undefined) => void): Unsubscribe;
     /**
      * Add items to the beginning of the array
      */
     unshift(...items: Item[]): number;
+    /**
+     * Update the value _(based on the current value)_
+     */
+    update(callback: (value: Item[]) => Item[]): void;
 }
 /**
  * Create a reactive array

package/types/value/computed.d.cts

@@ -65,13 +65,13 @@ export type ReactiveState<Value, Equal> = {
 	computeds: Set<Computed<unknown>>;
 	effects: Set<Effect>;
 	equal: (first: Equal, second: Equal) => boolean;
-	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+	subscriptions: Map<GenericCallback, Subscription>;
 	value: Value;
 };
-declare class Subscription<Value> {
-	state: ReactiveState<Value, never>;
+declare class Subscription {
+	state: ReactiveState<unknown, never>;
 	callback: GenericCallback;
-	constructor(state: ReactiveState<Value, never>, callback: GenericCallback);
+	constructor(state: ReactiveState<unknown, never>, callback: GenericCallback);
 }
 /**
  * Unsubscribe from changes

package/types/value/reactive.d.cts

@@ -52,13 +52,13 @@ export type ReactiveState<Value, Equal> = {
 	computeds: Set<Computed<unknown>>;
 	effects: Set<Effect>;
 	equal: (first: Equal, second: Equal) => boolean;
-	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+	subscriptions: Map<GenericCallback, Subscription>;
 	value: Value;
 };
-declare class Subscription<Value> {
-	state: ReactiveState<Value, never>;
+declare class Subscription {
+	state: ReactiveState<unknown, never>;
 	callback: GenericCallback;
-	constructor(state: ReactiveState<Value, never>, callback: GenericCallback);
+	constructor(state: ReactiveState<unknown, never>, callback: GenericCallback);
 }
 /**
  * Unsubscribe from changes

package/types/value/reactive.d.ts

@@ -1,3 +1,4 @@
+import type { GenericCallback } from '@oscarpalmer/atoms/models';
 import type { Effect } from '../effect';
 import { type Subscription, type Unsubscribe } from '../subscription';
 import type { Computed } from './computed';
@@ -39,6 +40,6 @@ export type ReactiveState<Value, Equal> = {
     computeds: Set<Computed<unknown>>;
     effects: Set<Effect>;
     equal: (first: Equal, second: Equal) => boolean;
-    subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+    subscriptions: Map<GenericCallback, Subscription>;
     value: Value;
 };