mobx-state-tree 7.0.0-pre.2 → 7.0.0

package/dist/types/complex-types/model.d.ts

@@ -1,4 +1,4 @@
-import { IAnyType, IType, _CustomOrOther, _NotCustomized, Instance, FunctionWithFlag } from "../../internal";
+import { FunctionWithFlag, IAnyType, IType, Instance, _CustomOrOther, _NotCustomized } from "../../internal";
 /** @hidden */
 export interface ModelProperties {
     [key: string]: IAnyType;
@@ -9,6 +9,8 @@ export type ModelPrimitive = string | number | boolean | Date;
 export interface ModelPropertiesDeclaration {
     [key: string]: ModelPrimitive | IAnyType;
 }
+/** intersect two object types, but omit keys of B from A before doing so */
+type OmitMerge<A, B> = Omit<A, keyof B> & B;
 /**
  * Unmaps syntax property declarations to a map of { propName: IType }
  *
@@ -32,6 +34,7 @@ export type ModelPropertiesDeclarationToProperties<T extends ModelPropertiesDecl
  * - unknown = true
  */
 type IsOptionalValue<C, TV, FV> = undefined extends C ? TV : FV;
+type AnyObject = Record<string, any>;
 /**
  * Name of the properties of an object that can't be set to undefined, any or unknown
  * @hidden
@@ -81,15 +84,15 @@ export interface ModelActions {
 export interface IModelType<PROPS extends ModelProperties, OTHERS, CustomC = _NotCustomized, CustomS = _NotCustomized> extends IType<ModelCreationType2<PROPS, CustomC>, ModelSnapshotType2<PROPS, CustomS>, ModelInstanceType<PROPS, OTHERS>> {
     readonly properties: PROPS;
     named(newName: string): IModelType<PROPS, OTHERS, CustomC, CustomS>;
-    props<PROPS2 extends ModelPropertiesDeclaration>(props: PROPS2): IModelType<PROPS & ModelPropertiesDeclarationToProperties<PROPS2>, OTHERS, CustomC, CustomS>;
-    views<V extends Object>(fn: (self: Instance<this>) => V): IModelType<PROPS, OTHERS & V, CustomC, CustomS>;
-    actions<A extends ModelActions>(fn: (self: Instance<this>) => A): IModelType<PROPS, OTHERS & A, CustomC, CustomS>;
-    volatile<TP extends object>(fn: (self: Instance<this>) => TP): IModelType<PROPS, OTHERS & TP, CustomC, CustomS>;
-    extend<A extends ModelActions = {}, V extends Object = {}, VS extends Object = {}>(fn: (self: Instance<this>) => {
+    props<PROPS2 extends ModelPropertiesDeclaration>(props: PROPS2): IModelType<OmitMerge<PROPS, ModelPropertiesDeclarationToProperties<PROPS2>>, OTHERS, CustomC, CustomS>;
+    views<V extends AnyObject>(fn: (self: Instance<this>) => V): IModelType<PROPS, OmitMerge<OTHERS, V>, CustomC, CustomS>;
+    actions<A extends ModelActions>(fn: (self: Instance<this>) => A): IModelType<PROPS, OmitMerge<OTHERS, A>, CustomC, CustomS>;
+    volatile<VS extends AnyObject>(fn: (self: Instance<this>) => VS): IModelType<PROPS, OmitMerge<OTHERS, VS>, CustomC, CustomS>;
+    extend<A extends ModelActions = {}, V extends AnyObject = {}, VS extends AnyObject = {}>(fn: (self: Instance<this>) => {
         actions?: A;
         views?: V;
         state?: VS;
-    }): IModelType<PROPS, OTHERS & A & V & VS, CustomC, CustomS>;
+    }): IModelType<PROPS, OmitMerge<OTHERS, A & V & VS>, CustomC, CustomS>;
     preProcessSnapshot<NewC = ModelCreationType2<PROPS, CustomC>>(fn: (snapshot: NewC) => WithAdditionalProperties<ModelCreationType2<PROPS, CustomC>>): IModelType<PROPS, OTHERS, NewC, CustomS>;
     postProcessSnapshot<NewS = ModelSnapshotType2<PROPS, CustomS>>(fn: (snapshot: ModelSnapshotType2<PROPS, CustomS>) => NewS): IModelType<PROPS, OTHERS, CustomC, NewS>;
 }

package/dist/types/utility-types/union.d.ts

@@ -1,8 +1,17 @@
 import { IType, IAnyType, _NotCustomized } from "../../internal";
-export type ITypeDispatcher = (snapshot: any) => IAnyType;
-export interface UnionOptions {
+export type ITypeDispatcher<Types extends IAnyType[]> = (snapshot: Types[number]["SnapshotType"]) => Types[number];
+export interface UnionOptions<Types extends IAnyType[]> {
+    /**
+     * Whether or not to use eager validation.
+     *
+     * When `true`, the first matching type will be used. Otherwise, all types will be checked and the
+     * validation will pass if and only if a single type matches.
+     */
     eager?: boolean;
-    dispatcher?: ITypeDispatcher;
+    /**
+     * A function that returns the type to be used given an input snapshot.
+     */
+    dispatcher?: ITypeDispatcher<Types>;
 }
 /**
  * Transform _NotCustomized | _NotCustomized... to _NotCustomized, _NotCustomized | A | B to A | B
@@ -14,7 +23,7 @@ export interface ITypeUnion<C, S, T> extends IType<_CustomCSProcessor<C>, _Custo
 }
 export type IUnionType<Types extends IAnyType[]> = ITypeUnion<Types[number]["CreationType"], Types[number]["SnapshotType"], Types[number]["TypeWithoutSTN"]>;
 export declare function union<Types extends IAnyType[]>(...types: Types): IUnionType<Types>;
-export declare function union<Types extends IAnyType[]>(options: UnionOptions, ...types: Types): IUnionType<Types>;
+export declare function union<Types extends IAnyType[]>(options: UnionOptions<Types>, ...types: Types): IUnionType<Types>;
 /**
  * Returns if a given value represents a union type.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-state-tree",
-  "version": "7.0.0-pre.2",
+  "version": "7.0.0",
   "description": "Opinionated, transactional, MobX powered state container",
   "main": "dist/mobx-state-tree.js",
   "umd:main": "dist/mobx-state-tree.umd.js",
@@ -17,8 +17,8 @@
   "scripts": {
     "clean": "shx rm -rf dist lib",
     "build": "bun run clean && tsc && cpr lib/src dist --filter=\\.js$ && rollup -c",
-    "test:dev": "./scripts/bun-test-dev.sh",
-    "test:prod": "./scripts/bun-test-prod.sh",
+    "test:dev": "NODE_ENV=development bun test",
+    "test:prod": "MST_TESTING=1 NODE_ENV=production bun test",
     "test:all": "bun run test:dev && bun run test:prod && bun run size",
     "test:perf": "bun test ./__tests__/perf/",
     "test:perf:compiled": "bun run build && bun run jest:perf && TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' /usr/bin/time node --expose-gc --require ts-node/register __tests__/perf/report.ts",
@@ -61,7 +61,7 @@
     "cpr": "^3.0.1",
     "husky": "^7.0.0",
     "lint-staged": "^11.1.2",
-    "mobx": "^6.3.0",
+    "mobx": "^6.13.1",
     "prettier": "^2.4.1",
     "rollup": "^2.18.1",
     "rollup-plugin-commonjs": "^10.0.0",