@oscarpalmer/mora 0.5.0 → 0.6.0

package/dist/batch.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const effect = require("./effect.cjs");
 function flushEffects() {
-  while (effect.dirtyEffects.size > 0) {
+  while (exports.batchDepth === 0 && effect.dirtyEffects.size > 0) {
     const effects = [...effect.dirtyEffects];
     effect.dirtyEffects.clear();
     for (const effect$1 of effects) {
@@ -17,9 +17,7 @@ function stopBatch() {
   if (exports.batchDepth > 0) {
     exports.batchDepth -= 1;
   }
-  if (exports.batchDepth === 0) {
-    flushEffects();
-  }
+  flushEffects();
 }
 exports.batchDepth = 0;
 exports.flushEffects = flushEffects;

package/dist/batch.js

@@ -1,6 +1,6 @@
 import { dirtyEffects, runEffect } from "./effect.js";
 function flushEffects() {
-  while (dirtyEffects.size > 0) {
+  while (batchDepth === 0 && dirtyEffects.size > 0) {
     const effects = [...dirtyEffects];
     dirtyEffects.clear();
     for (const effect of effects) {
@@ -15,9 +15,7 @@ function stopBatch() {
   if (batchDepth > 0) {
     batchDepth -= 1;
   }
-  if (batchDepth === 0) {
-    flushEffects();
-  }
+  flushEffects();
 }
 let batchDepth = 0;
 export {

package/dist/computed.cjs

@@ -3,6 +3,7 @@ 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");
 exports.activeComputed = void 0;
 class Computed {
@@ -46,7 +47,11 @@ class Computed {
       this.state.effects.add(effect.activeEffect);
     }
     if (this.state.dirty) {
-      effect.runEffect(this.state.effect);
+      if (batch.batchDepth === 0) {
+        effect.runEffect(this.state.effect);
+      } else {
+        effect.dirtyEffects.add(this.state.effect);
+      }
     }
     return this.state.value;
   }

package/dist/computed.js

@@ -1,6 +1,7 @@
 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";
 let activeComputed;
 class Computed {
@@ -44,7 +45,11 @@ class Computed {
       this.state.effects.add(activeEffect);
     }
     if (this.state.dirty) {
-      runEffect(this.state.effect);
+      if (batchDepth === 0) {
+        runEffect(this.state.effect);
+      } else {
+        dirtyEffects.add(this.state.effect);
+      }
     }
     return this.state.value;
   }

package/dist/mora.full.js

@@ -27,7 +27,7 @@ let activeEffect;
 const dirtyEffects = new Set();
 
 function flushEffects() {
-    while (dirtyEffects.size > 0) {
+    while (batchDepth === 0 && dirtyEffects.size > 0) {
         const effects = [...dirtyEffects];
         dirtyEffects.clear();
         for (const effect of effects) {
@@ -48,9 +48,7 @@ function stopBatch() {
     if (batchDepth > 0) {
         batchDepth -= 1;
     }
-    if (batchDepth === 0) {
-        flushEffects();
-    }
+    flushEffects();
 }
 let batchDepth = 0;
 
@@ -96,7 +94,12 @@ class Computed {
             this.state.effects.add(activeEffect);
         }
         if (this.state.dirty) {
-            runEffect(this.state.effect);
+            if (batchDepth === 0) {
+                runEffect(this.state.effect);
+            }
+            else {
+                dirtyEffects.add(this.state.effect);
+            }
         }
         return this.state.value;
     }
@@ -137,9 +140,9 @@ class Signal {
             return;
         }
         this.state.value = value;
-        for (const computed of this.state.computeds) {
-            computed.state.dirty = true;
-            dirtyEffects.add(computed.state.effect);
+        for (const comp of this.state.computeds) {
+            comp.state.dirty = true;
+            dirtyEffects.add(comp.state.effect);
         }
         for (const effect of this.state.effects) {
             dirtyEffects.add(effect);

package/dist/signal.cjs

@@ -35,9 +35,9 @@ class Signal {
       return;
     }
     this.state.value = value;
-    for (const computed2 of this.state.computeds) {
-      computed2.state.dirty = true;
-      effect.dirtyEffects.add(computed2.state.effect);
+    for (const comp of this.state.computeds) {
+      comp.state.dirty = true;
+      effect.dirtyEffects.add(comp.state.effect);
     }
     for (const effect$1 of this.state.effects) {
       effect.dirtyEffects.add(effect$1);

package/dist/signal.js

@@ -33,9 +33,9 @@ class Signal {
       return;
     }
     this.state.value = value;
-    for (const computed of this.state.computeds) {
-      computed.state.dirty = true;
-      dirtyEffects.add(computed.state.effect);
+    for (const comp of this.state.computeds) {
+      comp.state.dirty = true;
+      dirtyEffects.add(comp.state.effect);
     }
     for (const effect of this.state.effects) {
       dirtyEffects.add(effect);

package/package.json

@@ -6,7 +6,7 @@
 	"description": "Signals and stuff…",
 	"devDependencies": {
 		"@biomejs/biome": "^1.9",
-		"@oscarpalmer/atoms": "^0.99",
+		"@oscarpalmer/atoms": "^0.100",
 		"@rollup/plugin-node-resolve": "^16",
 		"@rollup/plugin-typescript": "^12.1",
 		"@types/node": "^22.15",
@@ -52,5 +52,5 @@
 	},
 	"type": "module",
 	"types": "./types/index.d.ts",
-	"version": "0.5.0"
+	"version": "0.6.0"
 }

package/src/batch.ts

@@ -1,7 +1,7 @@
 import {dirtyEffects, runEffect} from './effect';
 
 export function flushEffects(): void {
-	while (dirtyEffects.size > 0) {
+	while (batchDepth === 0 && dirtyEffects.size > 0) {
 		const effects = [...dirtyEffects];
 
 		dirtyEffects.clear();
@@ -27,9 +27,7 @@ export function stopBatch(): void {
 		batchDepth -= 1;
 	}
 
-	if (batchDepth === 0) {
-		flushEffects();
-	}
+	flushEffects();
 }
 
 export let batchDepth = 0;

package/src/computed.ts

@@ -1,3 +1,4 @@
+import {batchDepth} from './batch';
 import {
 	type Effect,
 	activeEffect,
@@ -14,10 +15,14 @@ type ComputedState<Value> = {
 	value: Value;
 };
 
+export type InternalComputed = {
+	readonly state: ComputedState<unknown>;
+};
+
 export let activeComputed: Computed<unknown> | undefined;
 
 export class Computed<Value> {
-	readonly state: ComputedState<Value>;
+	private readonly state: ComputedState<Value>;
 
 	constructor(callback: () => Value) {
 		this.state = {
@@ -70,7 +75,11 @@ export class Computed<Value> {
 		}
 
 		if (this.state.dirty) {
-			runEffect(this.state.effect);
+			if (batchDepth === 0) {
+				runEffect(this.state.effect);
+			} else {
+				dirtyEffects.add(this.state.effect);
+			}
 		}
 
 		return this.state.value;

package/src/effect.ts

@@ -4,8 +4,12 @@ type EffectState = {
 	callback: GenericCallback;
 };
 
+type InternalEffect = {
+	state: EffectState;
+};
+
 export class Effect {
-	readonly state: EffectState;
+	private readonly state: EffectState;
 
 	constructor(callback: GenericCallback) {
 		this.state = {
@@ -22,7 +26,7 @@ export function runEffect(effect: Effect): void {
 	activeEffect = effect;
 
 	try {
-		effect.state.callback();
+		(effect as unknown as InternalEffect).state.callback();
 	} finally {
 		activeEffect = previousEffect;
 	}

package/src/signal.ts

@@ -1,5 +1,5 @@
 import {batchDepth, flushEffects} from './batch';
-import {type Computed, activeComputed} from './computed';
+import {type Computed, type InternalComputed, activeComputed} from './computed';
 import {type Effect, activeEffect, dirtyEffects} from './effect';
 
 type SignalState<Value> = {
@@ -9,7 +9,7 @@ type SignalState<Value> = {
 };
 
 export class Signal<Value> {
-	readonly state: SignalState<Value>;
+	private readonly state: SignalState<Value>;
 
 	constructor(value: Value) {
 		this.state = {
@@ -44,10 +44,10 @@ export class Signal<Value> {
 
 		this.state.value = value;
 
-		for (const computed of this.state.computeds) {
-			computed.state.dirty = true;
+		for (const comp of this.state.computeds) {
+			(comp as unknown as InternalComputed).state.dirty = true;
 
-			dirtyEffects.add(computed.state.effect);
+			dirtyEffects.add((comp as unknown as InternalComputed).state.effect);
 		}
 
 		for (const effect of this.state.effects) {

package/types/computed.d.cts

@@ -1,11 +1,8 @@
 // Generated by dts-bundle-generator v9.5.1
 
 export type GenericCallback = (...args: any[]) => any;
-export type EffectState = {
-	callback: GenericCallback;
-};
 declare class Effect {
-	readonly state: EffectState;
+	private readonly state;
 	constructor(callback: GenericCallback);
 }
 export type ComputedState<Value> = {
@@ -15,9 +12,12 @@ export type ComputedState<Value> = {
 	effects: Set<Effect>;
 	value: Value;
 };
+export type InternalComputed = {
+	readonly state: ComputedState<unknown>;
+};
 export declare let activeComputed: Computed<unknown> | undefined;
 export declare class Computed<Value> {
-	readonly state: ComputedState<Value>;
+	private readonly state;
 	constructor(callback: () => Value);
 	/**
 	 * Get the value

package/types/computed.d.ts

@@ -6,9 +6,12 @@ type ComputedState<Value> = {
     effects: Set<Effect>;
     value: Value;
 };
+export type InternalComputed = {
+    readonly state: ComputedState<unknown>;
+};
 export declare let activeComputed: Computed<unknown> | undefined;
 export declare class Computed<Value> {
-    readonly state: ComputedState<Value>;
+    private readonly state;
     constructor(callback: () => Value);
     /**
      * Get the value

package/types/effect.d.cts

@@ -1,11 +1,8 @@
 // Generated by dts-bundle-generator v9.5.1
 
 export type GenericCallback = (...args: any[]) => any;
-export type EffectState = {
-	callback: GenericCallback;
-};
 export declare class Effect {
-	readonly state: EffectState;
+	private readonly state;
 	constructor(callback: GenericCallback);
 }
 export declare function runEffect(effect: Effect): void;

package/types/effect.d.ts

@@ -1,9 +1,6 @@
 import type { GenericCallback } from '@oscarpalmer/atoms/models';
-type EffectState = {
-    callback: GenericCallback;
-};
 export declare class Effect {
-    readonly state: EffectState;
+    private readonly state;
     constructor(callback: GenericCallback);
 }
 export declare function runEffect(effect: Effect): void;
@@ -13,4 +10,3 @@ export declare function runEffect(effect: Effect): void;
 export declare function effect(callback: GenericCallback): Effect;
 export declare let activeEffect: Effect | undefined;
 export declare const dirtyEffects: Set<Effect>;
-export {};

package/types/index.d.cts

@@ -1,43 +1,7 @@
 // Generated by dts-bundle-generator v9.5.1
 
-export type GenericCallback = (...args: any[]) => any;
-export type EffectState = {
-	callback: GenericCallback;
-};
-export declare class Effect {
-	readonly state: EffectState;
-	constructor(callback: GenericCallback);
-}
-/**
- * Create an effect
- */
-export declare function effect(callback: GenericCallback): Effect;
-export type ComputedState<Value> = {
-	computeds: Set<Computed<unknown>>;
-	dirty: boolean;
-	effect: Effect;
-	effects: Set<Effect>;
-	value: Value;
-};
-export declare class Computed<Value> {
-	readonly state: ComputedState<Value>;
-	constructor(callback: () => Value);
-	/**
-	 * Get the value
-	 */
-	get(): Value;
-}
-/**
- * Create a computed value
- */
-export declare function computed<Value>(callback: () => Value): Computed<Value>;
-export type SignalState<Value> = {
-	computeds: Set<Computed<unknown>>;
-	effects: Set<Effect>;
-	value: Value;
-};
 export declare class Signal<Value> {
-	readonly state: SignalState<Value>;
+	private readonly state;
 	constructor(value: Value);
 	/**
 	 * Get the value
@@ -61,5 +25,26 @@ export declare function startBatch(): void;
  * Stop batching effects and flush _(run)_ them
  */
 export declare function stopBatch(): void;
+export type GenericCallback = (...args: any[]) => any;
+export declare class Effect {
+	private readonly state;
+	constructor(callback: GenericCallback);
+}
+/**
+ * Create an effect
+ */
+export declare function effect(callback: GenericCallback): Effect;
+export declare class Computed<Value> {
+	private readonly state;
+	constructor(callback: () => Value);
+	/**
+	 * Get the value
+	 */
+	get(): Value;
+}
+/**
+ * Create a computed value
+ */
+export declare function computed<Value>(callback: () => Value): Computed<Value>;
 
 export {};

package/types/signal.d.cts

@@ -1,35 +1,7 @@
 // Generated by dts-bundle-generator v9.5.1
 
-export type GenericCallback = (...args: any[]) => any;
-export type EffectState = {
-	callback: GenericCallback;
-};
-declare class Effect {
-	readonly state: EffectState;
-	constructor(callback: GenericCallback);
-}
-export type ComputedState<Value> = {
-	computeds: Set<Computed<unknown>>;
-	dirty: boolean;
-	effect: Effect;
-	effects: Set<Effect>;
-	value: Value;
-};
-declare class Computed<Value> {
-	readonly state: ComputedState<Value>;
-	constructor(callback: () => Value);
-	/**
-	 * Get the value
-	 */
-	get(): Value;
-}
-export type SignalState<Value> = {
-	computeds: Set<Computed<unknown>>;
-	effects: Set<Effect>;
-	value: Value;
-};
 export declare class Signal<Value> {
-	readonly state: SignalState<Value>;
+	private readonly state;
 	constructor(value: Value);
 	/**
 	 * Get the value

package/types/signal.d.ts

@@ -1,12 +1,5 @@
-import { type Computed } from './computed';
-import { type Effect } from './effect';
-type SignalState<Value> = {
-    computeds: Set<Computed<unknown>>;
-    effects: Set<Effect>;
-    value: Value;
-};
 export declare class Signal<Value> {
-    readonly state: SignalState<Value>;
+    private readonly state;
     constructor(value: Value);
     /**
      * Get the value
@@ -22,4 +15,3 @@ export declare class Signal<Value> {
     update(callback: (value: Value) => Value): void;
 }
 export declare function signal<Value>(value: Value): Signal<Value>;
-export {};