jotai-state-tree 1.5.0 → 1.6.0

package/dist/{chunk-MEX2M3XM.mjs → chunk-HHDXRF6H.mjs}

@@ -1,5 +1,5 @@
 // src/primitives.ts
-function createSimpleType(name, validator, defaultValue) {
+function createSimpleType(name, validator) {
   return {
     name,
     _kind: "simple",
@@ -8,9 +8,6 @@ function createSimpleType(name, validator, defaultValue) {
     _T: void 0,
     create(snapshot) {
       if (snapshot === void 0) {
-        if (defaultValue !== void 0) {
-          return defaultValue;
-        }
         throw new Error(`[jotai-state-tree] A value of type '${name}' is required`);
       }
       if (!validator(snapshot)) {

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { I as ISimpleType, a as IType, b as IIdentifierType, c as IIdentifierNumberType, d as ILiteralType, e as IEnumerationType, f as IFrozenType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance } from './router-D1t27vXg.mjs';
-export { L as CustomTypeOptions, aG as IActionRecorder, aH as IActionRecording, C as IAnyComplexType, D as IAnyMixin, aE as IHistoryEntry, F as IJsonPatch, y as IMSTArray, z as IMSTMap, G as IReversibleJsonPatch, x as IStateTreeNode, aF as ITimeTravelManager, aC as IUndoManager, aD as IUndoManagerOptions, H as IValidationContext, K as IValidationError, J as IValidationResult, A as ModelInstance, E as ModelSelf, aJ as RouteDefinition, aI as RouterModel, B as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, aB as createActionRecorder, aK as createRouter, aA as createTimeTravelManager, az as createUndoManager, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './router-D1t27vXg.mjs';
+import { I as ILiteralType, a as IEnumerationType, b as IFrozenType, c as IType, d as ISimpleType, e as IIdentifierType, f as IIdentifierNumberType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance } from './router-DzUdXVV7.mjs';
+export { L as CustomTypeOptions, aG as IActionRecorder, aH as IActionRecording, C as IAnyComplexType, D as IAnyMixin, aE as IHistoryEntry, F as IJsonPatch, y as IMSTArray, z as IMSTMap, G as IReversibleJsonPatch, x as IStateTreeNode, aF as ITimeTravelManager, aC as IUndoManager, aD as IUndoManagerOptions, H as IValidationContext, K as IValidationError, J as IValidationResult, A as ModelInstance, E as ModelSelf, aJ as RouteDefinition, aI as RouterModel, B as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, aB as createActionRecorder, aK as createRouter, aA as createTimeTravelManager, az as createUndoManager, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './router-DzUdXVV7.mjs';
 import 'jotai/vanilla/internals';
 import 'jotai';
 import 'react';
@@ -493,6 +493,14 @@ declare function safeCreate<T extends IAnyType>(type: T, snapshot: unknown, env?
  * Create an instance with defaults for missing values
  */
 declare function createWithDefaults<T extends IAnyType>(type: T, snapshot?: Partial<SnapshotIn<T>>, env?: unknown): Instance<T>;
+/**
+ * Check if a type is a refinement type
+ */
+declare function isRefinementType(type: unknown): boolean;
+/**
+ * Check if a reference is valid, returning the target if valid and undefined otherwise
+ */
+declare function tryReference<T>(getter: () => T | null | undefined, checkIfAlive?: boolean): T | undefined;
 
 /**
  * The `types` namespace contains all type constructors.
@@ -593,4 +601,4 @@ declare function typecheck<T>(type: {
     is(v: unknown): v is T;
 }, value: unknown): void;
 
-export { DatePrimitive as Date, type DynamicReferenceOptions, IAnyModelType, IAnyType, IArrayType, IDisposer, IEnumerationType, IFrozenType, IIdentifierNumberType, IIdentifierType, ILateType, ILiteralType, IMapType, IMaybeNullType, IMaybeType, type IMiddlewareEvent, type IMiddlewareHandler, IMixin, IModelType, IOptionalType, IReferenceType, IRefinementType, ISafeReferenceType, type ISerializedActionCall, ISimpleType, IType, IUnionType, Instance, MixinConfig, ModelProperties, ReferenceOptions, SnapshotIn, UnionOptions, addMiddleware, applyAction, array, boolean, cast, castToReferenceSnapshot, castToSnapshot, clearModelRegistry, cloneFrozen, compose, createWithDefaults, custom, types as default, dynamicReference, enumeration, escapeJsonPath, finite, float, flow, frozen, getDebugInfo, getIdentifierAttribute, getModelMetadata, getOrCreate, getRegisteredModelNames, getTypeName, getValidationError, hasIdentifier, identifier, identifierNumber, integer, isArrayType, isFrozenType, isIdentifierType, isInstanceOf, isLateType, isLiteralType, isMapType, isModelRegistered, isModelType, isOptionalType, isPrimitiveType, isProtected, isReferenceType, isType, isUnionType, isValidSnapshot, joinJsonPath, late, lateModel, literal, map, maybe, maybeNull, mixin, model, nullType, nullable, number, onModelRegistered, optional, printTree, protect, recordActions, reference, refinement, registerModel, resolveModel, resolveModelAsync, safeCreate, safeDynamicReference, safeReference, snapshotProcessor, splitJsonPath, string, tryResolveModel, typecheck, types, undefinedType, unescapeJsonPath, union, unprotect, unregisterModel };
+export { DatePrimitive as Date, type DynamicReferenceOptions, IAnyModelType, IAnyType, IArrayType, IDisposer, IEnumerationType, IFrozenType, IIdentifierNumberType, IIdentifierType, ILateType, ILiteralType, IMapType, IMaybeNullType, IMaybeType, type IMiddlewareEvent, type IMiddlewareHandler, IMixin, IModelType, IOptionalType, IReferenceType, IRefinementType, ISafeReferenceType, type ISerializedActionCall, ISimpleType, IType, IUnionType, Instance, MixinConfig, ModelProperties, ReferenceOptions, SnapshotIn, UnionOptions, addMiddleware, applyAction, array, boolean, cast, castToReferenceSnapshot, castToSnapshot, clearModelRegistry, cloneFrozen, compose, createWithDefaults, custom, types as default, dynamicReference, enumeration, escapeJsonPath, finite, float, flow, frozen, getDebugInfo, getIdentifierAttribute, getModelMetadata, getOrCreate, getRegisteredModelNames, getTypeName, getValidationError, hasIdentifier, identifier, identifierNumber, integer, isArrayType, isFrozenType, isIdentifierType, isInstanceOf, isLateType, isLiteralType, isMapType, isModelRegistered, isModelType, isOptionalType, isPrimitiveType, isProtected, isReferenceType, isRefinementType, isType, isUnionType, isValidSnapshot, joinJsonPath, late, lateModel, literal, map, maybe, maybeNull, mixin, model, nullType, nullable, number, onModelRegistered, optional, printTree, protect, recordActions, reference, refinement, registerModel, resolveModel, resolveModelAsync, safeCreate, safeDynamicReference, safeReference, snapshotProcessor, splitJsonPath, string, types as t, tryReference, tryResolveModel, typecheck, types, undefinedType, unescapeJsonPath, union, unprotect, unregisterModel };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { I as ISimpleType, a as IType, b as IIdentifierType, c as IIdentifierNumberType, d as ILiteralType, e as IEnumerationType, f as IFrozenType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance } from './router-D1t27vXg.js';
-export { L as CustomTypeOptions, aG as IActionRecorder, aH as IActionRecording, C as IAnyComplexType, D as IAnyMixin, aE as IHistoryEntry, F as IJsonPatch, y as IMSTArray, z as IMSTMap, G as IReversibleJsonPatch, x as IStateTreeNode, aF as ITimeTravelManager, aC as IUndoManager, aD as IUndoManagerOptions, H as IValidationContext, K as IValidationError, J as IValidationResult, A as ModelInstance, E as ModelSelf, aJ as RouteDefinition, aI as RouterModel, B as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, aB as createActionRecorder, aK as createRouter, aA as createTimeTravelManager, az as createUndoManager, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './router-D1t27vXg.js';
+import { I as ILiteralType, a as IEnumerationType, b as IFrozenType, c as IType, d as ISimpleType, e as IIdentifierType, f as IIdentifierNumberType, M as ModelProperties, g as IModelType, h as MixinConfig, i as IMixin, j as IAnyType, k as IArrayType, l as IMapType, m as IOptionalType, n as IMaybeType, o as IMaybeNullType, p as IUnionType, U as UnionOptions, q as ILateType, r as IAnyModelType, R as ReferenceOptions, s as IReferenceType, t as ISafeReferenceType, u as IRefinementType, v as IDisposer, S as SnapshotIn, w as Instance } from './router-DzUdXVV7.js';
+export { L as CustomTypeOptions, aG as IActionRecorder, aH as IActionRecording, C as IAnyComplexType, D as IAnyMixin, aE as IHistoryEntry, F as IJsonPatch, y as IMSTArray, z as IMSTMap, G as IReversibleJsonPatch, x as IStateTreeNode, aF as ITimeTravelManager, aC as IUndoManager, aD as IUndoManagerOptions, H as IValidationContext, K as IValidationError, J as IValidationResult, A as ModelInstance, E as ModelSelf, aJ as RouteDefinition, aI as RouterModel, B as SnapshotOut, T as applyPatch, O as applySnapshot, aw as cleanupStaleEntries, ax as clearAllRegistries, aa as clone, aq as cloneDeep, aB as createActionRecorder, aK as createRouter, aA as createTimeTravelManager, az as createUndoManager, a8 as destroy, a9 as detach, am as findAll, an as findFirst, as as freeze, a2 as getEnv, ag as getGlobalStore, a4 as getIdentifier, af as getMembers, ar as getOrCreatePath, Y as getParent, $ as getParentOfType, a0 as getPath, a1 as getPathParts, av as getRegistryStats, aj as getRelativePath, X as getRoot, N as getSnapshot, ap as getTreeStats, a3 as getType, _ as hasParent, al as haveSameRoot, a5 as isAlive, ak as isAncestor, at as isFrozen, a6 as isRoot, a7 as isStateTreeNode, ao as isValidReference, W as onAction, ay as onLifecycleChange, Q as onPatch, P as onSnapshot, V as recordPatches, ai as resetGlobalStore, ae as resolveIdentifier, ac as resolvePath, ah as setGlobalStore, Z as tryGetParent, ad as tryResolve, au as unfreeze, ab as walk } from './router-DzUdXVV7.js';
 import 'jotai/vanilla/internals';
 import 'jotai';
 import 'react';
@@ -493,6 +493,14 @@ declare function safeCreate<T extends IAnyType>(type: T, snapshot: unknown, env?
  * Create an instance with defaults for missing values
  */
 declare function createWithDefaults<T extends IAnyType>(type: T, snapshot?: Partial<SnapshotIn<T>>, env?: unknown): Instance<T>;
+/**
+ * Check if a type is a refinement type
+ */
+declare function isRefinementType(type: unknown): boolean;
+/**
+ * Check if a reference is valid, returning the target if valid and undefined otherwise
+ */
+declare function tryReference<T>(getter: () => T | null | undefined, checkIfAlive?: boolean): T | undefined;
 
 /**
  * The `types` namespace contains all type constructors.
@@ -593,4 +601,4 @@ declare function typecheck<T>(type: {
     is(v: unknown): v is T;
 }, value: unknown): void;
 
-export { DatePrimitive as Date, type DynamicReferenceOptions, IAnyModelType, IAnyType, IArrayType, IDisposer, IEnumerationType, IFrozenType, IIdentifierNumberType, IIdentifierType, ILateType, ILiteralType, IMapType, IMaybeNullType, IMaybeType, type IMiddlewareEvent, type IMiddlewareHandler, IMixin, IModelType, IOptionalType, IReferenceType, IRefinementType, ISafeReferenceType, type ISerializedActionCall, ISimpleType, IType, IUnionType, Instance, MixinConfig, ModelProperties, ReferenceOptions, SnapshotIn, UnionOptions, addMiddleware, applyAction, array, boolean, cast, castToReferenceSnapshot, castToSnapshot, clearModelRegistry, cloneFrozen, compose, createWithDefaults, custom, types as default, dynamicReference, enumeration, escapeJsonPath, finite, float, flow, frozen, getDebugInfo, getIdentifierAttribute, getModelMetadata, getOrCreate, getRegisteredModelNames, getTypeName, getValidationError, hasIdentifier, identifier, identifierNumber, integer, isArrayType, isFrozenType, isIdentifierType, isInstanceOf, isLateType, isLiteralType, isMapType, isModelRegistered, isModelType, isOptionalType, isPrimitiveType, isProtected, isReferenceType, isType, isUnionType, isValidSnapshot, joinJsonPath, late, lateModel, literal, map, maybe, maybeNull, mixin, model, nullType, nullable, number, onModelRegistered, optional, printTree, protect, recordActions, reference, refinement, registerModel, resolveModel, resolveModelAsync, safeCreate, safeDynamicReference, safeReference, snapshotProcessor, splitJsonPath, string, tryResolveModel, typecheck, types, undefinedType, unescapeJsonPath, union, unprotect, unregisterModel };
+export { DatePrimitive as Date, type DynamicReferenceOptions, IAnyModelType, IAnyType, IArrayType, IDisposer, IEnumerationType, IFrozenType, IIdentifierNumberType, IIdentifierType, ILateType, ILiteralType, IMapType, IMaybeNullType, IMaybeType, type IMiddlewareEvent, type IMiddlewareHandler, IMixin, IModelType, IOptionalType, IReferenceType, IRefinementType, ISafeReferenceType, type ISerializedActionCall, ISimpleType, IType, IUnionType, Instance, MixinConfig, ModelProperties, ReferenceOptions, SnapshotIn, UnionOptions, addMiddleware, applyAction, array, boolean, cast, castToReferenceSnapshot, castToSnapshot, clearModelRegistry, cloneFrozen, compose, createWithDefaults, custom, types as default, dynamicReference, enumeration, escapeJsonPath, finite, float, flow, frozen, getDebugInfo, getIdentifierAttribute, getModelMetadata, getOrCreate, getRegisteredModelNames, getTypeName, getValidationError, hasIdentifier, identifier, identifierNumber, integer, isArrayType, isFrozenType, isIdentifierType, isInstanceOf, isLateType, isLiteralType, isMapType, isModelRegistered, isModelType, isOptionalType, isPrimitiveType, isProtected, isReferenceType, isRefinementType, isType, isUnionType, isValidSnapshot, joinJsonPath, late, lateModel, literal, map, maybe, maybeNull, mixin, model, nullType, nullable, number, onModelRegistered, optional, printTree, protect, recordActions, reference, refinement, registerModel, resolveModel, resolveModelAsync, safeCreate, safeDynamicReference, safeReference, snapshotProcessor, splitJsonPath, string, types as t, tryReference, tryResolveModel, typecheck, types, undefinedType, unescapeJsonPath, union, unprotect, unregisterModel };

package/dist/index.js

@@ -102,6 +102,7 @@ __export(index_exports, {
   isPrimitiveType: () => isPrimitiveType,
   isProtected: () => isProtected,
   isReferenceType: () => isReferenceType,
+  isRefinementType: () => isRefinementType,
   isRoot: () => isRoot,
   isStateTreeNode: () => isStateTreeNode,
   isType: () => isType,
@@ -145,7 +146,9 @@ __export(index_exports, {
   snapshotProcessor: () => snapshotProcessor,
   splitJsonPath: () => splitJsonPath,
   string: () => string,
+  t: () => types,
   tryGetParent: () => tryGetParent,
+  tryReference: () => tryReference,
   tryResolve: () => tryResolve,
   tryResolveModel: () => tryResolveModel,
   typecheck: () => typecheck,
@@ -161,7 +164,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/primitives.ts
-function createSimpleType(name, validator, defaultValue) {
+function createSimpleType(name, validator) {
   return {
     name,
     _kind: "simple",
@@ -170,9 +173,6 @@ function createSimpleType(name, validator, defaultValue) {
     _T: void 0,
     create(snapshot) {
       if (snapshot === void 0) {
-        if (defaultValue !== void 0) {
-          return defaultValue;
-        }
         throw new Error(`[jotai-state-tree] A value of type '${name}' is required`);
       }
       if (!validator(snapshot)) {
@@ -2849,14 +2849,12 @@ function array(itemType) {
 var MSTMap = class extends Map {
   constructor(node, valueType, entries) {
     super();
-    this.initialized = false;
     this.node = node;
     this.valueType = valueType;
-    this.initialized = true;
-    if (entries) {
-      for (const [key, value] of entries) {
-        super.set(key, value);
-      }
+    for (const [key, value] of entries) {
+      super.set(key, value);
+    }
+    if (entries.length > 0) {
       this.syncToNode();
     }
   }
@@ -2910,13 +2908,9 @@ var MSTMap = class extends Map {
   }
   // Override mutating methods to sync
   set(key, value) {
-    if (this.initialized) {
-      this.checkWrite();
-    }
+    this.checkWrite();
     super.set(key, value);
-    if (this.initialized) {
-      this.syncToNode();
-    }
+    this.syncToNode();
     return this;
   }
   get(key) {
@@ -2933,23 +2927,17 @@ var MSTMap = class extends Map {
     return super.get(key);
   }
   delete(key) {
-    if (this.initialized) {
-      this.checkWrite();
-    }
+    this.checkWrite();
     const result = super.delete(key);
-    if (result && this.initialized) {
+    if (result) {
       this.syncToNode();
     }
     return result;
   }
   clear() {
-    if (this.initialized) {
-      this.checkWrite();
-    }
+    this.checkWrite();
     super.clear();
-    if (this.initialized) {
-      this.syncToNode();
-    }
+    this.syncToNode();
   }
   toJSON() {
     const result = {};
@@ -3461,10 +3449,19 @@ function resolveModelAsync(name, timeout = 3e4) {
     return Promise.resolve(entry.type);
   }
   return new Promise((resolve, reject) => {
-    const timeoutId = setTimeout(() => {
+    let timeoutId;
+    const wrappedResolve = (type) => {
+      clearTimeout(timeoutId);
+      resolve(type);
+    };
+    const wrappedReject = (error) => {
+      clearTimeout(timeoutId);
+      reject(error);
+    };
+    timeoutId = setTimeout(() => {
       const pending = pendingResolutions.get(name);
       if (pending) {
-        const index = pending.findIndex((p) => p.resolve === resolve);
+        const index = pending.findIndex((p) => p.reject === wrappedReject);
         if (index >= 0) {
           pending.splice(index, 1);
           if (pending.length === 0) {
@@ -3478,14 +3475,6 @@ function resolveModelAsync(name, timeout = 3e4) {
         )
       );
     }, timeout);
-    const wrappedResolve = (type) => {
-      clearTimeout(timeoutId);
-      resolve(type);
-    };
-    const wrappedReject = (error) => {
-      clearTimeout(timeoutId);
-      reject(error);
-    };
     if (!pendingResolutions.has(name)) {
       pendingResolutions.set(name, []);
     }
@@ -3845,6 +3834,29 @@ function safeCreate(type, snapshot, env) {
 function createWithDefaults(type, snapshot = {}, env) {
   return type.create(snapshot, env);
 }
+function isRefinementType(type) {
+  return type !== null && typeof type === "object" && "_kind" in type && type._kind === "refinement";
+}
+function tryReference(getter, checkIfAlive = true) {
+  try {
+    const node = getter();
+    if (node === void 0 || node === null) {
+      return void 0;
+    }
+    if (hasStateTreeNode(node)) {
+      if (!checkIfAlive) {
+        return node;
+      }
+      return isAlive(node) ? node : void 0;
+    }
+    return void 0;
+  } catch (e) {
+    if (e instanceof Error && e.message.includes("Failed to resolve reference")) {
+      return void 0;
+    }
+    throw e;
+  }
+}
 
 // src/undo.ts
 var import_jotai3 = require("jotai");
@@ -4850,6 +4862,7 @@ var index_default = types;
   isPrimitiveType,
   isProtected,
   isReferenceType,
+  isRefinementType,
   isRoot,
   isStateTreeNode,
   isType,
@@ -4893,7 +4906,9 @@ var index_default = types;
   snapshotProcessor,
   splitJsonPath,
   string,
+  t,
   tryGetParent,
+  tryReference,
   tryResolve,
   tryResolveModel,
   typecheck,

package/dist/index.mjs

@@ -96,20 +96,18 @@ import {
   union,
   unprotect,
   walk
-} from "./chunk-MEX2M3XM.mjs";
+} from "./chunk-HHDXRF6H.mjs";
 
 // src/map.ts
 var MSTMap = class extends Map {
   constructor(node, valueType, entries) {
     super();
-    this.initialized = false;
     this.node = node;
     this.valueType = valueType;
-    this.initialized = true;
-    if (entries) {
-      for (const [key, value] of entries) {
-        super.set(key, value);
-      }
+    for (const [key, value] of entries) {
+      super.set(key, value);
+    }
+    if (entries.length > 0) {
       this.syncToNode();
     }
   }
@@ -163,13 +161,9 @@ var MSTMap = class extends Map {
   }
   // Override mutating methods to sync
   set(key, value) {
-    if (this.initialized) {
-      this.checkWrite();
-    }
+    this.checkWrite();
     super.set(key, value);
-    if (this.initialized) {
-      this.syncToNode();
-    }
+    this.syncToNode();
     return this;
   }
   get(key) {
@@ -186,23 +180,17 @@ var MSTMap = class extends Map {
     return super.get(key);
   }
   delete(key) {
-    if (this.initialized) {
-      this.checkWrite();
-    }
+    this.checkWrite();
     const result = super.delete(key);
-    if (result && this.initialized) {
+    if (result) {
       this.syncToNode();
     }
     return result;
   }
   clear() {
-    if (this.initialized) {
-      this.checkWrite();
-    }
+    this.checkWrite();
     super.clear();
-    if (this.initialized) {
-      this.syncToNode();
-    }
+    this.syncToNode();
   }
   toJSON() {
     const result = {};
@@ -362,10 +350,19 @@ function resolveModelAsync(name, timeout = 3e4) {
     return Promise.resolve(entry.type);
   }
   return new Promise((resolve, reject) => {
-    const timeoutId = setTimeout(() => {
+    let timeoutId;
+    const wrappedResolve = (type) => {
+      clearTimeout(timeoutId);
+      resolve(type);
+    };
+    const wrappedReject = (error) => {
+      clearTimeout(timeoutId);
+      reject(error);
+    };
+    timeoutId = setTimeout(() => {
       const pending = pendingResolutions.get(name);
       if (pending) {
-        const index = pending.findIndex((p) => p.resolve === resolve);
+        const index = pending.findIndex((p) => p.reject === wrappedReject);
         if (index >= 0) {
           pending.splice(index, 1);
           if (pending.length === 0) {
@@ -379,14 +376,6 @@ function resolveModelAsync(name, timeout = 3e4) {
         )
       );
     }, timeout);
-    const wrappedResolve = (type) => {
-      clearTimeout(timeoutId);
-      resolve(type);
-    };
-    const wrappedReject = (error) => {
-      clearTimeout(timeoutId);
-      reject(error);
-    };
     if (!pendingResolutions.has(name)) {
       pendingResolutions.set(name, []);
     }
@@ -746,6 +735,29 @@ function safeCreate(type, snapshot, env) {
 function createWithDefaults(type, snapshot = {}, env) {
   return type.create(snapshot, env);
 }
+function isRefinementType(type) {
+  return type !== null && typeof type === "object" && "_kind" in type && type._kind === "refinement";
+}
+function tryReference(getter, checkIfAlive = true) {
+  try {
+    const node = getter();
+    if (node === void 0 || node === null) {
+      return void 0;
+    }
+    if (hasStateTreeNode(node)) {
+      if (!checkIfAlive) {
+        return node;
+      }
+      return isAlive(node) ? node : void 0;
+    }
+    return void 0;
+  } catch (e) {
+    if (e instanceof Error && e.message.includes("Failed to resolve reference")) {
+      return void 0;
+    }
+    throw e;
+  }
+}
 
 // src/index.ts
 var types = {
@@ -926,6 +938,7 @@ export {
   isPrimitiveType,
   isProtected,
   isReferenceType,
+  isRefinementType,
   isRoot,
   isStateTreeNode,
   isType,
@@ -969,7 +982,9 @@ export {
   snapshotProcessor,
   splitJsonPath,
   string,
+  types as t,
   tryGetParent,
+  tryReference,
   tryResolve,
   tryResolveModel,
   typecheck,

package/dist/react.d.mts

@@ -1,6 +1,6 @@
 import React, { ComponentType, FC, ReactNode } from 'react';
-import { ag as getGlobalStore, aD as IUndoManagerOptions, aC as IUndoManager, aF as ITimeTravelManager } from './router-D1t27vXg.mjs';
-export { aM as RouterContext, aL as hasStateTreeNode, aN as useRouter } from './router-D1t27vXg.mjs';
+import { ag as getGlobalStore, aD as IUndoManagerOptions, aC as IUndoManager, aF as ITimeTravelManager } from './router-DzUdXVV7.mjs';
+export { aM as RouterContext, aL as hasStateTreeNode, aN as useRouter } from './router-DzUdXVV7.mjs';
 import 'jotai/vanilla/internals';
 import 'jotai';
 

package/dist/react.d.ts

@@ -1,6 +1,6 @@
 import React, { ComponentType, FC, ReactNode } from 'react';
-import { ag as getGlobalStore, aD as IUndoManagerOptions, aC as IUndoManager, aF as ITimeTravelManager } from './router-D1t27vXg.js';
-export { aM as RouterContext, aL as hasStateTreeNode, aN as useRouter } from './router-D1t27vXg.js';
+import { ag as getGlobalStore, aD as IUndoManagerOptions, aC as IUndoManager, aF as ITimeTravelManager } from './router-DzUdXVV7.js';
+export { aM as RouterContext, aL as hasStateTreeNode, aN as useRouter } from './router-DzUdXVV7.js';
 import 'jotai/vanilla/internals';
 import 'jotai';
 

package/dist/react.js

@@ -982,7 +982,7 @@ var import_react = require("react");
 var import_jotai4 = require("jotai");
 
 // src/primitives.ts
-function createSimpleType(name, validator, defaultValue) {
+function createSimpleType(name, validator) {
   return {
     name,
     _kind: "simple",
@@ -991,9 +991,6 @@ function createSimpleType(name, validator, defaultValue) {
     _T: void 0,
     create(snapshot) {
       if (snapshot === void 0) {
-        if (defaultValue !== void 0) {
-          return defaultValue;
-        }
         throw new Error(`[jotai-state-tree] A value of type '${name}' is required`);
       }
       if (!validator(snapshot)) {
@@ -2797,10 +2794,7 @@ function useRouter() {
 }
 
 // src/react.ts
-var ObserverTrackingContext = import_react2.default.createContext(null);
 function useObserverTracking() {
-  const contextFn = import_react2.default.useContext(ObserverTrackingContext);
-  if (contextFn) return contextFn;
   const activeFn = getActiveTrackingFn();
   if (activeFn) {
     return (node) => {
@@ -2817,7 +2811,7 @@ function observer(Component, options) {
   if (options?.forwardRef) {
     ObserverComponent = (0, import_react2.memo)((0, import_react2.forwardRef)((props, ref) => {
       return useObserver(() => {
-        if (typeof Component === "function") {
+        if (typeof Component === "function" && !(Component.prototype && Component.prototype.isReactComponent)) {
           return Component(props, ref);
         }
         return import_react2.default.createElement(Component, { ...props, ref });
@@ -2827,7 +2821,7 @@ function observer(Component, options) {
   } else {
     ObserverComponent = (0, import_react2.memo)((props) => {
       return useObserver(() => {
-        if (typeof Component === "function") {
+        if (typeof Component === "function" && !(Component.prototype && Component.prototype.isReactComponent)) {
           return Component(props);
         }
         return import_react2.default.createElement(Component, props);

package/dist/react.mjs

@@ -12,7 +12,7 @@ import {
   setActiveTrackingFn,
   setIsApplyingSnapshotOrPatch,
   useRouter
-} from "./chunk-MEX2M3XM.mjs";
+} from "./chunk-HHDXRF6H.mjs";
 
 // src/react.ts
 import React, {
@@ -28,10 +28,7 @@ import {
   useAtomValue
 } from "jotai";
 import { useHydrateAtoms } from "jotai/utils";
-var ObserverTrackingContext = React.createContext(null);
 function useObserverTracking() {
-  const contextFn = React.useContext(ObserverTrackingContext);
-  if (contextFn) return contextFn;
   const activeFn = getActiveTrackingFn();
   if (activeFn) {
     return (node) => {
@@ -48,7 +45,7 @@ function observer(Component, options) {
   if (options?.forwardRef) {
     ObserverComponent = memo(forwardRef((props, ref) => {
       return useObserver(() => {
-        if (typeof Component === "function") {
+        if (typeof Component === "function" && !(Component.prototype && Component.prototype.isReactComponent)) {
           return Component(props, ref);
         }
         return React.createElement(Component, { ...props, ref });
@@ -58,7 +55,7 @@ function observer(Component, options) {
   } else {
     ObserverComponent = memo((props) => {
       return useObserver(() => {
-        if (typeof Component === "function") {
+        if (typeof Component === "function" && !(Component.prototype && Component.prototype.isReactComponent)) {
           return Component(props);
         }
         return React.createElement(Component, props);

package/dist/{router-D1t27vXg.d.mts → router-DzUdXVV7.d.mts}

@@ -725,4 +725,4 @@ declare function createRouter(config: {
 declare const RouterContext: React.Context<any>;
 declare function useRouter(): any;
 
-export { getParentOfType as $, type ModelInstance as A, type SnapshotOut as B, type IAnyComplexType as C, type IAnyMixin as D, type ModelSelf as E, type IJsonPatch as F, type IReversibleJsonPatch as G, type IValidationContext as H, type ISimpleType as I, type IValidationResult as J, type IValidationError as K, type CustomTypeOptions as L, type ModelProperties as M, getSnapshot as N, applySnapshot as O, onSnapshot as P, onPatch as Q, type ReferenceOptions as R, type SnapshotIn as S, applyPatch as T, type UnionOptions as U, recordPatches as V, onAction as W, getRoot as X, getParent as Y, tryGetParent as Z, hasParent as _, type IType as a, getPath as a0, getPathParts as a1, getEnv as a2, getType as a3, getIdentifier as a4, isAlive as a5, isRoot as a6, isStateTreeNode as a7, destroy as a8, detach as a9, createTimeTravelManager as aA, createActionRecorder as aB, type IUndoManager as aC, type IUndoManagerOptions as aD, type IHistoryEntry as aE, type ITimeTravelManager as aF, type IActionRecorder as aG, type IActionRecording as aH, RouterModel as aI, RouteDefinition as aJ, createRouter as aK, hasStateTreeNode as aL, RouterContext as aM, useRouter as aN, clone as aa, walk as ab, resolvePath as ac, tryResolve as ad, resolveIdentifier as ae, getMembers as af, getGlobalStore as ag, setGlobalStore as ah, resetGlobalStore as ai, getRelativePath as aj, isAncestor as ak, haveSameRoot as al, findAll as am, findFirst as an, isValidReference as ao, getTreeStats as ap, cloneDeep as aq, getOrCreatePath as ar, freeze as as, isFrozen as at, unfreeze as au, getRegistryStats as av, cleanupStaleEntries as aw, clearAllRegistries as ax, onLifecycleChange as ay, createUndoManager as az, type IIdentifierType as b, type IIdentifierNumberType as c, type ILiteralType as d, type IEnumerationType as e, type IFrozenType as f, type IModelType as g, type MixinConfig as h, type IMixin as i, type IAnyType as j, type IArrayType as k, type IMapType as l, type IOptionalType as m, type IMaybeType as n, type IMaybeNullType as o, type IUnionType as p, type ILateType as q, type IAnyModelType as r, type IReferenceType as s, type ISafeReferenceType as t, type IRefinementType as u, type IDisposer as v, type Instance as w, type IStateTreeNode as x, type IMSTArray as y, type IMSTMap as z };
+export { getParentOfType as $, type ModelInstance as A, type SnapshotOut as B, type IAnyComplexType as C, type IAnyMixin as D, type ModelSelf as E, type IJsonPatch as F, type IReversibleJsonPatch as G, type IValidationContext as H, type ILiteralType as I, type IValidationResult as J, type IValidationError as K, type CustomTypeOptions as L, type ModelProperties as M, getSnapshot as N, applySnapshot as O, onSnapshot as P, onPatch as Q, type ReferenceOptions as R, type SnapshotIn as S, applyPatch as T, type UnionOptions as U, recordPatches as V, onAction as W, getRoot as X, getParent as Y, tryGetParent as Z, hasParent as _, type IEnumerationType as a, getPath as a0, getPathParts as a1, getEnv as a2, getType as a3, getIdentifier as a4, isAlive as a5, isRoot as a6, isStateTreeNode as a7, destroy as a8, detach as a9, createTimeTravelManager as aA, createActionRecorder as aB, type IUndoManager as aC, type IUndoManagerOptions as aD, type IHistoryEntry as aE, type ITimeTravelManager as aF, type IActionRecorder as aG, type IActionRecording as aH, RouterModel as aI, RouteDefinition as aJ, createRouter as aK, hasStateTreeNode as aL, RouterContext as aM, useRouter as aN, clone as aa, walk as ab, resolvePath as ac, tryResolve as ad, resolveIdentifier as ae, getMembers as af, getGlobalStore as ag, setGlobalStore as ah, resetGlobalStore as ai, getRelativePath as aj, isAncestor as ak, haveSameRoot as al, findAll as am, findFirst as an, isValidReference as ao, getTreeStats as ap, cloneDeep as aq, getOrCreatePath as ar, freeze as as, isFrozen as at, unfreeze as au, getRegistryStats as av, cleanupStaleEntries as aw, clearAllRegistries as ax, onLifecycleChange as ay, createUndoManager as az, type IFrozenType as b, type IType as c, type ISimpleType as d, type IIdentifierType as e, type IIdentifierNumberType as f, type IModelType as g, type MixinConfig as h, type IMixin as i, type IAnyType as j, type IArrayType as k, type IMapType as l, type IOptionalType as m, type IMaybeType as n, type IMaybeNullType as o, type IUnionType as p, type ILateType as q, type IAnyModelType as r, type IReferenceType as s, type ISafeReferenceType as t, type IRefinementType as u, type IDisposer as v, type Instance as w, type IStateTreeNode as x, type IMSTArray as y, type IMSTMap as z };

package/dist/{router-D1t27vXg.d.ts → router-DzUdXVV7.d.ts}

@@ -725,4 +725,4 @@ declare function createRouter(config: {
 declare const RouterContext: React.Context<any>;
 declare function useRouter(): any;
 
-export { getParentOfType as $, type ModelInstance as A, type SnapshotOut as B, type IAnyComplexType as C, type IAnyMixin as D, type ModelSelf as E, type IJsonPatch as F, type IReversibleJsonPatch as G, type IValidationContext as H, type ISimpleType as I, type IValidationResult as J, type IValidationError as K, type CustomTypeOptions as L, type ModelProperties as M, getSnapshot as N, applySnapshot as O, onSnapshot as P, onPatch as Q, type ReferenceOptions as R, type SnapshotIn as S, applyPatch as T, type UnionOptions as U, recordPatches as V, onAction as W, getRoot as X, getParent as Y, tryGetParent as Z, hasParent as _, type IType as a, getPath as a0, getPathParts as a1, getEnv as a2, getType as a3, getIdentifier as a4, isAlive as a5, isRoot as a6, isStateTreeNode as a7, destroy as a8, detach as a9, createTimeTravelManager as aA, createActionRecorder as aB, type IUndoManager as aC, type IUndoManagerOptions as aD, type IHistoryEntry as aE, type ITimeTravelManager as aF, type IActionRecorder as aG, type IActionRecording as aH, RouterModel as aI, RouteDefinition as aJ, createRouter as aK, hasStateTreeNode as aL, RouterContext as aM, useRouter as aN, clone as aa, walk as ab, resolvePath as ac, tryResolve as ad, resolveIdentifier as ae, getMembers as af, getGlobalStore as ag, setGlobalStore as ah, resetGlobalStore as ai, getRelativePath as aj, isAncestor as ak, haveSameRoot as al, findAll as am, findFirst as an, isValidReference as ao, getTreeStats as ap, cloneDeep as aq, getOrCreatePath as ar, freeze as as, isFrozen as at, unfreeze as au, getRegistryStats as av, cleanupStaleEntries as aw, clearAllRegistries as ax, onLifecycleChange as ay, createUndoManager as az, type IIdentifierType as b, type IIdentifierNumberType as c, type ILiteralType as d, type IEnumerationType as e, type IFrozenType as f, type IModelType as g, type MixinConfig as h, type IMixin as i, type IAnyType as j, type IArrayType as k, type IMapType as l, type IOptionalType as m, type IMaybeType as n, type IMaybeNullType as o, type IUnionType as p, type ILateType as q, type IAnyModelType as r, type IReferenceType as s, type ISafeReferenceType as t, type IRefinementType as u, type IDisposer as v, type Instance as w, type IStateTreeNode as x, type IMSTArray as y, type IMSTMap as z };
+export { getParentOfType as $, type ModelInstance as A, type SnapshotOut as B, type IAnyComplexType as C, type IAnyMixin as D, type ModelSelf as E, type IJsonPatch as F, type IReversibleJsonPatch as G, type IValidationContext as H, type ILiteralType as I, type IValidationResult as J, type IValidationError as K, type CustomTypeOptions as L, type ModelProperties as M, getSnapshot as N, applySnapshot as O, onSnapshot as P, onPatch as Q, type ReferenceOptions as R, type SnapshotIn as S, applyPatch as T, type UnionOptions as U, recordPatches as V, onAction as W, getRoot as X, getParent as Y, tryGetParent as Z, hasParent as _, type IEnumerationType as a, getPath as a0, getPathParts as a1, getEnv as a2, getType as a3, getIdentifier as a4, isAlive as a5, isRoot as a6, isStateTreeNode as a7, destroy as a8, detach as a9, createTimeTravelManager as aA, createActionRecorder as aB, type IUndoManager as aC, type IUndoManagerOptions as aD, type IHistoryEntry as aE, type ITimeTravelManager as aF, type IActionRecorder as aG, type IActionRecording as aH, RouterModel as aI, RouteDefinition as aJ, createRouter as aK, hasStateTreeNode as aL, RouterContext as aM, useRouter as aN, clone as aa, walk as ab, resolvePath as ac, tryResolve as ad, resolveIdentifier as ae, getMembers as af, getGlobalStore as ag, setGlobalStore as ah, resetGlobalStore as ai, getRelativePath as aj, isAncestor as ak, haveSameRoot as al, findAll as am, findFirst as an, isValidReference as ao, getTreeStats as ap, cloneDeep as aq, getOrCreatePath as ar, freeze as as, isFrozen as at, unfreeze as au, getRegistryStats as av, cleanupStaleEntries as aw, clearAllRegistries as ax, onLifecycleChange as ay, createUndoManager as az, type IFrozenType as b, type IType as c, type ISimpleType as d, type IIdentifierType as e, type IIdentifierNumberType as f, type IModelType as g, type MixinConfig as h, type IMixin as i, type IAnyType as j, type IArrayType as k, type IMapType as l, type IOptionalType as m, type IMaybeType as n, type IMaybeNullType as o, type IUnionType as p, type ILateType as q, type IAnyModelType as r, type IReferenceType as s, type ISafeReferenceType as t, type IRefinementType as u, type IDisposer as v, type Instance as w, type IStateTreeNode as x, type IMSTArray as y, type IMSTMap as z };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jotai-state-tree",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "MobX-State-Tree API compatible library powered by Jotai",
   "main": "dist/index.js",
   "module": "dist/index.mjs",