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

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";var $=Object.defineProperty;var B=(r,t,e)=>t in r?$(r,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[t]=e;var n=(r,t,e)=>B(r,typeof t!="symbol"?t+"":t,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("vue");class K 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 L extends u{constructor(t,e){super(`Unexpected AbortError for the action ${t} in state ${e}`),this.name=this.constructor.name}}const T=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){n(this,"name");n(this,"_state",s.possibleState.ready);n(this,"_value",null);n(this,"_args",null);this._model=t,this.actionFunction=e,this.modelGetter=o;const i=e.name;if(!(i in this._model&&typeof this._model[i]=="function"))throw new u(`Model does not contain method ${i}`);if(typeof e[s.actionFlag]!="function")throw new u(`Method ${i} is not action`);this.name=i}static create(t,e,o){return h.shallowReactive(new s(t,e,o))}toString(){return this.name}get owner(){return this.modelGetter()}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 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 a=this.actionFunction[s.actionFlag].apply(this._model,e);if(!(a instanceof Promise))return this.state=s.possibleState.ready,Promise.resolve();const d=a.then(()=>{this.ready()}).catch(c=>{if(c instanceof u||c instanceof RangeError||c instanceof ReferenceError||c instanceof SyntaxError||c instanceof TypeError||c instanceof URIError||c instanceof EvalError)throw c;const y=T(c);if(y&&!this.is(s.possibleState.pending,s.possibleState.lock))throw new L(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 K(this.name,{cause:c}))});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()}};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 l=s;const D=Proxy;function I(r){if(!(r instanceof g))throw new Error("ProtoModel instance is required");return new D(h.shallowReactive(r),{get(e,o,i){const a=Reflect.get(e,o,i),d=typeof a=="function";return d&&l.actionFlag in a&&typeof a[l.actionFlag]=="function"?e.action(a):d?a.bind(e):a}})}const p=Symbol("scope"),S=Symbol("model"),A=Symbol("actions"),v=Symbol("actionIds"),w=Symbol("actionStates"),E=Symbol("actionsSize"),f=Symbol("watchStopHandlers");var k,M,P,R,C,x,F;F=p,x=S,C=A,R=v,P=w,M=E,k=f;const m=class m{constructor(){n(this,F,h.effectScope(!0));n(this,x,null);n(this,C,new WeakMap);n(this,R,new WeakMap);n(this,P,new Map);n(this,M,0);n(this,k,new Set)}static model(...t){if(this.prototype===m.prototype)throw new Error("ProtoModel is abstract class and can not be instantiated");const e=new this(...t),o=m.createModel(e);return e[S]=o,o}get hasPendingActions(){return!!this.getActionStatesRef(l.possibleState.pending).value}get hasActionWithError(){return!!this.getActionStatesRef(l.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(()=>h.watchEffect(t[0])):this[p].run(()=>h.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(()=>h.computed(t,e))}updateBit(t,e,o){const i=o?1:0,a=~(1<<e);return t&a|i<<e}createAction(t){const e=()=>{if(!this[S])throw new Error("Model not set");return this[S]},o=l.create(this,t,e);return this[A].set(t,o),this[v].set(o,++this[E]),this.setActionState(o),o}getActionStatesRef(t){const e=this[w].get(t)||h.ref(0);return this[w].get(t)===void 0&&this[w].set(t,e),e}action(t){if(!(l.actionFlag in t&&typeof t[l.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()}};n(m,"createModel",I);let g=m;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(...i){return this.action(o[e]).exec(...i)}};return o[e][l.actionFlag]=r,o[e]}exports.ActionError=K;exports.ActionInternalError=u;exports.ActionStatusConflictError=b;exports.ActionUnexpectedAbortError=L;exports.ProtoModel=g;exports.action=O;
+"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,42 +6,17 @@ import { Ref } from 'vue';
 import { ShallowReactive } from 'vue';
 import { WatchStopHandle } from 'vue';
 
-export declare type Action<T extends ProtoModel, Args extends any[] = unknown[]> = Omit<ActionInner<T, Args>, 'call'>;
-
-export declare function action<T extends ProtoModel, Args extends unknown[]>(originalMethod: (this: T, ...args: Args) => Promise<void>, context: ClassMethodDecoratorContext<T, (this: T, ...args: Args) => Promise<void>>): OriginalMethodWrapper<Args>;
-
-/**
- * IMPORTANT: this class looks like error,
- * but it is an exception in the correct terminology "errors vs exceptions".
- *
- * In other words, this is a class of errors that must be handled
- * and displayed to the user as messages in UI layer.
- */
-export declare class ActionError extends Error {
-    protected actionName: string;
-    protected options: {
-        cause: Error;
-    };
-    constructor(actionName: string, options: {
-        cause: Error;
-    });
-    get cause(): Error;
-    throwCause(): void;
-    toString(): string;
-}
-
-declare const actionIdsKey: unique symbol;
-
 /**
  * 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 ActionInner<T extends ProtoModel, Args extends any[] = unknown[]> {
+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 modelGetter: () => Model<T>;
+    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";
@@ -55,11 +30,10 @@ declare class ActionInner<T extends ProtoModel, Args extends any[] = unknown[]>
     protected _state: ActionStateName;
     protected _value: ActionValue;
     protected _args: Args | null;
-    constructor(_model: T, // TODO: thing about this arg, it may be potential problem
-    actionFunction: OriginalMethodWrapper<Args>, modelGetter: () => Model<T>);
-    static create<T extends ProtoModel, Args extends unknown[] = unknown[]>(model: T, actionFunction: OriginalMethodWrapper<Args>, modelGetter: () => Model<T>): ActionInner<T, 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(): Model<T>;
+    get owner(): Owner;
     get possibleStates(): ActionStateName[];
     get state(): ActionStateName;
     protected set state(newState: ActionStateName);
@@ -86,6 +60,30 @@ declare class ActionInner<T extends ProtoModel, Args extends any[] = unknown[]>
     resetError(): this;
 }
 
+export declare function action<T extends ProtoModel, Args extends unknown[]>(originalMethod: (this: T, ...args: Args) => Promise<void>, context: ClassMethodDecoratorContext<T, (this: T, ...args: Args) => Promise<void>>): OriginalMethodWrapper<Args>;
+
+/**
+ * IMPORTANT: this class looks like error,
+ * but it is an exception in the correct terminology "errors vs exceptions".
+ *
+ * In other words, this is a class of errors that must be handled
+ * and displayed to the user as messages in UI layer.
+ */
+export declare class ActionError extends Error {
+    protected actionName: string;
+    protected options: {
+        cause: Error;
+    };
+    constructor(actionName: string, options: {
+        cause: Error;
+    });
+    get cause(): Error;
+    throwCause(): void;
+    toString(): string;
+}
+
+declare const actionIdsKey: unique symbol;
+
 /**
  * IMPORTANT: this class is an error in the correct terminology "errors vs exceptions".
  *
@@ -104,6 +102,34 @@ 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;
@@ -113,7 +139,7 @@ declare const actionsKey: unique symbol;
 
 declare const actionsSizeKey: unique symbol;
 
-export declare type ActionStateName = keyof typeof ActionInner.possibleState;
+export declare type ActionStateName = keyof typeof Action.possibleState;
 
 declare const actionStatesKey: unique symbol;
 
@@ -154,15 +180,15 @@ declare type ActionValue = ActionPendingValue | ActionError | null;
  */
 declare function createModel<Target extends ProtoModel>(protoModel: Target): Model<Target>;
 
-export declare type Model<T extends ProtoModel> = {
-    [K in keyof T]: T[K] extends ((...args: infer Args) => Promise<void>) ? Action<T, 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;
 
@@ -170,7 +196,7 @@ export declare type OriginalMethod = (...args: any[]) => Promise<void>;
 
 export declare interface OriginalMethodWrapper<Args extends any[] = unknown[]> {
     (...args: Args): Promise<void>;
-    [ActionInner.actionFlag]: OriginalMethod;
+    [Action.actionFlag]: OriginalMethod;
 }
 
 export declare type ProtectedMethodInModel = 'action' | 'setActionState';
@@ -178,9 +204,9 @@ export declare type ProtectedMethodInModel = 'action' | 'setActionState';
 export declare abstract class ProtoModel {
     protected [scopeKey]: EffectScope;
     protected [modelKey]: Model<this> | null;
-    protected [actionsKey]: WeakMap<OriginalMethodWrapper<unknown[]>, ShallowReactive<Action<this>>>;
-    protected [actionIdsKey]: WeakMap<ShallowReactive<Action<this>>, number>;
-    protected [actionStatesKey]: Map<"error" | "abort" | "lock" | "pending" | "ready", Ref<number>>;
+    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;
@@ -253,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<Action<this>>;
+    protected createAction(actionFunction: OriginalMethodWrapper): SrActionLike<Model<this>>;
     protected getActionStatesRef(stateName: ActionStateName): Ref<number>;
     /**
      * Gets Action instance by wrapped original method or create Action instance.
@@ -298,20 +324,26 @@ export declare abstract class ProtoModel {
      * @param originalMethod - defined as OriginalMethod or OriginalMethodWrapper.
      * @returns action
      */
-    protected action(originalMethod: OriginalMethod | OriginalMethodWrapper): ShallowReactive<Action<this>>;
+    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<this>): 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 K = Object.defineProperty;
-var L = (r, t, e) => t in r ? K(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e;
-var n = (r, t, e) => L(r, typeof t != "symbol" ? t + "" : t, e);
-import { shallowReactive as F, effectScope as $, watchEffect as B, watch as D, computed as T, ref as H } from "vue";
-class I 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,43 +16,43 @@ class I 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 b 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 O 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 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) {
-    n(this, "name");
-    n(this, "_state", s.possibleState.ready);
-    n(this, "_value", null);
-    n(this, "_args", null);
-    this._model = t, this.actionFunction = e, this.modelGetter = o;
-    const i = e.name;
-    if (!(i in this._model && typeof this._model[i] == "function"))
-      throw new l(`Model does not contain method ${i}`);
+  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 ${i} is not action`);
-    this.name = i;
+      throw new u(`Method ${n} is not action`);
+    this.name = n;
   }
-  static create(t, e, o) {
-    return F(new s(t, e, o));
+  static create(t, e, o, c) {
+    return F(new s(t, e, o, c));
   }
   toString() {
     return this.name;
   }
   get owner() {
-    return this.modelGetter();
+    return this.ownerGetter();
   }
   get possibleStates() {
     return Object.values(s.possibleState);
@@ -61,7 +61,8 @@ const j = (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;
@@ -110,15 +111,15 @@ const j = (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 a = this.actionFunction[s.actionFlag].apply(this._model, e);
-    if (!(a 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 = a.then(() => {
+    const l = n.then(() => {
       this.ready();
-    }).catch((c) => {
-      if (c instanceof l || c instanceof RangeError || c instanceof ReferenceError || c instanceof SyntaxError || c instanceof TypeError || c instanceof URIError || c instanceof EvalError)
-        throw c;
-      const w = j(c);
+    }).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 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) {
@@ -129,12 +130,12 @@ const j = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
         this.state = s.possibleState.abort;
         return;
       }
-      this.setError(new I(this.name, { cause: c }));
+      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
@@ -176,13 +177,13 @@ const j = (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"));
+}), i(s, "abortedByLock", Symbol("lock"));
 let h = s;
 const z = Proxy;
 function G(r) {
@@ -191,29 +192,29 @@ function G(r) {
   return new z(
     F(r),
     {
-      get(e, o, i) {
-        const a = Reflect.get(e, o, i), u = typeof a == "function";
-        return u && h.actionFlag in a && typeof a[h.actionFlag] == "function" ? e.action(a) : u ? a.bind(e) : a;
+      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 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, P, R, C, x;
-x = d, C = m, R = g, P = y, M = S, E = v, k = p;
+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, x, $(!0));
-    n(this, C, null);
+    i(this, x, L(!0));
+    i(this, R, null);
     // we use WeakMap to store actions as keys to avoid memory leaks
-    n(this, R, /* @__PURE__ */ new WeakMap());
-    n(this, P, /* @__PURE__ */ new WeakMap());
-    n(this, M, /* @__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, E, 0);
+    i(this, E, 0);
     // watchers are stored in a set to avoid memory leaks
-    n(this, k, /* @__PURE__ */ new Set());
+    i(this, k, /* @__PURE__ */ new Set());
   }
   /**
    * Creates a model instance.
@@ -293,7 +294,7 @@ const f = class f {
   watch(...t) {
     if (t.length === 0)
       throw new Error("watch requires at least one argument");
-    const e = t.length === 1 ? this[d].run(() => B(t[0])) : this[d].run(() => D(...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[p].add(e), () => {
@@ -301,23 +302,28 @@ const f = class f {
     };
   }
   computed(t, e) {
-    return this[d].run(() => T(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 i = o ? 1 : 0, a = ~(1 << e);
-    return t & a | i << e;
+    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);
+    }, 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[S].get(t) || H(0);
+    const e = this[S].get(t) || T(0);
     return this[S].get(t) === void 0 && this[S].set(t, e), e;
   }
   /**
@@ -365,7 +371,7 @@ const f = class f {
   */
   action(t) {
     if (!(h.actionFlag in t && typeof t[h.actionFlag] == "function"))
-      throw new l("Action decorator is not applied to the method");
+      throw new u("Action decorator is not applied to the method");
     return this[g].get(t) || this.createAction(t);
   }
   /**
@@ -391,7 +397,7 @@ const f = class f {
     }), this[p] = /* @__PURE__ */ new Set(), this[d].stop();
   }
 };
-n(f, "createModel", G);
+i(f, "createModel", G);
 let A = f;
 function V(r, t) {
   if (t.static)
@@ -402,15 +408,15 @@ function V(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(...i) {
-      return this.action(o[e]).exec(...i);
+    [e]: function(...c) {
+      return this.action(o[e]).exec(...c);
     }
   };
   return o[e][h.actionFlag] = r, o[e];
 }
 export {
-  I as ActionError,
-  l as ActionInternalError,
+  H as ActionError,
+  u as ActionInternalError,
   b as ActionStatusConflictError,
   O as ActionUnexpectedAbortError,
   A as ProtoModel,

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@vue-modeler/model",
-  "version": "2.2.0-beta.1",
+  "version": "2.2.0-beta.2",
   "description": "A state management library based on models for Vue.js",
   "author": "abratko",
   "license": "MIT",