@oscarpalmer/mora 0.18.2 → 0.20.0

package/dist/helpers/proxy.cjs

@@ -1,7 +1,19 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const batch = require("../batch.cjs");
+const value_computed = require("../value/computed.cjs");
 const helpers_value = require("./value.cjs");
+function getReactiveValueInProxy(reactive, mapped, key, isArray) {
+  let item = mapped.get(key);
+  if (item == null) {
+    item = value_computed.computed(() => {
+      const value = reactive.get();
+      return isArray ? value.at(key) : value[key];
+    });
+    mapped.set(key, item);
+  }
+  return item;
+}
 function setProxyValue(proxy, value) {
   batch.startBatch();
   const proxyKeys = Object.keys(proxy);
@@ -39,5 +51,6 @@ function setValueInProxy(target, property, value, state, isArray, length) {
   }
   return true;
 }
+exports.getReactiveValueInProxy = getReactiveValueInProxy;
 exports.setProxyValue = setProxyValue;
 exports.setValueInProxy = setValueInProxy;

package/dist/helpers/proxy.js

@@ -1,5 +1,17 @@
 import { startBatch, stopBatch } from "../batch.js";
+import { computed } from "../value/computed.js";
 import { emitValue } from "./value.js";
+function getReactiveValueInProxy(reactive, mapped, key, isArray) {
+  let item = mapped.get(key);
+  if (item == null) {
+    item = computed(() => {
+      const value = reactive.get();
+      return isArray ? value.at(key) : value[key];
+    });
+    mapped.set(key, item);
+  }
+  return item;
+}
 function setProxyValue(proxy, value) {
   startBatch();
   const proxyKeys = Object.keys(proxy);
@@ -38,6 +50,7 @@ function setValueInProxy(target, property, value, state, isArray, length) {
   return true;
 }
 export {
+  getReactiveValueInProxy,
   setProxyValue,
   setValueInProxy
 };

package/dist/mora.full.js

@@ -278,6 +278,19 @@ function getValue(state) {
     return state.value;
 }
 
+function getReactiveValueInProxy(reactive, mapped, key, isArray) {
+    let item = mapped.get(key);
+    if (item == null) {
+        item = computed(() => {
+            const value = reactive.get();
+            return isArray
+                ? value.at(key)
+                : value[key];
+        });
+        mapped.set(key, item);
+    }
+    return item;
+}
 function setProxyValue(proxy, value) {
     startBatch();
     const proxyKeys = Object.keys(proxy);
@@ -338,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));
@@ -352,6 +365,7 @@ function signal(value, options) {
 }
 
 class ReactiveArray extends Reactive {
+    #indiced = new Map();
     #size = signal(0);
     /**
      * The length of the array
@@ -378,22 +392,19 @@ class ReactiveArray extends Reactive {
         }), options);
         this.#size.set(value.length);
     }
-    /**
-     * Get an indexed item
-     */
-    at(index) {
-        return this.get().at(index);
-    }
     /**
      * Clear the array
      */
     clear() {
         this.length = 0;
     }
-    /**
-     * @inheritdoc
-     */
-    get() {
+    get(first) {
+        if (typeof first === 'number') {
+            return getReactiveValueInProxy(this, this.#indiced, first, true).get();
+        }
+        if (first === 'length') {
+            return this.length;
+        }
         return getValue(this.state);
     }
     /**
@@ -424,8 +435,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;
@@ -446,12 +457,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
@@ -504,13 +530,16 @@ function isPlainObject(value) {
 }
 
 class Store extends Reactive {
+    #keyed = new Map();
     constructor(value, options) {
         super(storeName, new Proxy(value, {
             set: (target, property, value) => setValueInProxy(target, property, value, this.state, false),
         }), options);
     }
     get(key) {
-        return isKey(key) ? this.state.value[key] : getValue(this.state);
+        return isKey(key)
+            ? getReactiveValueInProxy(this, this.#keyed, key, false).get()
+            : getValue(this.state);
     }
     peek(key) {
         return isKey(key) ? this.state.value[key] : { ...this.state.value };
@@ -523,6 +552,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

@@ -5,11 +5,12 @@ var __typeError = (msg) => {
 var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var _size;
+var _indiced, _size;
 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");
@@ -30,6 +31,7 @@ class ReactiveArray extends value_reactive.Reactive {
       }),
       options
     );
+    __privateAdd(this, _indiced, /* @__PURE__ */ new Map());
     __privateAdd(this, _size, value_signal.signal(0));
     __privateGet(this, _size).set(value.length);
   }
@@ -47,22 +49,19 @@ class ReactiveArray extends value_reactive.Reactive {
       this.get().length = value;
     }
   }
-  /**
-   * Get an indexed item
-   */
-  at(index) {
-    return this.get().at(index);
-  }
   /**
    * Clear the array
    */
   clear() {
     this.length = 0;
   }
-  /**
-   * @inheritdoc
-   */
-  get() {
+  get(first) {
+    if (typeof first === "number") {
+      return helpers_proxy.getReactiveValueInProxy(this, __privateGet(this, _indiced), first, true).get();
+    }
+    if (first === "length") {
+      return this.length;
+    }
     return helpers_value.getValue(this.state);
   }
   /**
@@ -93,8 +92,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") {
@@ -117,13 +116,34 @@ 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();
 function array(value, options) {
   return new ReactiveArray(Array.isArray(value) ? value : [], options);

package/dist/value/array.js

@@ -4,10 +4,11 @@ var __typeError = (msg) => {
 var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var _size;
+var _indiced, _size;
 import { arrayName } from "../helpers/is.js";
-import { setValueInProxy } from "../helpers/proxy.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";
@@ -28,6 +29,7 @@ class ReactiveArray extends Reactive {
       }),
       options
     );
+    __privateAdd(this, _indiced, /* @__PURE__ */ new Map());
     __privateAdd(this, _size, signal(0));
     __privateGet(this, _size).set(value.length);
   }
@@ -45,22 +47,19 @@ class ReactiveArray extends Reactive {
       this.get().length = value;
     }
   }
-  /**
-   * Get an indexed item
-   */
-  at(index) {
-    return this.get().at(index);
-  }
   /**
    * Clear the array
    */
   clear() {
     this.length = 0;
   }
-  /**
-   * @inheritdoc
-   */
-  get() {
+  get(first) {
+    if (typeof first === "number") {
+      return getReactiveValueInProxy(this, __privateGet(this, _indiced), first, true).get();
+    }
+    if (first === "length") {
+      return this.length;
+    }
     return getValue(this.state);
   }
   /**
@@ -91,8 +90,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") {
@@ -115,13 +114,34 @@ 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();
 function array(value, options) {
   return new ReactiveArray(Array.isArray(value) ? value : [], options);

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

@@ -1,9 +1,17 @@
 "use strict";
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var _keyed;
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 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) {
@@ -14,9 +22,10 @@ class Store extends value_reactive.Reactive {
       }),
       options
     );
+    __privateAdd(this, _keyed, /* @__PURE__ */ new Map());
   }
   get(key) {
-    return is.isKey(key) ? this.state.value[key] : 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 };
@@ -28,7 +37,25 @@ 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) {
   return new Store(is.isPlainObject(value) ? value : {}, options);
 }

package/dist/value/store.js

@@ -1,7 +1,15 @@
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var _keyed;
 import { isPlainObject, isKey } from "../node_modules/@oscarpalmer/atoms/dist/internal/is.js";
 import { storeName } from "../helpers/is.js";
-import { setValueInProxy, setProxyValue } from "../helpers/proxy.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) {
@@ -12,9 +20,10 @@ class Store extends Reactive {
       }),
       options
     );
+    __privateAdd(this, _keyed, /* @__PURE__ */ new Map());
   }
   get(key) {
-    return isKey(key) ? this.state.value[key] : 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 };
@@ -26,7 +35,25 @@ 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) {
   return new Store(isPlainObject(value) ? 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.18.2"
+	"version": "0.20.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

@@ -1,9 +1,53 @@
-import type {ArrayOrPlainObject, PlainObject} from '@oscarpalmer/atoms/models';
+import type {
+	ArrayOrPlainObject,
+	Key,
+	PlainObject,
+} from '@oscarpalmer/atoms/models';
 import {startBatch, stopBatch} from '../batch';
+import type {ReactiveArray} from '../value/array';
+import {type Computed, computed} from '../value/computed';
 import type {ReactiveState} from '../value/reactive';
 import type {Signal} from '../value/signal';
+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,
+	): Computed<unknown>;
+
+export function getReactiveValueInProxy<Value extends PlainObject>(
+		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,
+	): 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);
+		}
+
+		return item;
+	}
+
 export function setProxyValue(
 	proxy: ArrayOrPlainObject,
 	value: ArrayOrPlainObject,

package/src/index.ts

@@ -12,3 +12,4 @@ export {computed, type Computed} from './value/computed';
 export type {Reactive} from './value/reactive';
 export {signal, type Signal} from './value/signal';
 export {store, type Store} from './value/store';
+

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);