@vue-modeler/model 2.1.1-beta.1 → 2.2.0-beta.2

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";var m=Object.defineProperty;var A=(r,t,e)=>t in r?m(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e;var n=(r,t,e)=>A(r,typeof t!="symbol"?t+"":t,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("vue");class w extends Error{constructor(t,e){super(e.cause.message),this.actionName=t,this.options=e,this.name=this.constructor.name}get cause(){return this.options.cause}throwCause(){throw this.cause}toString(){return this.options.cause.message}}class u extends Error{constructor(t,e){super(t,e),this.message=t,this.options=e,this.name=this.constructor.name}}class p extends u{constructor(t,e,o){super(`Trying to update state of ${t} from ${e} to ${o}`),this.name=this.constructor.name}}class g extends u{constructor(t,e){super(`Unexpected AbortError for the action ${t} in state ${e}`),this.name=this.constructor.name}}const y=r=>r instanceof DOMException&&r.name==="AbortError"||typeof r=="object"&&r!==null&&"message"in r&&r.message==="canceled",s=class s{constructor(t,e){n(this,"name");n(this,"_state",s.possibleState.ready);n(this,"_value",null);n(this,"_args",null);this.model=t,this.actionFunction=e;const o=e.name;if(!(o in t&&typeof t[o]=="function"))throw new u(`Model does not contain method ${o}`);if(typeof e[s.actionFlag]!="function")throw new u(`Method ${o} is not action`);this.name=o}toString(){return this.name}get possibleStates(){return Object.values(s.possibleState)}get state(){return this._state}set state(t){this._state=t,this.model.setActionState(this)}get abortController(){return this.isPending?this._value.abortController:null}get args(){return this._args||[]}get promise(){return this.isPending?this._value.promise:null}get error(){return this.isError?this._value:null}get abortReason(){return this.isAbort?this._value.abortController.signal.reason:null}get isPending(){return this.state===s.possibleState.pending}get isError(){return this.state===s.possibleState.error}get isReady(){return this.state===s.possibleState.ready}get isLock(){return this.state===s.possibleState.lock}get isAbort(){return this.state===s.possibleState.abort}is(...t){return!!t.find(e=>this.state===e)}exec(...t){if(this.is(s.possibleState.lock,s.possibleState.pending))throw new p(this.name,this.state,s.possibleState.pending);const e=[...t];let o=t.length&&t[t.length-1];o instanceof AbortController||(o=new AbortController,e.push(o)),this.state=s.possibleState.pending,this._args=t;const i=this.actionFunction[s.actionFlag].apply(this.model,e);if(!(i instanceof Promise))return this.state=s.possibleState.ready,Promise.resolve();const d=i.then(()=>{this.ready()}).catch(a=>{if(a instanceof u||a instanceof RangeError||a instanceof ReferenceError||a instanceof SyntaxError||a instanceof TypeError||a instanceof URIError||a instanceof EvalError)throw a;const S=y(a);if(S&&!this.is(s.possibleState.pending,s.possibleState.lock))throw new g(this.name,this.state);if(S&&this._value.abortController instanceof AbortController&&this._value.abortController.signal.reason===s.abortedByLock){this.state=s.possibleState.lock,this._value=null;return}if(S){this.state=s.possibleState.abort;return}this.setError(new w(this.name,{cause:a}))});return this._value={promise:d,abortController:o},d}abort(t){return this.isPending?(this._value.abortController.abort(t),this._value.promise):Promise.resolve()}lock(){return this.isPending?this.abort(s.abortedByLock):(this.state=s.possibleState.lock,this._value=null,Promise.resolve())}unlock(){if(!this.isLock)throw new p(this.name,this.state,s.possibleState.ready);return this.ready()}setError(t){if(!this.isPending)throw new p(this.name,this.state,s.possibleState.error);return this.state=s.possibleState.error,this._value=t,this}ready(){return this.state=s.possibleState.ready,this}resetError(){if(!this.error)throw new p(this.name,this.state,s.possibleState.ready);return this.ready()}};n(s,"actionFlag",Symbol("__action_original_method__")),n(s,"possibleState",{pending:"pending",error:"error",lock:"lock",ready:"ready",abort:"abort"}),n(s,"abortedByLock",Symbol("lock"));let c=s;const v=Proxy;function E(r){if(!(r instanceof b))throw new Error("ProtoModel instance is required");return new v(l.shallowReactive(r),{get(e,o,h){const i=Reflect.get(e,o,h),d=typeof i=="function";return d&&c.actionFlag in i&&typeof i[c.actionFlag]=="function"?e.action(i):d?i.bind(e):i}})}const f=class f{constructor(){n(this,"_effectScope",l.effectScope(!0));n(this,"_actions",new WeakMap);n(this,"_actionIds",new WeakMap);n(this,"_actionStates",new Map);n(this,"_actionsSize",0);n(this,"_watchStopHandlers",new Set)}static model(...t){if(this.prototype===f.prototype)throw new Error("ProtoModel is abstract class and can not be instantiated");const e=new this(...t);return f.createModel(e)}get hasPendingActions(){return!!this.getActionStatesRef(c.possibleState.pending).value}get hasActionWithError(){return!!this.getActionStatesRef(c.possibleState.error).value}watch(...t){if(t.length===0)throw new Error("watch requires at least one argument");const e=t.length===1?this._effectScope.run(()=>l.watchEffect(t[0])):this._effectScope.run(()=>l.watch(...t));if(!e)throw new Error("watchStopHandler is undefined");return this._watchStopHandlers.add(e),()=>{e(),this._watchStopHandlers.delete(e)}}computed(t,e){return this._effectScope.run(()=>l.computed(t,e))}updateBit(t,e,o){const h=o?1:0,i=~(1<<e);return t&i|h<<e}createAction(t){const e=l.shallowReactive(new c(this,t));return this._actions.set(t,e),this._actionIds.set(e,++this._actionsSize),this.setActionState(e),e}getActionStatesRef(t){const e=this._actionStates.get(t)||l.ref(0);return this._actionStates.get(t)===void 0&&this._actionStates.set(t,e),e}action(t){if(!(c.actionFlag in t&&typeof t[c.actionFlag]=="function"))throw new u("Action decorator is not applied to the method");return this._actions.get(t)||this.createAction(t)}setActionState(t){const e=this._actionIds.get(t);if(!e)throw new Error("Action not found");for(const o of t.possibleStates)o!==t.state&&(this.getActionStatesRef(o).value=this.updateBit(this.getActionStatesRef(o).value,e,!1));this.getActionStatesRef(t.state).value=this.updateBit(this.getActionStatesRef(t.state).value,e,!0)}isModelOf(t){return this instanceof t}destructor(){this._watchStopHandlers.forEach(t=>{t()}),this._watchStopHandlers=new Set,this._effectScope.stop()}};n(f,"createModel",E);let b=f;function k(r,t){if(t.static)throw new Error("Action decorator is not supported for static methods");if(t.private)throw new Error("Action decorator is not supported for private methods");const e=t.name.toString(),o={[e]:function(...h){return this.action(o[e]).exec(...h)}};return o[e][c.actionFlag]=r,o[e]}exports.ActionError=w;exports.ActionInternalError=u;exports.ActionStatusConflictError=p;exports.ActionUnexpectedAbortError=g;exports.ProtoModel=b;exports.action=k;
+"use strict";var L=Object.defineProperty;var $=(r,t,e)=>t in r?L(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e;var i=(r,t,e)=>$(r,typeof t!="symbol"?t+"":t,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("vue");class I extends Error{constructor(t,e){super(e.cause.message),this.actionName=t,this.options=e,this.name=this.constructor.name}get cause(){return this.options.cause}throwCause(){throw this.cause}toString(){return this.options.cause.message}}class u extends Error{constructor(t,e){super(t,e),this.message=t,this.options=e,this.name=this.constructor.name}}class b extends u{constructor(t,e,o){super(`Trying to update state of ${t} from ${e} to ${o}`),this.name=this.constructor.name}}class K extends u{constructor(t,e){super(`Unexpected AbortError for the action ${t} in state ${e}`),this.name=this.constructor.name}}const B=r=>r instanceof DOMException&&r.name==="AbortError"||typeof r=="object"&&r!==null&&"message"in r&&r.message==="canceled",s=class s{constructor(t,e,o,c){i(this,"name");i(this,"_state",s.possibleState.ready);i(this,"_value",null);i(this,"_args",null);this._model=t,this.actionFunction=e,this.ownerGetter=o,this.setStateCb=c;const n=e.name;if(!(n in this._model&&typeof this._model[n]=="function"))throw new u(`Model does not contain method ${n}`);if(typeof e[s.actionFlag]!="function")throw new u(`Method ${n} is not action`);this.name=n}static create(t,e,o,c){return l.shallowReactive(new s(t,e,o,c))}toString(){return this.name}get owner(){return this.ownerGetter()}get possibleStates(){return Object.values(s.possibleState)}get state(){return this._state}set state(t){const e=this._state;this._state=t,this.setStateCb&&this.setStateCb(this,e,t)}get abortController(){return this.isPending?this._value.abortController:null}get args(){return this._args||[]}get promise(){return this.isPending?this._value.promise:null}get error(){return this.isError?this._value:null}get abortReason(){return this.isAbort?this._value.abortController.signal.reason:null}get isPending(){return this.state===s.possibleState.pending}get isError(){return this.state===s.possibleState.error}get isReady(){return this.state===s.possibleState.ready}get isLock(){return this.state===s.possibleState.lock}get isAbort(){return this.state===s.possibleState.abort}is(...t){return!!t.find(e=>this.state===e)}exec(...t){if(this.is(s.possibleState.lock,s.possibleState.pending))throw new b(this.name,this.state,s.possibleState.pending);const e=[...t];let o=t.length&&t[t.length-1];o instanceof AbortController||(o=new AbortController,e.push(o)),this.state=s.possibleState.pending,this._args=t;const n=this.actionFunction[s.actionFlag].apply(this._model,e);if(!(n instanceof Promise))return this.state=s.possibleState.ready,Promise.resolve();const d=n.then(()=>{this.ready()}).catch(a=>{if(a instanceof u||a instanceof RangeError||a instanceof ReferenceError||a instanceof SyntaxError||a instanceof TypeError||a instanceof URIError||a instanceof EvalError)throw a;const y=B(a);if(y&&!this.is(s.possibleState.pending,s.possibleState.lock))throw new K(this.name,this.state);if(y&&this._value.abortController instanceof AbortController&&this._value.abortController.signal.reason===s.abortedByLock){this.state=s.possibleState.lock,this._value=null;return}if(y){this.state=s.possibleState.abort;return}this.setError(new I(this.name,{cause:a}))});return this._value={promise:d,abortController:o},d}abort(t){return this.isPending?(this._value.abortController.abort(t),this._value.promise):Promise.resolve()}lock(){return this.isPending?this.abort(s.abortedByLock):(this.state=s.possibleState.lock,this._value=null,Promise.resolve())}unlock(){if(!this.isLock)throw new b(this.name,this.state,s.possibleState.ready);return this.ready()}setError(t){if(!this.isPending)throw new b(this.name,this.state,s.possibleState.error);return this.state=s.possibleState.error,this._value=t,this}ready(){return this.state=s.possibleState.ready,this}resetError(){if(!this.error)throw new b(this.name,this.state,s.possibleState.ready);return this.ready()}};i(s,"actionFlag",Symbol("__action_original_method__")),i(s,"possibleState",{pending:"pending",error:"error",lock:"lock",ready:"ready",abort:"abort"}),i(s,"abortedByLock",Symbol("lock"));let h=s;const T=Proxy;function D(r){if(!(r instanceof g))throw new Error("ProtoModel instance is required");return new T(l.shallowReactive(r),{get(e,o,c){const n=Reflect.get(e,o,c),d=typeof n=="function";return d&&h.actionFlag in n&&typeof n[h.actionFlag]=="function"?e.action(n):d?n.bind(e):n}})}const p=Symbol("scope"),m=Symbol("model"),A=Symbol("actions"),v=Symbol("actionIds"),w=Symbol("actionStates"),E=Symbol("actionsSize"),f=Symbol("watchStopHandlers");var k,M,P,C,R,x,F;F=p,x=m,R=A,C=v,P=w,M=E,k=f;const S=class S{constructor(){i(this,F,l.effectScope(!0));i(this,x,null);i(this,R,new WeakMap);i(this,C,new WeakMap);i(this,P,new Map);i(this,M,0);i(this,k,new Set)}static model(...t){if(this.prototype===S.prototype)throw new Error("ProtoModel is abstract class and can not be instantiated");const e=new this(...t),o=S.createModel(e);return e[m]=o,o}get hasPendingActions(){return!!this.getActionStatesRef(h.possibleState.pending).value}get hasActionWithError(){return!!this.getActionStatesRef(h.possibleState.error).value}watch(...t){if(t.length===0)throw new Error("watch requires at least one argument");const e=t.length===1?this[p].run(()=>l.watchEffect(t[0])):this[p].run(()=>l.watch(...t));if(!e)throw new Error("watchStopHandler is undefined");return this[f].add(e),()=>{e(),this[f].delete(e)}}computed(t,e){return this[p].run(()=>l.computed(t,e))}updateBit(t,e,o){const c=o?1:0,n=~(1<<e);return t&n|c<<e}createAction(t){const e=()=>{if(!this[m])throw new Error("Model not set");return this[m]},o=h.create(this,t,e,this.setActionState.bind(this));return this[A].set(t,o),this[v].set(o,++this[E]),this.setActionState(o),o}getActionStatesRef(t){const e=this[w].get(t)||l.ref(0);return this[w].get(t)===void 0&&this[w].set(t,e),e}action(t){if(!(h.actionFlag in t&&typeof t[h.actionFlag]=="function"))throw new u("Action decorator is not applied to the method");return this[A].get(t)||this.createAction(t)}setActionState(t){const e=this[v].get(t);if(!e)throw new Error("Action not found");for(const o of t.possibleStates)o!==t.state&&(this.getActionStatesRef(o).value=this.updateBit(this.getActionStatesRef(o).value,e,!1));this.getActionStatesRef(t.state).value=this.updateBit(this.getActionStatesRef(t.state).value,e,!0)}isModelOf(t){return this instanceof t}destructor(){this[f].forEach(t=>{t()}),this[f]=new Set,this[p].stop()}};i(S,"createModel",D);let g=S;function O(r,t){if(t.static)throw new Error("Action decorator is not supported for static methods");if(t.private)throw new Error("Action decorator is not supported for private methods");const e=t.name.toString(),o={[e]:function(...c){return this.action(o[e]).exec(...c)}};return o[e][h.actionFlag]=r,o[e]}exports.ActionError=I;exports.ActionInternalError=u;exports.ActionStatusConflictError=b;exports.ActionUnexpectedAbortError=K;exports.ProtoModel=g;exports.action=O;

package/dist/index.d.ts

@@ -6,9 +6,17 @@ import { Ref } from 'vue';
 import { ShallowReactive } from 'vue';
 import { WatchStopHandle } from 'vue';
 
-declare class Action<Args extends any[] = unknown[]> {
-    protected model: ProtoModel;
+/**
+ * We should to use here `<T extends ProtoModel>` because
+ * we need some methods from `ProtoModel` class which are protected in context of `Model<T>`.
+ * For example, `setActionState` method.
+ * @see `ProtoModel.setActionState`
+ */
+declare class Action<T extends object, Args extends any[] = unknown[], Owner extends object = Model<T>> implements ActionLike<Owner, Args> {
+    protected _model: T;
     protected actionFunction: OriginalMethodWrapper<Args>;
+    protected ownerGetter: () => Owner;
+    protected setStateCb?: ((action: SrActionLike<Owner, Args>, oldState: ActionStateName, newState: ActionStateName) => void) | undefined;
     static readonly actionFlag: unique symbol;
     static readonly possibleState: {
         readonly pending: "pending";
@@ -22,9 +30,10 @@ declare class Action<Args extends any[] = unknown[]> {
     protected _state: ActionStateName;
     protected _value: ActionValue;
     protected _args: Args | null;
-    constructor(model: ProtoModel, // TODO: thing about this arg, it may be potential problem
-    actionFunction: OriginalMethodWrapper<Args>);
+    constructor(_model: T, actionFunction: OriginalMethodWrapper<Args>, ownerGetter: () => Owner, setStateCb?: ((action: SrActionLike<Owner, Args>, oldState: ActionStateName, newState: ActionStateName) => void) | undefined);
+    static create<T extends ProtoModel, Args extends unknown[] = unknown[], Owner extends object = Model<T>>(model: T, actionFunction: OriginalMethodWrapper<Args>, ownerGetter: () => Owner, setStateCb?: (action: SrActionLike<Owner, Args>, oldState: ActionStateName, newState: ActionStateName) => void): SrActionLike<Owner, Args>;
     toString(): string;
+    get owner(): Owner;
     get possibleStates(): ActionStateName[];
     get state(): ActionStateName;
     protected set state(newState: ActionStateName);
@@ -73,6 +82,8 @@ export declare class ActionError extends Error {
     toString(): string;
 }
 
+declare const actionIdsKey: unique symbol;
+
 /**
  * IMPORTANT: this class is an error in the correct terminology "errors vs exceptions".
  *
@@ -91,15 +102,47 @@ export declare class ActionInternalError extends Error {
     } | undefined);
 }
 
+/**
+ * Public API interface for Action instances.
+ * Describes only the public contract without implementation details.
+ */
+declare interface ActionLike<Owner extends object, Args extends any[] = unknown[]> {
+    readonly name: string;
+    readonly owner: Owner;
+    readonly possibleStates: ActionStateName[];
+    readonly state: ActionStateName;
+    readonly abortController: null | AbortController;
+    readonly args: Args | never[];
+    readonly promise: null | Promise<void>;
+    readonly error: null | ActionError;
+    readonly abortReason: unknown;
+    readonly isPending: boolean;
+    readonly isError: boolean;
+    readonly isReady: boolean;
+    readonly isLock: boolean;
+    readonly isAbort: boolean;
+    is(...args: ActionStateName[]): boolean;
+    exec(...args: Args): Promise<void>;
+    abort(reason?: unknown): Promise<void>;
+    lock(): Promise<void>;
+    unlock(): this;
+    resetError(): this;
+    toString(): string;
+}
+
 declare interface ActionPendingValue {
     promise: Promise<void>;
     abortController: AbortController;
 }
 
-export declare type ActionPublic = Omit<Action, 'call'>;
+declare const actionsKey: unique symbol;
+
+declare const actionsSizeKey: unique symbol;
 
 export declare type ActionStateName = keyof typeof Action.possibleState;
 
+declare const actionStatesKey: unique symbol;
+
 export declare class ActionStatusConflictError extends ActionInternalError {
     constructor(actionName: string, currentState: ActionStateName, newState: ActionStateName);
 }
@@ -137,19 +180,21 @@ declare type ActionValue = ActionPendingValue | ActionError | null;
  */
 declare function createModel<Target extends ProtoModel>(protoModel: Target): Model<Target>;
 
-export declare type Model<T> = {
-    [K in keyof T]: T[K] extends ((...args: infer Args) => Promise<void>) ? Action<Args> : K extends ProtectedMethodInModel ? never : T[K];
-};
+export declare type Model<T extends object = object> = ShallowReactive<{
+    [K in keyof T]: T[K] extends ((...args: infer Args) => Promise<void>) ? SrActionLike<T, Args> : K extends ProtectedMethodInModel ? never : T[K];
+}>;
 
 export declare type ModelAdapterProxyConstructor = new <Target extends ProtoModel>(target: Target, handler: ProxyHandler<Target>) => Model<Target>;
 
 export declare type ModelConstructor<T extends new (...args: unknown[]) => unknown> = T extends new (...args: unknown[]) => infer R ? R extends ProtoModel ? T : never : never;
 
-declare type ModelConstructor_2 = new (...args: any[]) => ProtoModel;
+declare type ModelConstructor_2<T extends ProtoModel> = new (...args: any[]) => T;
+
+declare const modelKey: unique symbol;
 
 export declare type OriginalMethod = (...args: any[]) => Promise<void>;
 
-export declare interface OriginalMethodWrapper<Args extends unknown[] = unknown[]> {
+export declare interface OriginalMethodWrapper<Args extends any[] = unknown[]> {
     (...args: Args): Promise<void>;
     [Action.actionFlag]: OriginalMethod;
 }
@@ -157,12 +202,13 @@ export declare interface OriginalMethodWrapper<Args extends unknown[] = unknown[
 export declare type ProtectedMethodInModel = 'action' | 'setActionState';
 
 export declare abstract class ProtoModel {
-    protected _effectScope: EffectScope;
-    protected _actions: WeakMap<OriginalMethodWrapper<unknown[]>, ShallowReactive<ActionPublic>>;
-    protected _actionIds: WeakMap<ShallowReactive<ActionPublic>, number>;
-    protected _actionStates: Map<"error" | "abort" | "lock" | "pending" | "ready", Ref<number>>;
-    protected _actionsSize: number;
-    protected _watchStopHandlers: Set<WatchStopHandle>;
+    protected [scopeKey]: EffectScope;
+    protected [modelKey]: Model<this> | null;
+    protected [actionsKey]: WeakMap<OriginalMethodWrapper<unknown[]>, SrActionLike<Model<this>>>;
+    protected [actionIdsKey]: WeakMap<SrActionLike<Model<this>>, number>;
+    protected [actionStatesKey]: Map<"pending" | "error" | "lock" | "ready" | "abort", Ref<number>>;
+    protected [actionsSizeKey]: number;
+    protected [watchStopHandlersKey]: Set<WatchStopHandle>;
     protected static createModel: typeof createModel;
     /**
      * Creates a model instance.
@@ -233,7 +279,7 @@ export declare abstract class ProtoModel {
     protected watch(...args: unknown[]): WatchStopHandle;
     protected computed<T>(getter: ComputedGetter<T>, debugOptions?: DebuggerOptions): ComputedRef<T>;
     protected updateBit(number: number, bitPosition: number, bitValue: boolean): number;
-    protected createAction(actionFunction: OriginalMethodWrapper): ShallowReactive<ActionPublic>;
+    protected createAction(actionFunction: OriginalMethodWrapper): SrActionLike<Model<this>>;
     protected getActionStatesRef(stateName: ActionStateName): Ref<number>;
     /**
      * Gets Action instance by wrapped original method or create Action instance.
@@ -278,16 +324,26 @@ export declare abstract class ProtoModel {
      * @param originalMethod - defined as OriginalMethod or OriginalMethodWrapper.
      * @returns action
      */
-    protected action(originalMethod: OriginalMethod | OriginalMethodWrapper): ShallowReactive<ActionPublic>;
+    protected action(originalMethod: OriginalMethod | OriginalMethodWrapper): SrActionLike<Model<this>>;
     /**
      * It is public method in context ProtoModel,
      * but in Model<ProtoModel> context it is protected method
      *
      * @see type Model<T>
      */
-    setActionState(action: Action): void;
-    isModelOf(typeModel: ModelConstructor_2): boolean;
+    setActionState(action: SrActionLike<Model<this>>): void;
+    isModelOf<T extends ProtoModel>(typeModel: ModelConstructor_2<T>): boolean;
     destructor(): void;
 }
 
+declare const scopeKey: unique symbol;
+
+/**
+ * Reactive ActionLike type - ActionLike wrapped in ShallowReactive.
+ * This is the type used throughout the codebase for action instances.
+ */
+declare type SrActionLike<Owner extends object, Args extends any[] = unknown[]> = ShallowReactive<ActionLike<Owner, Args>>;
+
+declare const watchStopHandlersKey: unique symbol;
+
 export { }

package/dist/index.js

@@ -1,8 +1,8 @@
-var w = Object.defineProperty;
-var m = (r, t, e) => t in r ? w(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
-var n = (r, t, e) => m(r, typeof t != "symbol" ? t + "" : t, e);
-import { shallowReactive as S, effectScope as g, watchEffect as A, watch as y, computed as v, ref as k } from "vue";
-class E extends Error {
+var I = Object.defineProperty;
+var K = (r, t, e) => t in r ? I(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
+var i = (r, t, e) => K(r, typeof t != "symbol" ? t + "" : t, e);
+import { shallowReactive as F, effectScope as L, watchEffect as $, watch as B, computed as D, ref as T } from "vue";
+class H extends Error {
   constructor(t, e) {
     super(e.cause.message), this.actionName = t, this.options = e, this.name = this.constructor.name;
   }
@@ -16,38 +16,44 @@ class E extends Error {
     return this.options.cause.message;
   }
 }
-class l extends Error {
+class u extends Error {
   constructor(t, e) {
     super(t, e), this.message = t, this.options = e, this.name = this.constructor.name;
   }
 }
-class d extends l {
+class b extends u {
   constructor(t, e, o) {
     super(`Trying to update state of ${t} from ${e} to ${o}`), this.name = this.constructor.name;
   }
 }
-class M extends l {
+class O extends u {
   constructor(t, e) {
     super(`Unexpected AbortError for the action ${t} in state ${e}`), this.name = this.constructor.name;
   }
 }
-const P = (r) => r instanceof DOMException && r.name === "AbortError" || typeof r == "object" && r !== null && "message" in r && r.message === "canceled", s = class s {
-  constructor(t, e) {
-    n(this, "name");
-    n(this, "_state", s.possibleState.ready);
-    n(this, "_value", null);
-    n(this, "_args", null);
-    this.model = t, this.actionFunction = e;
-    const o = e.name;
-    if (!(o in t && typeof t[o] == "function"))
-      throw new l(`Model does not contain method ${o}`);
+const j = (r) => r instanceof DOMException && r.name === "AbortError" || typeof r == "object" && r !== null && "message" in r && r.message === "canceled", s = class s {
+  constructor(t, e, o, c) {
+    i(this, "name");
+    i(this, "_state", s.possibleState.ready);
+    i(this, "_value", null);
+    i(this, "_args", null);
+    this._model = t, this.actionFunction = e, this.ownerGetter = o, this.setStateCb = c;
+    const n = e.name;
+    if (!(n in this._model && typeof this._model[n] == "function"))
+      throw new u(`Model does not contain method ${n}`);
     if (typeof e[s.actionFlag] != "function")
-      throw new l(`Method ${o} is not action`);
-    this.name = o;
+      throw new u(`Method ${n} is not action`);
+    this.name = n;
+  }
+  static create(t, e, o, c) {
+    return F(new s(t, e, o, c));
   }
   toString() {
     return this.name;
   }
+  get owner() {
+    return this.ownerGetter();
+  }
   get possibleStates() {
     return Object.values(s.possibleState);
   }
@@ -55,7 +61,8 @@ const P = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
     return this._state;
   }
   set state(t) {
-    this._state = t, this.model.setActionState(this);
+    const e = this._state;
+    this._state = t, this.setStateCb && this.setStateCb(this, e, t);
   }
   get abortController() {
     return this.isPending ? this._value.abortController : null;
@@ -96,7 +103,7 @@ const P = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
    */
   exec(...t) {
     if (this.is(s.possibleState.lock, s.possibleState.pending))
-      throw new d(
+      throw new b(
         this.name,
         this.state,
         s.possibleState.pending
@@ -104,31 +111,31 @@ const P = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
     const e = [...t];
     let o = t.length && t[t.length - 1];
     o instanceof AbortController || (o = new AbortController(), e.push(o)), this.state = s.possibleState.pending, this._args = t;
-    const i = this.actionFunction[s.actionFlag].apply(this.model, e);
-    if (!(i instanceof Promise))
+    const n = this.actionFunction[s.actionFlag].apply(this._model, e);
+    if (!(n instanceof Promise))
       return this.state = s.possibleState.ready, Promise.resolve();
-    const u = i.then(() => {
+    const l = n.then(() => {
       this.ready();
     }).catch((a) => {
-      if (a instanceof l || a instanceof RangeError || a instanceof ReferenceError || a instanceof SyntaxError || a instanceof TypeError || a instanceof URIError || a instanceof EvalError)
+      if (a instanceof u || a instanceof RangeError || a instanceof ReferenceError || a instanceof SyntaxError || a instanceof TypeError || a instanceof URIError || a instanceof EvalError)
         throw a;
-      const f = P(a);
-      if (f && !this.is(s.possibleState.pending, s.possibleState.lock))
-        throw new M(this.name, this.state);
-      if (f && this._value.abortController instanceof AbortController && this._value.abortController.signal.reason === s.abortedByLock) {
+      const w = j(a);
+      if (w && !this.is(s.possibleState.pending, s.possibleState.lock))
+        throw new O(this.name, this.state);
+      if (w && this._value.abortController instanceof AbortController && this._value.abortController.signal.reason === s.abortedByLock) {
         this.state = s.possibleState.lock, this._value = null;
         return;
       }
-      if (f) {
+      if (w) {
         this.state = s.possibleState.abort;
         return;
       }
-      this.setError(new E(this.name, { cause: a }));
+      this.setError(new H(this.name, { cause: a }));
     });
     return this._value = {
-      promise: u,
+      promise: l,
       abortController: o
-    }, u;
+    }, l;
   }
   // Returns same promise as exec method
   // but in reject state
@@ -141,7 +148,7 @@ const P = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
   }
   unlock() {
     if (!this.isLock)
-      throw new d(
+      throw new b(
         this.name,
         this.state,
         s.possibleState.ready
@@ -150,7 +157,7 @@ const P = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
   }
   setError(t) {
     if (!this.isPending)
-      throw new d(
+      throw new b(
         this.name,
         this.state,
         s.possibleState.error
@@ -162,7 +169,7 @@ const P = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
   }
   resetError() {
     if (!this.error)
-      throw new d(
+      throw new b(
         this.name,
         this.state,
         s.possibleState.ready
@@ -170,40 +177,44 @@ const P = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
     return this.ready();
   }
 };
-n(s, "actionFlag", Symbol("__action_original_method__")), n(s, "possibleState", {
+i(s, "actionFlag", Symbol("__action_original_method__")), i(s, "possibleState", {
   pending: "pending",
   error: "error",
   lock: "lock",
   ready: "ready",
   abort: "abort"
-}), n(s, "abortedByLock", Symbol("lock"));
-let c = s;
-const _ = Proxy;
-function R(r) {
-  if (!(r instanceof b))
+}), i(s, "abortedByLock", Symbol("lock"));
+let h = s;
+const z = Proxy;
+function G(r) {
+  if (!(r instanceof A))
     throw new Error("ProtoModel instance is required");
-  return new _(
-    S(r),
+  return new z(
+    F(r),
     {
-      get(e, o, h) {
-        const i = Reflect.get(e, o, h), u = typeof i == "function";
-        return u && c.actionFlag in i && typeof i[c.actionFlag] == "function" ? e.action(i) : u ? i.bind(e) : i;
+      get(e, o, c) {
+        const n = Reflect.get(e, o, c), l = typeof n == "function";
+        return l && h.actionFlag in n && typeof n[h.actionFlag] == "function" ? e.action(n) : l ? n.bind(e) : n;
       }
     }
   );
 }
-const p = class p {
+const d = Symbol("scope"), m = Symbol("model"), g = Symbol("actions"), y = Symbol("actionIds"), S = Symbol("actionStates"), v = Symbol("actionsSize"), p = Symbol("watchStopHandlers");
+var k, E, M, C, P, R, x;
+x = d, R = m, P = g, C = y, M = S, E = v, k = p;
+const f = class f {
   constructor() {
     // each model has its own effect scope to avoid memory leaks
-    n(this, "_effectScope", g(!0));
+    i(this, x, L(!0));
+    i(this, R, null);
     // we use WeakMap to store actions as keys to avoid memory leaks
-    n(this, "_actions", /* @__PURE__ */ new WeakMap());
-    n(this, "_actionIds", /* @__PURE__ */ new WeakMap());
-    n(this, "_actionStates", /* @__PURE__ */ new Map());
+    i(this, P, /* @__PURE__ */ new WeakMap());
+    i(this, C, /* @__PURE__ */ new WeakMap());
+    i(this, M, /* @__PURE__ */ new Map());
     // WeakMap doesn't have a size property, so we need to store the size of the map
-    n(this, "_actionsSize", 0);
+    i(this, E, 0);
     // watchers are stored in a set to avoid memory leaks
-    n(this, "_watchStopHandlers", /* @__PURE__ */ new Set());
+    i(this, k, /* @__PURE__ */ new Set());
   }
   /**
    * Creates a model instance.
@@ -213,16 +224,16 @@ const p = class p {
    * @see src/create-model.ts
    */
   static model(...t) {
-    if (this.prototype === p.prototype)
+    if (this.prototype === f.prototype)
       throw new Error("ProtoModel is abstract class and can not be instantiated");
-    const e = new this(...t);
-    return p.createModel(e);
+    const e = new this(...t), o = f.createModel(e);
+    return e[m] = o, o;
   }
   get hasPendingActions() {
-    return !!this.getActionStatesRef(c.possibleState.pending).value;
+    return !!this.getActionStatesRef(h.possibleState.pending).value;
   }
   get hasActionWithError() {
-    return !!this.getActionStatesRef(c.possibleState.error).value;
+    return !!this.getActionStatesRef(h.possibleState.error).value;
   }
   /**
    * Registers watcher in the model effect scope.
@@ -283,28 +294,37 @@ const p = class p {
   watch(...t) {
     if (t.length === 0)
       throw new Error("watch requires at least one argument");
-    const e = t.length === 1 ? this._effectScope.run(() => A(t[0])) : this._effectScope.run(() => y(...t));
+    const e = t.length === 1 ? this[d].run(() => $(t[0])) : this[d].run(() => B(...t));
     if (!e)
       throw new Error("watchStopHandler is undefined");
-    return this._watchStopHandlers.add(e), () => {
-      e(), this._watchStopHandlers.delete(e);
+    return this[p].add(e), () => {
+      e(), this[p].delete(e);
     };
   }
   computed(t, e) {
-    return this._effectScope.run(() => v(t, e));
+    return this[d].run(() => D(t, e));
   }
   // @see https://github.com/trekhleb/javascript-algorithms/blob/master/src/algorithms/math/bits/updateBit.js
   updateBit(t, e, o) {
-    const h = o ? 1 : 0, i = ~(1 << e);
-    return t & i | h << e;
+    const c = o ? 1 : 0, n = ~(1 << e);
+    return t & n | c << e;
   }
   createAction(t) {
-    const e = S(new c(this, t));
-    return this._actions.set(t, e), this._actionIds.set(e, ++this._actionsSize), this.setActionState(e), e;
+    const e = () => {
+      if (!this[m])
+        throw new Error("Model not set");
+      return this[m];
+    }, o = h.create(
+      this,
+      t,
+      e,
+      this.setActionState.bind(this)
+    );
+    return this[g].set(t, o), this[y].set(o, ++this[v]), this.setActionState(o), o;
   }
   getActionStatesRef(t) {
-    const e = this._actionStates.get(t) || k(0);
-    return this._actionStates.get(t) === void 0 && this._actionStates.set(t, e), e;
+    const e = this[S].get(t) || T(0);
+    return this[S].get(t) === void 0 && this[S].set(t, e), e;
   }
   /**
    * Gets Action instance by wrapped original method or create Action instance.
@@ -350,9 +370,9 @@ const p = class p {
    * @returns action
   */
   action(t) {
-    if (!(c.actionFlag in t && typeof t[c.actionFlag] == "function"))
-      throw new l("Action decorator is not applied to the method");
-    return this._actions.get(t) || this.createAction(t);
+    if (!(h.actionFlag in t && typeof t[h.actionFlag] == "function"))
+      throw new u("Action decorator is not applied to the method");
+    return this[g].get(t) || this.createAction(t);
   }
   /**
    * It is public method in context ProtoModel,
@@ -361,7 +381,7 @@ const p = class p {
    * @see type Model<T>
    */
   setActionState(t) {
-    const e = this._actionIds.get(t);
+    const e = this[y].get(t);
     if (!e)
       throw new Error("Action not found");
     for (const o of t.possibleStates)
@@ -372,14 +392,14 @@ const p = class p {
     return this instanceof t;
   }
   destructor() {
-    this._watchStopHandlers.forEach((t) => {
+    this[p].forEach((t) => {
       t();
-    }), this._watchStopHandlers = /* @__PURE__ */ new Set(), this._effectScope.stop();
+    }), this[p] = /* @__PURE__ */ new Set(), this[d].stop();
   }
 };
-n(p, "createModel", R);
-let b = p;
-function H(r, t) {
+i(f, "createModel", G);
+let A = f;
+function V(r, t) {
   if (t.static)
     throw new Error("Action decorator is not supported for static methods");
   if (t.private)
@@ -388,17 +408,17 @@ function H(r, t) {
     // Action constructor checks that model has method with the same name.
     // We can`t define anonymous function and change name because Function.name is readonly property.
     // So we need to create stub object to save original method name
-    [e]: function(...h) {
-      return this.action(o[e]).exec(...h);
+    [e]: function(...c) {
+      return this.action(o[e]).exec(...c);
     }
   };
-  return o[e][c.actionFlag] = r, o[e];
+  return o[e][h.actionFlag] = r, o[e];
 }
 export {
-  E as ActionError,
-  l as ActionInternalError,
-  d as ActionStatusConflictError,
-  M as ActionUnexpectedAbortError,
-  b as ProtoModel,
-  H as action
+  H as ActionError,
+  u as ActionInternalError,
+  b as ActionStatusConflictError,
+  O as ActionUnexpectedAbortError,
+  A as ProtoModel,
+  V as action
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@vue-modeler/model",
-  "version": "2.1.1-beta.1",
+  "version": "2.2.0-beta.2",
   "description": "A state management library based on models for Vue.js",
   "author": "abratko",
   "license": "MIT",
@@ -45,7 +45,7 @@
   },
   "scripts": {
     "build": "tsc && vite build",
-    "test": "vitest",
+    "test": "tsc --noEmit && vitest",
     "coverage": "vitest run --coverage",
     "semantic-release": "semantic-release"
   },