mobx 6.16.1 → 7.0.1

package/src/types/computedannotation.ts

@@ -6,7 +6,8 @@ import {
     assert20223DecoratorType,
     $mobx,
     asObservableObject,
-    ComputedValue
+    ComputedValue,
+    assign
 } from "../internal"
 
 export function createComputedAnnotation(name: string, options?: object): Annotation {
@@ -14,8 +15,7 @@ export function createComputedAnnotation(name: string, options?: object): Annota
         annotationType_: name,
         options_: options,
         make_,
-        extend_,
-        decorate_20223_
+        extend_
     }
 }
 
@@ -38,20 +38,23 @@ function extend_(
     assertComputedDescriptor(adm, this, key, descriptor)
     return adm.defineComputedProperty_(
         key,
-        {
-            ...this.options_,
+        assign({}, this.options_, {
             get: descriptor.get,
             set: descriptor.set
-        },
+        }),
         proxyTrap
     )
 }
 
-function decorate_20223_(this: Annotation, get, context: ClassGetterDecoratorContext) {
+export function decorateComputed20223_(
+    annotation: Annotation,
+    get,
+    context: ClassGetterDecoratorContext
+) {
     if (__DEV__) {
         assert20223DecoratorType(context, ["getter"])
     }
-    const ann = this
+    const ann = annotation
     const { name: key, addInitializer } = context
     let computedValues: WeakMap<object, ComputedValue<any>> | undefined
 
@@ -59,11 +62,10 @@ function decorate_20223_(this: Annotation, get, context: ClassGetterDecoratorCon
     // ComputedValues for getters that are never read on a given instance.
     // The factory is materialised by ObservableObjectAdministration on demand.
     function createComputedValue(target: object, adm: ObservableObjectAdministration) {
-        const options = {
-            ...ann.options_,
+        const options = assign({}, ann.options_, {
             get,
             context: target
-        }
+        })
         options.name ||= __DEV__
             ? `${adm.name_}.${key.toString()}`
             : `ObservableObject.${key.toString()}`

package/src/types/decorator_fills.ts

@@ -25,6 +25,10 @@ export type ClassFieldDecorator<This = any, Value extends (...p: any[]) => any =
     context: ClassFieldDecoratorContext<This, Value>
 ) => Value | void
 
+export type ClassMethodAndFieldDecorator = ClassMethodDecorator & ClassFieldDecorator
+
+export type ClassAccessorAndFieldDecorator = ClassAccessorDecorator & ClassFieldDecorator
+
 export type Decorator =
     | ClassAccessorDecorator
     | ClassGetterDecorator

package/src/types/dynamicobject.ts

@@ -2,11 +2,8 @@ import {
     $mobx,
     IIsObservableObject,
     ObservableObjectAdministration,
-    warnAboutProxyRequirement,
-    assertProxies,
     die,
     isStringish,
-    globalState,
     CreateObservableOptions,
     asObservableObject
 } from "../internal"
@@ -19,11 +16,6 @@ function getAdm(target): ObservableObjectAdministration {
 // and skip either the internal values map, or the base object with its property descriptors!
 const objectProxyTraps: ProxyHandler<any> = {
     has(target: IIsObservableObject, name: PropertyKey): boolean {
-        if (__DEV__ && globalState.trackingDerivation) {
-            warnAboutProxyRequirement(
-                "detect new properties using the 'in' operator. Use 'has' from 'mobx' instead."
-            )
-        }
         return getAdm(target).has_(name)
     },
     get(target: IIsObservableObject, name: PropertyKey): any {
@@ -33,20 +25,10 @@ const objectProxyTraps: ProxyHandler<any> = {
         if (!isStringish(name)) {
             return false
         }
-        if (__DEV__ && !getAdm(target).values_.has(name)) {
-            warnAboutProxyRequirement(
-                "add a new observable property through direct assignment. Use 'set' from 'mobx' instead."
-            )
-        }
         // null (intercepted) -> true (success)
         return getAdm(target).set_(name, value, true) ?? true
     },
     deleteProperty(target: IIsObservableObject, name: PropertyKey): boolean {
-        if (__DEV__) {
-            warnAboutProxyRequirement(
-                "delete properties from an observable object. Use 'remove' from 'mobx' instead."
-            )
-        }
         if (!isStringish(name)) {
             return false
         }
@@ -58,20 +40,10 @@ const objectProxyTraps: ProxyHandler<any> = {
         name: PropertyKey,
         descriptor: PropertyDescriptor
     ): boolean {
-        if (__DEV__) {
-            warnAboutProxyRequirement(
-                "define property on an observable object. Use 'defineProperty' from 'mobx' instead."
-            )
-        }
         // null (intercepted) -> true (success)
         return getAdm(target).defineProperty_(name, descriptor) ?? true
     },
     ownKeys(target: IIsObservableObject): ArrayLike<string | symbol> {
-        if (__DEV__ && globalState.trackingDerivation) {
-            warnAboutProxyRequirement(
-                "iterate keys to detect added / removed properties. Use 'keys' from 'mobx' instead."
-            )
-        }
         return getAdm(target).ownKeys_()
     },
     preventExtensions(target) {
@@ -83,7 +55,6 @@ export function asDynamicObservableObject(
     target: any,
     options?: CreateObservableOptions
 ): IIsObservableObject {
-    assertProxies()
     target = asObservableObject(target, options)
     return (target[$mobx].proxy_ ??= new Proxy(target, objectProxyTraps))
 }

package/src/types/flowannotation.ts

@@ -17,8 +17,7 @@ export function createFlowAnnotation(name: string, options?: object): Annotation
         annotationType_: name,
         options_: options,
         make_,
-        extend_,
-        decorate_20223_
+        extend_
     }
 }
 
@@ -63,7 +62,11 @@ function extend_(
     return adm.defineProperty_(key, flowDescriptor, proxyTrap)
 }
 
-function decorate_20223_(this: Annotation, mthd, context: ClassMethodDecoratorContext) {
+export function decorateFlow20223_(
+    annotation: Annotation,
+    mthd,
+    context: ClassMethodDecoratorContext
+) {
     if (__DEV__) {
         assert20223DecoratorType(context, ["method"])
     }
@@ -73,7 +76,7 @@ function decorate_20223_(this: Annotation, mthd, context: ClassMethodDecoratorCo
         mthd = flow(mthd)
     }
 
-    if (this.options_?.bound) {
+    if (annotation.options_?.bound) {
         addInitializer(function () {
             const self = this as any
             const bound = self[name].bind(self)

package/src/types/modifiers.ts

@@ -22,6 +22,11 @@ export interface IEnhancer<T> {
 }
 
 export function deepEnhancer(v, _, name) {
+    // primitives can never be made observable; skip the type checks below
+    if (v === null || (typeof v !== "object" && typeof v !== "function")) {
+        return v
+    }
+
     // it is an observable already, done
     if (isObservable(v)) {
         return v

package/src/types/observableannotation.ts

@@ -15,8 +15,7 @@ export function createObservableAnnotation(name: string, options?: object): Anno
         annotationType_: name,
         options_: options,
         make_,
-        extend_,
-        decorate_20223_
+        extend_
     }
 }
 
@@ -40,13 +39,13 @@ function extend_(
     return adm.defineObservableProperty_(
         key,
         descriptor.value,
-        this.options_?.enhancer ?? deepEnhancer,
+        this.options_?.enhancer_ ?? deepEnhancer,
         proxyTrap
     )
 }
 
-function decorate_20223_(
-    this: Annotation,
+export function decorateObservable20223_(
+    annotation: Annotation,
     desc,
     context: ClassAccessorDecoratorContext | ClassFieldDecoratorContext
 ) {
@@ -61,7 +60,7 @@ function decorate_20223_(
         assert20223DecoratorType(context, ["accessor"])
     }
 
-    const ann = this
+    const ann = annotation
     const { kind, name } = context
 
     if (kind !== "accessor") {
@@ -78,7 +77,7 @@ function decorate_20223_(
             () =>
                 new ObservableValue(
                     value,
-                    ann.options_?.enhancer ?? deepEnhancer,
+                    ann.options_?.enhancer_ ?? deepEnhancer,
                     __DEV__
                         ? `${adm.name_}.${name.toString()}`
                         : `ObservableObject.${name.toString()}`,

package/src/types/observablearray.ts

@@ -5,9 +5,7 @@ import {
     IAtom,
     IEnhancer,
     IInterceptable,
-    IInterceptor,
     IListenable,
-    Lambda,
     addHiddenFinalProp,
     checkIfStateModificationsAreAllowed,
     createInstanceofPredicate,
@@ -18,12 +16,8 @@ import {
     isObject,
     isSpyEnabled,
     notifyListeners,
-    registerInterceptor,
-    registerListener,
     spyReportEnd,
     spyReportStart,
-    assertProxies,
-    reserveArrayBuffer,
     hasProp,
     die,
     globalState,
@@ -130,8 +124,7 @@ export class ObservableArrayAdministration
     constructor(
         name = __DEV__ ? "ObservableArray@" + getNextId() : "ObservableArray",
         enhancer: IEnhancer<any>,
-        public owned_: boolean,
-        public legacyMode_: boolean
+        public owned_: boolean
     ) {
         this.atom_ = new Atom(name)
         this.enhancer_ = (newV, oldV) =>
@@ -152,30 +145,6 @@ export class ObservableArrayAdministration
         return values
     }
 
-    intercept_(handler: IInterceptor<IArrayWillChange<any> | IArrayWillSplice<any>>): Lambda {
-        return registerInterceptor<IArrayWillChange<any> | IArrayWillSplice<any>>(this, handler)
-    }
-
-    observe_(
-        listener: (changeData: IArrayDidChange<any>) => void,
-        fireImmediately = false
-    ): Lambda {
-        if (fireImmediately) {
-            listener(<IArraySplice<any>>{
-                observableKind: "array",
-                object: this.proxy_ as any,
-                debugObjectName: this.atom_.name_,
-                type: "splice",
-                index: 0,
-                added: this.values_.slice(),
-                addedCount: this.values_.length,
-                removed: [],
-                removedCount: 0
-            })
-        }
-        return registerListener(this, listener)
-    }
-
     getArrayLength_(): number {
         this.atom_.reportObserved()
         return this.values_.length
@@ -183,16 +152,13 @@ export class ObservableArrayAdministration
 
     setArrayLength_(newLength: number) {
         if (typeof newLength !== "number" || isNaN(newLength) || newLength < 0) {
-            die("Out of range: " + newLength)
+            die(40, newLength)
         }
         let currentLength = this.values_.length
         if (newLength === currentLength) {
             return
         } else if (newLength > currentLength) {
-            const newItems = new Array(newLength - currentLength)
-            for (let i = 0; i < newLength - currentLength; i++) {
-                newItems[i] = undefined
-            } // No Array.fill everywhere...
+            const newItems = Array.from({ length: newLength - currentLength })
             this.spliceWithArray_(currentLength, 0, newItems)
         } else {
             this.spliceWithArray_(newLength, currentLength - newLength)
@@ -204,9 +170,6 @@ export class ObservableArrayAdministration
             die(16)
         }
         this.lastKnownLength_ += delta
-        if (this.legacyMode_ && delta > 0) {
-            reserveArrayBuffer(oldLength + delta + 1)
-        }
     }
 
     spliceWithArray_(index: number, deleteCount?: number, newItems?: any[]): any[] {
@@ -250,7 +213,7 @@ export class ObservableArrayAdministration
 
         newItems =
             newItems.length === 0 ? newItems : newItems.map(v => this.enhancer_(v, undefined))
-        if (this.legacyMode_ || __DEV__) {
+        if (__DEV__) {
             const lengthDelta = newItems.length - deleteCount
             this.updateArrayLength_(length, lengthDelta) // checks if internal array wasn't modified
         }
@@ -283,7 +246,7 @@ export class ObservableArrayAdministration
     }
 
     notifyArrayChildUpdate_(index: number, newValue: any, oldValue: any) {
-        const notifySpy = !this.owned_ && isSpyEnabled()
+        const notifySpy = __DEV__ && !this.owned_ && isSpyEnabled()
         const notify = hasListeners(this)
         const change: IArrayDidChange | null =
             notify || notifySpy
@@ -313,7 +276,7 @@ export class ObservableArrayAdministration
     }
 
     notifyArraySplice_(index: number, added: any[], removed: any[]) {
-        const notifySpy = !this.owned_ && isSpyEnabled()
+        const notifySpy = __DEV__ && !this.owned_ && isSpyEnabled()
         const notify = hasListeners(this)
         const change: IArraySplice | null =
             notify || notifySpy
@@ -344,24 +307,12 @@ export class ObservableArrayAdministration
     }
 
     get_(index: number): any | undefined {
-        if (this.legacyMode_ && index >= this.values_.length) {
-            console.warn(
-                __DEV__
-                    ? `[mobx.array] Attempt to read an array index (${index}) that is out of bounds (${this.values_.length}). Please check length first. Out of bound indices will not be tracked by MobX`
-                    : `[mobx] Out of bounds read: ${index}`
-            )
-            return undefined
-        }
         this.atom_.reportObserved()
         return this.dehanceValue_(this.values_[index])
     }
 
     set_(index: number, newValue: any) {
         const values = this.values_
-        if (this.legacyMode_ && index > values.length) {
-            // out of bounds
-            die(17, index, values.length)
-        }
         if (index < values.length) {
             // update at index in range
             checkIfStateModificationsAreAllowed(this.atom_)
@@ -388,10 +339,7 @@ export class ObservableArrayAdministration
             // For out of bound index, we don't create an actual sparse array,
             // but rather fill the holes with undefined (same as setArrayLength_).
             // This could be considered a bug.
-            const newItems = new Array(index + 1 - values.length)
-            for (let i = 0; i < newItems.length - 1; i++) {
-                newItems[i] = undefined
-            } // No Array.fill everywhere...
+            const newItems = Array.from({ length: index + 1 - values.length })
             newItems[newItems.length - 1] = newValue
             this.spliceWithArray_(values.length, 0, newItems)
         }
@@ -404,9 +352,8 @@ export function createObservableArray<T>(
     name = __DEV__ ? "ObservableArray@" + getNextId() : "ObservableArray",
     owned = false
 ): IObservableArray<T> {
-    assertProxies()
     return initObservable(() => {
-        const adm = new ObservableArrayAdministration(name, enhancer, owned, false)
+        const adm = new ObservableArrayAdministration(name, enhancer, owned)
         addHiddenFinalProp(adm.values_, $mobx, adm)
         const proxy = new Proxy(adm.values_, arrayTraps) as any
         adm.proxy_ = proxy

package/src/types/observablemap.ts

@@ -2,9 +2,7 @@ import {
     $mobx,
     IEnhancer,
     IInterceptable,
-    IInterceptor,
     IListenable,
-    Lambda,
     ObservableValue,
     checkIfStateModificationsAreAllowed,
     createAtom,
@@ -22,17 +20,13 @@ import {
     isSpyEnabled,
     notifyListeners,
     referenceEnhancer,
-    registerInterceptor,
-    registerListener,
     spyReportEnd,
     spyReportStart,
     stringifyKey,
     transaction,
     untracked,
-    onBecomeUnobserved,
     globalState,
     die,
-    isFunction,
     UPDATE,
     IAtom,
     PureSpyEvent,
@@ -106,9 +100,6 @@ export class ObservableMap<K = any, V = any>
         public enhancer_: IEnhancer<V> = deepEnhancer,
         public name_ = __DEV__ ? "ObservableMap@" + getNextId() : "ObservableMap"
     ) {
-        if (!isFunction(Map)) {
-            die(18)
-        }
         initObservable(() => {
             this.keysAtom_ = createAtom(__DEV__ ? `${this.name_}.keys()` : "ObservableMap.keys()")
             this.data_ = new Map()
@@ -137,7 +128,7 @@ export class ObservableMap<K = any, V = any>
                 false
             ))
             this.hasMap_.set(key, newEntry)
-            onBecomeUnobserved(newEntry, () => this.hasMap_.delete(key))
+            newEntry.onBUOL = new Set([() => this.hasMap_.delete(key)])
         }
 
         return entry.get()
@@ -178,7 +169,7 @@ export class ObservableMap<K = any, V = any>
             }
         }
         if (this.has_(key)) {
-            const notifySpy = isSpyEnabled()
+            const notifySpy = __DEV__ && isSpyEnabled()
             const notify = hasListeners(this)
             const change: IMapDidChange<K, V> | null =
                 notify || notifySpy
@@ -217,7 +208,7 @@ export class ObservableMap<K = any, V = any>
         const observable = this.data_.get(key)!
         newValue = (observable as any).prepareNewValue_(newValue) as V
         if (newValue !== globalState.UNCHANGED) {
-            const notifySpy = isSpyEnabled()
+            const notifySpy = __DEV__ && isSpyEnabled()
             const notify = hasListeners(this)
             const change: IMapDidChange<K, V> | null =
                 notify || notifySpy
@@ -258,7 +249,7 @@ export class ObservableMap<K = any, V = any>
             this.hasMap_.get(key)?.setNewValue_(true)
             this.keysAtom_.reportChanged()
         })
-        const notifySpy = isSpyEnabled()
+        const notifySpy = __DEV__ && isSpyEnabled()
         const notify = hasListeners(this)
         const change: IMapDidChange<K, V> | null =
             notify || notifySpy
@@ -481,22 +472,6 @@ export class ObservableMap<K = any, V = any>
     get [Symbol.toStringTag]() {
         return "Map"
     }
-
-    /**
-     * Observes this object. Triggers for the events 'add', 'update' and 'delete'.
-     * See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/observe
-     * for callback details
-     */
-    observe_(listener: (changes: IMapDidChange<K, V>) => void, fireImmediately?: boolean): Lambda {
-        if (__DEV__ && fireImmediately === true) {
-            die("`observe` doesn't support fireImmediately=true in combination with maps.")
-        }
-        return registerListener(this, listener)
-    }
-
-    intercept_(handler: IInterceptor<IMapWillChange<K, V>>): Lambda {
-        return registerInterceptor(this, handler)
-    }
 }
 
 // eslint-disable-next-line

package/src/types/observableobject.ts

@@ -12,7 +12,6 @@ import {
     IEnhancer,
     IInterceptable,
     IListenable,
-    Lambda,
     ObservableValue,
     addHiddenProp,
     createInstanceofPredicate,
@@ -26,8 +25,6 @@ import {
     isSpyEnabled,
     notifyListeners,
     referenceEnhancer,
-    registerInterceptor,
-    registerListener,
     spyReportEnd,
     spyReportStart,
     startBatch,
@@ -38,16 +35,14 @@ import {
     die,
     hasProp,
     getDescriptor,
-    storedAnnotationsSymbol,
     ownKeys,
     isOverride,
     defineProperty,
     autoAnnotation,
     getAdministration,
     getDebugName,
-    objectPrototype,
-    MakeResult,
-    checkIfStateModificationsAreAllowed
+    checkIfStateModificationsAreAllowed,
+    assign
 } from "../internal"
 
 const descriptorCache = Object.create(null)
@@ -274,47 +269,6 @@ export class ObservableObjectAdministration
         return entry.get()
     }
 
-    /**
-     * @param {PropertyKey} key
-     * @param {Annotation|boolean} annotation true - use default annotation, false - ignore prop
-     */
-    make_(key: PropertyKey, annotation: Annotation | boolean): void {
-        if (annotation === true) {
-            annotation = this.defaultAnnotation_
-        }
-        if (annotation === false) {
-            return
-        }
-        assertAnnotable(this, annotation, key)
-        if (!(key in this.target_)) {
-            // Throw on missing key, except for decorators:
-            // Decorator annotations are collected from whole prototype chain.
-            // When called from super() some props may not exist yet.
-            // However we don't have to worry about missing prop,
-            // because the decorator must have been applied to something.
-            if (this.target_[storedAnnotationsSymbol]?.[key]) {
-                return // will be annotated by subclass constructor
-            } else {
-                die(1, annotation.annotationType_, `${this.name_}.${key.toString()}`)
-            }
-        }
-        let source = this.target_
-        while (source && source !== objectPrototype) {
-            const descriptor = getDescriptor(source, key)
-            if (descriptor) {
-                const outcome = annotation.make_(this, key, descriptor, source)
-                if (outcome === MakeResult.Cancel) {
-                    return
-                }
-                if (outcome === MakeResult.Break) {
-                    break
-                }
-            }
-            source = Object.getPrototypeOf(source)
-        }
-        recordAnnotationApplied(this, annotation, key)
-    }
-
     /**
      * @param {PropertyKey} key
      * @param {PropertyDescriptor} descriptor
@@ -377,10 +331,9 @@ export class ObservableObjectAdministration
                 }
                 const { newValue } = change as any
                 if (descriptor.value !== newValue) {
-                    descriptor = {
-                        ...descriptor,
+                    descriptor = assign({}, descriptor, {
                         value: newValue
-                    }
+                    })
                 }
             }
 
@@ -618,22 +571,6 @@ export class ObservableObjectAdministration
         return true
     }
 
-    /**
-     * Observes this object. Triggers for the events 'add', 'update' and 'delete'.
-     * See: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/observe
-     * for callback details
-     */
-    observe_(callback: (changes: IObjectDidChange) => void, fireImmediately?: boolean): Lambda {
-        if (__DEV__ && fireImmediately === true) {
-            die("`observe` doesn't support the fire immediately property for observable objects.")
-        }
-        return registerListener(this, callback)
-    }
-
-    intercept_(handler): Lambda {
-        return registerInterceptor(this, handler)
-    }
-
     notifyPropertyAddition_(key: PropertyKey, value: any) {
         const notify = hasListeners(this)
         const notifySpy = __DEV__ && isSpyEnabled()
@@ -765,11 +702,9 @@ export function recordAnnotationApplied(
     if (__DEV__) {
         adm.appliedAnnotations_![key] = annotation
     }
-    // Remove applied decorator annotation so we don't try to apply it again in subclass constructor
-    delete adm.target_[storedAnnotationsSymbol]?.[key]
 }
 
-function assertAnnotable(
+export function assertAnnotable(
     adm: ObservableObjectAdministration,
     annotation: Annotation,
     key: PropertyKey