@oscarpalmer/mora 0.10.0 → 0.11.1

package/dist/computed.cjs

@@ -5,24 +5,17 @@ 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");
+const reactive = require("./reactive.cjs");
 exports.activeComputed = void 0;
-class Computed {
+class Computed extends reactive.Reactive {
   constructor(callback) {
-    __publicField(this, "state");
-    Object.defineProperty(this, "$mora", {
-      value: "computed"
-    });
-    this.state = {
-      computeds: /* @__PURE__ */ new Set(),
+    super("computed", void 0);
+    __publicField(this, "effect", {
       dirty: true,
-      effect: void 0,
-      effects: /* @__PURE__ */ new Set(),
-      subscriptions: /* @__PURE__ */ new Map(),
-      value: void 0
-    };
-    this.state.effect = effect.effect(() => {
-      if (this.state.dirty) {
+      instance: void 0
+    });
+    this.effect.instance = effect.effect(() => {
+      if (this.effect.dirty) {
         const previousComputed = exports.activeComputed;
         exports.activeComputed = this;
         const value = callback();
@@ -30,16 +23,16 @@ class Computed {
         if (!Object.is(this.state.value, value)) {
           this.state.value = value;
           for (const computed2 of this.state.computeds) {
-            computed2.state.dirty = true;
+            computed2.effect.dirty = true;
           }
           for (const effect2 of this.state.effects) {
             batch.batchedHandlers.add(effect2);
           }
-          for (const [, subscription2] of this.state.subscriptions) {
-            subscription2.callback(value);
+          for (const [, subscription] of this.state.subscriptions) {
+            subscription.callback(value);
           }
         }
-        this.state.dirty = false;
+        this.effect.dirty = false;
       }
     });
   }
@@ -50,32 +43,14 @@ class Computed {
     if (exports.activeComputed != null && exports.activeComputed !== this) {
       this.state.computeds.add(exports.activeComputed);
     }
-    if (effect.activeEffect != null && effect.activeEffect !== this.state.effect) {
+    if (effect.activeEffect != null && effect.activeEffect !== this.effect.instance) {
       this.state.effects.add(effect.activeEffect);
     }
-    if (this.state.dirty && batch.batchDepth === 0) {
-      effect.runEffect(this.state.effect);
+    if (this.effect.dirty && batch.batchDepth === 0) {
+      effect.runEffect(this.effect.instance);
     }
     return this.state.value;
   }
-  /**
-   * Get the value _(without reactivity)_
-   */
-  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

@@ -3,24 +3,17 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 import { batchedHandlers, batchDepth } from "./batch.js";
 import { effect, activeEffect, runEffect } from "./effect.js";
-import { subscribe, unsubscribe } from "./subscription.js";
+import { Reactive } from "./reactive.js";
 let activeComputed;
-class Computed {
+class Computed extends Reactive {
   constructor(callback) {
-    __publicField(this, "state");
-    Object.defineProperty(this, "$mora", {
-      value: "computed"
-    });
-    this.state = {
-      computeds: /* @__PURE__ */ new Set(),
+    super("computed", void 0);
+    __publicField(this, "effect", {
       dirty: true,
-      effect: void 0,
-      effects: /* @__PURE__ */ new Set(),
-      subscriptions: /* @__PURE__ */ new Map(),
-      value: void 0
-    };
-    this.state.effect = effect(() => {
-      if (this.state.dirty) {
+      instance: void 0
+    });
+    this.effect.instance = effect(() => {
+      if (this.effect.dirty) {
         const previousComputed = activeComputed;
         activeComputed = this;
         const value = callback();
@@ -28,7 +21,7 @@ class Computed {
         if (!Object.is(this.state.value, value)) {
           this.state.value = value;
           for (const computed2 of this.state.computeds) {
-            computed2.state.dirty = true;
+            computed2.effect.dirty = true;
           }
           for (const effect2 of this.state.effects) {
             batchedHandlers.add(effect2);
@@ -37,7 +30,7 @@ class Computed {
             subscription.callback(value);
           }
         }
-        this.state.dirty = false;
+        this.effect.dirty = false;
       }
     });
   }
@@ -48,32 +41,14 @@ class Computed {
     if (activeComputed != null && activeComputed !== this) {
       this.state.computeds.add(activeComputed);
     }
-    if (activeEffect != null && activeEffect !== this.state.effect) {
+    if (activeEffect != null && activeEffect !== this.effect.instance) {
       this.state.effects.add(activeEffect);
     }
-    if (this.state.dirty && batchDepth === 0) {
-      runEffect(this.state.effect);
+    if (this.effect.dirty && batchDepth === 0) {
+      runEffect(this.effect.instance);
     }
     return this.state.value;
   }
-  /**
-   * Get the value _(without reactivity)_
-   */
-  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/index.cjs

@@ -11,5 +11,6 @@ exports.computed = computed.computed;
 exports.effect = effect.effect;
 exports.isComputed = is.isComputed;
 exports.isEffect = is.isEffect;
+exports.isReactive = is.isReactive;
 exports.isSignal = is.isSignal;
 exports.signal = signal.signal;

package/dist/index.js

@@ -1,13 +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 { isComputed, isEffect, isReactive, isSignal } from "./is.js";
 import { signal } from "./signal.js";
 export {
   computed,
   effect,
   isComputed,
   isEffect,
+  isReactive,
   isSignal,
   signal,
   startBatch,

package/dist/is.cjs

@@ -9,9 +9,13 @@ function isEffect(value) {
 function isMora(value, name) {
   return typeof value === "object" && value != null && "$mora" in value && value.$mora === name;
 }
+function isReactive(value) {
+  return isComputed(value) || isSignal(value);
+}
 function isSignal(value) {
   return isMora(value, "signal");
 }
 exports.isComputed = isComputed;
 exports.isEffect = isEffect;
+exports.isReactive = isReactive;
 exports.isSignal = isSignal;

package/dist/is.js

@@ -7,11 +7,15 @@ function isEffect(value) {
 function isMora(value, name) {
   return typeof value === "object" && value != null && "$mora" in value && value.$mora === name;
 }
+function isReactive(value) {
+  return isComputed(value) || isSignal(value);
+}
 function isSignal(value) {
   return isMora(value, "signal");
 }
 export {
   isComputed,
   isEffect,
+  isReactive,
   isSignal
 };

package/dist/mora.full.js

@@ -45,6 +45,9 @@ function isMora(value, name) {
         '$mora' in value &&
         value.$mora === name);
 }
+function isReactive(value) {
+    return isComputed(value) || isSignal(value);
+}
 /**
  * Is the value a signal?
  */
@@ -112,23 +115,49 @@ function unsubscribe(state, callback) {
     }
 }
 
-let activeComputed;
-class Computed {
-    state;
-    constructor(callback) {
+class Reactive {
+    state = {
+        computeds: new Set(),
+        effects: new Set(),
+        subscriptions: new Map(),
+        value: undefined,
+    };
+    constructor(name, value) {
+        this.state.value = value;
         Object.defineProperty(this, '$mora', {
-            value: 'computed',
+            value: name,
         });
-        this.state = {
-            computeds: new Set(),
-            dirty: true,
-            effect: undefined,
-            effects: new Set(),
-            subscriptions: new Map(),
-            value: undefined,
-        };
-        this.state.effect = effect(() => {
-            if (this.state.dirty) {
+    }
+    /**
+     * Get the value _(without reactivity)_
+     */
+    peek() {
+        return this.state.value;
+    }
+    /**
+     * Subscribe to changes
+     */
+    subscribe(callback) {
+        return subscribe(this.state, callback);
+    }
+    /**
+     * Unsubscribe from changes
+     */
+    unsubscribe(callback) {
+        unsubscribe(this.state, callback);
+    }
+}
+
+let activeComputed;
+class Computed extends Reactive {
+    effect = {
+        dirty: true,
+        instance: undefined,
+    };
+    constructor(callback) {
+        super('computed', undefined);
+        this.effect.instance = effect(() => {
+            if (this.effect.dirty) {
                 const previousComputed = activeComputed;
                 activeComputed = this;
                 const value = callback();
@@ -136,7 +165,7 @@ class Computed {
                 if (!Object.is(this.state.value, value)) {
                     this.state.value = value;
                     for (const computed of this.state.computeds) {
-                        computed.state.dirty = true;
+                        computed.effect.dirty = true;
                     }
                     for (const effect of this.state.effects) {
                         batchedHandlers.add(effect);
@@ -145,7 +174,7 @@ class Computed {
                         subscription.callback(value);
                     }
                 }
-                this.state.dirty = false;
+                this.effect.dirty = false;
             }
         });
     }
@@ -156,32 +185,14 @@ class Computed {
         if (activeComputed != null && activeComputed !== this) {
             this.state.computeds.add(activeComputed);
         }
-        if (activeEffect != null && activeEffect !== this.state.effect) {
+        if (activeEffect != null && activeEffect !== this.effect.instance) {
             this.state.effects.add(activeEffect);
         }
-        if (this.state.dirty && batchDepth === 0) {
-            runEffect(this.state.effect);
+        if (this.effect.dirty && batchDepth === 0) {
+            runEffect(this.effect.instance);
         }
         return this.state.value;
     }
-    /**
-     * Get the value _(without reactivity)_
-     */
-    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
@@ -190,18 +201,9 @@ function computed(callback) {
     return new Computed(callback);
 }
 
-class Signal {
-    state;
+class Signal extends Reactive {
     constructor(value) {
-        Object.defineProperty(this, '$mora', {
-            value: 'signal',
-        });
-        this.state = {
-            value,
-            computeds: new Set(),
-            effects: new Set(),
-            subscriptions: new Map(),
-        };
+        super('signal', value);
     }
     /**
      * Get the value
@@ -215,12 +217,6 @@ class Signal {
         }
         return this.state.value;
     }
-    /**
-     * Get the value _(without reactivity)_
-     */
-    peek() {
-        return this.state.value;
-    }
     /**
      * Set the value
      */
@@ -230,7 +226,7 @@ class Signal {
         }
         this.state.value = value;
         for (const computed of this.state.computeds) {
-            computed.state.dirty = true;
+            computed.effect.dirty = true;
         }
         for (const effect of this.state.effects) {
             batchedHandlers.add(effect);
@@ -242,18 +238,6 @@ class Signal {
             flushEffects();
         }
     }
-    /**
-     * Subscribe to changes
-     */
-    subscribe(callback) {
-        return subscribe(this.state, callback);
-    }
-    /**
-     * Unsubscribe from changes
-     */
-    unsubscribe(callback) {
-        unsubscribe(this.state, callback);
-    }
     /**
      * Update the value
      */
@@ -265,4 +249,4 @@ function signal(value) {
     return new Signal(value);
 }
 
-export { computed, effect, isComputed, isEffect, isSignal, signal, startBatch, stopBatch };
+export { computed, effect, isComputed, isEffect, isReactive, isSignal, signal, startBatch, stopBatch };

package/dist/reactive.cjs

@@ -0,0 +1,39 @@
+"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 subscription = require("./subscription.cjs");
+class Reactive {
+  constructor(name, value) {
+    __publicField(this, "state", {
+      computeds: /* @__PURE__ */ new Set(),
+      effects: /* @__PURE__ */ new Set(),
+      subscriptions: /* @__PURE__ */ new Map(),
+      value: void 0
+    });
+    this.state.value = value;
+    Object.defineProperty(this, "$mora", {
+      value: name
+    });
+  }
+  /**
+   * Get the value _(without reactivity)_
+   */
+  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);
+  }
+}
+exports.Reactive = Reactive;

package/dist/reactive.js

@@ -0,0 +1,39 @@
+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 { subscribe, unsubscribe } from "./subscription.js";
+class Reactive {
+  constructor(name, value) {
+    __publicField(this, "state", {
+      computeds: /* @__PURE__ */ new Set(),
+      effects: /* @__PURE__ */ new Set(),
+      subscriptions: /* @__PURE__ */ new Map(),
+      value: void 0
+    });
+    this.state.value = value;
+    Object.defineProperty(this, "$mora", {
+      value: name
+    });
+  }
+  /**
+   * Get the value _(without reactivity)_
+   */
+  peek() {
+    return this.state.value;
+  }
+  /**
+   * Subscribe to changes
+   */
+  subscribe(callback) {
+    return subscribe(this.state, callback);
+  }
+  /**
+   * Unsubscribe from changes
+   */
+  unsubscribe(callback) {
+    unsubscribe(this.state, callback);
+  }
+}
+export {
+  Reactive
+};

package/dist/signal.cjs

@@ -1,24 +1,12 @@
 "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 computed = require("./computed.cjs");
 const effect = require("./effect.cjs");
-const subscription = require("./subscription.cjs");
-class Signal {
+const reactive = require("./reactive.cjs");
+class Signal extends reactive.Reactive {
   constructor(value) {
-    __publicField(this, "state");
-    Object.defineProperty(this, "$mora", {
-      value: "signal"
-    });
-    this.state = {
-      value,
-      computeds: /* @__PURE__ */ new Set(),
-      effects: /* @__PURE__ */ new Set(),
-      subscriptions: /* @__PURE__ */ new Map()
-    };
+    super("signal", value);
   }
   /**
    * Get the value
@@ -32,12 +20,6 @@ class Signal {
     }
     return this.state.value;
   }
-  /**
-   * Get the value _(without reactivity)_
-   */
-  peek() {
-    return this.state.value;
-  }
   /**
    * Set the value
    */
@@ -47,30 +29,18 @@ class Signal {
     }
     this.state.value = value;
     for (const computed2 of this.state.computeds) {
-      computed2.state.dirty = true;
+      computed2.effect.dirty = true;
     }
     for (const effect2 of this.state.effects) {
       batch.batchedHandlers.add(effect2);
     }
-    for (const [, subscription2] of this.state.subscriptions) {
-      batch.batchedHandlers.add(subscription2);
+    for (const [, subscription] of this.state.subscriptions) {
+      batch.batchedHandlers.add(subscription);
     }
     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,22 +1,10 @@
-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 { batchedHandlers, flushEffects, batchDepth } from "./batch.js";
 import { activeComputed } from "./computed.js";
 import { activeEffect } from "./effect.js";
-import { subscribe, unsubscribe } from "./subscription.js";
-class Signal {
+import { Reactive } from "./reactive.js";
+class Signal extends Reactive {
   constructor(value) {
-    __publicField(this, "state");
-    Object.defineProperty(this, "$mora", {
-      value: "signal"
-    });
-    this.state = {
-      value,
-      computeds: /* @__PURE__ */ new Set(),
-      effects: /* @__PURE__ */ new Set(),
-      subscriptions: /* @__PURE__ */ new Map()
-    };
+    super("signal", value);
   }
   /**
    * Get the value
@@ -30,12 +18,6 @@ class Signal {
     }
     return this.state.value;
   }
-  /**
-   * Get the value _(without reactivity)_
-   */
-  peek() {
-    return this.state.value;
-  }
   /**
    * Set the value
    */
@@ -45,7 +27,7 @@ class Signal {
     }
     this.state.value = value;
     for (const computed of this.state.computeds) {
-      computed.state.dirty = true;
+      computed.effect.dirty = true;
     }
     for (const effect of this.state.effects) {
       batchedHandlers.add(effect);
@@ -57,18 +39,6 @@ class Signal {
       flushEffects();
     }
   }
-  /**
-   * Subscribe to changes
-   */
-  subscribe(callback) {
-    return subscribe(this.state, callback);
-  }
-  /**
-   * Unsubscribe from changes
-   */
-  unsubscribe(callback) {
-    unsubscribe(this.state, callback);
-  }
   /**
    * Update the value
    */

package/package.json

@@ -54,5 +54,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.ts",
-	"version": "0.10.0"
+	"version": "0.11.1"
 }

package/src/batch.ts

@@ -36,6 +36,6 @@ export function stopBatch(): void {
 	flushEffects();
 }
 
-export const batchedHandlers = new Set<Effect | Subscription>();
+export const batchedHandlers = new Set<Effect | Subscription<unknown>>();
 
 export let batchDepth = 0;