@oscarpalmer/mora 0.26.0 → 0.28.0

package/dist/{mora.full.js → mora.full.mjs}

@@ -1,7 +1,5 @@
+//#region src/constants.ts
 const ACTIVE = {};
-const ARRAY_THRESHOLD = 100;
-const ARRAY_OFFSET = 25;
-const ARRAY_PEEK = 10;
 const BATCH = {
 	depth: 0,
 	handlers: /* @__PURE__ */ new Set()
@@ -32,8 +30,8 @@ const NAME_ALL = new Set([
 	NAME_SIGNAL,
 	NAME_STORE
 ]);
-const PROPERTY_LENGTH = "length";
-
+//#endregion
+//#region src/effect.ts
 var Effect = class {
 	constructor(callback) {
 		Object.defineProperty(this, NAME_MORA, { value: NAME_EFFECT });
@@ -41,11 +39,11 @@ var Effect = class {
 		runEffect(this);
 	}
 };
-function runEffect(effect$1) {
+function runEffect(effect) {
 	const previousEffect = ACTIVE.effect;
-	ACTIVE.effect = effect$1;
+	ACTIVE.effect = effect;
 	try {
-		effect$1.state.callback();
+		effect.state.callback();
 	} finally {
 		ACTIVE.effect = previousEffect;
 	}
@@ -58,7 +56,8 @@ function runEffect(effect$1) {
 function effect(callback) {
 	return typeof callback === "function" ? new Effect(callback) : void 0;
 }
-
+//#endregion
+//#region src/helpers/is.ts
 /**
 * Is the value a reactive array?
 * @param value Value to check
@@ -84,7 +83,7 @@ function isEffect(value) {
 	return isMora(value, NAME_EFFECT);
 }
 function isMora(value, name) {
-	return typeof value === "object" && value != null && NAME_MORA in value && (typeof name === "string" ? value[NAME_MORA] === name : name.has(value[NAME_MORA]));
+	return typeof value === "object" && value != null && "$mora" in value && (typeof name === "string" ? value["$mora"] === name : name.has(value["$mora"]));
 }
 /**
 * Is the value reactive?
@@ -102,7 +101,8 @@ function isReactive(value) {
 function isSignal(value) {
 	return isMora(value, NAME_SIGNAL);
 }
-
+//#endregion
+//#region src/batch.ts
 function flushHandlers() {
 	while (BATCH.depth === 0 && BATCH.handlers.size > 0) {
 		const handlers = [...BATCH.handlers];
@@ -126,7 +126,8 @@ function stopBatch() {
 	if (BATCH.depth > 0) BATCH.depth -= 1;
 	flushHandlers();
 }
-
+//#endregion
+//#region src/subscription.ts
 var Subscription = class {
 	callback;
 	state;
@@ -152,7 +153,8 @@ function unsubscribe(state, callback) {
 	state.subscriptions.get(callback)?.destroy();
 	state.subscriptions.delete(callback);
 }
-
+//#endregion
+//#region src/value/reactive.ts
 var Reactive = class {
 	state = {
 		computeds: /* @__PURE__ */ new Set(),
@@ -203,7 +205,8 @@ var Reactive = class {
 		unsubscribe(this.state, callback);
 	}
 };
-
+//#endregion
+//#region src/value/computed.ts
 var Computed = class extends Reactive {
 	effect = {
 		dirty: true,
@@ -212,18 +215,10 @@ var Computed = class extends Reactive {
 	constructor(callback, options) {
 		super(NAME_COMPUTED, void 0, options);
 		this.effect.instance = effect(() => {
-			if (!this.effect.dirty) return;
-			const previousComputed = ACTIVE.computed;
-			ACTIVE.computed = this;
-			const value = callback();
-			ACTIVE.computed = previousComputed;
-			if (!this.state.equal(this.state.value, value)) {
-				this.state.value = value;
-				for (const computed$1 of this.state.computeds) computed$1.effect.dirty = true;
-				for (const effect$1 of this.state.effects) BATCH.handlers.add(effect$1);
-				for (const [, subscription] of this.state.subscriptions) subscription.callback(value);
+			if (this.effect.dirty) {
+				setValue$1(this, this.state, callback);
+				this.effect.dirty = false;
 			}
-			this.effect.dirty = false;
 		});
 	}
 	/**
@@ -245,10 +240,39 @@ var Computed = class extends Reactive {
 function computed(callback, options) {
 	return new Computed(callback, options);
 }
-
+function setAndEmit$1(state, value) {
+	if (state.equal(state.value, value)) return;
+	state.value = value;
+	for (const computed of state.computeds) computed.effect.dirty = true;
+	for (const effect of state.effects) BATCH.handlers.add(effect);
+	for (const [, subscription] of state.subscriptions) subscription.callback(value);
+	flushHandlers();
+}
+function setValue$1(instance, state, callback) {
+	const previousComputed = ACTIVE.computed;
+	ACTIVE.computed = instance;
+	try {
+		const value = callback();
+		if (value instanceof Promise) {
+			state.promise = value;
+			value.then((resolvedValue) => {
+				if (state.promise === value) {
+					state.promise = void 0;
+					setAndEmit$1(state, resolvedValue);
+				}
+			}).catch(() => {
+				if (state.promise === value) state.promise = void 0;
+			});
+		} else setAndEmit$1(state, value);
+	} finally {
+		ACTIVE.computed = previousComputed;
+	}
+}
+//#endregion
+//#region src/helpers/value.ts
 function emitValue(state) {
-	for (const computed$1 of state.computeds) computed$1.effect.dirty = true;
-	for (const effect$1 of state.effects) BATCH.handlers.add(effect$1);
+	for (const computed of state.computeds) computed.effect.dirty = true;
+	for (const effect of state.effects) BATCH.handlers.add(effect);
 	for (const [, subscription] of state.subscriptions) BATCH.handlers.add(subscription);
 	if (BATCH.depth === 0) flushHandlers();
 }
@@ -256,9 +280,9 @@ function equalArrays(state, first, second) {
 	let { length } = first;
 	if (length !== second.length) return false;
 	let offset = 0;
-	if (length >= ARRAY_THRESHOLD) {
-		offset = Math.round(length / ARRAY_PEEK);
-		offset = offset > ARRAY_OFFSET ? ARRAY_OFFSET : offset;
+	if (length >= 100) {
+		offset = Math.round(length / 10);
+		offset = offset > 25 ? 25 : offset;
 		for (let index = 0; index < offset; index += 1) if (!state.equal(first[index], second[index])) return false;
 	}
 	length -= offset;
@@ -270,51 +294,76 @@ function getValue(state) {
 	if (ACTIVE.effect != null) state.effects.add(ACTIVE.effect);
 	return state.value;
 }
-
+//#endregion
+//#region src/helpers/proxy.ts
 function emityProxyValues(state, mapped) {
 	const values = [...mapped.values()];
 	const { length } = values;
 	for (let index = 0; index < length; index += 1) values[index].effect.dirty = true;
 	emitValue(state);
 }
-function getReactiveValueInProxy(reactive, mapped, key, isArray$1) {
+function getReactiveValueInProxy(reactive, mapped, key, isArray) {
 	let item = mapped.get(key);
 	if (item == null) {
-		item = computed(() => isArray$1 ? reactive.get().at(key) : reactive.get()[key]);
+		item = computed(() => isArray ? reactive.get().at(key) : reactive.get()[key]);
 		mapped.set(key, item);
 	}
 	return item;
 }
-function setProxyValue(proxy, value) {
-	startBatch();
-	const proxyKeys = Object.keys(proxy);
-	const valueKeys = Object.keys(value);
-	let { length } = proxyKeys;
-	for (let index = 0; index < length; index += 1) {
-		const key = proxyKeys[index];
-		proxy[key] = valueKeys.includes(key) ? value[key] : void 0;
-	}
-	length = valueKeys.length;
-	for (let index = 0; index < length; index += 1) {
-		const key = valueKeys[index];
-		if (!proxyKeys.includes(key)) proxy[key] = value[key];
-	}
-	stopBatch();
+function setProxyValue(array, state, isObject, isProperty, setObject, setProperty, first, second) {
+	if (array && first === "length") {
+		state.value.length = second;
+		return;
+	}
+	if (isObject(first)) {
+		setObject(state, first);
+		return;
+	}
+	const property = isProperty(first);
+	if (array && property && Number.isNaN(first)) return;
+	let actual = property ? second : first;
+	if (typeof actual === "function") try {
+		actual = actual();
+	} catch {
+		return;
+	}
+	if (actual instanceof Promise) {
+		if (property) {
+			state.promises ??= /* @__PURE__ */ new Map();
+			state.promises.set(first, actual);
+		} else state.promise = actual;
+		actual.then((value) => {
+			if (property && state.promises.get(first) === actual) {
+				state.promises.delete(first);
+				setProperty(state, first, value);
+				return;
+			}
+			if (!property && isObject(value) && state.promise === actual) {
+				state.promise = void 0;
+				setObject(state, value);
+			}
+		}).catch(() => {
+			if (property && state.promises.get(first) === actual) state.promises.delete(first);
+			else if (!property && state.promise === actual) state.promise = void 0;
+		});
+	} else if (property) setProperty(state, first, actual);
+	else if (isObject(actual)) setObject(state, actual);
 }
 function setValueInProxy(parameters) {
-	const { isArray: isArray$1, length, property, state, target, value } = parameters;
-	if (isArray$1) {
-		if (!(!Number.isNaN(Number(property)) || property === PROPERTY_LENGTH)) return Reflect.set(target, property, value);
+	const { isArray, length, property, state, target, value } = parameters;
+	if (isArray) {
+		if (!(!Number.isNaN(Number(property)) || property === "length")) return Reflect.set(target, property, value);
 	}
 	const previous = Reflect.get(target, property);
 	if (!state.equal(previous, value)) {
 		Reflect.set(target, property, value);
 		emitValue(state);
-		if (isArray$1) length?.set(target.length);
+		if (isArray) length?.set(target.length);
 	}
 	return true;
 }
-
+//#endregion
+//#region src/value/signal.ts
 var Signal = class extends Reactive {
 	constructor(value, options) {
 		super(NAME_SIGNAL, value, options);
@@ -330,10 +379,7 @@ var Signal = class extends Reactive {
 	* @param value New value
 	*/
 	set(value) {
-		if (!this.state.equal(this.state.value, value)) {
-			this.state.value = value;
-			emitValue(this.state);
-		}
+		setValue(this.state, value);
 	}
 	/**
 	* Update the value _(based on the current value)_
@@ -343,16 +389,36 @@ var Signal = class extends Reactive {
 		this.set(callback(this.state.value));
 	}
 };
-/**
-* Create a reactive value
-* @param value Initial value
-* @param options Reactivity options
-* @returns Reactive value
-*/
+function setAndEmit(state, value) {
+	if (!state.equal(state.value, value)) {
+		state.value = value;
+		emitValue(state);
+	}
+}
+function setValue(state, value) {
+	try {
+		let actual = value;
+		if (typeof value === "function") actual = value();
+		if (actual instanceof Promise) {
+			state.promise = actual;
+			actual.then((value) => {
+				if (actual === state.promise) {
+					state.promise = void 0;
+					setAndEmit(state, value);
+				}
+			}).catch(() => {
+				if (actual === state.promise) state.promise = void 0;
+			});
+		} else setAndEmit(state, actual);
+	} catch {}
+}
 function signal(value, options) {
-	return new Signal(value, options);
+	const instance = new Signal(void 0, options);
+	instance.set(value);
+	return instance;
 }
-
+//#endregion
+//#region src/value/array.ts
 var ReactiveArray = class extends Reactive {
 	#indiced = /* @__PURE__ */ new Map();
 	#size = signal(0);
@@ -371,10 +437,10 @@ var ReactiveArray = class extends Reactive {
 	constructor(value, options) {
 		super(NAME_ARRAY, new Proxy(value, {
 			get: (target, property) => METHODS_UPDATE.has(property) ? updateArray(property, target, this.state, this.#size) : Reflect.get(target, property),
-			set: (target, property, value$1) => setValueInProxy({
+			set: (target, property, value) => setValueInProxy({
 				property,
 				target,
-				value: value$1,
+				value,
 				isArray: true,
 				state: this.state,
 				length: this.#size
@@ -398,7 +464,7 @@ var ReactiveArray = class extends Reactive {
 	}
 	get(first) {
 		if (typeof first === "number") return getReactiveValueInProxy(this, this.#indiced, first, true).get();
-		return first === PROPERTY_LENGTH ? this.length : getValue(this.state);
+		return first === "length" ? this.length : getValue(this.state);
 	}
 	/**
 	* Create a computed, mapped array
@@ -419,7 +485,7 @@ var ReactiveArray = class extends Reactive {
 	}
 	peek(value) {
 		if (value === "length") return this.#size.peek();
-		return typeof value === "number" ? this.state.value.at(value) : [...this.state.value];
+		return typeof value === "number" ? this.state.value.at(value) : this.state.value.slice();
 	}
 	/**
 	* Remove and return the last item of the array
@@ -437,9 +503,7 @@ var ReactiveArray = class extends Reactive {
 		return this.state.value.push(...items);
 	}
 	set(first, second) {
-		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" && !Number.isNaN(first)) setAtIndex(this.state.value, first, second);
+		setProxyValue(true, this.state, isArrayValue, isArrayIndex, setArray, setAtIndex, first, second);
 	}
 	/**
 	* Remove and return the first item of the array
@@ -479,50 +543,67 @@ var ReactiveArray = class extends Reactive {
 		if (updated == null || Array.isArray(updated)) this.set(updated);
 	}
 };
-/**
-* Create a reactive array
-* @param value Initial array of items
-* @param options Reactivity options
-* @returns Reactive array
-*/
 function array(value, options) {
-	return new ReactiveArray(Array.isArray(value) ? value : [], options);
+	const instance = new ReactiveArray([], options);
+	instance.set(value);
+	return instance;
+}
+function isArrayIndex(value) {
+	return typeof value === "number";
+}
+function isArrayValue(value) {
+	return value == null || Array.isArray(value);
 }
-function updateArray(type, array$1, state, length) {
+function updateArray(type, array, state, length) {
 	const affectsLength = METHODS_AFFECTING_LENGTH.has(type);
-	const previousArray = affectsLength ? [] : [...array$1];
-	const previousLength = array$1.length;
+	const previousArray = affectsLength ? [] : array.slice();
+	const previousLength = array.length;
 	return (...args) => {
-		const result = array$1[type](...args);
-		if (affectsLength ? array$1.length !== previousLength : !equalArrays(state, previousArray, array$1)) {
+		const result = array[type](...args);
+		if (affectsLength ? array.length !== previousLength : !equalArrays(state, previousArray, array)) {
 			emitValue(state);
-			length.set(array$1.length);
+			length.set(array.length);
 		}
 		return result;
 	};
 }
-function setAtIndex(array$1, index, value) {
-	const actual = index < 0 ? array$1.length + index : index;
-	if (actual > -1) array$1[actual] = value;
+function setArray(state, value) {
+	state.value.splice(0, state.value.length, ...value ?? []);
 }
-
+function setAtIndex(state, index, value) {
+	const actual = index < 0 ? state.value.length + index : index;
+	if (actual > -1) state.value[actual] = value;
+}
+//#endregion
+//#region node_modules/@oscarpalmer/atoms/dist/internal/is.mjs
+/**
+* Is the value a key?
+* @param value Value to check
+* @returns `true` if the value is a `Key` _(`number` or `string`)_, otherwise `false`
+*/
 function isKey(value) {
 	return typeof value === "number" || typeof value === "string";
 }
+/**
+* Is the value a plain object?
+* @param value Value to check
+* @returns `true` if the value is a plain object, otherwise `false`
+*/
 function isPlainObject(value) {
 	if (value === null || typeof value !== "object") return false;
 	if (Symbol.toStringTag in value || Symbol.iterator in value) return false;
 	const prototype = Object.getPrototypeOf(value);
 	return prototype === null || prototype === Object.prototype || Object.getPrototypeOf(prototype) === null;
 }
-
+//#endregion
+//#region src/value/store.ts
 var Store = class extends Reactive {
 	#keyed = /* @__PURE__ */ new Map();
 	constructor(value, options) {
-		super(NAME_STORE, new Proxy(value, { set: (target, property, value$1) => setValueInProxy({
+		super(NAME_STORE, new Proxy(value, { set: (target, property, value) => setValueInProxy({
 			target,
 			property,
-			value: value$1,
+			value,
 			isArray: false,
 			state: this.state
 		}) }), options);
@@ -543,8 +624,7 @@ var Store = class extends Reactive {
 		return isKey(key) ? this.state.value[key] : { ...this.state.value };
 	}
 	set(first, second) {
-		if (isKey(first)) this.state.value[first] = second;
-		else if (first == null || isPlainObject(first)) setProxyValue(this.state.value, first ?? {});
+		setProxyValue(false, this.state, isStoreObject, isKey, setObject, setProperty, first, second);
 	}
 	subscribe(first, second) {
 		if (isKey(first) && typeof second === "function") return getReactiveValueInProxy(this, this.#keyed, first, false).subscribe(second);
@@ -555,18 +635,38 @@ var Store = class extends Reactive {
 	* @param callback Callback to update the value
 	*/
 	update(callback) {
-		const updated = callback({ ...this.state.value });
-		if (updated == null || isPlainObject(updated)) setProxyValue(this.state.value, updated ?? {});
+		const updated = callback(this.state.value);
+		if (updated == null || isPlainObject(updated)) setObject(this.state, updated);
 	}
 };
-/**
-* Create a reactive store
-* @param value Initial object value
-* @param options Reactivity options
-* @returns Reactive store
-*/
+function isStoreObject(value) {
+	return value == null || isPlainObject(value);
+}
+function setObject(state, value) {
+	startBatch();
+	const actual = value ?? {};
+	const proxy = state.value;
+	const proxyKeys = Object.keys(proxy);
+	const actualKeys = Object.keys(actual);
+	let { length } = proxyKeys;
+	for (let index = 0; index < length; index += 1) {
+		const key = proxyKeys[index];
+		proxy[key] = actualKeys.includes(key) ? actual[key] : void 0;
+	}
+	length = actualKeys.length;
+	for (let index = 0; index < length; index += 1) {
+		const key = actualKeys[index];
+		if (!proxyKeys.includes(key)) proxy[key] = actual[key];
+	}
+	stopBatch();
+}
+function setProperty(state, key, value) {
+	state.value[key] = value;
+}
 function store(value, options) {
-	return new Store(isPlainObject(value) ? value : {}, options);
+	const instance = new Store({}, options);
+	instance.set(value);
+	return instance;
 }
-
-export { array, computed, effect, isArray, isComputed, isEffect, isReactive, isSignal, signal, startBatch, stopBatch, store };
+//#endregion
+export { array, computed, effect, isArray, isComputed, isEffect, isReactive, isSignal, signal, startBatch, stopBatch, store };

package/dist/subscription.d.mts

@@ -0,0 +1,15 @@
+import { ReactiveState, Unsubscribe } from "./models.mjs";
+import { GenericCallback } from "@oscarpalmer/atoms/models";
+
+//#region src/subscription.d.ts
+declare class Subscription {
+  callback: GenericCallback;
+  state: ReactiveState<unknown, never>;
+  constructor(state: ReactiveState<unknown, never>, callback: GenericCallback);
+  destroy(): void;
+}
+declare function noop(): void;
+declare function subscribe<Value>(state: ReactiveState<Value, never>, callback: (value: Value) => void): Unsubscribe;
+declare function unsubscribe<Value>(state: ReactiveState<Value, never>, callback: (value: Value) => void): void;
+//#endregion
+export { Subscription, noop, subscribe, unsubscribe };

package/dist/{subscription.js → subscription.mjs}

@@ -1,3 +1,4 @@
+//#region src/subscription.ts
 var Subscription = class {
 	callback;
 	state;
@@ -23,4 +24,5 @@ function unsubscribe(state, callback) {
 	state.subscriptions.get(callback)?.destroy();
 	state.subscriptions.delete(callback);
 }
+//#endregion
 export { Subscription, noop, subscribe, unsubscribe };