@vue-modeler/model 2.2.4 → 2.2.5-beta.2

package/README.md

@@ -1,5 +1,7 @@
 # vue-modeler/model
 
+[![npm version](https://img.shields.io/npm/v/@vue-modeler/model.svg)](https://www.npmjs.com/package/@vue-modeler/model) [![codecov](https://codecov.io/gh/vue-modeler/model/branch/main/graph/badge.svg?token=BFQI22MBZ1)](https://codecov.io/gh/vue-modeler/model)
+
 ## What is @vue-modeler/model
 
 A state management library based on models for [Vue.js](https://vuejs.org/). The extremely simple API serves single purpose — creating models. It preserves types, supports OOP, DRY, and SOLID principles.

package/dist/index.cjs

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

package/dist/index.d.ts

@@ -26,7 +26,7 @@ export declare class Action<T extends object, Args extends any[] = unknown[]> im
         readonly ready: "ready";
         readonly abort: "abort";
     };
-    static abortedByLock: symbol;
+    static readonly abortedByLock: unique symbol;
     readonly name: string;
     protected _state: ActionStateName;
     protected _value: ActionValue;

package/dist/index.js

@@ -1,8 +1,5 @@
-var $ = Object.defineProperty;
-var K = (r, t, e) => t in r ? $(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 B, watch as D, computed as T, ref as H } from "vue";
-class O extends Error {
+import { shallowReactive as y, effectScope as A, watchEffect as E, watch as k, computed as M, ref as C } from "vue";
+class P extends Error {
   constructor(t, e) {
     super(e.cause.message), this.actionName = t, this.options = e, this.name = this.constructor.name;
   }
@@ -16,42 +13,52 @@ class O extends Error {
     return this.options.cause.message;
   }
 }
-class u extends Error {
+class h 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 d extends h {
+  constructor(t, e, r) {
+    super(`Trying to update state of ${t} from ${e} to ${r}`), this.name = this.constructor.name;
   }
 }
-class j extends u {
+class R extends h {
   constructor(t, e) {
     super(`Unexpected AbortError for the action ${t} in state ${e}`), this.name = this.constructor.name;
   }
 }
-const z = (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, h) {
-    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, this._validateArgs = h;
-    const n = e.name;
-    if (!(n in this._model && typeof this._model[n] == "function"))
-      throw new u(`Model does not contain method ${n}`);
+const x = (a) => a instanceof DOMException && a.name === "AbortError" || typeof a == "object" && a !== null && "message" in a && a.message === "canceled";
+class s {
+  constructor(t, e, r, i, c) {
+    this._model = t, this.actionFunction = e, this.ownerGetter = r, this.setStateCb = i, this._validateArgs = c;
+    const o = e.name;
+    if (!(o in this._model && typeof this._model[o] == "function"))
+      throw new h(`Model does not contain method ${o}`);
     if (typeof e[s.actionFlag] != "function")
-      throw new u(`Method ${n} is not action`);
-    this.name = n;
-  }
-  static create(t, e, o, c, h) {
-    return F(new s(
+      throw new h(`Method ${o} is not action`);
+    this.name = o;
+  }
+  static actionFlag = /* @__PURE__ */ Symbol("__action_original_method__");
+  static possibleState = {
+    pending: "pending",
+    error: "error",
+    lock: "lock",
+    ready: "ready",
+    abort: "abort"
+  };
+  static abortedByLock = /* @__PURE__ */ Symbol("lock");
+  name;
+  _state = s.possibleState.ready;
+  _value = null;
+  _args = null;
+  static create(t, e, r, i, c) {
+    return y(new s(
       t,
       e,
-      o,
-      c,
-      h
+      r,
+      i,
+      c
     ));
   }
   toString() {
@@ -73,9 +80,8 @@ const z = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
   get abortController() {
     return this.isPending ? this._value.abortController : null;
   }
-  // TODO: add tests
   get args() {
-    return this._args || [];
+    return this._args ?? [];
   }
   get promise() {
     return this.isPending ? this._value.promise : null;
@@ -102,7 +108,7 @@ const z = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
     return this.state === s.possibleState.abort;
   }
   is(...t) {
-    return !!t.find((e) => this.state === e);
+    return t.includes(this.state);
   }
   validate(...t) {
     return this._validateArgs(this, ...t);
@@ -112,39 +118,39 @@ const z = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
    */
   exec(...t) {
     if (this.is(s.possibleState.lock, s.possibleState.pending))
-      throw new b(
+      throw new d(
         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 h = this.actionFunction[s.actionFlag].apply(this._model, e);
-    if (!(h instanceof Promise))
+    let r = t.length && t.at(-1);
+    r instanceof AbortController || (r = new AbortController(), e.push(r)), this.state = s.possibleState.pending, this._args = t;
+    const c = this.actionFunction[s.actionFlag].apply(this._model, e);
+    if (!(c instanceof Promise))
       return this.state = s.possibleState.ready, Promise.resolve();
-    const n = h.then(() => {
+    const o = c.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 = z(a);
-      if (S && !this.is(s.possibleState.pending, s.possibleState.lock))
-        throw new j(this.name, this.state);
-      if (S && this._value.abortController instanceof AbortController && this._value.abortController.signal.reason === s.abortedByLock) {
+    }).catch((n) => {
+      if (n instanceof h || n instanceof RangeError || n instanceof ReferenceError || n instanceof SyntaxError || n instanceof TypeError || n instanceof URIError || n instanceof EvalError)
+        throw n;
+      const m = x(n);
+      if (m && !this.is(s.possibleState.pending, s.possibleState.lock))
+        throw new R(this.name, this.state);
+      if (m && this._value.abortController instanceof AbortController && this._value.abortController.signal.reason === s.abortedByLock) {
         this.state = s.possibleState.lock, this._value = null;
         return;
       }
-      if (S) {
+      if (m) {
         this.state = s.possibleState.abort;
         return;
       }
-      this.setError(new O(this.name, { cause: a }));
+      this.setError(new P(this.name, { cause: n }));
     });
     return this._value = {
-      promise: n,
-      abortController: o
-    }, n;
+      promise: o,
+      abortController: r
+    }, o;
   }
   // Returns same promise as exec method
   // but in reject state
@@ -157,7 +163,7 @@ const z = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
   }
   unlock() {
     if (!this.isLock)
-      throw new b(
+      throw new d(
         this.name,
         this.state,
         s.possibleState.ready
@@ -166,7 +172,7 @@ const z = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
   }
   setError(t) {
     if (!this.isPending)
-      throw new b(
+      throw new d(
         this.name,
         this.state,
         s.possibleState.error
@@ -178,39 +184,27 @@ const z = (r) => r instanceof DOMException && r.name === "AbortError" || typeof
   }
   resetError() {
     if (!this.error)
-      throw new b(
+      throw new d(
         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 l = s;
-const d = Symbol("scope"), m = Symbol("model"), w = Symbol("actions"), y = Symbol("actionIds"), g = Symbol("actionStates"), A = Symbol("actionsSize"), p = Symbol("watchStopHandlers"), G = Proxy;
-var E, k, M, P, C, R, x;
-x = d, R = m, C = w, P = y, M = g, k = A, E = p;
-const f = class f {
-  constructor() {
-    // each model has its own effect scope to avoid memory leaks
-    i(this, x, L(!0));
-    i(this, R, null);
-    // we use WeakMap to store actions as keys to avoid memory leaks
-    i(this, C, /* @__PURE__ */ new WeakMap());
-    i(this, P, /* @__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
-    i(this, k, 0);
-    // watchers are stored in a set to avoid memory leaks
-    i(this, E, /* @__PURE__ */ new Set());
-  }
+}
+const l = /* @__PURE__ */ Symbol("scope"), p = /* @__PURE__ */ Symbol("model"), g = /* @__PURE__ */ Symbol("actions"), S = /* @__PURE__ */ Symbol("actionIds"), f = /* @__PURE__ */ Symbol("actionStates"), w = /* @__PURE__ */ Symbol("actionsSize"), u = /* @__PURE__ */ Symbol("watchStopHandlers"), F = Proxy;
+class b {
+  // each model has its own effect scope to avoid memory leaks
+  [l] = A(!0);
+  [p] = null;
+  // we use WeakMap to store actions as keys to avoid memory leaks
+  [g] = /* @__PURE__ */ new WeakMap();
+  [S] = /* @__PURE__ */ new WeakMap();
+  [f] = /* @__PURE__ */ new Map();
+  // WeakMap doesn't have a size property, so we need to store the size of the map
+  [w] = 0;
+  // watchers are stored in a set to avoid memory leaks
+  [u] = /* @__PURE__ */ new Set();
   /**
    * Wraps ProtoModel instance with proxy to handle get traps for actions
    * and to return Action instance instead of original method.
@@ -236,18 +230,18 @@ const f = class f {
    * @returns model instance wrapped with proxy.
    */
   static createModel(t) {
-    if (!(t instanceof f))
-      throw new Error("ProtoModel instance is required");
-    const e = new G(
-      F(t),
+    if (!(t instanceof b))
+      throw new TypeError("ProtoModel instance is required");
+    const e = new F(
+      y(t),
       {
-        get(o, c, h) {
-          const n = Reflect.get(o, c, h), a = typeof n == "function";
-          return a && l.actionFlag in n && typeof n[l.actionFlag] == "function" ? o.action(n) : a ? n.bind(o) : n;
+        get(r, i, c) {
+          const o = Reflect.get(r, i, c), n = typeof o == "function";
+          return n && s.actionFlag in o && typeof o[s.actionFlag] == "function" ? r.action(o) : n ? o.bind(r) : o;
         }
       }
     );
-    return t[m] = e, e;
+    return t[p] = e, e;
   }
   /**
    * Creates a model instance.
@@ -256,16 +250,16 @@ const f = class f {
    * @returns model instance.
    */
   static model(...t) {
-    if (this.prototype === f.prototype)
+    if (this.prototype === b.prototype)
       throw new Error("ProtoModel is abstract class and can not be instantiated");
     const e = new this(...t);
-    return f.createModel(e);
+    return b.createModel(e);
   }
   get hasPendingActions() {
-    return !!this.getActionStatesRef(l.possibleState.pending).value;
+    return !!this.getActionStatesRef(s.possibleState.pending).value;
   }
   get hasActionWithError() {
-    return !!this.getActionStatesRef(l.possibleState.error).value;
+    return !!this.getActionStatesRef(s.possibleState.error).value;
   }
   /**
    * Registers watcher in the model effect scope.
@@ -326,38 +320,38 @@ 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[l].run(() => E(t[0])) : this[l].run(() => k(...t));
     if (!e)
       throw new Error("watchStopHandler is undefined");
-    return this[p].add(e), () => {
-      e(), this[p].delete(e);
+    return this[u].add(e), () => {
+      e(), this[u].delete(e);
     };
   }
   computed(t, e) {
-    return this[d].run(() => T(t, e));
+    return this[l].run(() => M(t, e));
   }
   // @see https://github.com/trekhleb/javascript-algorithms/blob/master/src/algorithms/math/bits/updateBit.js
-  updateBit(t, e, o) {
-    const c = o ? 1 : 0, h = ~(1 << e);
-    return t & h | c << e;
+  updateBit(t, e, r) {
+    const i = r ? 1 : 0, c = ~(1 << e);
+    return t & c | i << e;
   }
   createAction(t) {
     const e = () => {
-      if (!this[m])
+      if (!this[p])
         throw new Error("Model not set");
-      return this[m];
-    }, o = l.create(
+      return this[p];
+    }, r = s.create(
       this,
       t,
       e,
       this.setActionState.bind(this),
       this.validateArgs.bind(this)
     );
-    return this[w].set(t, o), this[y].set(o, ++this[A]), this.setActionState(o), o;
+    return this[g].set(t, r), this[S].set(r, ++this[w]), this.setActionState(r), r;
   }
   getActionStatesRef(t) {
-    const e = this[g].get(t) || H(0);
-    return this[g].get(t) === void 0 && this[g].set(t, e), e;
+    const e = this[f].get(t) || C(0);
+    return this[f].get(t) === void 0 && this[f].set(t, e), e;
   }
   /**
    * Gets Action instance by wrapped original method or create Action instance.
@@ -403,9 +397,9 @@ const f = class f {
    * @returns action
   */
   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[w].get(t) || this.createAction(t);
+    if (!(s.actionFlag in t && typeof t[s.actionFlag] == "function"))
+      throw new h("Action decorator is not applied to the method");
+    return this[g].get(t) || this.createAction(t);
   }
   /**
    * It is public method in context ProtoModel,
@@ -414,29 +408,28 @@ const f = class f {
    * @see type Model<T>
    */
   setActionState(t) {
-    const e = this[y].get(t);
+    const e = this[S].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));
+    for (const r of t.possibleStates)
+      r !== t.state && (this.getActionStatesRef(r).value = this.updateBit(this.getActionStatesRef(r).value, e, !1));
     this.getActionStatesRef(t.state).value = this.updateBit(this.getActionStatesRef(t.state).value, e, !0);
   }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   validateArgs(t, ...e) {
-    const o = `validateArgs is not implemented for action ${t.name} in the model`;
-    return [new Error(o)];
+    const r = `validateArgs is not implemented for action ${t.name} in the model`;
+    return [new Error(r)];
   }
   isModelOf(t) {
     return this instanceof t;
   }
   destructor() {
-    this[p].forEach((t) => {
+    this[u].forEach((t) => {
       t();
-    }), this[p] = /* @__PURE__ */ new Set(), this[d].stop();
+    }), this[u] = /* @__PURE__ */ new Set(), this[l].stop();
   }
-};
-let v = f;
-function N(r, t) {
+}
+function K(a, t) {
   if (t.static)
     throw new Error("Action decorator is not supported for static methods");
   if (t.private)
@@ -444,26 +437,26 @@ function N(r, t) {
   let e;
   try {
     e = t.name.toString();
-  } catch (c) {
-    const n = `Invalid context. Can\`t get name of the method: ${c instanceof Error ? c.message : "unknown error"}`;
-    throw new Error(n);
+  } catch (i) {
+    const o = `Invalid context. Can\`t get name of the method: ${i instanceof Error ? i.message : "unknown error"}`;
+    throw new Error(o);
   }
-  const o = {
+  const r = {
     // 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(...c) {
-      return this.action(o[e]).exec(...c);
+    [e]: function(...i) {
+      return this.action(r[e]).exec(...i);
     }
   };
-  return o[e][l.actionFlag] = r, o[e];
+  return r[e][s.actionFlag] = a, r[e];
 }
 export {
-  l as Action,
-  O as ActionError,
-  u as ActionInternalError,
-  b as ActionStatusConflictError,
-  j as ActionUnexpectedAbortError,
-  v as ProtoModel,
-  N as action
+  s as Action,
+  P as ActionError,
+  h as ActionInternalError,
+  d as ActionStatusConflictError,
+  R as ActionUnexpectedAbortError,
+  b as ProtoModel,
+  K as action
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "@vue-modeler/model",
-  "version": "2.2.4",
+  "version": "2.2.5-beta.2",
   "description": "A state management library based on models for Vue.js",
   "author": "abratko",
   "license": "MIT",
@@ -21,30 +21,31 @@
     "access": "public"
   },
   "devDependencies": {
-    "@eslint/js": "^9.23.0",
+    "@eslint/js": "^9.39.2",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@types/eslint__js": "^8.42.3",
-    "@types/node": "^22.14.0",
-    "@vitest/coverage-v8": "2.1.3",
-    "@vue/test-utils": "^1.3.6",
+    "@types/node": "^25.0.3",
+    "@vitest/coverage-v8": "4.0.16",
+    "@vue/test-utils": "^2.4.6",
     "conventional-changelog-conventionalcommits": "^9.1.0",
-    "eslint": "^9.23.0",
-    "eslint-scope": "^8.3.0",
-    "eslint-visitor-keys": "^4.2.0",
-    "jsdom": "^25.0.1",
-    "semantic-release": "^24.2.3",
-    "typescript": "^5.8.2",
-    "typescript-eslint": "^8.29.0",
-    "vite": "^5.4.16",
-    "vite-plugin-dts": "^4.5.3",
-    "vitest": "^2.1.9"
+    "eslint": "^9.39.2",
+    "eslint-scope": "^9.0.0",
+    "eslint-visitor-keys": "^5.0.0",
+    "jsdom": "^27.4.0",
+    "semantic-release": "^25.0.2",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.51.0",
+    "vite": "^7.3.0",
+    "vite-plugin-dts": "^4.5.4",
+    "vitest": "^4.0.16",
+    "vue": ">=2.7 <4.0.0"
   },
   "peerDependencies": {
     "vue": ">=2.7 <4.0.0"
   },
   "scripts": {
     "build": "tsc && vite build",
+    "lint": "eslint .",
     "test": "tsc --noEmit && vitest",
     "coverage": "vitest run --coverage",
     "semantic-release": "semantic-release"