@vue-modeler/model 2.2.0-beta.3 → 2.2.0-beta.4

package/dist/index.d.ts

@@ -12,11 +12,11 @@ import { WatchStopHandle } from 'vue';
  * For example, `setActionState` method.
  * @see `ProtoModel.setActionState`
  */
-export declare class Action<T extends object, Args extends any[] = unknown[], Owner extends object = Model<T>> implements ActionLike<Owner, Args> {
+export declare class Action<T extends object, Args extends any[] = unknown[]> implements ActionLike<T, Args> {
     protected _model: T;
     protected actionFunction: OriginalMethodWrapper<Args>;
-    protected ownerGetter: () => Owner;
-    protected setStateCb?: ((action: SrActionLike<Owner, Args>, oldState: ActionStateName, newState: ActionStateName) => void) | undefined;
+    protected ownerGetter: () => Model<T>;
+    protected setStateCb?: ((action: ActionLike<T, Args>, oldState: ActionStateName, newState: ActionStateName) => void) | undefined;
     static readonly actionFlag: unique symbol;
     static readonly possibleState: {
         readonly pending: "pending";
@@ -30,10 +30,10 @@ export declare class Action<T extends object, Args extends any[] = unknown[], Ow
     protected _state: ActionStateName;
     protected _value: ActionValue;
     protected _args: Args | null;
-    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>;
+    constructor(_model: T, actionFunction: OriginalMethodWrapper<Args>, ownerGetter: () => Model<T>, setStateCb?: ((action: ActionLike<T, Args>, oldState: ActionStateName, newState: ActionStateName) => void) | undefined);
+    static create<T extends ProtoModel, Args extends unknown[] = unknown[]>(model: T, actionFunction: OriginalMethodWrapper<Args>, ownerGetter: () => Model<T>, setStateCb?: (action: ActionLike<T, Args>, oldState: ActionStateName, newState: ActionStateName) => void): ActionLike<T, Args>;
     toString(): string;
-    get owner(): Owner;
+    get owner(): Model<T>;
     get possibleStates(): ActionStateName[];
     get state(): ActionStateName;
     protected set state(newState: ActionStateName);
@@ -106,9 +106,9 @@ export declare class ActionInternalError extends Error {
  * Public API interface for Action instances.
  * Describes only the public contract without implementation details.
  */
-export declare interface ActionLike<Owner extends object, Args extends any[] = unknown[]> {
+export declare interface ActionLike<T extends object, Args extends any[] = unknown[]> {
     readonly name: string;
-    readonly owner: Owner;
+    readonly owner: Model<T>;
     readonly possibleStates: ActionStateName[];
     readonly state: ActionStateName;
     readonly abortController: null | AbortController;
@@ -181,7 +181,7 @@ declare type ActionValue = ActionPendingValue | ActionError | null;
 declare function createModel<Target extends ProtoModel>(protoModel: Target): Model<Target>;
 
 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];
+    [K in keyof T]: T[K] extends ((...args: infer Args) => Promise<void>) ? ActionLike<T, Args> : K extends ProtectedMethodInModel ? never : T[K];
 }>;
 
 export declare type ModelAdapterProxyConstructor = new <Target extends ProtoModel>(target: Target, handler: ProxyHandler<Target>) => Model<Target>;
@@ -204,8 +204,8 @@ export declare type ProtectedMethodInModel = 'action' | 'setActionState';
 export declare abstract class ProtoModel {
     protected [scopeKey]: EffectScope;
     protected [modelKey]: Model<this> | null;
-    protected [actionsKey]: WeakMap<OriginalMethodWrapper<unknown[]>, SrActionLike<Model<this>>>;
-    protected [actionIdsKey]: WeakMap<SrActionLike<Model<this>>, number>;
+    protected [actionsKey]: WeakMap<OriginalMethodWrapper<unknown[]>, ActionLike<this, unknown[]>>;
+    protected [actionIdsKey]: WeakMap<ActionLike<this, unknown[]>, number>;
     protected [actionStatesKey]: Map<"pending" | "error" | "lock" | "ready" | "abort", Ref<number>>;
     protected [actionsSizeKey]: number;
     protected [watchStopHandlersKey]: Set<WatchStopHandle>;
@@ -279,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): SrActionLike<Model<this>>;
+    protected createAction(actionFunction: OriginalMethodWrapper): ActionLike<this>;
     protected getActionStatesRef(stateName: ActionStateName): Ref<number>;
     /**
      * Gets Action instance by wrapped original method or create Action instance.
@@ -324,26 +324,20 @@ export declare abstract class ProtoModel {
      * @param originalMethod - defined as OriginalMethod or OriginalMethodWrapper.
      * @returns action
      */
-    protected action(originalMethod: OriginalMethod | OriginalMethodWrapper): SrActionLike<Model<this>>;
+    protected action(originalMethod: OriginalMethod | OriginalMethodWrapper): ActionLike<this>;
     /**
      * It is public method in context ProtoModel,
      * but in Model<ProtoModel> context it is protected method
      *
      * @see type Model<T>
      */
-    setActionState(action: SrActionLike<Model<this>>): void;
+    setActionState(action: ActionLike<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.
- */
-export declare type SrActionLike<Owner extends object, Args extends any[] = unknown[]> = ShallowReactive<ActionLike<Owner, Args>>;
-
 declare const watchStopHandlersKey: unique symbol;
 
 export { }

package/package.json

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