@oscarpalmer/mora 0.8.0 → 0.10.0

package/dist/batch.cjs

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

package/dist/batch.js

@@ -1,10 +1,15 @@
-import { dirtyEffects, runEffect } from "./effect.js";
+import { runEffect } from "./effect.js";
+import { isEffect } from "./is.js";
 function flushEffects() {
-  while (batchDepth === 0 && dirtyEffects.size > 0) {
-    const effects = [...dirtyEffects];
-    dirtyEffects.clear();
-    for (const effect of effects) {
-      runEffect(effect);
+  while (batchDepth === 0 && batchedHandlers.size > 0) {
+    const handlers = [...batchedHandlers];
+    batchedHandlers.clear();
+    for (const handler of handlers) {
+      if (isEffect(handler)) {
+        runEffect(handler);
+      } else {
+        handler.callback(handler.state.value);
+      }
     }
   }
 }
@@ -17,9 +22,11 @@ function stopBatch() {
   }
   flushEffects();
 }
+const batchedHandlers = /* @__PURE__ */ new Set();
 let batchDepth = 0;
 export {
   batchDepth,
+  batchedHandlers,
   flushEffects,
   startBatch,
   stopBatch

package/dist/computed.cjs

@@ -5,15 +5,20 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const batch = require("./batch.cjs");
 const effect = require("./effect.cjs");
+const subscription = require("./subscription.cjs");
 exports.activeComputed = void 0;
 class Computed {
   constructor(callback) {
     __publicField(this, "state");
+    Object.defineProperty(this, "$mora", {
+      value: "computed"
+    });
     this.state = {
       computeds: /* @__PURE__ */ new Set(),
       dirty: true,
       effect: void 0,
       effects: /* @__PURE__ */ new Set(),
+      subscriptions: /* @__PURE__ */ new Map(),
       value: void 0
     };
     this.state.effect = effect.effect(() => {
@@ -28,7 +33,10 @@ class Computed {
             computed2.state.dirty = true;
           }
           for (const effect2 of this.state.effects) {
-            effect.dirtyEffects.add(effect2);
+            batch.batchedHandlers.add(effect2);
+          }
+          for (const [, subscription2] of this.state.subscriptions) {
+            subscription2.callback(value);
           }
         }
         this.state.dirty = false;
@@ -56,6 +64,18 @@ class Computed {
   peek() {
     return this.state.value;
   }
+  /**
+   * Subscribe to changes
+   */
+  subscribe(callback) {
+    return subscription.subscribe(this.state, callback);
+  }
+  /**
+   * Unsubscribe from changes
+   */
+  unsubscribe(callback) {
+    subscription.unsubscribe(this.state, callback);
+  }
 }
 function computed(callback) {
   return new Computed(callback);

package/dist/computed.js

@@ -1,17 +1,22 @@
 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);
-import { batchDepth } from "./batch.js";
-import { effect, dirtyEffects, activeEffect, runEffect } from "./effect.js";
+import { batchedHandlers, batchDepth } from "./batch.js";
+import { effect, activeEffect, runEffect } from "./effect.js";
+import { subscribe, unsubscribe } from "./subscription.js";
 let activeComputed;
 class Computed {
   constructor(callback) {
     __publicField(this, "state");
+    Object.defineProperty(this, "$mora", {
+      value: "computed"
+    });
     this.state = {
       computeds: /* @__PURE__ */ new Set(),
       dirty: true,
       effect: void 0,
       effects: /* @__PURE__ */ new Set(),
+      subscriptions: /* @__PURE__ */ new Map(),
       value: void 0
     };
     this.state.effect = effect(() => {
@@ -26,7 +31,10 @@ class Computed {
             computed2.state.dirty = true;
           }
           for (const effect2 of this.state.effects) {
-            dirtyEffects.add(effect2);
+            batchedHandlers.add(effect2);
+          }
+          for (const [, subscription] of this.state.subscriptions) {
+            subscription.callback(value);
           }
         }
         this.state.dirty = false;
@@ -54,6 +62,18 @@ class Computed {
   peek() {
     return this.state.value;
   }
+  /**
+   * Subscribe to changes
+   */
+  subscribe(callback) {
+    return subscribe(this.state, callback);
+  }
+  /**
+   * Unsubscribe from changes
+   */
+  unsubscribe(callback) {
+    unsubscribe(this.state, callback);
+  }
 }
 function computed(callback) {
   return new Computed(callback);

package/dist/effect.cjs

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 class Effect {
   constructor(callback) {
+    Object.defineProperty(this, "$mora", {
+      value: "effect"
+    });
     this.state = {
       callback
     };
@@ -21,8 +24,6 @@ function effect(callback) {
   return new Effect(callback);
 }
 exports.activeEffect = void 0;
-const dirtyEffects = /* @__PURE__ */ new Set();
 exports.Effect = Effect;
-exports.dirtyEffects = dirtyEffects;
 exports.effect = effect;
 exports.runEffect = runEffect;

package/dist/effect.js

@@ -1,5 +1,8 @@
 class Effect {
   constructor(callback) {
+    Object.defineProperty(this, "$mora", {
+      value: "effect"
+    });
     this.state = {
       callback
     };
@@ -19,11 +22,9 @@ function effect(callback) {
   return new Effect(callback);
 }
 let activeEffect;
-const dirtyEffects = /* @__PURE__ */ new Set();
 export {
   Effect,
   activeEffect,
-  dirtyEffects,
   effect,
   runEffect
 };

package/dist/index.cjs

@@ -3,9 +3,13 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const batch = require("./batch.cjs");
 const computed = require("./computed.cjs");
 const effect = require("./effect.cjs");
+const is = require("./is.cjs");
 const signal = require("./signal.cjs");
 exports.startBatch = batch.startBatch;
 exports.stopBatch = batch.stopBatch;
 exports.computed = computed.computed;
 exports.effect = effect.effect;
+exports.isComputed = is.isComputed;
+exports.isEffect = is.isEffect;
+exports.isSignal = is.isSignal;
 exports.signal = signal.signal;

package/dist/index.js

@@ -1,10 +1,14 @@
 import { startBatch, stopBatch } from "./batch.js";
 import { computed } from "./computed.js";
 import { effect } from "./effect.js";
+import { isComputed, isEffect, isSignal } from "./is.js";
 import { signal } from "./signal.js";
 export {
   computed,
   effect,
+  isComputed,
+  isEffect,
+  isSignal,
   signal,
   startBatch,
   stopBatch

package/dist/is.cjs

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+function isComputed(value) {
+  return isMora(value, "computed");
+}
+function isEffect(value) {
+  return isMora(value, "effect");
+}
+function isMora(value, name) {
+  return typeof value === "object" && value != null && "$mora" in value && value.$mora === name;
+}
+function isSignal(value) {
+  return isMora(value, "signal");
+}
+exports.isComputed = isComputed;
+exports.isEffect = isEffect;
+exports.isSignal = isSignal;

package/dist/is.js

@@ -0,0 +1,17 @@
+function isComputed(value) {
+  return isMora(value, "computed");
+}
+function isEffect(value) {
+  return isMora(value, "effect");
+}
+function isMora(value, name) {
+  return typeof value === "object" && value != null && "$mora" in value && value.$mora === name;
+}
+function isSignal(value) {
+  return isMora(value, "signal");
+}
+export {
+  isComputed,
+  isEffect,
+  isSignal
+};

package/dist/mora.full.js

@@ -1,5 +1,8 @@
 class Effect {
     constructor(callback) {
+        Object.defineProperty(this, '$mora', {
+            value: 'effect',
+        });
         this.state = {
             callback,
         };
@@ -23,14 +26,43 @@ function effect(callback) {
     return new Effect(callback);
 }
 let activeEffect;
-const dirtyEffects = new Set();
+
+/**
+ * Is the value a computed signal?
+ */
+function isComputed(value) {
+    return isMora(value, 'computed');
+}
+/**
+ * Is the value an effect?
+ */
+function isEffect(value) {
+    return isMora(value, 'effect');
+}
+function isMora(value, name) {
+    return (typeof value === 'object' &&
+        value != null &&
+        '$mora' in value &&
+        value.$mora === name);
+}
+/**
+ * Is the value a signal?
+ */
+function isSignal(value) {
+    return isMora(value, 'signal');
+}
 
 function flushEffects() {
-    while (batchDepth === 0 && dirtyEffects.size > 0) {
-        const effects = [...dirtyEffects];
-        dirtyEffects.clear();
-        for (const effect of effects) {
-            runEffect(effect);
+    while (batchDepth === 0 && batchedHandlers.size > 0) {
+        const handlers = [...batchedHandlers];
+        batchedHandlers.clear();
+        for (const handler of handlers) {
+            if (isEffect(handler)) {
+                runEffect(handler);
+            }
+            else {
+                handler.callback(handler.state.value);
+            }
         }
     }
 }
@@ -49,17 +81,50 @@ function stopBatch() {
     }
     flushEffects();
 }
+const batchedHandlers = new Set();
 let batchDepth = 0;
 
+class Subscription {
+    state;
+    callback;
+    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 = undefined;
+    }
+}
+
 let activeComputed;
 class Computed {
     state;
     constructor(callback) {
+        Object.defineProperty(this, '$mora', {
+            value: 'computed',
+        });
         this.state = {
             computeds: new Set(),
             dirty: true,
             effect: undefined,
             effects: new Set(),
+            subscriptions: new Map(),
             value: undefined,
         };
         this.state.effect = effect(() => {
@@ -74,7 +139,10 @@ class Computed {
                         computed.state.dirty = true;
                     }
                     for (const effect of this.state.effects) {
-                        dirtyEffects.add(effect);
+                        batchedHandlers.add(effect);
+                    }
+                    for (const [, subscription] of this.state.subscriptions) {
+                        subscription.callback(value);
                     }
                 }
                 this.state.dirty = false;
@@ -102,6 +170,18 @@ class Computed {
     peek() {
         return this.state.value;
     }
+    /**
+     * Subscribe to changes
+     */
+    subscribe(callback) {
+        return subscribe(this.state, callback);
+    }
+    /**
+     * Unsubscribe from changes
+     */
+    unsubscribe(callback) {
+        unsubscribe(this.state, callback);
+    }
 }
 /**
  * Create a computed value
@@ -113,10 +193,14 @@ function computed(callback) {
 class Signal {
     state;
     constructor(value) {
+        Object.defineProperty(this, '$mora', {
+            value: 'signal',
+        });
         this.state = {
             value,
             computeds: new Set(),
             effects: new Set(),
+            subscriptions: new Map(),
         };
     }
     /**
@@ -149,12 +233,27 @@ class Signal {
             computed.state.dirty = true;
         }
         for (const effect of this.state.effects) {
-            dirtyEffects.add(effect);
+            batchedHandlers.add(effect);
+        }
+        for (const [, subscription] of this.state.subscriptions) {
+            batchedHandlers.add(subscription);
         }
         if (batchDepth === 0) {
             flushEffects();
         }
     }
+    /**
+     * Subscribe to changes
+     */
+    subscribe(callback) {
+        return subscribe(this.state, callback);
+    }
+    /**
+     * Unsubscribe from changes
+     */
+    unsubscribe(callback) {
+        unsubscribe(this.state, callback);
+    }
     /**
      * Update the value
      */
@@ -166,4 +265,4 @@ function signal(value) {
     return new Signal(value);
 }
 
-export { computed, effect, signal, startBatch, stopBatch };
+export { computed, effect, isComputed, isEffect, isSignal, signal, startBatch, stopBatch };

package/dist/signal.cjs

@@ -6,13 +6,18 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const batch = require("./batch.cjs");
 const computed = require("./computed.cjs");
 const effect = require("./effect.cjs");
+const subscription = require("./subscription.cjs");
 class Signal {
   constructor(value) {
     __publicField(this, "state");
+    Object.defineProperty(this, "$mora", {
+      value: "signal"
+    });
     this.state = {
       value,
       computeds: /* @__PURE__ */ new Set(),
-      effects: /* @__PURE__ */ new Set()
+      effects: /* @__PURE__ */ new Set(),
+      subscriptions: /* @__PURE__ */ new Map()
     };
   }
   /**
@@ -44,13 +49,28 @@ class Signal {
     for (const computed2 of this.state.computeds) {
       computed2.state.dirty = true;
     }
-    for (const effect$1 of this.state.effects) {
-      effect.dirtyEffects.add(effect$1);
+    for (const effect2 of this.state.effects) {
+      batch.batchedHandlers.add(effect2);
+    }
+    for (const [, subscription2] of this.state.subscriptions) {
+      batch.batchedHandlers.add(subscription2);
     }
     if (batch.batchDepth === 0) {
       batch.flushEffects();
     }
   }
+  /**
+   * Subscribe to changes
+   */
+  subscribe(callback) {
+    return subscription.subscribe(this.state, callback);
+  }
+  /**
+   * Unsubscribe from changes
+   */
+  unsubscribe(callback) {
+    subscription.unsubscribe(this.state, callback);
+  }
   /**
    * Update the value
    */

package/dist/signal.js

@@ -1,16 +1,21 @@
 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);
-import { flushEffects, batchDepth } from "./batch.js";
+import { batchedHandlers, flushEffects, batchDepth } from "./batch.js";
 import { activeComputed } from "./computed.js";
-import { activeEffect, dirtyEffects } from "./effect.js";
+import { activeEffect } from "./effect.js";
+import { subscribe, unsubscribe } from "./subscription.js";
 class Signal {
   constructor(value) {
     __publicField(this, "state");
+    Object.defineProperty(this, "$mora", {
+      value: "signal"
+    });
     this.state = {
       value,
       computeds: /* @__PURE__ */ new Set(),
-      effects: /* @__PURE__ */ new Set()
+      effects: /* @__PURE__ */ new Set(),
+      subscriptions: /* @__PURE__ */ new Map()
     };
   }
   /**
@@ -43,12 +48,27 @@ class Signal {
       computed.state.dirty = true;
     }
     for (const effect of this.state.effects) {
-      dirtyEffects.add(effect);
+      batchedHandlers.add(effect);
+    }
+    for (const [, subscription] of this.state.subscriptions) {
+      batchedHandlers.add(subscription);
     }
     if (batchDepth === 0) {
       flushEffects();
     }
   }
+  /**
+   * Subscribe to changes
+   */
+  subscribe(callback) {
+    return subscribe(this.state, callback);
+  }
+  /**
+   * Unsubscribe from changes
+   */
+  unsubscribe(callback) {
+    unsubscribe(this.state, callback);
+  }
   /**
    * Update the value
    */

package/dist/subscription.cjs

@@ -0,0 +1,32 @@
+"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/subscription.js

@@ -0,0 +1,32 @@
+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;
+  }
+}
+export {
+  Subscription,
+  noop,
+  subscribe,
+  unsubscribe
+};

package/package.json

@@ -3,10 +3,12 @@
 		"name": "Oscar Palmér",
 		"url": "https://oscarpalmer.se"
 	},
+	"dependencies": {
+		"@oscarpalmer/atoms": "^0.100"
+	},
 	"description": "Signals and stuff…",
 	"devDependencies": {
 		"@biomejs/biome": "^1.9",
-		"@oscarpalmer/atoms": "^0.100",
 		"@rollup/plugin-node-resolve": "^16",
 		"@rollup/plugin-typescript": "^12.1",
 		"@types/node": "^22.15",
@@ -52,5 +54,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.ts",
-	"version": "0.8.0"
+	"version": "0.10.0"
 }