mobx 6.13.0 → 6.13.2

package/dist/utils/utils.d.ts

@@ -30,9 +30,18 @@ export declare function isGenerator(obj: any): boolean;
 export declare function addHiddenProp(object: any, propName: PropertyKey, value: any): void;
 export declare function addHiddenFinalProp(object: any, propName: PropertyKey, value: any): void;
 export declare function createInstanceofPredicate<T>(name: string, theClass: new (...args: any[]) => T): (x: any) => x is T;
-export declare function isES6Map(thing: any): thing is Map<any, any>;
-export declare function isPlainES6Map(thing: Map<any, any>): boolean;
-export declare function isES6Set(thing: any): thing is Set<any>;
+/**
+ * Yields true for both native and observable Map, even across different windows.
+ */
+export declare function isES6Map(thing: unknown): thing is Map<any, any>;
+/**
+ * Makes sure a Map is an instance of non-inherited native or observable Map.
+ */
+export declare function isPlainES6Map(thing: Map<unknown, unknown>): boolean;
+/**
+ * Yields true for both native and observable Set, even across different windows.
+ */
+export declare function isES6Set(thing: unknown): thing is Set<any>;
 /**
  * Returns the following: own enumerable keys and symbols.
  */
@@ -44,3 +53,5 @@ export declare function hasProp(target: Object, prop: PropertyKey): boolean;
 export declare const getOwnPropertyDescriptors: <T>(o: T) => { [P in keyof T]: TypedPropertyDescriptor<T[P]>; } & {
     [x: string]: PropertyDescriptor;
 };
+export declare function getFlag(flags: number, mask: number): boolean;
+export declare function setFlag(flags: number, mask: number, newValue: boolean): number;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mobx",
-    "version": "6.13.0",
+    "version": "6.13.2",
     "description": "Simple, scalable state management.",
     "source": "src/mobx.ts",
     "main": "dist/index.js",

package/src/api/autorun.ts

@@ -75,7 +75,7 @@ export function autorun(
                     isScheduled = true
                     scheduler(() => {
                         isScheduled = false
-                        if (!reaction.isDisposed_) {
+                        if (!reaction.isDisposed) {
                             reaction.track(reactionRunner)
                         }
                     })
@@ -90,7 +90,7 @@ export function autorun(
         view(reaction)
     }
 
-    if(!opts?.signal?.aborted) {
+    if (!opts?.signal?.aborted) {
         reaction.schedule_()
     }
     return reaction.getDisposer_(opts?.signal)
@@ -160,7 +160,7 @@ export function reaction<T, FireImmediately extends boolean = false>(
 
     function reactionRunner() {
         isScheduled = false
-        if (r.isDisposed_) {
+        if (r.isDisposed) {
             return
         }
         let changed: boolean = false
@@ -181,7 +181,7 @@ export function reaction<T, FireImmediately extends boolean = false>(
         firstTime = false
     }
 
-    if(!opts?.signal?.aborted) {
+    if (!opts?.signal?.aborted) {
         r.schedule_()
     }
     return r.getDisposer_(opts?.signal)

package/src/api/when.ts

@@ -38,7 +38,7 @@ function _when(predicate: () => boolean, effect: Lambda, opts: IWhenOptions): IR
     if (typeof opts.timeout === "number") {
         const error = new Error("WHEN_TIMEOUT")
         timeoutHandle = setTimeout(() => {
-            if (!disposer[$mobx].isDisposed_) {
+            if (!disposer[$mobx].isDisposed) {
                 disposer()
                 if (opts.onError) {
                     opts.onError(error)

package/src/core/atom.ts

@@ -14,6 +14,8 @@ import {
     Lambda
 } from "../internal"
 
+import { getFlag, setFlag } from "../utils/utils"
+
 export const $mobx = Symbol("mobx administration")
 
 export interface IAtom extends IObservable {
@@ -22,11 +24,13 @@ export interface IAtom extends IObservable {
 }
 
 export class Atom implements IAtom {
-    isPendingUnobservation = false // for effective unobserving. BaseAtom has true, for extra optimization, so its onBecomeUnobserved never gets called, because it's not needed
-    isBeingObserved = false
+    private static readonly isBeingObservedMask_ = 0b001
+    private static readonly isPendingUnobservationMask_ = 0b010
+    private static readonly diffValueMask_ = 0b100
+    private flags_ = 0b000
+
     observers_ = new Set<IDerivation>()
 
-    diffValue_ = 0
     lastAccessedBy_ = 0
     lowestObserverState_ = IDerivationState_.NOT_TRACKING_
     /**
@@ -35,6 +39,28 @@ export class Atom implements IAtom {
      */
     constructor(public name_ = __DEV__ ? "Atom@" + getNextId() : "Atom") {}
 
+    // for effective unobserving. BaseAtom has true, for extra optimization, so its onBecomeUnobserved never gets called, because it's not needed
+    get isBeingObserved(): boolean {
+        return getFlag(this.flags_, Atom.isBeingObservedMask_)
+    }
+    set isBeingObserved(newValue: boolean) {
+        this.flags_ = setFlag(this.flags_, Atom.isBeingObservedMask_, newValue)
+    }
+
+    get isPendingUnobservation(): boolean {
+        return getFlag(this.flags_, Atom.isPendingUnobservationMask_)
+    }
+    set isPendingUnobservation(newValue: boolean) {
+        this.flags_ = setFlag(this.flags_, Atom.isPendingUnobservationMask_, newValue)
+    }
+
+    get diffValue(): 0 | 1 {
+        return getFlag(this.flags_, Atom.diffValueMask_) ? 1 : 0
+    }
+    set diffValue(newValue: 0 | 1) {
+        this.flags_ = setFlag(this.flags_, Atom.diffValueMask_, newValue === 1 ? true : false)
+    }
+
     // onBecomeObservedListeners
     public onBOL: Set<Lambda> | undefined
     // onBecomeUnobservedListeners

package/src/core/computedvalue.ts

@@ -32,6 +32,8 @@ import {
     allowStateChangesEnd
 } from "../internal"
 
+import { getFlag, setFlag } from "../utils/utils"
+
 export interface IComputedValue<T> {
     get(): T
     set(value: T): void
@@ -56,18 +58,6 @@ export type IComputedDidChange<T = any> = {
     oldValue: T | undefined
 }
 
-function getFlag(flags: number, mask: number) {
-    return !!(flags & mask)
-}
-function setFlag(flags: number, mask: number, newValue: boolean): number {
-    if (newValue) {
-        flags |= mask
-    } else {
-        flags &= ~mask
-    }
-    return flags
-}
-
 /**
  * A node in the state dependency root that observes other nodes, and can be observed itself.
  *
@@ -92,7 +82,6 @@ export class ComputedValue<T> implements IObservable, IComputedValue<T>, IDeriva
     observing_: IObservable[] = [] // nodes we are looking at. Our value depends on these nodes
     newObserving_ = null // during tracking it's an array with new observed observers
     observers_ = new Set<IDerivation>()
-    diffValue_ = 0
     runId_ = 0
     lastAccessedBy_ = 0
     lowestObserverState_ = IDerivationState_.UP_TO_DATE_
@@ -101,11 +90,12 @@ export class ComputedValue<T> implements IObservable, IComputedValue<T>, IDeriva
     name_: string
     triggeredBy_?: string
 
-    private static readonly isComputingMask_ = 0b0001
-    private static readonly isRunningSetterMask_ = 0b0010
-    private static readonly isBeingObservedMask_ = 0b0100
-    private static readonly isPendingUnobservationMask_ = 0b1000
-    private flags_ = 0b0000
+    private static readonly isComputingMask_ = 0b00001
+    private static readonly isRunningSetterMask_ = 0b00010
+    private static readonly isBeingObservedMask_ = 0b00100
+    private static readonly isPendingUnobservationMask_ = 0b01000
+    private static readonly diffValueMask_ = 0b10000
+    private flags_ = 0b00000
 
     derivation: () => T // N.B: unminified as it is used by MST
     setter_?: (value: T) => void
@@ -197,6 +187,17 @@ export class ComputedValue<T> implements IObservable, IComputedValue<T>, IDeriva
         this.flags_ = setFlag(this.flags_, ComputedValue.isPendingUnobservationMask_, newValue)
     }
 
+    get diffValue(): 0 | 1 {
+        return getFlag(this.flags_, ComputedValue.diffValueMask_) ? 1 : 0
+    }
+    set diffValue(newValue: 0 | 1) {
+        this.flags_ = setFlag(
+            this.flags_,
+            ComputedValue.diffValueMask_,
+            newValue === 1 ? true : false
+        )
+    }
+
     /**
      * Returns the current value of this computed value.
      * Will evaluate its computation first if needed.

package/src/core/derivation.ts

@@ -235,8 +235,8 @@ function bindDependencies(derivation: IDerivation) {
         l = derivation.unboundDepsCount_
     for (let i = 0; i < l; i++) {
         const dep = observing[i]
-        if (dep.diffValue_ === 0) {
-            dep.diffValue_ = 1
+        if (dep.diffValue === 0) {
+            dep.diffValue = 1
             if (i0 !== i) {
                 observing[i0] = dep
             }
@@ -259,10 +259,10 @@ function bindDependencies(derivation: IDerivation) {
     l = prevObserving.length
     while (l--) {
         const dep = prevObserving[l]
-        if (dep.diffValue_ === 0) {
+        if (dep.diffValue === 0) {
             removeObserver(dep, derivation)
         }
-        dep.diffValue_ = 0
+        dep.diffValue = 0
     }
 
     // Go through all new observables and check diffValue: (now it should be unique)
@@ -270,8 +270,8 @@ function bindDependencies(derivation: IDerivation) {
     //   1: it wasn't observed, let's observe it. set back to 0
     while (i0--) {
         const dep = observing[i0]
-        if (dep.diffValue_ === 1) {
-            dep.diffValue_ = 0
+        if (dep.diffValue === 1) {
+            dep.diffValue = 0
             addObserver(dep, derivation)
         }
     }

package/src/core/observable.ts

@@ -17,7 +17,7 @@ export interface IDepTreeNode {
 }
 
 export interface IObservable extends IDepTreeNode {
-    diffValue_: number
+    diffValue: number
     /**
      * Id of the derivation *run* that last accessed this observable.
      * If this id equals the *run* id of the current derivation,

package/src/core/reaction.ts

@@ -22,6 +22,8 @@ import {
     GenericAbortSignal
 } from "../internal"
 
+import { getFlag, setFlag } from "../utils/utils"
+
 /**
  * Reactions are a special kind of derivations. Several things distinguishes them from normal reactive computations
  *
@@ -55,13 +57,16 @@ export class Reaction implements IDerivation, IReactionPublic {
     observing_: IObservable[] = [] // nodes we are looking at. Our value depends on these nodes
     newObserving_: IObservable[] = []
     dependenciesState_ = IDerivationState_.NOT_TRACKING_
-    diffValue_ = 0
     runId_ = 0
     unboundDepsCount_ = 0
-    isDisposed_ = false
-    isScheduled_ = false
-    isTrackPending_ = false
-    isRunning_ = false
+
+    private static readonly isDisposedMask_ = 0b00001
+    private static readonly isScheduledMask_ = 0b00010
+    private static readonly isTrackPendingMask_ = 0b00100
+    private static readonly isRunningMask_ = 0b01000
+    private static readonly diffValueMask_ = 0b10000
+    private flags_ = 0b00000
+
     isTracing_: TraceMode = TraceMode.NONE
 
     constructor(
@@ -71,37 +76,68 @@ export class Reaction implements IDerivation, IReactionPublic {
         public requiresObservable_?
     ) {}
 
+    get isDisposed() {
+        return getFlag(this.flags_, Reaction.isDisposedMask_)
+    }
+    set isDisposed(newValue: boolean) {
+        this.flags_ = setFlag(this.flags_, Reaction.isDisposedMask_, newValue)
+    }
+
+    get isScheduled() {
+        return getFlag(this.flags_, Reaction.isScheduledMask_)
+    }
+    set isScheduled(newValue: boolean) {
+        this.flags_ = setFlag(this.flags_, Reaction.isScheduledMask_, newValue)
+    }
+
+    get isTrackPending() {
+        return getFlag(this.flags_, Reaction.isTrackPendingMask_)
+    }
+    set isTrackPending(newValue: boolean) {
+        this.flags_ = setFlag(this.flags_, Reaction.isTrackPendingMask_, newValue)
+    }
+
+    get isRunning() {
+        return getFlag(this.flags_, Reaction.isRunningMask_)
+    }
+    set isRunning(newValue: boolean) {
+        this.flags_ = setFlag(this.flags_, Reaction.isRunningMask_, newValue)
+    }
+
+    get diffValue(): 0 | 1 {
+        return getFlag(this.flags_, Reaction.diffValueMask_) ? 1 : 0
+    }
+    set diffValue(newValue: 0 | 1) {
+        this.flags_ = setFlag(this.flags_, Reaction.diffValueMask_, newValue === 1 ? true : false)
+    }
+
     onBecomeStale_() {
         this.schedule_()
     }
 
     schedule_() {
-        if (!this.isScheduled_) {
-            this.isScheduled_ = true
+        if (!this.isScheduled) {
+            this.isScheduled = true
             globalState.pendingReactions.push(this)
             runReactions()
         }
     }
 
-    isScheduled() {
-        return this.isScheduled_
-    }
-
     /**
      * internal, use schedule() if you intend to kick off a reaction
      */
     runReaction_() {
-        if (!this.isDisposed_) {
+        if (!this.isDisposed) {
             startBatch()
-            this.isScheduled_ = false
+            this.isScheduled = false
             const prev = globalState.trackingContext
             globalState.trackingContext = this
             if (shouldCompute(this)) {
-                this.isTrackPending_ = true
+                this.isTrackPending = true
 
                 try {
                     this.onInvalidate_()
-                    if (__DEV__ && this.isTrackPending_ && isSpyEnabled()) {
+                    if (__DEV__ && this.isTrackPending && isSpyEnabled()) {
                         // onInvalidate didn't trigger track right away..
                         spyReport({
                             name: this.name_,
@@ -118,7 +154,7 @@ export class Reaction implements IDerivation, IReactionPublic {
     }
 
     track(fn: () => void) {
-        if (this.isDisposed_) {
+        if (this.isDisposed) {
             return
             // console.warn("Reaction already disposed") // Note: Not a warning / error in mobx 4 either
         }
@@ -132,14 +168,14 @@ export class Reaction implements IDerivation, IReactionPublic {
                 type: "reaction"
             })
         }
-        this.isRunning_ = true
+        this.isRunning = true
         const prevReaction = globalState.trackingContext // reactions could create reactions...
         globalState.trackingContext = this
         const result = trackDerivedFunction(this, fn, undefined)
         globalState.trackingContext = prevReaction
-        this.isRunning_ = false
-        this.isTrackPending_ = false
-        if (this.isDisposed_) {
+        this.isRunning = false
+        this.isTrackPending = false
+        if (this.isDisposed) {
             // disposed during last run. Clean up everything that was bound after the dispose call.
             clearObserving(this)
         }
@@ -185,9 +221,9 @@ export class Reaction implements IDerivation, IReactionPublic {
     }
 
     dispose() {
-        if (!this.isDisposed_) {
-            this.isDisposed_ = true
-            if (!this.isRunning_) {
+        if (!this.isDisposed) {
+            this.isDisposed = true
+            if (!this.isRunning) {
                 // if disposed while running, clean up later. Maybe not optimal, but rare case
                 startBatch()
                 clearObserving(this)

package/src/types/observableset.ts

@@ -244,7 +244,7 @@ export class ObservableSet<T = any> implements Set<T>, IInterceptable<ISetWillCh
     }
 
     intersection<U>(otherSet: ReadonlySetLike<U> | Set<U>): Set<T & U> {
-        if (isES6Set(otherSet)) {
+        if (isES6Set(otherSet) && !isObservableSet(otherSet)) {
             return otherSet.intersection(this)
         } else {
             const dehancedSet = new Set(this)
@@ -253,7 +253,7 @@ export class ObservableSet<T = any> implements Set<T>, IInterceptable<ISetWillCh
     }
 
     union<U>(otherSet: ReadonlySetLike<U> | Set<U>): Set<T | U> {
-        if (isES6Set(otherSet)) {
+        if (isES6Set(otherSet) && !isObservableSet(otherSet)) {
             return otherSet.union(this)
         } else {
             const dehancedSet = new Set(this)
@@ -266,7 +266,7 @@ export class ObservableSet<T = any> implements Set<T>, IInterceptable<ISetWillCh
     }
 
     symmetricDifference<U>(otherSet: ReadonlySetLike<U> | Set<U>): Set<T | U> {
-        if (isES6Set(otherSet)) {
+        if (isES6Set(otherSet) && !isObservableSet(otherSet)) {
             return otherSet.symmetricDifference(this)
         } else {
             const dehancedSet = new Set(this)
@@ -283,7 +283,7 @@ export class ObservableSet<T = any> implements Set<T>, IInterceptable<ISetWillCh
     }
 
     isDisjointFrom(otherSet: ReadonlySetLike<unknown> | Set<unknown>): boolean {
-        if (isES6Set(otherSet)) {
+        if (isES6Set(otherSet) && !isObservableSet(otherSet)) {
             return otherSet.isDisjointFrom(this)
         } else {
             const dehancedSet = new Set(this)

package/src/utils/utils.ts

@@ -140,18 +140,27 @@ export function createInstanceofPredicate<T>(
     } as any
 }
 
-export function isES6Map(thing: any): thing is Map<any, any> {
+/**
+ * Yields true for both native and observable Map, even across different windows.
+ */
+export function isES6Map(thing: unknown): thing is Map<any, any> {
     return thing != null && Object.prototype.toString.call(thing) === "[object Map]"
 }
 
-export function isPlainES6Map(thing: Map<any, any>): boolean {
+/**
+ * Makes sure a Map is an instance of non-inherited native or observable Map.
+ */
+export function isPlainES6Map(thing: Map<unknown, unknown>): boolean {
     const mapProto = Object.getPrototypeOf(thing)
     const objectProto = Object.getPrototypeOf(mapProto)
     const nullProto = Object.getPrototypeOf(objectProto)
     return nullProto === null
 }
 
-export function isES6Set(thing: any): thing is Set<any> {
+/**
+ * Yields true for both native and observable Set, even across different windows.
+ */
+export function isES6Set(thing: unknown): thing is Set<any> {
     return thing != null && Object.prototype.toString.call(thing) === "[object Set]"
 }
 
@@ -212,3 +221,16 @@ export const getOwnPropertyDescriptors =
         })
         return res
     }
+
+export function getFlag(flags: number, mask: number) {
+    return !!(flags & mask)
+}
+
+export function setFlag(flags: number, mask: number, newValue: boolean): number {
+    if (newValue) {
+        flags |= mask
+    } else {
+        flags &= ~mask
+    }
+    return flags
+}