@oscarpalmer/mora 0.20.0 → 0.22.0

package/package.json

@@ -8,35 +8,30 @@
 	},
 	"description": "Signals and stuff…",
 	"devDependencies": {
-		"@biomejs/biome": "^1.9",
+		"@biomejs/biome": "^2.2",
 		"@rollup/plugin-node-resolve": "^16",
 		"@rollup/plugin-typescript": "^12.1",
-		"@types/node": "^24",
+		"@types/node": "^24.3",
 		"@vitest/coverage-istanbul": "^3.2",
 		"dts-bundle-generator": "^9.5",
 		"glob": "^11",
 		"jsdom": "^26.1",
+		"rollup": "^4.50",
 		"tslib": "^2.8",
-		"typescript": "^5.8",
-		"vite": "^6.3",
+		"typescript": "^5.9",
+		"vite": "npm:rolldown-vite@latest",
 		"vitest": "^3.2"
 	},
 	"exports": {
+		"./package.json": "./package.json",
 		".": {
-			"import": {
-				"types": "./types/index.d.ts",
-				"default": "./dist/index.js"
-			},
-			"require": {
-				"types": "./types/index.d.cts",
-				"default": "./dist/index.cjs"
-			}
+			"types": "./types/index.d.ts",
+			"default": "./dist/index.js"
 		}
 	},
 	"files": ["dist", "src", "types"],
 	"keywords": ["signal", "signals", "reactive"],
 	"license": "MIT",
-	"main": "./dist/index.cjs",
 	"module": "./dist/index.js",
 	"name": "@oscarpalmer/mora",
 	"repository": {
@@ -44,15 +39,14 @@
 		"url": "git+https://github.com/oscarpalmer/mora.git"
 	},
 	"scripts": {
-		"build": "npm run clean && npm run build:js && npm run rollup && npm run types",
-		"build:js": "npx vite build",
+		"build": "npm run clean && npx vite build && npm run rollup:build && npx tsc",
 		"clean": "rm -rf ./dist && rm -rf ./types && rm -f ./tsconfig.tsbuildinfo",
-		"rollup": "npx rollup -c",
+		"rollup:build": "npx rollup -c",
+		"rollup:watch": "npx rollup -c --watch",
 		"test": "npx vitest --coverage",
-		"types": "npx tsc && npx dts-bundle-generator --config ./dts.config.cts --silent",
 		"watch": "npx vite build --watch"
 	},
 	"type": "module",
 	"types": "./types/index.d.ts",
-	"version": "0.20.0"
+	"version": "0.22.0"
 }

package/src/helpers/value.ts

@@ -1,6 +1,6 @@
 import {batchDepth, batchedHandlers, flushHandlers} from '../batch';
 import {activeEffect} from '../effect';
-import {type InternalComputed, activeComputed} from '../value/computed';
+import {activeComputed, type InternalComputed} from '../value/computed';
 import type {ReactiveState} from '../value/reactive';
 
 export function emitValue<Value>(state: ReactiveState<Value, never>): void {

package/src/index.ts

@@ -12,4 +12,3 @@ 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/value/array.ts

@@ -1,4 +1,4 @@
-import type {GenericCallback} from '@oscarpalmer/atoms';
+import type {GenericCallback} from '@oscarpalmer/atoms/models';
 import {arrayName} from '../helpers/is';
 import {getReactiveValueInProxy, setValueInProxy} from '../helpers/proxy';
 import {emitValue, equalArrays, getValue} from '../helpers/value';
@@ -112,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];
 	}
 
 	/**

package/types/value/array.d.ts

@@ -40,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)_
      */

package/dist/batch.cjs

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const effect = require("./effect.cjs");
-const helpers_is = require("./helpers/is.cjs");
-function flushHandlers() {
-  while (exports.batchDepth === 0 && batchedHandlers.size > 0) {
-    const handlers = [...batchedHandlers];
-    batchedHandlers.clear();
-    for (const handler of handlers) {
-      if (helpers_is.isEffect(handler)) {
-        effect.runEffect(handler);
-      } else {
-        handler.callback(handler.state.value);
-      }
-    }
-  }
-}
-function startBatch() {
-  exports.batchDepth += 1;
-}
-function stopBatch() {
-  if (exports.batchDepth > 0) {
-    exports.batchDepth -= 1;
-  }
-  flushHandlers();
-}
-const batchedHandlers = /* @__PURE__ */ new Set();
-exports.batchDepth = 0;
-exports.batchedHandlers = batchedHandlers;
-exports.flushHandlers = flushHandlers;
-exports.startBatch = startBatch;
-exports.stopBatch = stopBatch;

package/dist/effect.cjs

@@ -1,30 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const helpers_is = require("./helpers/is.cjs");
-class Effect {
-  constructor(callback) {
-    Object.defineProperty(this, "$mora", {
-      value: helpers_is.effectName
-    });
-    this.state = {
-      callback
-    };
-    runEffect(this);
-  }
-}
-function runEffect(effect2) {
-  const previousEffect = exports.activeEffect;
-  exports.activeEffect = effect2;
-  try {
-    effect2.state.callback();
-  } finally {
-    exports.activeEffect = previousEffect;
-  }
-}
-function effect(callback) {
-  return new Effect(callback);
-}
-exports.activeEffect = void 0;
-exports.Effect = Effect;
-exports.effect = effect;
-exports.runEffect = runEffect;

package/dist/helpers/is.cjs

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-function isArray(value) {
-  return isMora(value, arrayName);
-}
-function isComputed(value) {
-  return isMora(value, computedName);
-}
-function isEffect(value) {
-  return isMora(value, effectName);
-}
-function isMora(value, name) {
-  return typeof value === "object" && value != null && "$mora" in value && (typeof name === "string" ? value.$mora === name : name.has(value.$mora));
-}
-function isReactive(value) {
-  return isMora(value, reactiveNames);
-}
-function isSignal(value) {
-  return isMora(value, signalName);
-}
-function isStore(value) {
-  return isMora(value, storeName);
-}
-const arrayName = "array";
-const computedName = "computed";
-const effectName = "effect";
-const signalName = "signal";
-const storeName = "store";
-const reactiveNames = /* @__PURE__ */ new Set([arrayName, computedName, signalName, storeName]);
-exports.arrayName = arrayName;
-exports.computedName = computedName;
-exports.effectName = effectName;
-exports.isArray = isArray;
-exports.isComputed = isComputed;
-exports.isEffect = isEffect;
-exports.isReactive = isReactive;
-exports.isSignal = isSignal;
-exports.isStore = isStore;
-exports.signalName = signalName;
-exports.storeName = storeName;

package/dist/helpers/proxy.cjs

@@ -1,56 +0,0 @@
-"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);
-  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)) {
-      const keyedValue = value[key];
-      proxy[key] = keyedValue;
-    }
-  }
-  batch.stopBatch();
-}
-function setValueInProxy(target, property, value, state, isArray, length) {
-  if (isArray) {
-    const isIndex = !Number.isNaN(Number(property));
-    const isLength = property === "length";
-    if (!isIndex && !isLength) {
-      return Reflect.set(target, property, value);
-    }
-  }
-  const previous = Reflect.get(target, property);
-  if (!state.equal(previous, value)) {
-    Reflect.set(target, property, value);
-    helpers_value.emitValue(state);
-    if (isArray) {
-      length == null ? void 0 : length.set(target.length);
-    }
-  }
-  return true;
-}
-exports.getReactiveValueInProxy = getReactiveValueInProxy;
-exports.setProxyValue = setProxyValue;
-exports.setValueInProxy = setValueInProxy;

package/dist/helpers/value.cjs

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const batch = require("../batch.cjs");
-const effect = require("../effect.cjs");
-const value_computed = require("../value/computed.cjs");
-function emitValue(state) {
-  for (const computed of state.computeds) {
-    computed.effect.dirty = true;
-  }
-  for (const effect2 of state.effects) {
-    batch.batchedHandlers.add(effect2);
-  }
-  for (const [, subscription] of state.subscriptions) {
-    batch.batchedHandlers.add(subscription);
-  }
-  if (batch.batchDepth === 0) {
-    batch.flushHandlers();
-  }
-}
-function equalArrays(state, first, second) {
-  let { length } = first;
-  if (length !== second.length) {
-    return false;
-  }
-  let offset = 0;
-  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;
-  for (let index = offset; index < length; index += 1) {
-    if (!state.equal(first[index], second[index])) {
-      return false;
-    }
-  }
-  return true;
-}
-function getValue(state) {
-  if (value_computed.activeComputed != null) {
-    state.computeds.add(value_computed.activeComputed);
-  }
-  if (effect.activeEffect != null) {
-    state.effects.add(effect.activeEffect);
-  }
-  return state.value;
-}
-exports.emitValue = emitValue;
-exports.equalArrays = equalArrays;
-exports.getValue = getValue;

package/dist/index.cjs

@@ -1,21 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const batch = require("./batch.cjs");
-const effect = require("./effect.cjs");
-const helpers_is = require("./helpers/is.cjs");
-const value_array = require("./value/array.cjs");
-const value_computed = require("./value/computed.cjs");
-const value_signal = require("./value/signal.cjs");
-const value_store = require("./value/store.cjs");
-exports.startBatch = batch.startBatch;
-exports.stopBatch = batch.stopBatch;
-exports.effect = effect.effect;
-exports.isArray = helpers_is.isArray;
-exports.isComputed = helpers_is.isComputed;
-exports.isEffect = helpers_is.isEffect;
-exports.isReactive = helpers_is.isReactive;
-exports.isSignal = helpers_is.isSignal;
-exports.array = value_array.array;
-exports.computed = value_computed.computed;
-exports.signal = value_signal.signal;
-exports.store = value_store.store;

package/dist/node_modules/@oscarpalmer/atoms/dist/internal/is.cjs

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-function isKey(value) {
-  return typeof value === "number" || typeof value === "string";
-}
-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;
-}
-exports.isKey = isKey;
-exports.isPlainObject = isPlainObject;

package/dist/node_modules/@oscarpalmer/atoms/dist/internal/is.js

@@ -1,17 +0,0 @@
-function isKey(value) {
-  return typeof value === "number" || typeof value === "string";
-}
-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;
-}
-export {
-  isKey,
-  isPlainObject
-};

package/dist/subscription.cjs

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-class Subscription {
-  constructor(state, callback) {
-    this.state = state;
-    this.callback = callback;
-    callback(state.value);
-  }
-}
-function noop() {
-}
-function subscribe(state, callback) {
-  if (typeof callback !== "function" || state.subscriptions.has(callback)) {
-    return noop;
-  }
-  state.subscriptions.set(callback, new Subscription(state, callback));
-  return () => {
-    unsubscribe(state, callback);
-  };
-}
-function unsubscribe(state, callback) {
-  const subscription = state.subscriptions.get(callback);
-  state.subscriptions.delete(callback);
-  if (subscription != null) {
-    subscription.callback = noop;
-    subscription.state = void 0;
-  }
-}
-exports.Subscription = Subscription;
-exports.noop = noop;
-exports.subscribe = subscribe;
-exports.unsubscribe = unsubscribe;

package/dist/value/array.cjs

@@ -1,181 +0,0 @@
-"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 _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");
-class ReactiveArray extends value_reactive.Reactive {
-  constructor(value, options) {
-    super(
-      helpers_is.arrayName,
-      new Proxy(value, {
-        get: (target, property) => updateMethods.has(property) ? updateArray(property, target, this.state, __privateGet(this, _size)) : Reflect.get(target, property),
-        set: (target, property, value2) => helpers_proxy.setValueInProxy(
-          target,
-          property,
-          value2,
-          this.state,
-          true,
-          __privateGet(this, _size)
-        )
-      }),
-      options
-    );
-    __privateAdd(this, _indiced, /* @__PURE__ */ new Map());
-    __privateAdd(this, _size, value_signal.signal(0));
-    __privateGet(this, _size).set(value.length);
-  }
-  /**
-   * The length of the array
-   */
-  get length() {
-    return __privateGet(this, _size).get();
-  }
-  /**
-   * Set the length of the array
-   */
-  set length(value) {
-    if (typeof value === "number" && value >= 0 && value !== this.state.value.length) {
-      this.get().length = value;
-    }
-  }
-  /**
-   * Clear the array
-   */
-  clear() {
-    this.length = 0;
-  }
-  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);
-  }
-  /**
-   * Create a computed, filtered array
-   */
-  filter(callback) {
-    return value_computed.computed(() => this.get().filter(callback));
-  }
-  /**
-   * Create a computed, mapped array
-   */
-  map(callback) {
-    return value_computed.computed(() => this.get().map(callback));
-  }
-  peek(length) {
-    return length === true ? __privateGet(this, _size).peek() : [...this.state.value];
-  }
-  /**
-   * Remove and return the last item of the array
-   */
-  pop() {
-    return this.state.value.pop();
-  }
-  /**
-   * Add items to the end of the array
-   */
-  push(...items) {
-    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") {
-      this.state.value[first] = second;
-    }
-  }
-  /**
-   * Remove and return the first item of the array
-   */
-  shift() {
-    return this.state.value.shift();
-  }
-  /**
-   * Remove and return items from the array _(and optionally add new items)_
-   */
-  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 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);
-}
-function updateArray(type, array2, state, length) {
-  const affectsLength = lengthAffectingMethods.has(type);
-  const previousArray = affectsLength ? [] : [...array2];
-  const previousLength = array2.length;
-  return (...args) => {
-    const result = array2[type](
-      ...args
-    );
-    if (affectsLength ? array2.length !== previousLength : !helpers_value.equalArrays(state, previousArray, array2)) {
-      helpers_value.emitValue(state);
-      length.set(array2.length);
-    }
-    return result;
-  };
-}
-const lengthAffectingMethods = /* @__PURE__ */ new Set([
-  "pop",
-  "push",
-  "shift",
-  "unshift"
-]);
-const updateMethods = /* @__PURE__ */ new Set([
-  ...lengthAffectingMethods,
-  "copyWithin",
-  "fill",
-  "reverse",
-  "sort",
-  "splice"
-]);
-exports.ReactiveArray = ReactiveArray;
-exports.array = array;

package/dist/value/computed.cjs

@@ -1,60 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const batch = require("../batch.cjs");
-const effect = require("../effect.cjs");
-const helpers_is = require("../helpers/is.cjs");
-const value_reactive = require("./reactive.cjs");
-exports.activeComputed = void 0;
-class Computed extends value_reactive.Reactive {
-  constructor(callback, options) {
-    super(helpers_is.computedName, void 0, options);
-    __publicField(this, "effect", {
-      dirty: true,
-      instance: void 0
-    });
-    this.effect.instance = effect.effect(() => {
-      if (this.effect.dirty) {
-        const previousComputed = exports.activeComputed;
-        exports.activeComputed = this;
-        const value = callback();
-        exports.activeComputed = previousComputed;
-        if (!this.state.equal(this.state.value, value)) {
-          this.state.value = value;
-          for (const computed2 of this.state.computeds) {
-            computed2.effect.dirty = true;
-          }
-          for (const effect2 of this.state.effects) {
-            batch.batchedHandlers.add(effect2);
-          }
-          for (const [, subscription] of this.state.subscriptions) {
-            subscription.callback(value);
-          }
-        }
-        this.effect.dirty = false;
-      }
-    });
-  }
-  /**
-   * @inheritdoc
-   */
-  get() {
-    if (exports.activeComputed != null && this !== exports.activeComputed) {
-      this.state.computeds.add(exports.activeComputed);
-    }
-    if (effect.activeEffect != null && effect.activeEffect !== this.effect.instance) {
-      this.state.effects.add(effect.activeEffect);
-    }
-    if (this.effect.dirty && batch.batchDepth === 0) {
-      effect.runEffect(this.effect.instance);
-    }
-    return this.state.value;
-  }
-}
-function computed(callback, options) {
-  return new Computed(callback, options);
-}
-exports.Computed = Computed;
-exports.computed = computed;