mobx 6.13.7 → 6.15.1

package/dist/types/observablemap.d.ts

@@ -5,7 +5,7 @@ export interface IKeyValueMap<V = any> {
 export type IMapEntry<K = any, V = any> = [K, V];
 export type IReadonlyMapEntry<K = any, V = any> = readonly [K, V];
 export type IMapEntries<K = any, V = any> = IMapEntry<K, V>[];
-export type IReadonlyMapEntries<K = any, V = any> = IReadonlyMapEntry<K, V>[];
+export type IReadonlyMapEntries<K = any, V = any> = readonly IReadonlyMapEntry<K, V>[];
 export type IMapDidChange<K = any, V = any> = {
     observableKind: "map";
     debugObjectName: string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mobx",
-    "version": "6.13.7",
+    "version": "6.15.1",
     "description": "Simple, scalable state management.",
     "source": "src/mobx.ts",
     "main": "dist/index.js",
@@ -22,7 +22,7 @@
     "sideEffects": false,
     "repository": {
         "type": "git",
-        "url": "https://github.com/mobxjs/mobx.git"
+        "url": "git+https://github.com/mobxjs/mobx.git"
     },
     "author": "Michel Weststrate",
     "license": "MIT",
@@ -61,10 +61,10 @@
         "data flow"
     ],
     "scripts": {
-        "test": "jest",
+        "test": "jest --config jest.projects.js",
         "lint": "eslint src/**/*",
         "build": "node ../../scripts/build.js mobx",
-        "build:test": "yarn build --target test",
+        "build:test": "npm run build --target test",
         "perf": "scripts/perf.sh",
         "perf-legacy": "node --expose-gc ./__tests__/perf/index.js legacy",
         "perf-proxy": "node --expose-gc ./__tests__/perf/index.js proxy",
@@ -75,6 +75,6 @@
         "test:coverage": "yarn test -i --coverage",
         "test:size": "yarn import-size --report . observable computed autorun action",
         "test:check": "yarn test:types",
-        "prepublishOnly": "node ./scripts/prepublish.js && yarn build --target publish"
+        "prepublishOnly": "node ./scripts/prepublish.js && npm run build --target publish"
     }
 }

package/src/api/flow.ts

@@ -17,10 +17,17 @@ export const FLOW = "flow"
 
 let generatorId = 0
 
-export function FlowCancellationError() {
-    this.message = "FLOW_CANCELLED"
+export class FlowCancellationError extends Error {
+    constructor() {
+        super("FLOW_CANCELLED")
+        Object.setPrototypeOf(this, new.target.prototype)
+        this.name = "FlowCancellationError"
+    }
+
+    toString() {
+        return `Error: ${this.message}`
+    }
 }
-FlowCancellationError.prototype = Object.create(Error.prototype)
 
 export function isFlowCancellationError(error: Error) {
     return error instanceof FlowCancellationError

package/src/api/observable.ts

@@ -3,6 +3,9 @@ import {
     IEqualsComparer,
     IObservableArray,
     IObservableMapInitialValues,
+    IMapEntries,
+    IReadonlyMapEntries,
+    IKeyValueMap,
     IObservableSetInitialValues,
     IObservableValue,
     ObservableMap,
@@ -151,6 +154,24 @@ export interface IObservableValueFactory {
     <T>(value?: T, options?: CreateObservableOptions): IObservableValue<T | undefined>
 }
 
+export interface IObservableMapFactory {
+    <K = any, V = any>(): ObservableMap<K, V>
+    <K, V>(initialValues?: IMapEntries<K, V>, options?: CreateObservableOptions): ObservableMap<
+        K,
+        V
+    >
+    <K, V>(
+        initialValues?: IReadonlyMapEntries<K, V>,
+        options?: CreateObservableOptions
+    ): ObservableMap<K, V>
+    <K, V>(initialValues?: IKeyValueMap<V>, options?: CreateObservableOptions): ObservableMap<K, V>
+    <K, V>(initialValues?: Map<K, V>, options?: CreateObservableOptions): ObservableMap<K, V>
+    <K = any, V = any>(initialValues: undefined, options?: CreateObservableOptions): ObservableMap<
+        K,
+        V
+    >
+}
+
 export interface IObservableFactory
     extends Annotation,
         PropertyDecorator,
@@ -172,10 +193,7 @@ export interface IObservableFactory
         initialValues?: IObservableSetInitialValues<T>,
         options?: CreateObservableOptions
     ) => ObservableSet<T>
-    map: <K = any, V = any>(
-        initialValues?: IObservableMapInitialValues<K, V>,
-        options?: CreateObservableOptions
-    ) => ObservableMap<K, V>
+    map: IObservableMapFactory
     object: <T = any>(
         props: T,
         decorators?: AnnotationsMap<T, never>,

package/src/core/reaction.ts

@@ -240,6 +240,10 @@ export class Reaction implements IDerivation, IReactionPublic {
         abortSignal?.addEventListener?.("abort", dispose)
         dispose[$mobx] = this
 
+        if ("dispose" in Symbol && typeof Symbol.dispose === "symbol") {
+            dispose[Symbol.dispose] = dispose
+        }
+
         return dispose
     }
 

package/src/mobx.ts

@@ -108,6 +108,7 @@ export {
     flow,
     isFlow,
     flowResult,
+    CancellablePromise,
     FlowCancellationError,
     isFlowCancellationError,
     toJS,

package/src/types/autoannotation.ts

@@ -10,7 +10,8 @@ import {
     autoAction,
     isGenerator,
     MakeResult,
-    die
+    die,
+    isAction
 } from "../internal"
 
 const AUTO = "true"
@@ -40,7 +41,9 @@ function make_(
     // lone setter -> action setter
     if (descriptor.set) {
         // TODO make action applicable to setter and delegate to action.make_
-        const set = createAction(key.toString(), descriptor.set) as (v: any) => void
+        const set = isAction(descriptor.set)
+            ? descriptor.set // See #4553
+            : (createAction(key.toString(), descriptor.set) as (v: any) => void)
         // own
         if (source === adm.target_) {
             return adm.defineProperty_(key, {

package/src/types/observablemap.ts

@@ -46,7 +46,7 @@ export interface IKeyValueMap<V = any> {
 export type IMapEntry<K = any, V = any> = [K, V]
 export type IReadonlyMapEntry<K = any, V = any> = readonly [K, V]
 export type IMapEntries<K = any, V = any> = IMapEntry<K, V>[]
-export type IReadonlyMapEntries<K = any, V = any> = IReadonlyMapEntry<K, V>[]
+export type IReadonlyMapEntries<K = any, V = any> = readonly IReadonlyMapEntry<K, V>[]
 
 export type IMapDidChange<K = any, V = any> = { observableKind: "map"; debugObjectName: string } & (
     | {

package/src/types/observablevalue.ts

@@ -83,7 +83,7 @@ export class ObservableValue<T>
                 object: this,
                 observableKind: "value",
                 debugObjectName: this.name_,
-                newValue: "" + this.value_
+                newValue: "" + this.value_?.toString()
             })
         }
     }