fix(type): fix type and add port id

unadlib · Feb 13, 2023 · 7ecf352 · 7ecf352
1 parent e96a11e
commit 7ecf352
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/packages/reactant-model/src/model.ts b/packages/reactant-model/src/model.ts
@@ -10,6 +10,7 @@ import {
   nameKey,
   strictKey,
   Patch,
+  Patches,
 } from 'reactant-module';
 
 interface Scheme<S, A> {
@@ -34,8 +35,8 @@ export const model = <
     Object.assign(scheme.actions, {
       [key]: (...args: any[]) => {
         let state: Immutable<S> | S | undefined;
-        let patches: Patch[] | undefined;
-        let inversePatches: Patch[] | undefined;
+        let patches: Patches | undefined;
+        let inversePatches: Patches | undefined;
         if (module[enablePatchesKey]) {
           [state, patches, inversePatches] = create(
             module[stateKey] as S,

diff --git a/packages/reactant-module/src/decorators/action.ts b/packages/reactant-module/src/decorators/action.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 /* eslint-disable func-names */
 import { create } from 'mutative';
-import { Patch, ReactantAction, Service } from '../interfaces';
+import { Patch, Patches, ReactantAction, Service } from '../interfaces';
 import {
   storeKey,
   actionIdentifier,
@@ -67,8 +67,8 @@ const action = (
       try {
         const lastState = this[storeKey]?.getState();
         let state: Record<string, unknown>;
-        let patches: Patch[] | undefined;
-        let inversePatches: Patch[] | undefined;
+        let patches: Patches | undefined;
+        let inversePatches: Patches | undefined;
         if (this[enablePatchesKey]) {
           [state, patches, inversePatches] = create(
             lastState,

diff --git a/packages/reactant-module/src/interfaces.ts b/packages/reactant-module/src/interfaces.ts
@@ -109,8 +109,8 @@ export interface ReactantAction<T = any> extends Action<string | symbol> {
   state: Record<string, T>;
   params: any[];
   _reactant: typeof actionIdentifier;
-  _patches?: Patch[];
-  _inversePatches?: Patch[];
+  _patches?: Patches;
+  _inversePatches?: Patches;
 }
 
 export type StateMapObject<T extends Record<string, Function>> = {

diff --git a/packages/reactant-share/src/portDetector.ts b/packages/reactant-share/src/portDetector.ts
@@ -99,6 +99,10 @@ export class PortDetector {
     });
   }
 
+  get id() {
+    return this.clientId ?? '__SERVER__';
+  }
+
   get shared() {
     return !!(this.sharedAppOptions.port && this.sharedAppOptions.type);
   }