Small fixes based on mobx-utils migration

notes.md

@@ -91,10 +91,10 @@
 -   [ ] post 6.0
     -   [ ] make cheatsheet
     -   [ ] support mobx-utils `computedFn` as annotation?
-    -   [ ] merge https://github.com/mobxjs/mobx/pull/2389
-    -   [ ] set up discussions
+    -   [x] merge https://github.com/mobxjs/mobx/pull/2389
+    -   [x] set up discussions
     -   [ ] use autObservable options for codemod (if no superclass)?
-    -   [ ] add a solution for keepAlive computeds like https://github.com/mobxjs/mobx/issues/2309#issuecomment-598707584
+    -   [x] add a solution for keepAlive computeds like https://github.com/mobxjs/mobx/issues/2309#issuecomment-598707584
     -   [ ] set up continous delivery
     -   [ ] support chrome formatter https://www.mattzeunert.com/2016/02/19/custom-chrome-devtools-object-formatters.html also in Immer?
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx",
-  "version": "6.0.0-rc.1",
+  "version": "6.0.0-rc.3",
   "description": "Simple, scalable state management.",
   "main": "dist/index.js",
   "module": "dist/mobx.esm.js",

packages/mobx-undecorate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-undecorate",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Migrate MobX 4/5 to MobX 6",
   "bin": "cli.js",
   "scripts": {

src/api/computed.ts

@@ -8,7 +8,8 @@ import {
     isPlainObject,
     isFunction,
     assign,
-    die
+    die,
+    IComputedValue
 } from "../internal"
 
 export const COMPUTED = "computed"
@@ -18,7 +19,7 @@ export interface IComputedFactory extends Annotation, PropertyDecorator {
     // @computed(opts)
     <T>(options: IComputedValueOptions<T>): Annotation & PropertyDecorator
     // computed(fn, opts)
-    <T>(func: () => T, options?: IComputedValueOptions<T>): ComputedValue<T>
+    <T>(func: () => T, options?: IComputedValueOptions<T>): IComputedValue<T>
 
     struct: Annotation & PropertyDecorator
 }

src/core/computedvalue.ts

@@ -94,7 +94,7 @@ export class ComputedValue<T> implements IObservable, IComputedValue<T>, IDeriva
     triggeredBy_?: string
     isComputing_: boolean = false // to check for cycles
     isRunningSetter_: boolean = false
-    derivation_: () => T
+    derivation: () => T
     setter_?: (value: T) => void
     isTracing_: TraceMode = TraceMode.NONE
     scope_: Object | undefined
@@ -116,7 +116,7 @@ export class ComputedValue<T> implements IObservable, IComputedValue<T>, IDeriva
      */
     constructor(options: IComputedValueOptions<T>) {
         if (!options.get) die(31)
-        this.derivation_ = options.get!
+        this.derivation = options.get!
         this.name_ = options.name || "ComputedValue@" + getNextId()
         if (options.set) this.setter_ = createAction(this.name_ + "-setter", options.set) as any
         this.equals_ =
@@ -153,7 +153,7 @@ export class ComputedValue<T> implements IObservable, IComputedValue<T>, IDeriva
      * Will evaluate its computation first if needed.
      */
     public get(): T {
-        if (this.isComputing_) die(32, this.name_, this.derivation_)
+        if (this.isComputing_) die(32, this.name_, this.derivation)
         if (
             globalState.inBatch === 0 &&
             // !globalState.trackingDerivatpion &&
@@ -229,13 +229,13 @@ export class ComputedValue<T> implements IObservable, IComputedValue<T>, IDeriva
         const prev = allowStateChangesStart(false)
         let res: T | CaughtException
         if (track) {
-            res = trackDerivedFunction(this, this.derivation_, this.scope_)
+            res = trackDerivedFunction(this, this.derivation, this.scope_)
         } else {
             if (globalState.disableErrorBoundaries === true) {
-                res = this.derivation_.call(this.scope_)
+                res = this.derivation.call(this.scope_)
             } else {
                 try {
-                    res = this.derivation_.call(this.scope_)
+                    res = this.derivation.call(this.scope_)
                 } catch (e) {
                     res = new CaughtException(e)
                 }
@@ -294,7 +294,7 @@ export class ComputedValue<T> implements IObservable, IComputedValue<T>, IDeriva
     }
 
     toString() {
-        return `${this.name_}[${this.derivation_.toString()}]`
+        return `${this.name_}[${this.derivation.toString()}]`
     }
 
     valueOf(): T {

src/core/observable.ts

@@ -252,7 +252,7 @@ You are entering this break point because derivation '${derivation.name_}' is be
 Just follow the stacktrace you should now see in the devtools to see precisely what piece of your code is causing this update
 The stackframe you are looking for is at least ~6-8 stack-frames up.
 
-${derivation instanceof ComputedValue ? derivation.derivation_.toString().replace(/[*]\//g, "/") : ""}
+${derivation instanceof ComputedValue ? derivation.derivation.toString().replace(/[*]\//g, "/") : ""}
 
 The dependencies for this derivation are:
 

src/mobx.ts

@@ -53,6 +53,8 @@ export {
     IObservableArray,
     IArrayWillChange,
     IArrayWillSplice,
+    IArraySplice,
+    IArrayUpdate,
     IArrayDidChange,
     isObservableArray,
     IKeyValueMap,

src/types/observablearray.ts

@@ -52,13 +52,13 @@ interface IArrayBaseChange<T> {
 
 export type IArrayDidChange<T = any> = IArrayUpdate<T> | IArraySplice<T>
 
-interface IArrayUpdate<T = any> extends IArrayBaseChange<T> {
+export interface IArrayUpdate<T = any> extends IArrayBaseChange<T> {
     type: "update"
     newValue: T
     oldValue: T
 }
 
-interface IArraySplice<T = any> extends IArrayBaseChange<T> {
+export interface IArraySplice<T = any> extends IArrayBaseChange<T> {
     type: "splice"
     added: T[]
     addedCount: number