@oscarpalmer/mora 0.10.0 → 0.11.1

package/types/is.d.cts

@@ -6,14 +6,17 @@ declare class Effect {
 	private readonly state;
 	constructor(callback: GenericCallback);
 }
-declare class Computed<Value> {
-	private readonly $mora;
-	private readonly state;
+declare class Computed<Value> extends Reactive<Value> {
+	private readonly effect;
 	constructor(callback: () => Value);
 	/**
 	 * Get the value
 	 */
 	get(): Value;
+}
+declare abstract class Reactive<Value> {
+	protected readonly state: ReactiveState<Value>;
+	constructor(name: string, value: Value);
 	/**
 	 * Get the value _(without reactivity)_
 	 */
@@ -27,36 +30,36 @@ declare class Computed<Value> {
 	 */
 	unsubscribe(callback: (value: Value) => void): void;
 }
-declare class Signal<Value> {
-	private readonly $mora;
-	private readonly state;
+export type ReactiveState<Value> = {
+	computeds: Set<Computed<unknown>>;
+	effects: Set<Effect>;
+	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+	value: Value;
+};
+declare class Subscription<Value> {
+	state: ReactiveState<Value>;
+	callback: GenericCallback;
+	constructor(state: ReactiveState<Value>, callback: GenericCallback);
+}
+/**
+ * Unsubscribe from changes
+ */
+export type Unsubscribe = () => void;
+declare class Signal<Value> extends Reactive<Value> {
 	constructor(value: Value);
 	/**
 	 * Get the value
 	 */
 	get(): Value;
-	/**
-	 * Get the value _(without reactivity)_
-	 */
-	peek(): Value;
 	/**
 	 * Set the value
 	 */
 	set(value: Value): void;
-	/**
-	 * Subscribe to changes
-	 */
-	subscribe(callback: (value: Value) => void): Unsubscribe;
-	/**
-	 * Unsubscribe from changes
-	 */
-	unsubscribe(callback: (value: Value) => void): void;
 	/**
 	 * Update the value
 	 */
 	update(callback: (value: Value) => Value): void;
 }
-export type Unsubscribe = () => void;
 /**
  * Is the value a computed signal?
  */
@@ -65,6 +68,7 @@ export declare function isComputed(value: unknown): value is Computed<unknown>;
  * Is the value an effect?
  */
 export declare function isEffect(value: unknown): value is Effect;
+export declare function isReactive(value: unknown): value is Reactive<unknown>;
 /**
  * Is the value a signal?
  */

package/types/is.d.ts

@@ -1,5 +1,6 @@
 import type { Computed } from './computed';
 import type { Effect } from './effect';
+import type { Reactive } from './reactive';
 import type { Signal } from './signal';
 /**
  * Is the value a computed signal?
@@ -9,6 +10,7 @@ export declare function isComputed(value: unknown): value is Computed<unknown>;
  * Is the value an effect?
  */
 export declare function isEffect(value: unknown): value is Effect;
+export declare function isReactive(value: unknown): value is Reactive<unknown>;
 /**
  * Is the value a signal?
  */

package/types/reactive.d.cts

@@ -0,0 +1,49 @@
+// Generated by dts-bundle-generator v9.5.1
+
+export type GenericCallback = (...args: any[]) => any;
+declare class Effect {
+	private readonly $mora;
+	private readonly state;
+	constructor(callback: GenericCallback);
+}
+declare class Computed<Value> extends Reactive<Value> {
+	private readonly effect;
+	constructor(callback: () => Value);
+	/**
+	 * Get the value
+	 */
+	get(): Value;
+}
+export declare abstract class Reactive<Value> {
+	protected readonly state: ReactiveState<Value>;
+	constructor(name: string, value: Value);
+	/**
+	 * Get the value _(without reactivity)_
+	 */
+	peek(): Value;
+	/**
+	 * Subscribe to changes
+	 */
+	subscribe(callback: (value: Value) => void): Unsubscribe;
+	/**
+	 * Unsubscribe from changes
+	 */
+	unsubscribe(callback: (value: Value) => void): void;
+}
+export type ReactiveState<Value> = {
+	computeds: Set<Computed<unknown>>;
+	effects: Set<Effect>;
+	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+	value: Value;
+};
+declare class Subscription<Value> {
+	state: ReactiveState<Value>;
+	callback: GenericCallback;
+	constructor(state: ReactiveState<Value>, callback: GenericCallback);
+}
+/**
+ * Unsubscribe from changes
+ */
+export type Unsubscribe = () => void;
+
+export {};

package/types/reactive.d.ts

@@ -0,0 +1,25 @@
+import type { Computed } from './computed';
+import type { Effect } from './effect';
+import { type Subscription, type Unsubscribe } from './subscription';
+export declare abstract class Reactive<Value> {
+    protected readonly state: ReactiveState<Value>;
+    constructor(name: string, value: Value);
+    /**
+     * Get the value _(without reactivity)_
+     */
+    peek(): Value;
+    /**
+     * Subscribe to changes
+     */
+    subscribe(callback: (value: Value) => void): Unsubscribe;
+    /**
+     * Unsubscribe from changes
+     */
+    unsubscribe(callback: (value: Value) => void): void;
+}
+export type ReactiveState<Value> = {
+    computeds: Set<Computed<unknown>>;
+    effects: Set<Effect>;
+    subscriptions: Map<(value: Value) => void, Subscription<Value>>;
+    value: Value;
+};

package/types/signal.d.cts

@@ -6,22 +6,17 @@ declare class Effect {
 	private readonly state;
 	constructor(callback: GenericCallback);
 }
-export type ComputedState<Value> = {
-	computeds: Set<Computed<unknown>>;
-	dirty: boolean;
-	effect: Effect;
-	effects: Set<Effect>;
-	subscriptions: Map<GenericCallback, Subscription>;
-	value: Value;
-};
-declare class Computed<Value> {
-	private readonly $mora;
-	private readonly state;
+declare class Computed<Value> extends Reactive<Value> {
+	private readonly effect;
 	constructor(callback: () => Value);
 	/**
 	 * Get the value
 	 */
 	get(): Value;
+}
+declare abstract class Reactive<Value> {
+	protected readonly state: ReactiveState<Value>;
+	constructor(name: string, value: Value);
 	/**
 	 * Get the value _(without reactivity)_
 	 */
@@ -35,47 +30,36 @@ declare class Computed<Value> {
 	 */
 	unsubscribe(callback: (value: Value) => void): void;
 }
-export type SignalState<Value> = {
+export type ReactiveState<Value> = {
 	computeds: Set<Computed<unknown>>;
 	effects: Set<Effect>;
-	subscriptions: Map<GenericCallback, Subscription>;
+	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
 	value: Value;
 };
-export declare class Signal<Value> {
-	private readonly $mora;
-	private readonly state;
+declare class Subscription<Value> {
+	state: ReactiveState<Value>;
+	callback: GenericCallback;
+	constructor(state: ReactiveState<Value>, callback: GenericCallback);
+}
+/**
+ * Unsubscribe from changes
+ */
+export type Unsubscribe = () => void;
+export declare class Signal<Value> extends Reactive<Value> {
 	constructor(value: Value);
 	/**
 	 * Get the value
 	 */
 	get(): Value;
-	/**
-	 * Get the value _(without reactivity)_
-	 */
-	peek(): Value;
 	/**
 	 * Set the value
 	 */
 	set(value: Value): void;
-	/**
-	 * Subscribe to changes
-	 */
-	subscribe(callback: (value: Value) => void): Unsubscribe;
-	/**
-	 * Unsubscribe from changes
-	 */
-	unsubscribe(callback: (value: Value) => void): void;
 	/**
 	 * Update the value
 	 */
 	update(callback: (value: Value) => Value): void;
 }
 export declare function signal<Value>(value: Value): Signal<Value>;
-declare class Subscription {
-	state: ComputedState<unknown> | SignalState<unknown>;
-	callback: GenericCallback;
-	constructor(state: ComputedState<unknown> | SignalState<unknown>, callback: GenericCallback);
-}
-export type Unsubscribe = () => void;
 
 export {};

package/types/signal.d.ts

@@ -1,37 +1,14 @@
-import type { GenericCallback } from '@oscarpalmer/atoms/models';
-import { type Computed } from './computed';
-import { type Effect } from './effect';
-import { type Subscription, type Unsubscribe } from './subscription';
-export type SignalState<Value> = {
-    computeds: Set<Computed<unknown>>;
-    effects: Set<Effect>;
-    subscriptions: Map<GenericCallback, Subscription>;
-    value: Value;
-};
-export declare class Signal<Value> {
-    private readonly $mora;
-    private readonly state;
+import { Reactive } from './reactive';
+export declare class Signal<Value> extends Reactive<Value> {
     constructor(value: Value);
     /**
      * Get the value
      */
     get(): Value;
-    /**
-     * Get the value _(without reactivity)_
-     */
-    peek(): Value;
     /**
      * Set the value
      */
     set(value: Value): void;
-    /**
-     * Subscribe to changes
-     */
-    subscribe(callback: (value: Value) => void): Unsubscribe;
-    /**
-     * Unsubscribe from changes
-     */
-    unsubscribe(callback: (value: Value) => void): void;
     /**
      * Update the value
      */

package/types/subscription.d.cts

@@ -6,22 +6,17 @@ declare class Effect {
 	private readonly state;
 	constructor(callback: GenericCallback);
 }
-export type ComputedState<Value> = {
-	computeds: Set<Computed<unknown>>;
-	dirty: boolean;
-	effect: Effect;
-	effects: Set<Effect>;
-	subscriptions: Map<GenericCallback, Subscription>;
-	value: Value;
-};
-declare class Computed<Value> {
-	private readonly $mora;
-	private readonly state;
+declare class Computed<Value> extends Reactive<Value> {
+	private readonly effect;
 	constructor(callback: () => Value);
 	/**
 	 * Get the value
 	 */
 	get(): Value;
+}
+declare abstract class Reactive<Value> {
+	protected readonly state: ReactiveState<Value>;
+	constructor(name: string, value: Value);
 	/**
 	 * Get the value _(without reactivity)_
 	 */
@@ -35,20 +30,23 @@ declare class Computed<Value> {
 	 */
 	unsubscribe(callback: (value: Value) => void): void;
 }
-export type SignalState<Value> = {
+export type ReactiveState<Value> = {
 	computeds: Set<Computed<unknown>>;
 	effects: Set<Effect>;
-	subscriptions: Map<GenericCallback, Subscription>;
+	subscriptions: Map<(value: Value) => void, Subscription<Value>>;
 	value: Value;
 };
-export declare class Subscription {
-	state: ComputedState<unknown> | SignalState<unknown>;
+export declare class Subscription<Value> {
+	state: ReactiveState<Value>;
 	callback: GenericCallback;
-	constructor(state: ComputedState<unknown> | SignalState<unknown>, callback: GenericCallback);
+	constructor(state: ReactiveState<Value>, callback: GenericCallback);
 }
+/**
+ * Unsubscribe from changes
+ */
 export type Unsubscribe = () => void;
 export declare function noop(): void;
-export declare function subscribe(state: ComputedState<unknown> | SignalState<unknown>, callback: GenericCallback): Unsubscribe;
-export declare function unsubscribe(state: ComputedState<unknown> | SignalState<unknown>, callback: GenericCallback): void;
+export declare function subscribe<Value>(state: ReactiveState<Value>, callback: (value: Value) => void): Unsubscribe;
+export declare function unsubscribe<Value>(state: ReactiveState<Value>, callback: (value: Value) => void): void;
 
 export {};

package/types/subscription.d.ts

@@ -1,12 +1,14 @@
 import type { GenericCallback } from '@oscarpalmer/atoms/models';
-import type { ComputedState } from './computed';
-import type { SignalState } from './signal';
-export declare class Subscription {
-    state: ComputedState<unknown> | SignalState<unknown>;
+import type { ReactiveState } from './reactive';
+export declare class Subscription<Value> {
+    state: ReactiveState<Value>;
     callback: GenericCallback;
-    constructor(state: ComputedState<unknown> | SignalState<unknown>, callback: GenericCallback);
+    constructor(state: ReactiveState<Value>, callback: GenericCallback);
 }
+/**
+ * Unsubscribe from changes
+ */
 export type Unsubscribe = () => void;
 export declare function noop(): void;
-export declare function subscribe(state: ComputedState<unknown> | SignalState<unknown>, callback: GenericCallback): Unsubscribe;
-export declare function unsubscribe(state: ComputedState<unknown> | SignalState<unknown>, callback: GenericCallback): void;
+export declare function subscribe<Value>(state: ReactiveState<Value>, callback: (value: Value) => void): Unsubscribe;
+export declare function unsubscribe<Value>(state: ReactiveState<Value>, callback: (value: Value) => void): void;