feat: merge mergeState

amos-project · Nov 3, 2024 · f835c9a · f835c9a
1 parent 3f9681e
commit f835c9a
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@amos/root",
   "private": true,
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "license": "MIT",
   "workspaces": [
     "packages/*",

diff --git a/packages/amos-babel/package.json b/packages/amos-babel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amos-babel",
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "private": true,
   "files": [],
   "peerDependencies": {

diff --git a/packages/amos-boxes/package.json b/packages/amos-boxes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amos-boxes",
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "private": true,
   "files": []
 }
diff --git a/packages/amos-boxes/src/objectBox.ts b/packages/amos-boxes/src/objectBox.ts
@@ -7,8 +7,7 @@ import { Box, Mutation, Selector } from 'amos-core';
 import { resolveFuncValue, shallowEqual, type ValueOrFunc } from 'amos-utils';
 
 export interface ObjectBox<T extends object> extends Box<Readonly<T>> {
-  mergeState(state: Partial<T>): Mutation<Readonly<T>>;
-  mergeState(next: (state: Readonly<T>) => Partial<T>): Mutation<Readonly<T>>;
+  mergeState(state: ValueOrFunc<Partial<Readonly<T>>, [Readonly<T>]>): Mutation<Readonly<T>>;
   set<K extends keyof T>(key: K, value: T[K]): Mutation<T>;
   get<K extends keyof T>(key: K): Selector<[K], T[K]>;
   pick<Ks extends Array<keyof T>>(...keys: Ks): Selector<Ks, Pick<T, Ks[number]>>;

diff --git a/packages/amos-core/package.json b/packages/amos-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amos-core",
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "private": true,
   "files": []
 }
diff --git a/packages/amos-io/package.json b/packages/amos-io/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amos-io",
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "private": true,
   "files": []
 }
diff --git a/packages/amos-persist/package.json b/packages/amos-persist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amos-persist",
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "private": true,
   "files": []
 }
diff --git a/packages/amos-react/package.json b/packages/amos-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amos-react",
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "private": true,
   "files": [],
   "peerDependencies": {

diff --git a/packages/amos-shapes/package.json b/packages/amos-shapes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amos-shapes",
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "private": true,
   "files": []
 }
diff --git a/packages/amos-testing/package.json b/packages/amos-testing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amos-testing",
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "private": true,
   "files": []
 }
diff --git a/packages/amos-typescript/package.json b/packages/amos-typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amos-typescript",
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "private": true,
   "files": [],
   "peerDependencies": {

diff --git a/packages/amos-utils/package.json b/packages/amos-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amos-utils",
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "private": true,
   "files": []
 }
diff --git a/packages/amos/package.json b/packages/amos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amos",
-  "version": "0.3.0-beta.31",
+  "version": "0.3.0-beta.32",
   "description": "An out-of-the-box state management library designed for your large-scale projects.",
   "keywords": [
     "amos",

diff --git a/packages/amos/src/index.ts b/packages/amos/src/index.ts
@@ -123,8 +123,20 @@ export {
 } from 'amos-shapes';
 export {
   AmosObject,
+  AnyFunc,
   Enhancer,
+  ID,
+  IsAny,
+  IsNever,
+  IsNoType,
+  IsUnknown,
   JSONState,
+  Unsubscribe,
+  ValueOrArray,
+  ValueOrConstructor,
+  ValueOrFunc,
+  ValueOrPromise,
+  ValueOrReadonlyArray,
   arrayEqual,
   isAmosObject,
   shallowEqual,