@zeix/cause-effect 0.15.0 → 0.15.1

package/README.md

@@ -1,6 +1,6 @@
 # Cause & Effect
 
-Version 0.15.0
+Version 0.15.1
 
 **Cause & Effect** is a lightweight, reactive state management library for JavaScript applications. It uses fine-grained reactivity with signals to create predictable and efficient data flow in your app.
 
@@ -23,7 +23,7 @@ Version 0.15.0
 - 🛡️ **Error Handling**: Built-in helper functions for declarative error handling
 - 🔧 **Helper Functions**: `resolve()` and `match()` for type-safe value extraction and pattern matching for suspense and error boundaries
 - 🚀 **Performance**: Batching and efficient dependency tracking
-- 📦 **Tiny**: Less than 3kB gzipped, zero dependencies
+- 📦 **Tiny**: Less than 3kB gzipped, tree-shakable, zero dependencies
 
 ## Quick Start
 
@@ -445,14 +445,6 @@ document.querySelector('.double-all').addEventListener('click', () => {
 signals[0].set(NaN)
 ```
 
-The Cause & Effect library is designed around these principles:
-
-- **Minimal API**: Core primitives with a small but powerful interface
-- **Automatic Dependency Tracking**: Fine-grained reactivity with minimal boilerplate
-- **Performance-Focused**: Choose the right tool (functions vs computed) for optimal speed
-- **Tree-Shakable**: Import only what you need for optimal bundle size
-- **Flexible Integration**: Works with any JavaScript application or framework
-
 ### Cleanup Functions
 
 Effects return a cleanup function. When executed, it will unsubscribe from signals and run cleanup functions returned by effect callbacks, for example to remove event listeners.

package/index.dev.js

@@ -88,17 +88,17 @@ var enqueue = (fn, dedupe) => new Promise((resolve, reject) => {
 });
 
 // src/util.ts
+var isString = (value) => typeof value === "string";
+var isNumber = (value) => typeof value === "number";
 var isFunction = (fn) => typeof fn === "function";
 var isAsyncFunction = (fn) => isFunction(fn) && fn.constructor.name === "AsyncFunction";
 var isObjectOfType = (value, type) => Object.prototype.toString.call(value) === `[object ${type}]`;
 var isRecord = (value) => isObjectOfType(value, "Object");
-var arrayToRecord = (array) => {
-  const record = {};
-  for (let i = 0;i < array.length; i++) {
-    if (i in array)
-      record[String(i)] = array[i];
-  }
-  return record;
+var validArrayIndexes = (keys) => {
+  if (!keys.length)
+    return null;
+  const indexes = keys.map((k) => isString(k) ? parseInt(k, 10) : isNumber(k) ? k : NaN);
+  return indexes.every((index) => Number.isFinite(index) && index >= 0) ? indexes.sort((a, b) => a - b) : null;
 };
 var hasMethod = (obj, methodName) => (methodName in obj) && isFunction(obj[methodName]);
 var isAbortError = (error) => error instanceof DOMException && error.name === "AbortError";
@@ -155,9 +155,8 @@ var effect = (callback) => {
         controller = new AbortController;
         const currentController = controller;
         callback(controller.signal).then((cleanup2) => {
-          if (isFunction(cleanup2) && controller === currentController) {
+          if (isFunction(cleanup2) && controller === currentController)
             run.off(cleanup2);
-          }
         }).catch((error) => {
           if (!isAbortError(error))
             console.error("Async effect error:", error);
@@ -189,29 +188,35 @@ var store = (initialValue) => {
   const cleanups = new Map;
   const size = state(0);
   const current = () => {
+    const keys = Array.from(signals.keys());
+    const arrayIndexes = validArrayIndexes(keys);
+    if (arrayIndexes)
+      return arrayIndexes.map((index) => signals.get(String(index))?.get());
     const record = {};
-    for (const [key, value] of signals) {
-      record[key] = value.get();
+    for (const [key, signal] of signals) {
+      record[key] = signal.get();
     }
     return record;
   };
   const emit = (type, detail) => eventTarget.dispatchEvent(new CustomEvent(type, { detail }));
-  const addSignalAndEffect = (key, value) => {
+  const addProperty = (key, value) => {
+    const stringKey = String(key);
     const signal = toMutableSignal(value);
-    signals.set(key, signal);
+    signals.set(stringKey, signal);
     const cleanup = effect(() => {
-      const value2 = signal.get();
-      if (value2 != null)
-        emit("store-change", { [key]: value2 });
+      const currentValue = signal.get();
+      if (currentValue != null)
+        emit("store-change", { [key]: currentValue });
     });
-    cleanups.set(key, cleanup);
+    cleanups.set(stringKey, cleanup);
   };
-  const removeSignalAndEffect = (key) => {
-    signals.delete(key);
-    const cleanup = cleanups.get(key);
+  const removeProperty = (key) => {
+    const stringKey = String(key);
+    signals.delete(stringKey);
+    const cleanup = cleanups.get(stringKey);
     if (cleanup)
       cleanup();
-    cleanups.delete(key);
+    cleanups.delete(stringKey);
   };
   const reconcile = (oldValue, newValue) => {
     const changes = diff(oldValue, newValue);
@@ -220,7 +225,7 @@ var store = (initialValue) => {
         for (const key in changes.add) {
           const value = changes.add[key];
           if (value != null)
-            addSignalAndEffect(key, value);
+            addProperty(key, value);
         }
         emit("store-add", changes.add);
       }
@@ -235,7 +240,7 @@ var store = (initialValue) => {
       }
       if (Object.keys(changes.remove).length) {
         for (const key in changes.remove) {
-          removeSignalAndEffect(key);
+          removeProperty(key);
         }
         emit("store-remove", changes.remove);
       }
@@ -263,12 +268,11 @@ var store = (initialValue) => {
   ];
   return new Proxy({}, {
     get(_target, prop) {
-      const key = String(prop);
       switch (prop) {
         case "add":
           return (k, v) => {
             if (!signals.has(k)) {
-              addSignalAndEffect(k, v);
+              addProperty(k, v);
               notify(watchers);
               emit("store-add", {
                 [k]: v
@@ -284,7 +288,7 @@ var store = (initialValue) => {
         case "remove":
           return (k) => {
             if (signals.has(k)) {
-              removeSignalAndEffect(k);
+              removeProperty(k);
               notify(watchers);
               emit("store-remove", { [k]: UNSET });
               size.set(signals.size);
@@ -321,19 +325,19 @@ var store = (initialValue) => {
         return TYPE_STORE;
       if (prop === Symbol.iterator) {
         return function* () {
-          for (const [key2, signal] of signals) {
-            yield [key2, signal];
+          for (const [key, signal] of signals) {
+            yield [key, signal];
           }
         };
       }
-      return signals.get(key);
+      return signals.get(String(prop));
     },
     has(_target, prop) {
       const key = String(prop);
       return signals.has(key) || storeProps.includes(key) || prop === Symbol.toStringTag || prop === Symbol.iterator;
     },
     ownKeys() {
-      return Array.from(signals.keys());
+      return Array.from(signals.keys()).map((key) => String(key));
     },
     getOwnPropertyDescriptor(_target, prop) {
       const signal = signals.get(String(prop));
@@ -357,8 +361,8 @@ function toSignal(value) {
   if (isComputedCallback(value))
     return computed(value);
   if (Array.isArray(value))
-    return store(arrayToRecord(value));
-  if (isRecord(value))
+    return store(value);
+  if (Array.isArray(value) || isRecord(value))
     return store(value);
   return state(value);
 }
@@ -366,7 +370,7 @@ function toMutableSignal(value) {
   if (isState(value) || isStore(value))
     return value;
   if (Array.isArray(value))
-    return store(arrayToRecord(value));
+    return store(value);
   if (isRecord(value))
     return store(value);
   return state(value);
@@ -554,20 +558,17 @@ var isComputedCallback = (value) => isFunction(value) && value.length < 2;
 // src/match.ts
 function match(result, handlers) {
   try {
-    if (result.pending) {
+    if (result.pending)
       handlers.nil?.();
-    } else if (result.errors) {
+    else if (result.errors)
       handlers.err?.(result.errors);
-    } else {
+    else
       handlers.ok?.(result.values);
-    }
   } catch (error) {
-    if (handlers.err && (!result.errors || !result.errors.includes(toError(error)))) {
-      const allErrors = result.errors ? [...result.errors, toError(error)] : [toError(error)];
-      handlers.err(allErrors);
-    } else {
+    if (handlers.err && (!result.errors || !result.errors.includes(toError(error))))
+      handlers.err(result.errors ? [...result.errors, toError(error)] : [toError(error)]);
+    else
       throw error;
-    }
   }
 }
 // src/resolve.ts
@@ -578,26 +579,24 @@ function resolve(signals) {
   for (const [key, signal] of Object.entries(signals)) {
     try {
       const value = signal.get();
-      if (value === UNSET) {
+      if (value === UNSET)
         pending2 = true;
-      } else {
+      else
         values[key] = value;
-      }
     } catch (e) {
       errors.push(toError(e));
     }
   }
-  if (pending2) {
+  if (pending2)
     return { ok: false, pending: true };
-  }
-  if (errors.length > 0) {
+  if (errors.length > 0)
     return { ok: false, errors };
-  }
   return { ok: true, values };
 }
 export {
   watch,
   toSignal,
+  toMutableSignal,
   toError,
   subscribe,
   store,
@@ -606,9 +605,11 @@ export {
   observe,
   notify,
   match,
+  isString,
   isStore,
   isState,
   isSignal,
+  isNumber,
   isFunction,
   isEqual,
   isComputedCallback,

package/index.js

@@ -1 +1 @@
-var q,f=new Set,p=0,h=new Map,k,l=()=>{k=void 0;let $=Array.from(h.values());h.clear();for(let B of $)B()},B$=()=>{if(k)cancelAnimationFrame(k);k=requestAnimationFrame(l)};queueMicrotask(l);var m=($)=>{let B=new Set,W=$;return W.off=(x)=>{B.add(x)},W.cleanup=()=>{for(let x of B)x();B.clear()},W},U=($)=>{if(q&&!$.has(q)){let B=q;$.add(B),q.off(()=>{$.delete(B)})}},M=($)=>{for(let B of $)if(p)f.add(B);else B()},w=()=>{while(f.size){let $=Array.from(f);f.clear();for(let B of $)B()}},v=($)=>{p++;try{$()}finally{w(),p--}},y=($,B)=>{let W=q;q=B;try{$()}finally{q=W}},W$=($,B)=>new Promise((W,x)=>{h.set(B||Symbol(),()=>{try{W($())}catch(J){x(J)}}),B$()});var A=($)=>typeof $==="function",E=($)=>A($)&&$.constructor.name==="AsyncFunction",O=($,B)=>Object.prototype.toString.call($)===`[object ${B}]`,V=($)=>O($,"Object");var d=($)=>{let B={};for(let W=0;W<$.length;W++)if(W in $)B[String(W)]=$[W];return B},a=($,B)=>(B in $)&&A($[B]),R=($)=>$ instanceof DOMException&&$.name==="AbortError",Y=($)=>$ instanceof Error?$:Error(String($));class D extends Error{constructor($){super(`Circular dependency in ${$} detected`);this.name="CircularDependencyError"}}var o="State",S=($)=>{let B=new Set,W=$,x={[Symbol.toStringTag]:o,get:()=>{return U(B),W},set:(J)=>{if(P(W,J))return;if(W=J,M(B),C===W)B.clear()},update:(J)=>{x.set(J(W))}};return x},b=($)=>O($,o);var c=($)=>{let B=E($),W=!1,x,J=m(()=>y(()=>{if(W)throw new D("effect");W=!0,x?.abort(),x=void 0;let F;try{if(B){x=new AbortController;let H=x;$(x.signal).then((z)=>{if(A(z)&&x===H)J.off(z)}).catch((z)=>{if(!R(z))console.error("Async effect error:",z)})}else if(F=$(),A(F))J.off(F)}catch(H){if(!R(H))console.error("Effect callback error:",H)}W=!1},J));return J(),()=>{x?.abort(),J.cleanup()}};var n="Store",T=($)=>{let B=new Set,W=new EventTarget,x=new Map,J=new Map,F=S(0),H=()=>{let Z={};for(let[L,Q]of x)Z[L]=Q.get();return Z},z=(Z,L)=>W.dispatchEvent(new CustomEvent(Z,{detail:L})),K=(Z,L)=>{let Q=e(L);x.set(Z,Q);let G=c(()=>{let X=Q.get();if(X!=null)z("store-change",{[Z]:X})});J.set(Z,G)},N=(Z)=>{x.delete(Z);let L=J.get(Z);if(L)L();J.delete(Z)},j=(Z,L)=>{let Q=u(Z,L);return v(()=>{if(Object.keys(Q.add).length){for(let G in Q.add){let X=Q.add[G];if(X!=null)K(G,X)}z("store-add",Q.add)}if(Object.keys(Q.change).length){for(let G in Q.change){let X=x.get(G),I=Q.change[G];if(X&&I!=null&&a(X,"set"))X.set(I)}z("store-change",Q.change)}if(Object.keys(Q.remove).length){for(let G in Q.remove)N(G);z("store-remove",Q.remove)}F.set(x.size)}),Q.changed};j({},$),setTimeout(()=>{let Z=new CustomEvent("store-add",{detail:$});W.dispatchEvent(Z)},0);let _=["add","get","remove","set","update","addEventListener","removeEventListener","dispatchEvent","size"];return new Proxy({},{get(Z,L){let Q=String(L);switch(L){case"add":return(G,X)=>{if(!x.has(G))K(G,X),M(B),z("store-add",{[G]:X}),F.set(x.size)};case"get":return()=>{return U(B),H()};case"remove":return(G)=>{if(x.has(G))N(G),M(B),z("store-remove",{[G]:C}),F.set(x.size)};case"set":return(G)=>{if(j(H(),G)){if(M(B),C===G)B.clear()}};case"update":return(G)=>{let X=H(),I=G(X);if(j(X,I)){if(M(B),C===I)B.clear()}};case"addEventListener":return W.addEventListener.bind(W);case"removeEventListener":return W.removeEventListener.bind(W);case"dispatchEvent":return W.dispatchEvent.bind(W);case"size":return F}if(L===Symbol.toStringTag)return n;if(L===Symbol.iterator)return function*(){for(let[G,X]of x)yield[G,X]};return x.get(Q)},has(Z,L){let Q=String(L);return x.has(Q)||_.includes(Q)||L===Symbol.toStringTag||L===Symbol.iterator},ownKeys(){return Array.from(x.keys())},getOwnPropertyDescriptor(Z,L){let Q=x.get(String(L));return Q?{enumerable:!0,configurable:!0,writable:!0,value:Q}:void 0}})},g=($)=>O($,n);var C=Symbol(),$$=($)=>b($)||t($)||g($);function x$($){if($$($))return $;if(s($))return i($);if(Array.isArray($))return T(d($));if(V($))return T($);return S($)}function e($){if(b($)||g($))return $;if(Array.isArray($))return T(d($));if(V($))return T($);return S($)}var P=($,B,W)=>{if(Object.is($,B))return!0;if(typeof $!==typeof B)return!1;if(typeof $!=="object"||$===null||B===null)return!1;if(!W)W=new WeakSet;if(W.has($)||W.has(B))throw new D("isEqual");W.add($),W.add(B);try{if(Array.isArray($)&&Array.isArray(B)){if($.length!==B.length)return!1;for(let x=0;x<$.length;x++)if(!P($[x],B[x],W))return!1;return!0}if(Array.isArray($)!==Array.isArray(B))return!1;if(V($)&&V(B)){let x=Object.keys($),J=Object.keys(B);if(x.length!==J.length)return!1;for(let F of x){if(!(F in B))return!1;if(!P($[F],B[F],W))return!1}return!0}return!1}finally{W.delete($),W.delete(B)}},u=($,B)=>{let W=new WeakSet;return((J,F)=>{let H={},z={},K={},N=Object.keys(J),j=Object.keys(F),_=new Set([...N,...j]);for(let L of _){let Q=L in J,G=L in F;if(!Q&&G){H[L]=F[L];continue}else if(Q&&!G){K[L]=C;continue}let X=J[L],I=F[L];if(!P(X,I,W))z[L]=I}return{changed:Object.keys(H).length>0||Object.keys(z).length>0||Object.keys(K).length>0,add:H,change:z,remove:K}})($,B)};var r="Computed",i=($)=>{let B=new Set,W=C,x,J,F=!0,H=!1,z=!1,K=(G)=>{if(!P(G,W))W=G,H=!0;x=void 0,F=!1},N=()=>{H=C!==W,W=C,x=void 0},j=(G)=>{let X=Y(G);H=!x||X.name!==x.name||X.message!==x.message,W=C,x=X},_=(G)=>(X)=>{if(z=!1,J=void 0,G(X),H)M(B)},Z=m(()=>{if(F=!0,J?.abort(),B.size)M(B);else Z.cleanup()});Z.off(()=>{J?.abort()});let L=()=>y(()=>{if(z)throw new D("computed");if(H=!1,E($)){if(J)return W;J=new AbortController,J.signal.addEventListener("abort",()=>{z=!1,J=void 0,L()},{once:!0})}let G;z=!0;try{G=J?$(J.signal):$()}catch(X){if(R(X))N();else j(X);z=!1;return}if(G instanceof Promise)G.then(_(K),_(j));else if(G==null||C===G)N();else K(G);z=!1},Z);return{[Symbol.toStringTag]:r,get:()=>{if(U(B),w(),F)L();if(x)throw x;return W}}},t=($)=>O($,r),s=($)=>A($)&&$.length<2;function G$($,B){try{if($.pending)B.nil?.();else if($.errors)B.err?.($.errors);else B.ok?.($.values)}catch(W){if(B.err&&(!$.errors||!$.errors.includes(Y(W)))){let x=$.errors?[...$.errors,Y(W)]:[Y(W)];B.err(x)}else throw W}}function J$($){let B=[],W=!1,x={};for(let[J,F]of Object.entries($))try{let H=F.get();if(H===C)W=!0;else x[J]=H}catch(H){B.push(Y(H))}if(W)return{ok:!1,pending:!0};if(B.length>0)return{ok:!1,errors:B};return{ok:!0,values:x}}export{m as watch,x$ as toSignal,Y as toError,U as subscribe,T as store,S as state,J$ as resolve,y as observe,M as notify,G$ as match,g as isStore,b as isState,$$ as isSignal,A as isFunction,P as isEqual,s as isComputedCallback,t as isComputed,E as isAsyncFunction,R as isAbortError,w as flush,W$ as enqueue,c as effect,u as diff,i as computed,v as batch,C as UNSET,n as TYPE_STORE,o as TYPE_STATE,r as TYPE_COMPUTED,D as CircularDependencyError};
+var q,f=new Set,p=0,h=new Map,k,r=()=>{k=void 0;let $=Array.from(h.values());h.clear();for(let B of $)B()},F$=()=>{if(k)cancelAnimationFrame(k);k=requestAnimationFrame(r)};queueMicrotask(r);var E=($)=>{let B=new Set,W=$;return W.off=(F)=>{B.add(F)},W.cleanup=()=>{for(let F of B)F();B.clear()},W},O=($)=>{if(q&&!$.has(q)){let B=q;$.add(B),q.off(()=>{$.delete(B)})}},C=($)=>{for(let B of $)if(p)f.add(B);else B()},w=()=>{while(f.size){let $=Array.from(f);f.clear();for(let B of $)B()}},v=($)=>{p++;try{$()}finally{w(),p--}},T=($,B)=>{let W=q;q=B;try{$()}finally{q=W}},G$=($,B)=>new Promise((W,F)=>{h.set(B||Symbol(),()=>{try{W($())}catch(Q){F(Q)}}),F$()});var a=($)=>typeof $==="string",e=($)=>typeof $==="number",D=($)=>typeof $==="function",y=($)=>D($)&&$.constructor.name==="AsyncFunction",P=($,B)=>Object.prototype.toString.call($)===`[object ${B}]`,R=($)=>P($,"Object"),$$=($)=>{if(!$.length)return null;let B=$.map((W)=>a(W)?parseInt(W,10):e(W)?W:NaN);return B.every((W)=>Number.isFinite(W)&&W>=0)?B.sort((W,F)=>W-F):null},B$=($,B)=>(B in $)&&D($[B]),V=($)=>$ instanceof DOMException&&$.name==="AbortError",Y=($)=>$ instanceof Error?$:Error(String($));class I extends Error{constructor($){super(`Circular dependency in ${$} detected`);this.name="CircularDependencyError"}}var d="State",S=($)=>{let B=new Set,W=$,F={[Symbol.toStringTag]:d,get:()=>{return O(B),W},set:(Q)=>{if(K(W,Q))return;if(W=Q,C(B),z===W)B.clear()},update:(Q)=>{F.set(Q(W))}};return F},b=($)=>P($,d);var o=($)=>{let B=y($),W=!1,F,Q=E(()=>T(()=>{if(W)throw new I("effect");W=!0,F?.abort(),F=void 0;let Z;try{if(B){F=new AbortController;let A=F;$(F.signal).then((H)=>{if(D(H)&&F===A)Q.off(H)}).catch((H)=>{if(!V(H))console.error("Async effect error:",H)})}else if(Z=$(),D(Z))Q.off(Z)}catch(A){if(!V(A))console.error("Effect callback error:",A)}W=!1},Q));return Q(),()=>{F?.abort(),Q.cleanup()}};var c="Store",m=($)=>{let B=new Set,W=new EventTarget,F=new Map,Q=new Map,Z=S(0),A=()=>{let M=Array.from(F.keys()),L=$$(M);if(L)return L.map((J)=>F.get(String(J))?.get());let G={};for(let[J,X]of F)G[J]=X.get();return G},H=(M,L)=>W.dispatchEvent(new CustomEvent(M,{detail:L})),x=(M,L)=>{let G=String(M),J=n(L);F.set(G,J);let X=o(()=>{let j=J.get();if(j!=null)H("store-change",{[M]:j})});Q.set(G,X)},U=(M)=>{let L=String(M);F.delete(L);let G=Q.get(L);if(G)G();Q.delete(L)},N=(M,L)=>{let G=u(M,L);return v(()=>{if(Object.keys(G.add).length){for(let J in G.add){let X=G.add[J];if(X!=null)x(J,X)}H("store-add",G.add)}if(Object.keys(G.change).length){for(let J in G.change){let X=F.get(J),j=G.change[J];if(X&&j!=null&&B$(X,"set"))X.set(j)}H("store-change",G.change)}if(Object.keys(G.remove).length){for(let J in G.remove)U(J);H("store-remove",G.remove)}Z.set(F.size)}),G.changed};N({},$),setTimeout(()=>{let M=new CustomEvent("store-add",{detail:$});W.dispatchEvent(M)},0);let _=["add","get","remove","set","update","addEventListener","removeEventListener","dispatchEvent","size"];return new Proxy({},{get(M,L){switch(L){case"add":return(G,J)=>{if(!F.has(G))x(G,J),C(B),H("store-add",{[G]:J}),Z.set(F.size)};case"get":return()=>{return O(B),A()};case"remove":return(G)=>{if(F.has(G))U(G),C(B),H("store-remove",{[G]:z}),Z.set(F.size)};case"set":return(G)=>{if(N(A(),G)){if(C(B),z===G)B.clear()}};case"update":return(G)=>{let J=A(),X=G(J);if(N(J,X)){if(C(B),z===X)B.clear()}};case"addEventListener":return W.addEventListener.bind(W);case"removeEventListener":return W.removeEventListener.bind(W);case"dispatchEvent":return W.dispatchEvent.bind(W);case"size":return Z}if(L===Symbol.toStringTag)return c;if(L===Symbol.iterator)return function*(){for(let[G,J]of F)yield[G,J]};return F.get(String(L))},has(M,L){let G=String(L);return F.has(G)||_.includes(G)||L===Symbol.toStringTag||L===Symbol.iterator},ownKeys(){return Array.from(F.keys()).map((M)=>String(M))},getOwnPropertyDescriptor(M,L){let G=F.get(String(L));return G?{enumerable:!0,configurable:!0,writable:!0,value:G}:void 0}})},g=($)=>P($,c);var z=Symbol(),W$=($)=>b($)||t($)||g($);function J$($){if(W$($))return $;if(s($))return i($);if(Array.isArray($))return m($);if(Array.isArray($)||R($))return m($);return S($)}function n($){if(b($)||g($))return $;if(Array.isArray($))return m($);if(R($))return m($);return S($)}var K=($,B,W)=>{if(Object.is($,B))return!0;if(typeof $!==typeof B)return!1;if(typeof $!=="object"||$===null||B===null)return!1;if(!W)W=new WeakSet;if(W.has($)||W.has(B))throw new I("isEqual");W.add($),W.add(B);try{if(Array.isArray($)&&Array.isArray(B)){if($.length!==B.length)return!1;for(let F=0;F<$.length;F++)if(!K($[F],B[F],W))return!1;return!0}if(Array.isArray($)!==Array.isArray(B))return!1;if(R($)&&R(B)){let F=Object.keys($),Q=Object.keys(B);if(F.length!==Q.length)return!1;for(let Z of F){if(!(Z in B))return!1;if(!K($[Z],B[Z],W))return!1}return!0}return!1}finally{W.delete($),W.delete(B)}},u=($,B)=>{let W=new WeakSet;return((Q,Z)=>{let A={},H={},x={},U=Object.keys(Q),N=Object.keys(Z),_=new Set([...U,...N]);for(let L of _){let G=L in Q,J=L in Z;if(!G&&J){A[L]=Z[L];continue}else if(G&&!J){x[L]=z;continue}let X=Q[L],j=Z[L];if(!K(X,j,W))H[L]=j}return{changed:Object.keys(A).length>0||Object.keys(H).length>0||Object.keys(x).length>0,add:A,change:H,remove:x}})($,B)};var l="Computed",i=($)=>{let B=new Set,W=z,F,Q,Z=!0,A=!1,H=!1,x=(J)=>{if(!K(J,W))W=J,A=!0;F=void 0,Z=!1},U=()=>{A=z!==W,W=z,F=void 0},N=(J)=>{let X=Y(J);A=!F||X.name!==F.name||X.message!==F.message,W=z,F=X},_=(J)=>(X)=>{if(H=!1,Q=void 0,J(X),A)C(B)},M=E(()=>{if(Z=!0,Q?.abort(),B.size)C(B);else M.cleanup()});M.off(()=>{Q?.abort()});let L=()=>T(()=>{if(H)throw new I("computed");if(A=!1,y($)){if(Q)return W;Q=new AbortController,Q.signal.addEventListener("abort",()=>{H=!1,Q=void 0,L()},{once:!0})}let J;H=!0;try{J=Q?$(Q.signal):$()}catch(X){if(V(X))U();else N(X);H=!1;return}if(J instanceof Promise)J.then(_(x),_(N));else if(J==null||z===J)U();else x(J);H=!1},M);return{[Symbol.toStringTag]:l,get:()=>{if(O(B),w(),Z)L();if(F)throw F;return W}}},t=($)=>P($,l),s=($)=>D($)&&$.length<2;function L$($,B){try{if($.pending)B.nil?.();else if($.errors)B.err?.($.errors);else B.ok?.($.values)}catch(W){if(B.err&&(!$.errors||!$.errors.includes(Y(W))))B.err($.errors?[...$.errors,Y(W)]:[Y(W)]);else throw W}}function Q$($){let B=[],W=!1,F={};for(let[Q,Z]of Object.entries($))try{let A=Z.get();if(A===z)W=!0;else F[Q]=A}catch(A){B.push(Y(A))}if(W)return{ok:!1,pending:!0};if(B.length>0)return{ok:!1,errors:B};return{ok:!0,values:F}}export{E as watch,J$ as toSignal,n as toMutableSignal,Y as toError,O as subscribe,m as store,S as state,Q$ as resolve,T as observe,C as notify,L$ as match,a as isString,g as isStore,b as isState,W$ as isSignal,e as isNumber,D as isFunction,K as isEqual,s as isComputedCallback,t as isComputed,y as isAsyncFunction,V as isAbortError,w as flush,G$ as enqueue,o as effect,u as diff,i as computed,v as batch,z as UNSET,c as TYPE_STORE,d as TYPE_STATE,l as TYPE_COMPUTED,I as CircularDependencyError};

package/index.ts

@@ -1,6 +1,6 @@
 /**
  * @name Cause & Effect
- * @version 0.15.0
+ * @version 0.15.1
  * @author Esther Brunner
  */
 
@@ -12,7 +12,13 @@ export {
 	isComputedCallback,
 	TYPE_COMPUTED,
 } from './src/computed'
-export { type DiffResult, diff, isEqual, type UnknownRecord } from './src/diff'
+export {
+	type DiffResult,
+	diff,
+	isEqual,
+	type UnknownRecord,
+	type UnknownRecordOrArray,
+} from './src/diff'
 export { type EffectCallback, effect, type MaybeCleanup } from './src/effect'
 export { type MatchHandlers, match } from './src/match'
 export { type ResolveResult, resolve } from './src/resolve'
@@ -33,8 +39,10 @@ export {
 	type MaybeSignal,
 	type Signal,
 	type SignalValues,
+	toMutableSignal,
 	toSignal,
 	UNSET,
+	type UnknownSignalRecord,
 } from './src/signal'
 export { isState, type State, state, TYPE_STATE } from './src/state'
 export {
@@ -52,5 +60,7 @@ export {
 	isAbortError,
 	isAsyncFunction,
 	isFunction,
+	isNumber,
+	isString,
 	toError,
 } from './src/util'

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zeix/cause-effect",
-	"version": "0.15.0",
+	"version": "0.15.1",
 	"author": "Esther Brunner",
 	"main": "index.js",
 	"module": "index.ts",

package/src/diff.ts

@@ -4,8 +4,11 @@ import { CircularDependencyError, isRecord } from './util'
 /* === Types === */
 
 type UnknownRecord = Record<string, unknown & {}>
+type UnknownRecordOrArray = {
+	[x: string | number]: unknown & {}
+}
 
-type DiffResult<T extends UnknownRecord = UnknownRecord> = {
+type DiffResult<T extends UnknownRecordOrArray = UnknownRecord> = {
 	changed: boolean
 	add: Partial<T>
 	change: Partial<T>
@@ -81,7 +84,10 @@ const isEqual = <T>(a: T, b: T, visited?: WeakSet<object>): boolean => {
  * @param {T} newObj - The new record to compare
  * @returns {DiffResult<T>} The result of the comparison
  */
-const diff = <T extends UnknownRecord>(oldObj: T, newObj: T): DiffResult<T> => {
+const diff = <T extends UnknownRecordOrArray>(
+	oldObj: T,
+	newObj: T,
+): DiffResult<T> => {
 	const visited = new WeakSet<object>()
 
 	const diffRecords = (
@@ -133,4 +139,10 @@ const diff = <T extends UnknownRecord>(oldObj: T, newObj: T): DiffResult<T> => {
 
 /* === Exports === */
 
-export { type DiffResult, diff, isEqual, type UnknownRecord }
+export {
+	type DiffResult,
+	diff,
+	isEqual,
+	type UnknownRecord,
+	type UnknownRecordOrArray,
+}

package/src/effect.ts

@@ -55,9 +55,8 @@ const effect = (callback: EffectCallback): Cleanup => {
 							if (
 								isFunction(cleanup) &&
 								controller === currentController
-							) {
+							)
 								run.off(cleanup)
-							}
 						})
 						.catch(error => {
 							if (!isAbortError(error))

package/src/match.ts

@@ -1,10 +1,10 @@
 import type { ResolveResult } from './resolve'
-import type { Signal, SignalValues } from './signal'
+import type { SignalValues, UnknownSignalRecord } from './signal'
 import { toError } from './util'
 
 /* === Types === */
 
-type MatchHandlers<S extends Record<string, Signal<unknown & {}>>> = {
+type MatchHandlers<S extends UnknownSignalRecord> = {
 	ok?: (values: SignalValues<S>) => void
 	err?: (errors: readonly Error[]) => void
 	nil?: () => void
@@ -24,31 +24,26 @@ type MatchHandlers<S extends Record<string, Signal<unknown & {}>>> = {
  * @param {MatchHandlers<S>} handlers - Handlers for different states (side effects only)
  * @returns {void} - Always returns void
  */
-function match<S extends Record<string, Signal<unknown & {}>>>(
+function match<S extends UnknownSignalRecord>(
 	result: ResolveResult<S>,
 	handlers: MatchHandlers<S>,
 ): void {
 	try {
-		if (result.pending) {
-			handlers.nil?.()
-		} else if (result.errors) {
-			handlers.err?.(result.errors)
-		} else {
-			handlers.ok?.(result.values as SignalValues<S>)
-		}
+		if (result.pending) handlers.nil?.()
+		else if (result.errors) handlers.err?.(result.errors)
+		else handlers.ok?.(result.values as SignalValues<S>)
 	} catch (error) {
 		// If handler throws, try error handler, otherwise rethrow
 		if (
 			handlers.err &&
 			(!result.errors || !result.errors.includes(toError(error)))
-		) {
-			const allErrors = result.errors
-				? [...result.errors, toError(error)]
-				: [toError(error)]
-			handlers.err(allErrors)
-		} else {
-			throw error
-		}
+		)
+			handlers.err(
+				result.errors
+					? [...result.errors, toError(error)]
+					: [toError(error)],
+			)
+		else throw error
 	}
 }
 

package/src/resolve.ts

@@ -1,10 +1,10 @@
 import type { UnknownRecord } from './diff'
-import { type Signal, type SignalValues, UNSET } from './signal'
+import { type SignalValues, UNSET, type UnknownSignalRecord } from './signal'
 import { toError } from './util'
 
 /* === Types === */
 
-type ResolveResult<S extends Record<string, Signal<unknown & {}>>> =
+type ResolveResult<S extends UnknownSignalRecord> =
 	| { ok: true; values: SignalValues<S>; errors?: never; pending?: never }
 	| { ok: false; errors: readonly Error[]; values?: never; pending?: never }
 	| { ok: false; pending: true; values?: never; errors?: never }
@@ -21,9 +21,7 @@ type ResolveResult<S extends Record<string, Signal<unknown & {}>>> =
  * @param {S} signals - Signals to resolve
  * @returns {ResolveResult<S>} - Discriminated union result
  */
-function resolve<S extends Record<string, Signal<unknown & {}>>>(
-	signals: S,
-): ResolveResult<S> {
+function resolve<S extends UnknownSignalRecord>(signals: S): ResolveResult<S> {
 	const errors: Error[] = []
 	let pending = false
 	const values: UnknownRecord = {}
@@ -32,24 +30,16 @@ function resolve<S extends Record<string, Signal<unknown & {}>>>(
 	for (const [key, signal] of Object.entries(signals)) {
 		try {
 			const value = signal.get()
-
-			if (value === UNSET) {
-				pending = true
-			} else {
-				values[key] = value
-			}
+			if (value === UNSET) pending = true
+			else values[key] = value
 		} catch (e) {
 			errors.push(toError(e))
 		}
 	}
 
 	// Return discriminated union
-	if (pending) {
-		return { ok: false, pending: true }
-	}
-	if (errors.length > 0) {
-		return { ok: false, errors }
-	}
+	if (pending) return { ok: false, pending: true }
+	if (errors.length > 0) return { ok: false, errors }
 	return { ok: true, values: values as SignalValues<S> }
 }
 

package/src/signal.ts

@@ -7,7 +7,7 @@ import {
 } from './computed'
 import { isState, type State, state } from './state'
 import { isStore, type Store, store } from './store'
-import { arrayToRecord, isRecord } from './util'
+import { isRecord } from './util'
 
 /* === Types === */
 
@@ -16,7 +16,9 @@ type Signal<T extends {}> = {
 }
 type MaybeSignal<T extends {}> = T | Signal<T> | ComputedCallback<T>
 
-type SignalValues<S extends Record<string, Signal<unknown & {}>>> = {
+type UnknownSignalRecord = Record<string, Signal<unknown & {}>>
+
+type SignalValues<S extends UnknownSignalRecord> = {
 	[K in keyof S]: S[K] extends Signal<infer T> ? T : never
 }
 
@@ -42,45 +44,56 @@ const isSignal = /*#__PURE__*/ <T extends {}>(
  * Convert a value to a Signal if it's not already a Signal
  *
  * @since 0.9.6
+ * @param {T} value - value to convert
+ * @returns {Signal<T>} - Signal instance
  */
-function toSignal<T extends Array<unknown & {}>>(
-	value: T[],
-): Store<Record<string, T>>
-function toSignal<T extends Record<keyof T, T[keyof T]>>(value: T): Store<T>
-function toSignal<T extends {}>(value: ComputedCallback<T>): Computed<T>
-function toSignal<T extends {}>(value: Signal<T>): Signal<T>
-function toSignal<T extends {}>(value: T): State<T>
+function toSignal<T extends {}>(value: T[]): Store<Record<string, T>>
+function toSignal<T extends {}>(
+	value: (() => T) | ((abort: AbortSignal) => Promise<T>),
+): Computed<T>
 function toSignal<T extends {}>(
-	value: MaybeSignal<T> | T[],
-): Signal<T> | Store<Record<string, T>> {
+	value: T,
+): T extends Store<infer U>
+	? Store<U>
+	: T extends State<infer U>
+		? State<U>
+		: T extends Computed<infer U>
+			? Computed<U>
+			: T extends Signal<infer U>
+				? Signal<U>
+				: T extends Record<string, unknown & {}>
+					? Store<{ [K in keyof T]: T[K] }>
+					: State<T>
+function toSignal<T extends {}>(value: MaybeSignal<T>): Signal<T> {
 	if (isSignal<T>(value)) return value
-	if (isComputedCallback<T>(value)) return computed(value)
-	if (Array.isArray(value)) return store(arrayToRecord(value))
-	if (isRecord(value)) return store(value as T)
-	return state(value as T)
+	if (isComputedCallback(value)) return computed(value)
+	if (Array.isArray(value)) return store(value as T)
+	if (Array.isArray(value) || isRecord(value)) return store(value)
+	return state(value)
 }
 
 /**
  * Convert a value to a mutable Signal if it's not already a Signal
  *
- * @since 0.9.6
+ * @since 0.15.0
+ * @param {T} value - value to convert
+ * @returns {State<T> | Store<T>} - Signal instance
  */
-function toMutableSignal<T extends Array<unknown & {}>>(
-	value: T[],
-): Store<Record<string, T>>
-function toMutableSignal<T extends Record<keyof T, T[keyof T]>>(
-	value: T,
-): Store<T>
-function toMutableSignal<T extends State<T>>(value: State<T>): State<T>
-function toMutableSignal<T extends Store<T>>(value: Store<T>): Store<T>
-function toMutableSignal<T extends {}>(value: T): State<T>
+function toMutableSignal<T extends {}>(value: T[]): Store<Record<string, T>>
 function toMutableSignal<T extends {}>(
-	value: T | State<T> | Store<T> | T[],
-): Signal<T> | Store<Record<string, T>> {
+	value: T,
+): T extends Store<infer U>
+	? Store<U>
+	: T extends State<infer U>
+		? State<U>
+		: T extends Record<string, unknown & {}>
+			? Store<{ [K in keyof T]: T[K] }>
+			: State<T>
+function toMutableSignal<T extends {}>(value: T): State<T> | Store<T> {
 	if (isState<T>(value) || isStore<T>(value)) return value
-	if (Array.isArray(value)) return store(arrayToRecord(value))
-	if (isRecord(value)) return store(value as T)
-	return state(value as T)
+	if (Array.isArray(value)) return store(value as T)
+	if (isRecord(value)) return store(value)
+	return state(value)
 }
 
 /* === Exports === */
@@ -88,6 +101,7 @@ function toMutableSignal<T extends {}>(
 export {
 	type Signal,
 	type MaybeSignal,
+	type UnknownSignalRecord,
 	type SignalValues,
 	UNSET,
 	isSignal,