jotai-state-tree 1.0.3 → 1.1.0

package/dist/index.d.mts

@@ -105,6 +105,21 @@ interface IModelType<P extends ModelProperties, V extends object, A extends obje
     beforeDetach(fn: (self: ModelInstance<P, V, A, Vol> & V & A & Vol) => void): IModelType<P, V, A, Vol>;
     /** Add beforeDestroy lifecycle hook (called before node is destroyed) */
     beforeDestroy(fn: (self: ModelInstance<P, V, A, Vol> & V & A & Vol) => void): IModelType<P, V, A, Vol>;
+    /**
+     * Apply a mixin to this model.
+     * The mixin's requirements must be satisfied by this model's properties.
+     *
+     * @example
+     * const Timestamped = types.mixin({
+     *   requires: { createdAt: types.number },
+     *   views: (self) => ({ get formattedDate() { ... } }),
+     * });
+     *
+     * const MyModel = types
+     *   .model({ name: types.string, createdAt: types.number })
+     *   .apply(Timestamped);
+     */
+    apply<RequiredProps extends ModelProperties, MV extends object, MA extends object, MVol extends object>(mixin: IMixin<RequiredProps, MV, MA, MVol>): P extends RequiredProps ? IModelType<P, V & MV, A & MA, Vol & MVol> : never;
 }
 /**
  * MST Array interface that allows both instance types and snapshot/creation types
@@ -243,6 +258,58 @@ interface IReversibleJsonPatch extends IJsonPatch {
 type IAnyType = IType<unknown, unknown, unknown>;
 type IAnyModelType = IModelType<ModelProperties, object, object, object>;
 type IAnyComplexType = IAnyModelType | IArrayType<IAnyType> | IMapType<IAnyType>;
+/**
+ * Extract the full "self" type from a model type.
+ * This includes properties, views, actions, and volatile state.
+ *
+ * @example
+ * const User = types.model({ name: types.string }).views(self => ({ ... }));
+ * type UserSelf = ModelSelf<typeof User>; // includes name + all views
+ */
+type ModelSelf<M> = M extends IModelType<infer P, infer V, infer A, infer Vol> ? ModelInstance<P, V, A, Vol> & V & A & Vol : never;
+/**
+ * Configuration for creating a mixin.
+ * @template RequiredProps - Properties the mixin requires from the base model
+ * @template V - Views the mixin provides
+ * @template A - Actions the mixin provides
+ * @template Vol - Volatile state the mixin provides
+ */
+interface MixinConfig<RequiredProps extends ModelProperties, V extends object = object, A extends object = object, Vol extends object = object> {
+    /** Properties the mixin requires from any model it's applied to */
+    requires?: RequiredProps;
+    /** Views to add to the model */
+    views?: (self: ModelInstanceType<RequiredProps>) => V;
+    /** Actions to add to the model */
+    actions?: (self: ModelInstanceType<RequiredProps> & V) => A;
+    /** Volatile state to add to the model */
+    volatile?: (self: ModelInstanceType<RequiredProps> & V & A) => Vol;
+}
+/**
+ * A mixin that can be applied to models to add views, actions, and volatile state.
+ * Mixins declare what properties they require and what they provide.
+ *
+ * @template RequiredProps - Properties the mixin requires
+ * @template V - Views the mixin provides
+ * @template A - Actions the mixin provides
+ * @template Vol - Volatile state the mixin provides
+ */
+interface IMixin<RequiredProps extends ModelProperties, V extends object = object, A extends object = object, Vol extends object = object> {
+    readonly _kind: "mixin";
+    /** Properties the mixin requires from the base model */
+    readonly requires: RequiredProps;
+    /** Function to create views */
+    readonly views?: (self: ModelInstanceType<RequiredProps>) => V;
+    /** Function to create actions */
+    readonly actions?: (self: ModelInstanceType<RequiredProps> & V) => A;
+    /** Function to create volatile state */
+    readonly volatile?: (self: ModelInstanceType<RequiredProps> & V & A) => Vol;
+    /** Phantom types for inference */
+    readonly _V: V;
+    readonly _A: A;
+    readonly _Vol: Vol;
+}
+/** Any mixin type */
+type IAnyMixin = IMixin<ModelProperties, object, object, object>;
 interface IDisposer {
     (): void;
 }
@@ -302,6 +369,39 @@ declare function model<P extends ModelProperties>(name: string, properties: P):
 declare function model<P extends ModelProperties>(properties: P): IModelType<P, object, object, object>;
 declare function compose<PA extends ModelProperties, PB extends ModelProperties, VA extends object, VB extends object, AA extends object, AB extends object, VolA extends object, VolB extends object>(name: string, a: IModelType<PA, VA, AA, VolA>, b: IModelType<PB, VB, AB, VolB>): IModelType<PA & PB, VA & VB, AA & AB, VolA & VolB>;
 declare function compose<PA extends ModelProperties, PB extends ModelProperties, VA extends object, VB extends object, AA extends object, AB extends object, VolA extends object, VolB extends object>(a: IModelType<PA, VA, AA, VolA>, b: IModelType<PB, VB, AB, VolB>): IModelType<PA & PB, VA & VB, AA & AB, VolA & VolB>;
+/**
+ * Create a type-safe mixin that can be applied to models.
+ *
+ * Mixins declare:
+ * - `requires`: Properties the mixin needs from any model it's applied to
+ * - `views`: Computed views to add
+ * - `actions`: Actions to add
+ * - `volatile`: Volatile (non-serialized) state to add
+ *
+ * @example
+ * ```typescript
+ * // Create a mixin that adds validation capabilities
+ * const Validatable = types.mixin({
+ *   requires: {
+ *     errors: types.array(types.string),
+ *   },
+ *   views: (self) => ({
+ *     get isValid() { return self.errors.length === 0; },
+ *     get hasErrors() { return self.errors.length > 0; },
+ *   }),
+ *   actions: (self) => ({
+ *     clearErrors() { self.errors.clear(); },
+ *     addError(msg: string) { self.errors.push(msg); },
+ *   }),
+ * });
+ *
+ * // Apply to a model
+ * const FormModel = types
+ *   .model({ name: types.string, errors: types.array(types.string) })
+ *   .apply(Validatable);
+ * ```
+ */
+declare function mixin<RequiredProps extends ModelProperties = ModelProperties, V extends object = object, A extends object = object, Vol extends object = object>(config: MixinConfig<RequiredProps, V, A, Vol>): IMixin<RequiredProps, V, A, Vol>;
 
 /**
  * Array type implementation
@@ -1025,6 +1125,7 @@ declare const types: {
     custom: typeof custom;
     model: typeof model;
     compose: typeof compose;
+    mixin: typeof mixin;
     array: typeof array;
     map: typeof map;
     optional: typeof optional;
@@ -1106,4 +1207,4 @@ declare function typecheck<T>(type: {
     is(v: unknown): v is T;
 }, value: unknown): void;
 
-export { type CustomTypeOptions$1 as CustomTypeOptions, DatePrimitive as Date, type DynamicReferenceOptions, type IActionRecorder, type IActionRecording, type IAnyComplexType, type IAnyModelType, type IAnyType, type IArrayType, type IDisposer, type IEnumerationType, type IFrozenType, type IHistoryEntry, type IIdentifierNumberType, type IIdentifierType, type IJsonPatch, type ILateType, type ILiteralType, type IMSTArray, type IMSTMap, type IMapType, type IMaybeNullType, type IMaybeType, type IMiddlewareEvent, type IMiddlewareHandler, type IModelType, type IOptionalType, type IReferenceType, type IRefinementType, type IReversibleJsonPatch, type ISafeReferenceType, type ISerializedActionCall, type ISimpleType, type IStateTreeNode, type ITimeTravelManager, type IType, type IUndoManager, type IUndoManagerOptions, type IUnionType, type IValidationContext, type IValidationError, type IValidationResult, type Instance, type ModelInstance, type ModelProperties, type ReferenceOptions, type SnapshotIn, type SnapshotOut, type UnionOptions, addMiddleware, applyAction, applyPatch, applySnapshot, array, boolean, cast, castToReferenceSnapshot, castToSnapshot, cleanupStaleEntries, clearAllRegistries, clearModelRegistry, clone, cloneDeep, cloneFrozen, compose, createActionRecorder, createTimeTravelManager, createUndoManager, createWithDefaults, custom, types as default, destroy, detach, dynamicReference, enumeration, escapeJsonPath, findAll, findFirst, finite, float, flow, freeze, frozen, getDebugInfo, getEnv, getGlobalStore, getIdentifier, getIdentifierAttribute, getMembers, getModelMetadata, getOrCreate, getOrCreatePath, getParent, getParentOfType, getPath, getPathParts, getRegisteredModelNames, getRegistryStats, getRelativePath, getRoot, getSnapshot, getTreeStats, getType, getTypeName, getValidationError, hasIdentifier, hasParent, haveSameRoot, identifier, identifierNumber, integer, isAlive, isAncestor, isArrayType, isFrozen, isFrozenType, isIdentifierType, isInstanceOf, isLateType, isLiteralType, isMapType, isModelRegistered, isModelType, isOptionalType, isPrimitiveType, isProtected, isReferenceType, isRoot, isStateTreeNode, isType, isUnionType, isValidReference, isValidSnapshot, joinJsonPath, late, lateModel, literal, map, maybe, maybeNull, model, nullType, nullable, number, onAction, onLifecycleChange, onModelRegistered, onPatch, onSnapshot, optional, printTree, protect, recordActions, recordPatches, reference, refinement, registerModel, resetGlobalStore, resolveIdentifier, resolveModel, resolveModelAsync, resolvePath, safeCreate, safeDynamicReference, safeReference, setGlobalStore, snapshotProcessor, splitJsonPath, string, tryGetParent, tryResolve, tryResolveModel, typecheck, types, undefinedType, unescapeJsonPath, unfreeze, union, unprotect, unregisterModel, walk };
+export { type CustomTypeOptions$1 as CustomTypeOptions, DatePrimitive as Date, type DynamicReferenceOptions, type IActionRecorder, type IActionRecording, type IAnyComplexType, type IAnyMixin, type IAnyModelType, type IAnyType, type IArrayType, type IDisposer, type IEnumerationType, type IFrozenType, type IHistoryEntry, type IIdentifierNumberType, type IIdentifierType, type IJsonPatch, type ILateType, type ILiteralType, type IMSTArray, type IMSTMap, type IMapType, type IMaybeNullType, type IMaybeType, type IMiddlewareEvent, type IMiddlewareHandler, type IMixin, type IModelType, type IOptionalType, type IReferenceType, type IRefinementType, type IReversibleJsonPatch, type ISafeReferenceType, type ISerializedActionCall, type ISimpleType, type IStateTreeNode, type ITimeTravelManager, type IType, type IUndoManager, type IUndoManagerOptions, type IUnionType, type IValidationContext, type IValidationError, type IValidationResult, type Instance, type MixinConfig, type ModelInstance, type ModelProperties, type ModelSelf, type ReferenceOptions, type SnapshotIn, type SnapshotOut, type UnionOptions, addMiddleware, applyAction, applyPatch, applySnapshot, array, boolean, cast, castToReferenceSnapshot, castToSnapshot, cleanupStaleEntries, clearAllRegistries, clearModelRegistry, clone, cloneDeep, cloneFrozen, compose, createActionRecorder, createTimeTravelManager, createUndoManager, createWithDefaults, custom, types as default, destroy, detach, dynamicReference, enumeration, escapeJsonPath, findAll, findFirst, finite, float, flow, freeze, frozen, getDebugInfo, getEnv, getGlobalStore, getIdentifier, getIdentifierAttribute, getMembers, getModelMetadata, getOrCreate, getOrCreatePath, getParent, getParentOfType, getPath, getPathParts, getRegisteredModelNames, getRegistryStats, getRelativePath, getRoot, getSnapshot, getTreeStats, getType, getTypeName, getValidationError, hasIdentifier, hasParent, haveSameRoot, identifier, identifierNumber, integer, isAlive, isAncestor, isArrayType, isFrozen, isFrozenType, isIdentifierType, isInstanceOf, isLateType, isLiteralType, isMapType, isModelRegistered, isModelType, isOptionalType, isPrimitiveType, isProtected, isReferenceType, isRoot, isStateTreeNode, isType, isUnionType, isValidReference, isValidSnapshot, joinJsonPath, late, lateModel, literal, map, maybe, maybeNull, mixin, model, nullType, nullable, number, onAction, onLifecycleChange, onModelRegistered, onPatch, onSnapshot, optional, printTree, protect, recordActions, recordPatches, reference, refinement, registerModel, resetGlobalStore, resolveIdentifier, resolveModel, resolveModelAsync, resolvePath, safeCreate, safeDynamicReference, safeReference, setGlobalStore, snapshotProcessor, splitJsonPath, string, tryGetParent, tryResolve, tryResolveModel, typecheck, types, undefinedType, unescapeJsonPath, unfreeze, union, unprotect, unregisterModel, walk };

package/dist/index.d.ts

@@ -105,6 +105,21 @@ interface IModelType<P extends ModelProperties, V extends object, A extends obje
     beforeDetach(fn: (self: ModelInstance<P, V, A, Vol> & V & A & Vol) => void): IModelType<P, V, A, Vol>;
     /** Add beforeDestroy lifecycle hook (called before node is destroyed) */
     beforeDestroy(fn: (self: ModelInstance<P, V, A, Vol> & V & A & Vol) => void): IModelType<P, V, A, Vol>;
+    /**
+     * Apply a mixin to this model.
+     * The mixin's requirements must be satisfied by this model's properties.
+     *
+     * @example
+     * const Timestamped = types.mixin({
+     *   requires: { createdAt: types.number },
+     *   views: (self) => ({ get formattedDate() { ... } }),
+     * });
+     *
+     * const MyModel = types
+     *   .model({ name: types.string, createdAt: types.number })
+     *   .apply(Timestamped);
+     */
+    apply<RequiredProps extends ModelProperties, MV extends object, MA extends object, MVol extends object>(mixin: IMixin<RequiredProps, MV, MA, MVol>): P extends RequiredProps ? IModelType<P, V & MV, A & MA, Vol & MVol> : never;
 }
 /**
  * MST Array interface that allows both instance types and snapshot/creation types
@@ -243,6 +258,58 @@ interface IReversibleJsonPatch extends IJsonPatch {
 type IAnyType = IType<unknown, unknown, unknown>;
 type IAnyModelType = IModelType<ModelProperties, object, object, object>;
 type IAnyComplexType = IAnyModelType | IArrayType<IAnyType> | IMapType<IAnyType>;
+/**
+ * Extract the full "self" type from a model type.
+ * This includes properties, views, actions, and volatile state.
+ *
+ * @example
+ * const User = types.model({ name: types.string }).views(self => ({ ... }));
+ * type UserSelf = ModelSelf<typeof User>; // includes name + all views
+ */
+type ModelSelf<M> = M extends IModelType<infer P, infer V, infer A, infer Vol> ? ModelInstance<P, V, A, Vol> & V & A & Vol : never;
+/**
+ * Configuration for creating a mixin.
+ * @template RequiredProps - Properties the mixin requires from the base model
+ * @template V - Views the mixin provides
+ * @template A - Actions the mixin provides
+ * @template Vol - Volatile state the mixin provides
+ */
+interface MixinConfig<RequiredProps extends ModelProperties, V extends object = object, A extends object = object, Vol extends object = object> {
+    /** Properties the mixin requires from any model it's applied to */
+    requires?: RequiredProps;
+    /** Views to add to the model */
+    views?: (self: ModelInstanceType<RequiredProps>) => V;
+    /** Actions to add to the model */
+    actions?: (self: ModelInstanceType<RequiredProps> & V) => A;
+    /** Volatile state to add to the model */
+    volatile?: (self: ModelInstanceType<RequiredProps> & V & A) => Vol;
+}
+/**
+ * A mixin that can be applied to models to add views, actions, and volatile state.
+ * Mixins declare what properties they require and what they provide.
+ *
+ * @template RequiredProps - Properties the mixin requires
+ * @template V - Views the mixin provides
+ * @template A - Actions the mixin provides
+ * @template Vol - Volatile state the mixin provides
+ */
+interface IMixin<RequiredProps extends ModelProperties, V extends object = object, A extends object = object, Vol extends object = object> {
+    readonly _kind: "mixin";
+    /** Properties the mixin requires from the base model */
+    readonly requires: RequiredProps;
+    /** Function to create views */
+    readonly views?: (self: ModelInstanceType<RequiredProps>) => V;
+    /** Function to create actions */
+    readonly actions?: (self: ModelInstanceType<RequiredProps> & V) => A;
+    /** Function to create volatile state */
+    readonly volatile?: (self: ModelInstanceType<RequiredProps> & V & A) => Vol;
+    /** Phantom types for inference */
+    readonly _V: V;
+    readonly _A: A;
+    readonly _Vol: Vol;
+}
+/** Any mixin type */
+type IAnyMixin = IMixin<ModelProperties, object, object, object>;
 interface IDisposer {
     (): void;
 }
@@ -302,6 +369,39 @@ declare function model<P extends ModelProperties>(name: string, properties: P):
 declare function model<P extends ModelProperties>(properties: P): IModelType<P, object, object, object>;
 declare function compose<PA extends ModelProperties, PB extends ModelProperties, VA extends object, VB extends object, AA extends object, AB extends object, VolA extends object, VolB extends object>(name: string, a: IModelType<PA, VA, AA, VolA>, b: IModelType<PB, VB, AB, VolB>): IModelType<PA & PB, VA & VB, AA & AB, VolA & VolB>;
 declare function compose<PA extends ModelProperties, PB extends ModelProperties, VA extends object, VB extends object, AA extends object, AB extends object, VolA extends object, VolB extends object>(a: IModelType<PA, VA, AA, VolA>, b: IModelType<PB, VB, AB, VolB>): IModelType<PA & PB, VA & VB, AA & AB, VolA & VolB>;
+/**
+ * Create a type-safe mixin that can be applied to models.
+ *
+ * Mixins declare:
+ * - `requires`: Properties the mixin needs from any model it's applied to
+ * - `views`: Computed views to add
+ * - `actions`: Actions to add
+ * - `volatile`: Volatile (non-serialized) state to add
+ *
+ * @example
+ * ```typescript
+ * // Create a mixin that adds validation capabilities
+ * const Validatable = types.mixin({
+ *   requires: {
+ *     errors: types.array(types.string),
+ *   },
+ *   views: (self) => ({
+ *     get isValid() { return self.errors.length === 0; },
+ *     get hasErrors() { return self.errors.length > 0; },
+ *   }),
+ *   actions: (self) => ({
+ *     clearErrors() { self.errors.clear(); },
+ *     addError(msg: string) { self.errors.push(msg); },
+ *   }),
+ * });
+ *
+ * // Apply to a model
+ * const FormModel = types
+ *   .model({ name: types.string, errors: types.array(types.string) })
+ *   .apply(Validatable);
+ * ```
+ */
+declare function mixin<RequiredProps extends ModelProperties = ModelProperties, V extends object = object, A extends object = object, Vol extends object = object>(config: MixinConfig<RequiredProps, V, A, Vol>): IMixin<RequiredProps, V, A, Vol>;
 
 /**
  * Array type implementation
@@ -1025,6 +1125,7 @@ declare const types: {
     custom: typeof custom;
     model: typeof model;
     compose: typeof compose;
+    mixin: typeof mixin;
     array: typeof array;
     map: typeof map;
     optional: typeof optional;
@@ -1106,4 +1207,4 @@ declare function typecheck<T>(type: {
     is(v: unknown): v is T;
 }, value: unknown): void;
 
-export { type CustomTypeOptions$1 as CustomTypeOptions, DatePrimitive as Date, type DynamicReferenceOptions, type IActionRecorder, type IActionRecording, type IAnyComplexType, type IAnyModelType, type IAnyType, type IArrayType, type IDisposer, type IEnumerationType, type IFrozenType, type IHistoryEntry, type IIdentifierNumberType, type IIdentifierType, type IJsonPatch, type ILateType, type ILiteralType, type IMSTArray, type IMSTMap, type IMapType, type IMaybeNullType, type IMaybeType, type IMiddlewareEvent, type IMiddlewareHandler, type IModelType, type IOptionalType, type IReferenceType, type IRefinementType, type IReversibleJsonPatch, type ISafeReferenceType, type ISerializedActionCall, type ISimpleType, type IStateTreeNode, type ITimeTravelManager, type IType, type IUndoManager, type IUndoManagerOptions, type IUnionType, type IValidationContext, type IValidationError, type IValidationResult, type Instance, type ModelInstance, type ModelProperties, type ReferenceOptions, type SnapshotIn, type SnapshotOut, type UnionOptions, addMiddleware, applyAction, applyPatch, applySnapshot, array, boolean, cast, castToReferenceSnapshot, castToSnapshot, cleanupStaleEntries, clearAllRegistries, clearModelRegistry, clone, cloneDeep, cloneFrozen, compose, createActionRecorder, createTimeTravelManager, createUndoManager, createWithDefaults, custom, types as default, destroy, detach, dynamicReference, enumeration, escapeJsonPath, findAll, findFirst, finite, float, flow, freeze, frozen, getDebugInfo, getEnv, getGlobalStore, getIdentifier, getIdentifierAttribute, getMembers, getModelMetadata, getOrCreate, getOrCreatePath, getParent, getParentOfType, getPath, getPathParts, getRegisteredModelNames, getRegistryStats, getRelativePath, getRoot, getSnapshot, getTreeStats, getType, getTypeName, getValidationError, hasIdentifier, hasParent, haveSameRoot, identifier, identifierNumber, integer, isAlive, isAncestor, isArrayType, isFrozen, isFrozenType, isIdentifierType, isInstanceOf, isLateType, isLiteralType, isMapType, isModelRegistered, isModelType, isOptionalType, isPrimitiveType, isProtected, isReferenceType, isRoot, isStateTreeNode, isType, isUnionType, isValidReference, isValidSnapshot, joinJsonPath, late, lateModel, literal, map, maybe, maybeNull, model, nullType, nullable, number, onAction, onLifecycleChange, onModelRegistered, onPatch, onSnapshot, optional, printTree, protect, recordActions, recordPatches, reference, refinement, registerModel, resetGlobalStore, resolveIdentifier, resolveModel, resolveModelAsync, resolvePath, safeCreate, safeDynamicReference, safeReference, setGlobalStore, snapshotProcessor, splitJsonPath, string, tryGetParent, tryResolve, tryResolveModel, typecheck, types, undefinedType, unescapeJsonPath, unfreeze, union, unprotect, unregisterModel, walk };
+export { type CustomTypeOptions$1 as CustomTypeOptions, DatePrimitive as Date, type DynamicReferenceOptions, type IActionRecorder, type IActionRecording, type IAnyComplexType, type IAnyMixin, type IAnyModelType, type IAnyType, type IArrayType, type IDisposer, type IEnumerationType, type IFrozenType, type IHistoryEntry, type IIdentifierNumberType, type IIdentifierType, type IJsonPatch, type ILateType, type ILiteralType, type IMSTArray, type IMSTMap, type IMapType, type IMaybeNullType, type IMaybeType, type IMiddlewareEvent, type IMiddlewareHandler, type IMixin, type IModelType, type IOptionalType, type IReferenceType, type IRefinementType, type IReversibleJsonPatch, type ISafeReferenceType, type ISerializedActionCall, type ISimpleType, type IStateTreeNode, type ITimeTravelManager, type IType, type IUndoManager, type IUndoManagerOptions, type IUnionType, type IValidationContext, type IValidationError, type IValidationResult, type Instance, type MixinConfig, type ModelInstance, type ModelProperties, type ModelSelf, type ReferenceOptions, type SnapshotIn, type SnapshotOut, type UnionOptions, addMiddleware, applyAction, applyPatch, applySnapshot, array, boolean, cast, castToReferenceSnapshot, castToSnapshot, cleanupStaleEntries, clearAllRegistries, clearModelRegistry, clone, cloneDeep, cloneFrozen, compose, createActionRecorder, createTimeTravelManager, createUndoManager, createWithDefaults, custom, types as default, destroy, detach, dynamicReference, enumeration, escapeJsonPath, findAll, findFirst, finite, float, flow, freeze, frozen, getDebugInfo, getEnv, getGlobalStore, getIdentifier, getIdentifierAttribute, getMembers, getModelMetadata, getOrCreate, getOrCreatePath, getParent, getParentOfType, getPath, getPathParts, getRegisteredModelNames, getRegistryStats, getRelativePath, getRoot, getSnapshot, getTreeStats, getType, getTypeName, getValidationError, hasIdentifier, hasParent, haveSameRoot, identifier, identifierNumber, integer, isAlive, isAncestor, isArrayType, isFrozen, isFrozenType, isIdentifierType, isInstanceOf, isLateType, isLiteralType, isMapType, isModelRegistered, isModelType, isOptionalType, isPrimitiveType, isProtected, isReferenceType, isRoot, isStateTreeNode, isType, isUnionType, isValidReference, isValidSnapshot, joinJsonPath, late, lateModel, literal, map, maybe, maybeNull, mixin, model, nullType, nullable, number, onAction, onLifecycleChange, onModelRegistered, onPatch, onSnapshot, optional, printTree, protect, recordActions, recordPatches, reference, refinement, registerModel, resetGlobalStore, resolveIdentifier, resolveModel, resolveModelAsync, resolvePath, safeCreate, safeDynamicReference, safeReference, setGlobalStore, snapshotProcessor, splitJsonPath, string, tryGetParent, tryResolve, tryResolveModel, typecheck, types, undefinedType, unescapeJsonPath, unfreeze, union, unprotect, unregisterModel, walk };

package/dist/index.js

@@ -967,6 +967,7 @@ __export(index_exports, {
   map: () => map,
   maybe: () => maybe,
   maybeNull: () => maybeNull,
+  mixin: () => mixin,
   model: () => model,
   nullType: () => nullType,
   nullable: () => nullable,
@@ -1710,6 +1711,48 @@ var ModelType = class _ModelType {
       }
     });
   }
+  /**
+   * Apply a mixin to this model.
+   * The mixin's views, actions, and volatile state are added to the model.
+   */
+  apply(mixinDef) {
+    const newViews = [];
+    const newActions = [];
+    const newVolatiles = [];
+    if (mixinDef.views) {
+      const viewsFn = mixinDef.views;
+      newViews.push(
+        (self) => viewsFn(self)
+      );
+    }
+    if (mixinDef.actions) {
+      const actionsFn = mixinDef.actions;
+      newActions.push(
+        (self) => actionsFn(self)
+      );
+    }
+    if (mixinDef.volatile) {
+      const volatileFn = mixinDef.volatile;
+      newVolatiles.push(
+        (self) => volatileFn(
+          self
+        )
+      );
+    }
+    return new _ModelType({
+      ...this.config,
+      views: [...this.config.views, ...newViews],
+      actions: [...this.config.actions, ...newActions],
+      volatiles: [...this.config.volatiles, ...newVolatiles]
+    });
+  }
+  /**
+   * Get the internal config for use by compose
+   * @internal
+   */
+  getConfig() {
+    return this.config;
+  }
 };
 function model(nameOrProperties, maybeProperties) {
   const name = typeof nameOrProperties === "string" ? nameOrProperties : "AnonymousModel";
@@ -1728,10 +1771,44 @@ function compose(...args) {
   const name = typeof args[0] === "string" ? args[0] : "ComposedModel";
   const types2 = typeof args[0] === "string" ? args.slice(1) : args;
   const mergedProperties = {};
+  const mergedViews = [];
+  const mergedActions = [];
+  const mergedVolatiles = [];
+  const mergedInitializers = [];
+  let mergedHooks = {};
   for (const type of types2) {
     Object.assign(mergedProperties, type.properties);
+    if (type instanceof ModelType) {
+      const config = type.getConfig();
+      mergedViews.push(...config.views);
+      mergedActions.push(...config.actions);
+      mergedVolatiles.push(...config.volatiles);
+      mergedInitializers.push(...config.initializers);
+      mergedHooks = { ...mergedHooks, ...config.hooks };
+    }
   }
-  return model(name, mergedProperties);
+  return new ModelType({
+    name,
+    properties: mergedProperties,
+    views: mergedViews,
+    actions: mergedActions,
+    volatiles: mergedVolatiles,
+    initializers: mergedInitializers,
+    hooks: mergedHooks
+  });
+}
+function mixin(config) {
+  return {
+    _kind: "mixin",
+    requires: config.requires ?? {},
+    views: config.views,
+    actions: config.actions,
+    volatile: config.volatile,
+    // Phantom types for inference
+    _V: void 0,
+    _A: void 0,
+    _Vol: void 0
+  };
 }
 
 // src/array.ts
@@ -3353,6 +3430,7 @@ var types = {
   // Model
   model,
   compose,
+  mixin,
   // Collections
   array,
   map,
@@ -3535,6 +3613,7 @@ var index_default = types;
   map,
   maybe,
   maybeNull,
+  mixin,
   model,
   nullType,
   nullable,

package/dist/index.mjs

@@ -756,6 +756,48 @@ var ModelType = class _ModelType {
       }
     });
   }
+  /**
+   * Apply a mixin to this model.
+   * The mixin's views, actions, and volatile state are added to the model.
+   */
+  apply(mixinDef) {
+    const newViews = [];
+    const newActions = [];
+    const newVolatiles = [];
+    if (mixinDef.views) {
+      const viewsFn = mixinDef.views;
+      newViews.push(
+        (self) => viewsFn(self)
+      );
+    }
+    if (mixinDef.actions) {
+      const actionsFn = mixinDef.actions;
+      newActions.push(
+        (self) => actionsFn(self)
+      );
+    }
+    if (mixinDef.volatile) {
+      const volatileFn = mixinDef.volatile;
+      newVolatiles.push(
+        (self) => volatileFn(
+          self
+        )
+      );
+    }
+    return new _ModelType({
+      ...this.config,
+      views: [...this.config.views, ...newViews],
+      actions: [...this.config.actions, ...newActions],
+      volatiles: [...this.config.volatiles, ...newVolatiles]
+    });
+  }
+  /**
+   * Get the internal config for use by compose
+   * @internal
+   */
+  getConfig() {
+    return this.config;
+  }
 };
 function model(nameOrProperties, maybeProperties) {
   const name = typeof nameOrProperties === "string" ? nameOrProperties : "AnonymousModel";
@@ -774,10 +816,44 @@ function compose(...args) {
   const name = typeof args[0] === "string" ? args[0] : "ComposedModel";
   const types2 = typeof args[0] === "string" ? args.slice(1) : args;
   const mergedProperties = {};
+  const mergedViews = [];
+  const mergedActions = [];
+  const mergedVolatiles = [];
+  const mergedInitializers = [];
+  let mergedHooks = {};
   for (const type of types2) {
     Object.assign(mergedProperties, type.properties);
+    if (type instanceof ModelType) {
+      const config = type.getConfig();
+      mergedViews.push(...config.views);
+      mergedActions.push(...config.actions);
+      mergedVolatiles.push(...config.volatiles);
+      mergedInitializers.push(...config.initializers);
+      mergedHooks = { ...mergedHooks, ...config.hooks };
+    }
   }
-  return model(name, mergedProperties);
+  return new ModelType({
+    name,
+    properties: mergedProperties,
+    views: mergedViews,
+    actions: mergedActions,
+    volatiles: mergedVolatiles,
+    initializers: mergedInitializers,
+    hooks: mergedHooks
+  });
+}
+function mixin(config) {
+  return {
+    _kind: "mixin",
+    requires: config.requires ?? {},
+    views: config.views,
+    actions: config.actions,
+    volatile: config.volatile,
+    // Phantom types for inference
+    _V: void 0,
+    _A: void 0,
+    _Vol: void 0
+  };
 }
 
 // src/array.ts
@@ -2399,6 +2475,7 @@ var types = {
   // Model
   model,
   compose,
+  mixin,
   // Collections
   array,
   map,
@@ -2581,6 +2658,7 @@ export {
   map,
   maybe,
   maybeNull,
+  mixin,
   model,
   nullType,
   nullable,

package/package.json

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