r-state-tree 0.8.1 → 0.8.2

package/README.md

@@ -205,7 +205,7 @@ class ItemsStore extends Store {
 
 ### Store lifetime and owned effects
 
-Mounted stores expose reactive `isMounted` state and implement `Disposable`:
+Stores implement `Disposable`, and their owned effects run only during the mounted lifetime:
 
 ```ts
 class TodoStore extends Store {
@@ -242,9 +242,9 @@ class TodoStore extends Store {
 }
 ```
 
-`Store.effect()` and `Store.reaction()` register mount-scoped behavior. Mounting first links the complete store tree and marks it mounted bottom-up in one transaction. Registrations then activate bottom-up, so even a grandchild's initial effect observes every ancestor and descendant as mounted. A reaction establishes its initial value at activation and still skips its initial callback. Calling the disposer returned during construction cancels the pending registration; after mount, it disposes the live subscription. All registrations are disposed automatically with the store.
+`Store.effect()` and `Store.reaction()` register mount-scoped behavior. Mounting first links the complete store tree and commits its private mounted state bottom-up in one transaction. Registrations then activate bottom-up, so even a grandchild's initial effect sees a complete tree. A reaction establishes its initial value at activation and still skips its initial callback. Calling the disposer returned during construction cancels the pending registration; after mount, it disposes the live subscription. All registrations are disposed automatically with the store.
 
-Use the exported standalone `effect()` or `reaction()` when observing a store from outside its owned lifetime—for example, to observe the public reactive `isMounted` transition to `false`.
+Registration activation is non-reentrant. If an active effect or reaction lazily materializes another child store, the new child's registrations are queued until the current callback and child getter stack have returned. This prevents initialization behavior from running inside the getter that created the store.
 
 ### Context
 
@@ -878,23 +878,19 @@ This keeps snapshot hydration predictable: `create(snapshot)` and `applySnapshot
 
 ### Model attachment and disposal
 
-The public `parent` relationship is reactive. Register a model-owned reaction in the constructor to observe attachment and detachment:
+Models are inert state trees: creating or attaching one does not start reactions or effects. The public `parent` relationship remains reactive, so an external owner may observe it explicitly when needed:
 
 ```ts
-class TodoModel extends Model {
-	@child tags: TagModel[] = [];
-
-	constructor() {
-		super();
-		this.reaction(() => this.parent, (parent, previousParent) => {
-			if (previousParent) console.log("detached", previousParent);
-			if (parent) console.log("attached", parent);
-		});
+const stop = reaction(
+	() => todo.parent,
+	(parent, previousParent) => {
+		if (previousParent) console.log("detached", previousParent);
+		if (parent) console.log("attached", parent);
 	}
-}
+);
 ```
 
-Detachment is reversible; model-owned effects survive reattachment. `model[Symbol.dispose]()` is terminal and recursively disposes owned child models, but never model refs.
+The external caller owns `stop`. Detachment is reversible. `model[Symbol.dispose]()` is terminal and recursively disposes owned child models, but never model refs.
 
 ### Model configuration
 
@@ -1207,15 +1203,9 @@ class ListModel extends Model {
 }
 ```
 
-Lifecycle registration:
+Store lifecycle registration:
 
 ```ts
-class M extends Model {
-	constructor() {
-		super();
-		this.reaction(() => this.parent, (parent, previousParent) => {});
-	}
-}
 class S extends Store {
 	constructor(props) {
 		super(props);
@@ -1284,7 +1274,7 @@ When child stores are created during mount with `models` that point back into th
 - Decorators (Stores): `@child`, `@model`
 - Core: `createStore`, `mount`, `Symbol.dispose`, `updateStore`
 - Snapshots: `onSnapshot`, `toSnapshot`, `applySnapshot`, `onSnapshotDiff`
-- Lifecycle: reactive `Store.isMounted`, reactive `Model.parent`, and owned `reaction`/`effect`
+- Lifecycle: Store-owned `reaction`/`effect`, reactive `Model.parent`, and `Symbol.dispose`
 - Best practices: domain in Models; delegate from Stores; stable keys for `@child`; return cleanup from store effects; don’t shadow `props`.
 
 ## Testing

package/dist/model/Model.d.ts

@@ -7,7 +7,5 @@ export default class Model implements Disposable {
     }, snapshot?: Snapshot<T>): T;
     constructor();
     get parent(): Model | null;
-    reaction<T>(track: () => T, callback: (value: T, previousValue: T) => void): () => void;
-    effect(callback: () => void | (() => void)): () => void;
     [Symbol.dispose](): void;
 }

package/dist/model/ModelAdministration.d.ts

@@ -20,16 +20,12 @@ export declare class ModelAdministration extends PreactObjectAdministration<any>
     private computedSnapshot;
     private snapshotMap;
     private contextCache;
-    private ownedDisposers;
     private disposed;
     parentName: PropertyKey | null;
     get parent(): ModelAdministration | null;
     set parent(value: ModelAdministration | null);
     setConfiguration(configurationGetter: () => ModelConfiguration<any>): void;
     assertUsable(): void;
-    private own;
-    reaction<T>(track: () => T, callback: (value: T, previousValue: T) => void): () => void;
-    effect(callback: () => void | (() => void)): () => void;
     private get configuration();
     private getReferencedAtom;
     private setState;

package/dist/r-state-tree.cjs

@@ -1993,6 +1993,32 @@ function validateStoreChildValue(value, propertyName) {
   );
 }
 class StoreAdministration extends PreactObjectAdministration {
+  static pendingActivations = [];
+  static isFlushingActivations = false;
+  static currentActivationDepth = 0;
+  static flushReactiveRegistrations(stores) {
+    const depth = this.isFlushingActivations ? this.currentActivationDepth + 1 : 0;
+    this.pendingActivations.push(...stores.map((store) => ({ store, depth })));
+    if (this.isFlushingActivations) return;
+    this.isFlushingActivations = true;
+    try {
+      let entry;
+      while (entry = this.pendingActivations.shift()) {
+        this.currentActivationDepth = entry.depth;
+        if (entry.depth > MAX_MOUNT_DEPTH) {
+          throw createCircularMountError({
+            storeName: entry.store.proxy.constructor.name || "Store",
+            modelsKeys: Object.keys(entry.store.proxy.props?.models ?? {})
+          });
+        }
+        entry.store.startReactiveRegistrations();
+      }
+    } finally {
+      this.pendingActivations.length = 0;
+      this.currentActivationDepth = 0;
+      this.isFlushingActivations = false;
+    }
+  }
   static proxyTraps = Object.assign(
     {},
     PreactObjectAdministration.proxyTraps,
@@ -2032,7 +2058,7 @@ class StoreAdministration extends PreactObjectAdministration {
     }
   );
   parent = null;
-  mountedSignal = createSignal(false);
+  mounted = false;
   disposed = false;
   contextCache = /* @__PURE__ */ new Map();
   childStoreDataMap = /* @__PURE__ */ new Map();
@@ -2194,7 +2220,7 @@ class StoreAdministration extends PreactObjectAdministration {
     return !this.parent;
   }
   get isMounted() {
-    return this.mountedSignal.get();
+    return this.mounted;
   }
   getContextValue(contextId, provideSymbol, defaultValue, hasDefault) {
     let computed2 = this.contextCache.get(contextId);
@@ -2290,13 +2316,11 @@ class StoreAdministration extends PreactObjectAdministration {
             getStoreAdm(stores)?.mount(this, name, registrationsToStart);
           }
         });
-        this.mountedSignal.set(true);
+        this.mounted = true;
         registrationsToStart.push(this);
       });
       if (isOutermostMount) {
-        registrationsToStart.forEach(
-          (store) => store.startReactiveRegistrations()
-        );
+        StoreAdministration.flushReactiveRegistrations(registrationsToStart);
       }
     } catch (error) {
       if (error instanceof Error && (error instanceof RangeError && /call stack/i.test(error.message) || /cycle detected/i.test(error.message))) {
@@ -2336,7 +2360,7 @@ class StoreAdministration extends PreactObjectAdministration {
       registration.stop = void 0;
     });
     this.reactiveRegistrations.clear();
-    this.mountedSignal.set(false);
+    this.mounted = false;
   }
 }
 let initEnabled$1 = false;
@@ -2382,9 +2406,6 @@ class Store {
   get key() {
     return this.props.key;
   }
-  get isMounted() {
-    return getStoreAdm(this).isMounted;
-  }
   reaction(track, callback) {
     return getStoreAdm(this).reaction(track, callback);
   }
@@ -2738,7 +2759,6 @@ class ModelAdministration extends PreactObjectAdministration {
   computedSnapshot;
   snapshotMap = /* @__PURE__ */ new Map();
   contextCache = /* @__PURE__ */ new Map();
-  ownedDisposers = /* @__PURE__ */ new Set();
   disposed = false;
   parentName = null;
   get parent() {
@@ -2759,24 +2779,6 @@ class ModelAdministration extends PreactObjectAdministration {
       throw new Error("r-state-tree: cannot use a disposed model");
     }
   }
-  own(disposer) {
-    this.assertUsable();
-    let active = true;
-    const wrapped = () => {
-      if (!active) return;
-      active = false;
-      this.ownedDisposers.delete(wrapped);
-      disposer();
-    };
-    this.ownedDisposers.add(wrapped);
-    return wrapped;
-  }
-  reaction(track, callback) {
-    return this.own(reaction(track, callback));
-  }
-  effect(callback) {
-    return this.own(signalsCore.effect(callback));
-  }
   get configuration() {
     return this.configurationGetter?.() ?? {};
   }
@@ -3068,7 +3070,6 @@ class ModelAdministration extends PreactObjectAdministration {
     this.modelsTraceUnsub.clear();
     this.contextCache.forEach((computed2) => computed2.clear());
     this.contextCache.clear();
-    Array.from(this.ownedDisposers).forEach((dispose) => dispose());
   }
   getContextValue(contextId, provideSymbol, defaultValue, hasDefault) {
     let computed2 = this.contextCache.get(contextId);
@@ -3318,12 +3319,6 @@ class Model {
   get parent() {
     return getModelAdm(this).parent?.proxy ?? null;
   }
-  reaction(track, callback) {
-    return getModelAdm(this).reaction(track, callback);
-  }
-  effect(callback) {
-    return getModelAdm(this).effect(callback);
-  }
   [Symbol.dispose]() {
     getModelAdm(this).dispose();
   }

package/dist/r-state-tree.js

@@ -1992,6 +1992,32 @@ function validateStoreChildValue(value, propertyName) {
   );
 }
 class StoreAdministration extends PreactObjectAdministration {
+  static pendingActivations = [];
+  static isFlushingActivations = false;
+  static currentActivationDepth = 0;
+  static flushReactiveRegistrations(stores) {
+    const depth = this.isFlushingActivations ? this.currentActivationDepth + 1 : 0;
+    this.pendingActivations.push(...stores.map((store) => ({ store, depth })));
+    if (this.isFlushingActivations) return;
+    this.isFlushingActivations = true;
+    try {
+      let entry;
+      while (entry = this.pendingActivations.shift()) {
+        this.currentActivationDepth = entry.depth;
+        if (entry.depth > MAX_MOUNT_DEPTH) {
+          throw createCircularMountError({
+            storeName: entry.store.proxy.constructor.name || "Store",
+            modelsKeys: Object.keys(entry.store.proxy.props?.models ?? {})
+          });
+        }
+        entry.store.startReactiveRegistrations();
+      }
+    } finally {
+      this.pendingActivations.length = 0;
+      this.currentActivationDepth = 0;
+      this.isFlushingActivations = false;
+    }
+  }
   static proxyTraps = Object.assign(
     {},
     PreactObjectAdministration.proxyTraps,
@@ -2031,7 +2057,7 @@ class StoreAdministration extends PreactObjectAdministration {
     }
   );
   parent = null;
-  mountedSignal = createSignal(false);
+  mounted = false;
   disposed = false;
   contextCache = /* @__PURE__ */ new Map();
   childStoreDataMap = /* @__PURE__ */ new Map();
@@ -2193,7 +2219,7 @@ class StoreAdministration extends PreactObjectAdministration {
     return !this.parent;
   }
   get isMounted() {
-    return this.mountedSignal.get();
+    return this.mounted;
   }
   getContextValue(contextId, provideSymbol, defaultValue, hasDefault) {
     let computed2 = this.contextCache.get(contextId);
@@ -2289,13 +2315,11 @@ class StoreAdministration extends PreactObjectAdministration {
             getStoreAdm(stores)?.mount(this, name, registrationsToStart);
           }
         });
-        this.mountedSignal.set(true);
+        this.mounted = true;
         registrationsToStart.push(this);
       });
       if (isOutermostMount) {
-        registrationsToStart.forEach(
-          (store) => store.startReactiveRegistrations()
-        );
+        StoreAdministration.flushReactiveRegistrations(registrationsToStart);
       }
     } catch (error) {
       if (error instanceof Error && (error instanceof RangeError && /call stack/i.test(error.message) || /cycle detected/i.test(error.message))) {
@@ -2335,7 +2359,7 @@ class StoreAdministration extends PreactObjectAdministration {
       registration.stop = void 0;
     });
     this.reactiveRegistrations.clear();
-    this.mountedSignal.set(false);
+    this.mounted = false;
   }
 }
 let initEnabled$1 = false;
@@ -2381,9 +2405,6 @@ class Store {
   get key() {
     return this.props.key;
   }
-  get isMounted() {
-    return getStoreAdm(this).isMounted;
-  }
   reaction(track, callback) {
     return getStoreAdm(this).reaction(track, callback);
   }
@@ -2737,7 +2758,6 @@ class ModelAdministration extends PreactObjectAdministration {
   computedSnapshot;
   snapshotMap = /* @__PURE__ */ new Map();
   contextCache = /* @__PURE__ */ new Map();
-  ownedDisposers = /* @__PURE__ */ new Set();
   disposed = false;
   parentName = null;
   get parent() {
@@ -2758,24 +2778,6 @@ class ModelAdministration extends PreactObjectAdministration {
       throw new Error("r-state-tree: cannot use a disposed model");
     }
   }
-  own(disposer) {
-    this.assertUsable();
-    let active = true;
-    const wrapped = () => {
-      if (!active) return;
-      active = false;
-      this.ownedDisposers.delete(wrapped);
-      disposer();
-    };
-    this.ownedDisposers.add(wrapped);
-    return wrapped;
-  }
-  reaction(track, callback) {
-    return this.own(reaction(track, callback));
-  }
-  effect(callback) {
-    return this.own(effect(callback));
-  }
   get configuration() {
     return this.configurationGetter?.() ?? {};
   }
@@ -3067,7 +3069,6 @@ class ModelAdministration extends PreactObjectAdministration {
     this.modelsTraceUnsub.clear();
     this.contextCache.forEach((computed2) => computed2.clear());
     this.contextCache.clear();
-    Array.from(this.ownedDisposers).forEach((dispose) => dispose());
   }
   getContextValue(contextId, provideSymbol, defaultValue, hasDefault) {
     let computed2 = this.contextCache.get(contextId);
@@ -3317,12 +3318,6 @@ class Model {
   get parent() {
     return getModelAdm(this).parent?.proxy ?? null;
   }
-  reaction(track, callback) {
-    return getModelAdm(this).reaction(track, callback);
-  }
-  effect(callback) {
-    return getModelAdm(this).effect(callback);
-  }
   [Symbol.dispose]() {
     getModelAdm(this).dispose();
   }

package/dist/store/Store.d.ts

@@ -13,7 +13,6 @@ export default class Store<PropsType extends Record<string, any> = StoreProps<Pr
     props: StoreProps<PropsType>;
     constructor(props: StoreProps<PropsType>);
     get key(): string | number | undefined;
-    get isMounted(): boolean;
     reaction<T>(track: () => T, callback: (value: T, previousValue: T) => void): () => void;
     effect(callback: () => void | (() => void)): () => void;
     [Symbol.dispose](): void;

package/dist/store/StoreAdministration.d.ts

@@ -4,9 +4,13 @@ import type { StoreConfiguration, Props } from "../types";
 export declare function updateProps(props: Props, newProps: Props): void;
 export declare function getStoreAdm(store: Store): StoreAdministration;
 export declare class StoreAdministration<StoreType extends Store = Store> extends ObjectAdministration<Store> {
+    private static pendingActivations;
+    private static isFlushingActivations;
+    private static currentActivationDepth;
+    private static flushReactiveRegistrations;
     static proxyTraps: ProxyHandler<object>;
     parent: StoreAdministration | null;
-    private mountedSignal;
+    private mounted;
     private disposed;
     private contextCache;
     private childStoreDataMap;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "r-state-tree",
-	"version": "0.8.1",
+	"version": "0.8.2",
 	"description": "reactive state management library",
 	"main": "dist/r-state-tree.cjs",
 	"module": "dist/r-state-tree.js",