@oscarpalmer/mora 0.19.0 → 0.21.0

package/dist/helpers/proxy.cjs

@@ -12,7 +12,7 @@ function getReactiveValueInProxy(reactive, mapped, key, isArray) {
     });
     mapped.set(key, item);
   }
-  return item.get();
+  return item;
 }
 function setProxyValue(proxy, value) {
   batch.startBatch();

package/dist/helpers/proxy.js

@@ -10,7 +10,7 @@ function getReactiveValueInProxy(reactive, mapped, key, isArray) {
     });
     mapped.set(key, item);
   }
-  return item.get();
+  return item;
 }
 function setProxyValue(proxy, value) {
   startBatch();

package/dist/mora.full.js

@@ -289,7 +289,7 @@ function getReactiveValueInProxy(reactive, mapped, key, isArray) {
         });
         mapped.set(key, item);
     }
-    return item.get();
+    return item;
 }
 function setProxyValue(proxy, value) {
     startBatch();
@@ -351,7 +351,7 @@ class Signal extends Reactive {
         }
     }
     /**
-     * Update the value
+     * Update the value _(based on the current value)_
      */
     update(callback) {
         this.set(callback(this.state.value));
@@ -400,7 +400,7 @@ class ReactiveArray extends Reactive {
     }
     get(first) {
         if (typeof first === 'number') {
-            return getReactiveValueInProxy(this, this.#indiced, first, true);
+            return getReactiveValueInProxy(this, this.#indiced, first, true).get();
         }
         if (first === 'length') {
             return this.length;
@@ -419,8 +419,14 @@ class ReactiveArray extends Reactive {
     map(callback) {
         return computed(() => this.get().map(callback));
     }
-    peek(length) {
-        return length === true ? this.#size.peek() : [...this.state.value];
+    peek(value) {
+        if (value === true) {
+            return this.#size.peek();
+        }
+        if (typeof value === 'number') {
+            return this.state.value.at(value);
+        }
+        return [...this.state.value];
     }
     /**
      * Remove and return the last item of the array
@@ -435,8 +441,8 @@ class ReactiveArray extends Reactive {
         return this.state.value.push(...items);
     }
     set(first, second) {
-        if (Array.isArray(first)) {
-            this.state.value.splice(0, this.state.value.length, ...first);
+        if (first == null || Array.isArray(first)) {
+            this.state.value.splice(0, this.state.value.length, ...(first ?? []));
         }
         else if (first === 'length') {
             this.length = second;
@@ -457,12 +463,27 @@ class ReactiveArray extends Reactive {
     splice(from, to, ...items) {
         return this.state.value.splice(from, to ?? this.state.value.length, ...items);
     }
+    subscribe(first, second) {
+        if (typeof first === 'number' && typeof second === 'function') {
+            return getReactiveValueInProxy(this, this.#indiced, first, true).subscribe(second);
+        }
+        return typeof first === 'function' ? subscribe(this.state, first) : noop;
+    }
     /**
      * Add items to the beginning of the array
      */
     unshift(...items) {
         return this.state.value.unshift(...items);
     }
+    /**
+     * Update the value _(based on the current value)_
+     */
+    update(callback) {
+        const updated = callback(this.state.value);
+        if (updated == null || Array.isArray(updated)) {
+            this.set(updated);
+        }
+    }
 }
 /**
  * Create a reactive array
@@ -523,7 +544,7 @@ class Store extends Reactive {
     }
     get(key) {
         return isKey(key)
-            ? getReactiveValueInProxy(this, this.#keyed, key, false)
+            ? getReactiveValueInProxy(this, this.#keyed, key, false).get()
             : getValue(this.state);
     }
     peek(key) {
@@ -537,6 +558,21 @@ class Store extends Reactive {
             setProxyValue(this.state.value, first ?? {});
         }
     }
+    subscribe(first, second) {
+        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) {
+        const updated = callback({ ...this.state.value });
+        if (updated == null || isPlainObject(updated)) {
+            setProxyValue(this.state.value, updated ?? {});
+        }
+    }
 }
 /**
  * Create a reactive store

package/dist/value/array.cjs

@@ -10,6 +10,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const helpers_is = require("../helpers/is.cjs");
 const helpers_proxy = require("../helpers/proxy.cjs");
 const helpers_value = require("../helpers/value.cjs");
+const subscription = require("../subscription.cjs");
 const value_computed = require("./computed.cjs");
 const value_reactive = require("./reactive.cjs");
 const value_signal = require("./signal.cjs");
@@ -56,7 +57,7 @@ class ReactiveArray extends value_reactive.Reactive {
   }
   get(first) {
     if (typeof first === "number") {
-      return helpers_proxy.getReactiveValueInProxy(this, __privateGet(this, _indiced), first, true);
+      return helpers_proxy.getReactiveValueInProxy(this, __privateGet(this, _indiced), first, true).get();
     }
     if (first === "length") {
       return this.length;
@@ -75,8 +76,14 @@ class ReactiveArray extends value_reactive.Reactive {
   map(callback) {
     return value_computed.computed(() => this.get().map(callback));
   }
-  peek(length) {
-    return length === true ? __privateGet(this, _size).peek() : [...this.state.value];
+  peek(value) {
+    if (value === true) {
+      return __privateGet(this, _size).peek();
+    }
+    if (typeof value === "number") {
+      return this.state.value.at(value);
+    }
+    return [...this.state.value];
   }
   /**
    * Remove and return the last item of the array
@@ -91,8 +98,8 @@ class ReactiveArray extends value_reactive.Reactive {
     return this.state.value.push(...items);
   }
   set(first, second) {
-    if (Array.isArray(first)) {
-      this.state.value.splice(0, this.state.value.length, ...first);
+    if (first == null || Array.isArray(first)) {
+      this.state.value.splice(0, this.state.value.length, ...first ?? []);
     } else if (first === "length") {
       this.length = second;
     } else if (typeof first === "number") {
@@ -115,12 +122,32 @@ class ReactiveArray extends value_reactive.Reactive {
       ...items
     );
   }
+  subscribe(first, second) {
+    if (typeof first === "number" && typeof second === "function") {
+      return helpers_proxy.getReactiveValueInProxy(
+        this,
+        __privateGet(this, _indiced),
+        first,
+        true
+      ).subscribe(second);
+    }
+    return typeof first === "function" ? subscription.subscribe(this.state, first) : subscription.noop;
+  }
   /**
    * Add items to the beginning of the array
    */
   unshift(...items) {
     return this.state.value.unshift(...items);
   }
+  /**
+   * Update the value _(based on the current value)_
+   */
+  update(callback) {
+    const updated = callback(this.state.value);
+    if (updated == null || Array.isArray(updated)) {
+      this.set(updated);
+    }
+  }
 }
 _indiced = new WeakMap();
 _size = new WeakMap();

package/dist/value/array.js

@@ -8,6 +8,7 @@ var _indiced, _size;
 import { arrayName } from "../helpers/is.js";
 import { setValueInProxy, getReactiveValueInProxy } from "../helpers/proxy.js";
 import { getValue, equalArrays, emitValue } from "../helpers/value.js";
+import { subscribe, noop } from "../subscription.js";
 import { computed } from "./computed.js";
 import { Reactive } from "./reactive.js";
 import { signal } from "./signal.js";
@@ -54,7 +55,7 @@ class ReactiveArray extends Reactive {
   }
   get(first) {
     if (typeof first === "number") {
-      return getReactiveValueInProxy(this, __privateGet(this, _indiced), first, true);
+      return getReactiveValueInProxy(this, __privateGet(this, _indiced), first, true).get();
     }
     if (first === "length") {
       return this.length;
@@ -73,8 +74,14 @@ class ReactiveArray extends Reactive {
   map(callback) {
     return computed(() => this.get().map(callback));
   }
-  peek(length) {
-    return length === true ? __privateGet(this, _size).peek() : [...this.state.value];
+  peek(value) {
+    if (value === true) {
+      return __privateGet(this, _size).peek();
+    }
+    if (typeof value === "number") {
+      return this.state.value.at(value);
+    }
+    return [...this.state.value];
   }
   /**
    * Remove and return the last item of the array
@@ -89,8 +96,8 @@ class ReactiveArray extends Reactive {
     return this.state.value.push(...items);
   }
   set(first, second) {
-    if (Array.isArray(first)) {
-      this.state.value.splice(0, this.state.value.length, ...first);
+    if (first == null || Array.isArray(first)) {
+      this.state.value.splice(0, this.state.value.length, ...first ?? []);
     } else if (first === "length") {
       this.length = second;
     } else if (typeof first === "number") {
@@ -113,12 +120,32 @@ class ReactiveArray extends Reactive {
       ...items
     );
   }
+  subscribe(first, second) {
+    if (typeof first === "number" && typeof second === "function") {
+      return getReactiveValueInProxy(
+        this,
+        __privateGet(this, _indiced),
+        first,
+        true
+      ).subscribe(second);
+    }
+    return typeof first === "function" ? subscribe(this.state, first) : noop;
+  }
   /**
    * Add items to the beginning of the array
    */
   unshift(...items) {
     return this.state.value.unshift(...items);
   }
+  /**
+   * Update the value _(based on the current value)_
+   */
+  update(callback) {
+    const updated = callback(this.state.value);
+    if (updated == null || Array.isArray(updated)) {
+      this.set(updated);
+    }
+  }
 }
 _indiced = new WeakMap();
 _size = new WeakMap();

package/dist/value/signal.cjs

@@ -23,7 +23,7 @@ class Signal extends value_reactive.Reactive {
     }
   }
   /**
-   * Update the value
+   * Update the value _(based on the current value)_
    */
   update(callback) {
     this.set(callback(this.state.value));

package/dist/value/signal.js

@@ -21,7 +21,7 @@ class Signal extends Reactive {
     }
   }
   /**
-   * Update the value
+   * Update the value _(based on the current value)_
    */
   update(callback) {
     this.set(callback(this.state.value));

package/dist/value/store.cjs

@@ -11,6 +11,7 @@ const is = require("../node_modules/@oscarpalmer/atoms/dist/internal/is.cjs");
 const helpers_is = require("../helpers/is.cjs");
 const helpers_proxy = require("../helpers/proxy.cjs");
 const helpers_value = require("../helpers/value.cjs");
+const subscription = require("../subscription.cjs");
 const value_reactive = require("./reactive.cjs");
 class Store extends value_reactive.Reactive {
   constructor(value, options) {
@@ -24,7 +25,7 @@ class Store extends value_reactive.Reactive {
     __privateAdd(this, _keyed, /* @__PURE__ */ new Map());
   }
   get(key) {
-    return is.isKey(key) ? helpers_proxy.getReactiveValueInProxy(this, __privateGet(this, _keyed), key, false) : helpers_value.getValue(this.state);
+    return is.isKey(key) ? helpers_proxy.getReactiveValueInProxy(this, __privateGet(this, _keyed), key, false).get() : helpers_value.getValue(this.state);
   }
   peek(key) {
     return is.isKey(key) ? this.state.value[key] : { ...this.state.value };
@@ -36,6 +37,23 @@ class Store extends value_reactive.Reactive {
       helpers_proxy.setProxyValue(this.state.value, first ?? {});
     }
   }
+  subscribe(first, second) {
+    if (is.isKey(first) && typeof second === "function") {
+      return helpers_proxy.getReactiveValueInProxy(this, __privateGet(this, _keyed), first, false).subscribe(
+        second
+      );
+    }
+    return typeof first === "function" ? subscription.subscribe(this.state, first) : subscription.noop;
+  }
+  /**
+   * Update the value _(based on the current value)_
+   */
+  update(callback) {
+    const updated = callback({ ...this.state.value });
+    if (updated == null || is.isPlainObject(updated)) {
+      helpers_proxy.setProxyValue(this.state.value, updated ?? {});
+    }
+  }
 }
 _keyed = new WeakMap();
 function store(value, options) {

package/dist/value/store.js

@@ -9,6 +9,7 @@ import { isPlainObject, isKey } from "../node_modules/@oscarpalmer/atoms/dist/in
 import { storeName } from "../helpers/is.js";
 import { setValueInProxy, getReactiveValueInProxy, setProxyValue } from "../helpers/proxy.js";
 import { getValue } from "../helpers/value.js";
+import { subscribe, noop } from "../subscription.js";
 import { Reactive } from "./reactive.js";
 class Store extends Reactive {
   constructor(value, options) {
@@ -22,7 +23,7 @@ class Store extends Reactive {
     __privateAdd(this, _keyed, /* @__PURE__ */ new Map());
   }
   get(key) {
-    return isKey(key) ? getReactiveValueInProxy(this, __privateGet(this, _keyed), key, false) : getValue(this.state);
+    return isKey(key) ? getReactiveValueInProxy(this, __privateGet(this, _keyed), key, false).get() : getValue(this.state);
   }
   peek(key) {
     return isKey(key) ? this.state.value[key] : { ...this.state.value };
@@ -34,6 +35,23 @@ class Store extends Reactive {
       setProxyValue(this.state.value, first ?? {});
     }
   }
+  subscribe(first, second) {
+    if (isKey(first) && typeof second === "function") {
+      return getReactiveValueInProxy(this, __privateGet(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) {
+    const updated = callback({ ...this.state.value });
+    if (updated == null || isPlainObject(updated)) {
+      setProxyValue(this.state.value, updated ?? {});
+    }
+  }
 }
 _keyed = new WeakMap();
 function store(value, options) {

package/package.json

@@ -4,14 +4,14 @@
 		"url": "https://oscarpalmer.se"
 	},
 	"dependencies": {
-		"@oscarpalmer/atoms": "^0.100"
+		"@oscarpalmer/atoms": "^0.102"
 	},
 	"description": "Signals and stuff…",
 	"devDependencies": {
 		"@biomejs/biome": "^1.9",
 		"@rollup/plugin-node-resolve": "^16",
 		"@rollup/plugin-typescript": "^12.1",
-		"@types/node": "^22.15",
+		"@types/node": "^24",
 		"@vitest/coverage-istanbul": "^3.2",
 		"dts-bundle-generator": "^9.5",
 		"glob": "^11",
@@ -54,5 +54,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.ts",
-	"version": "0.19.0"
+	"version": "0.21.0"
 }

package/src/batch.ts

@@ -36,6 +36,6 @@ export function stopBatch(): void {
 	flushHandlers();
 }
 
-export const batchedHandlers = new Set<Effect | Subscription<unknown>>();
+export const batchedHandlers = new Set<Effect | Subscription>();
 
 export let batchDepth = 0;

package/src/helpers/proxy.ts

@@ -12,42 +12,42 @@ import type {Store} from '../value/store';
 import {emitValue} from './value';
 
 export function getReactiveValueInProxy<Value>(
-	array: ReactiveArray<Value>,
-	mapped: Map<Key, Computed<unknown>>,
-	index: number,
-	isArray: true,
-): unknown;
+		array: ReactiveArray<Value>,
+		mapped: Map<Key, Computed<unknown>>,
+		index: number,
+		isArray: true,
+	): Computed<unknown>;
 
 export function getReactiveValueInProxy<Value extends PlainObject>(
-	store: Store<Value>,
-	mapped: Map<Key, Computed<unknown>>,
-	key: Key,
-	isArray: false,
-): unknown;
+		store: Store<Value>,
+		mapped: Map<Key, Computed<unknown>>,
+		key: Key,
+		isArray: false,
+	): Computed<unknown>;
 
 export function getReactiveValueInProxy(
-	reactive: ReactiveArray<unknown> | Store<PlainObject>,
-	mapped: Map<Key, Computed<unknown>>,
-	key: Key,
-	isArray: boolean,
-): unknown {
-	let item = mapped.get(key);
-
-	if (item == null) {
-		item = computed(() => {
-			const value = reactive.get();
-
-			return isArray
-				? (value as unknown[]).at(key as number)
-				: (value as PlainObject)[key];
-		}) as Computed<unknown>;
+		reactive: ReactiveArray<unknown> | Store<PlainObject>,
+		mapped: Map<Key, Computed<unknown>>,
+		key: Key,
+		isArray: boolean,
+	): Computed<unknown> {
+		let item = mapped.get(key);
+
+		if (item == null) {
+			item = computed(() => {
+				const value = reactive.get();
+
+				return isArray
+					? (value as unknown[]).at(key as number)
+					: (value as PlainObject)[key];
+			}) as Computed<unknown>;
+
+			mapped.set(key, item);
+		}
 
-		mapped.set(key, item);
+		return item;
 	}
 
-	return item.get();
-}
-
 export function setProxyValue(
 	proxy: ArrayOrPlainObject,
 	value: ArrayOrPlainObject,

package/src/subscription.ts

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

package/src/value/array.ts

@@ -1,6 +1,8 @@
+import type {GenericCallback} from '@oscarpalmer/atoms';
 import {arrayName} from '../helpers/is';
 import {getReactiveValueInProxy, setValueInProxy} from '../helpers/proxy';
 import {emitValue, equalArrays, getValue} from '../helpers/value';
+import {type Unsubscribe, noop, subscribe} from '../subscription';
 import {type Computed, computed} from './computed';
 import {Reactive, type ReactiveOptions, type ReactiveState} from './reactive';
 import {type Signal, signal} from './signal';
@@ -65,13 +67,19 @@ export class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 */
 	get(): Item[];
 
+	/**
+	 * Get the value at an index
+	 */
 	get(index: number): Item | undefined;
 
+	/**
+	 * Get the length of the array
+	 */
 	get(property: 'length'): number;
 
 	get(first?: unknown): unknown {
 		if (typeof first === 'number') {
-			return getReactiveValueInProxy(this, this.#indiced, first, true);
+			return getReactiveValueInProxy(this, this.#indiced, first, true).get();
 		}
 
 		if (first === 'length') {
@@ -104,13 +112,23 @@ export class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 */
 	peek(): Item[];
 
+	peek(index: number): Item | undefined;
+
 	/**
 	 * Get the length of the array _(without reactivity)_
 	 */
 	peek(length: true): number;
 
-	peek(length?: unknown): Item[] | number {
-		return length === true ? this.#size.peek() : [...this.state.value];
+	peek(value?: unknown): unknown {
+		if (value === true) {
+			return this.#size.peek();
+		}
+
+		if (typeof value === 'number') {
+			return this.state.value.at(value);
+		}
+
+		return [...this.state.value];
 	}
 
 	/**
@@ -130,7 +148,7 @@ export class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	/**
 	 * Set the value
 	 */
-	set(value: Item[]): void;
+	set(value?: Item[]): void;
 
 	/**
 	 * Set the value at an index
@@ -142,9 +160,9 @@ export class ReactiveArray<Item> extends Reactive<Item[], Item> {
 	 */
 	set(property: 'length', value: number): void;
 
-	set(first: number | 'length' | Item[], second?: number | Item): void {
-		if (Array.isArray(first)) {
-			this.state.value.splice(0, this.state.value.length, ...first);
+	set(first?: number | 'length' | Item[], second?: number | Item): void {
+		if (first == null || Array.isArray(first)) {
+			this.state.value.splice(0, this.state.value.length, ...(first ?? []));
 		} else if (first === 'length') {
 			this.length = second as number;
 		} else if (typeof first === 'number') {
@@ -170,12 +188,52 @@ export class ReactiveArray<Item> extends Reactive<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;
+
+	subscribe(
+		first: number | GenericCallback,
+		second?: GenericCallback,
+	): Unsubscribe {
+		if (typeof first === 'number' && typeof second === 'function') {
+			return getReactiveValueInProxy(
+				this,
+				this.#indiced,
+				first,
+				true,
+			).subscribe(second);
+		}
+
+		return typeof first === 'function' ? subscribe(this.state, first) : noop;
+	}
+
 	/**
 	 * Add items to the beginning of the array
 	 */
 	unshift(...items: Item[]): number {
 		return this.state.value.unshift(...items);
 	}
+
+	/**
+	 * Update the value _(based on the current value)_
+	 */
+	update(callback: (value: Item[]) => Item[]): void {
+		const updated = callback(this.state.value);
+
+		if (updated == null || Array.isArray(updated)) {
+			this.set(updated);
+		}
+	}
 }
 
 /**

package/src/value/reactive.ts

@@ -1,3 +1,4 @@
+import type {GenericCallback} from '@oscarpalmer/atoms/models';
 import type {Effect} from '../effect';
 import {
 	type Subscription,
@@ -80,6 +81,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;
 };

package/src/value/signal.ts

@@ -26,7 +26,7 @@ export class Signal<Value> extends Reactive<Value> {
 	}
 
 	/**
-	 * Update the value
+	 * Update the value _(based on the current value)_
 	 */
 	update(callback: (value: Value) => Value): void {
 		this.set(callback(this.state.value));