mobx-keystone 1.23.0 → 1.24.0

package/dist/types/modelShared/modelDecorator.d.ts

@@ -9,7 +9,7 @@ import { AnyFunction } from '../utils/AnyFunction';
  * @param name Unique name for the model type. Note that this name must be unique for your whole
  * application, so it is usually a good idea to use some prefix unique to your application domain.
  */
-export declare const model: (name: string) => <MC extends ModelClass<AnyModel | AnyDataModel>>(clazz: MC, ...args: any[]) => MC;
+export declare const model: (name: string) => <MC extends ModelClass<AnyModel | AnyDataModel>>(clazz: MC, _context?: ClassDecoratorContext<MC>) => MC;
 /**
  * Marks a class (which MUST inherit from the `Model` abstract class)
  * as a model and decorates some of its methods/properties.

package/dist/types/utils/index.d.ts

@@ -4,3 +4,27 @@
 export declare class MobxKeystoneError extends Error {
     constructor(msg: string);
 }
+/**
+ * MobX method action decorator compatible with both legacy decorators and
+ * MobX 7's standard decorator API.
+ *
+ * This is a decorator compatibility helper, not a replacement for other
+ * `action` overloads such as `action(fn)`. Field decorators are not supported.
+ *
+ * @hidden
+ */
+export declare function mobxAction<This, Args extends unknown[], Return>(value: (this: This, ...args: Args) => Return, context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>): (this: This, ...args: Args) => Return;
+export declare function mobxAction<This, Args extends unknown[], Return>(target: object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Return>): TypedPropertyDescriptor<(this: This, ...args: Args) => Return> | void;
+/**
+ * MobX getter computed decorator compatible with both legacy decorators and
+ * MobX 7's standard decorator API.
+ *
+ * This is a decorator compatibility helper, not a replacement for other
+ * `computed` overloads. Field decorators and decorator options are not supported.
+ * Under MobX 7's legacy decorator transform the getter is backed by a computed
+ * value, but is not registered as a computed property for MobX introspection.
+ *
+ * @hidden
+ */
+export declare function mobxComputed<This, Value>(value: (this: This) => Value, context: ClassGetterDecoratorContext<This, Value>): ((this: This) => Value) | void;
+export declare function mobxComputed<Value>(target: object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<Value>): TypedPropertyDescriptor<Value> | void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-keystone",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "description": "A MobX powered state management solution based on data trees with first class support for TypeScript, snapshots, patches and much more",
   "keywords": [
     "mobx",
@@ -63,11 +63,12 @@
     "build-docs": "shx rm -rf api-docs && node --import ./scripts/typedoc-typescript6-register.mjs ./node_modules/typedoc/dist/cli.js --options ./typedocconfig.js src/index.ts && shx rm -rf ../../apps/site/generated-static/api && shx mkdir -p ../../apps/site/generated-static/api && shx cp -R ./api-docs/* ../../apps/site/generated-static/api"
   },
   "peerDependencies": {
-    "mobx": "^6.0.0 || ^5.0.0 || ^4.0.0"
+    "mobx": "^7.0.0 || ^6.0.0 || ^5.0.0 || ^4.0.0"
   },
   "devDependencies": {
     "@babel/core": "^8.0.1",
     "@babel/plugin-proposal-decorators": "^8.0.2",
+    "@babel/plugin-transform-class-static-block": "^8.0.1",
     "@babel/plugin-transform-class-properties": "^8.0.1",
     "@babel/plugin-transform-typescript": "^8.0.1",
     "@babel/preset-env": "^8.0.2",
@@ -78,6 +79,8 @@
     "@vitest/coverage-v8": "^4.1.10",
     "mobx-v4": "npm:mobx@^4.15.7",
     "mobx-v5": "npm:mobx@^5.15.7",
+    "mobx-v6": "npm:mobx@^6.0.0",
+    "mobx-v7": "npm:mobx@^7.0.0",
     "shx": "^0.4.0",
     "spec.ts": "^1.1.3",
     "ts-node": "^10.9.2",

package/src/actionMiddlewares/undoMiddleware.ts

@@ -1,4 +1,3 @@
-import { action, computed } from "mobx"
 import type { ActionMiddlewareDisposer } from "../action/middleware"
 import { modelAction } from "../action/modelAction"
 import { Model } from "../model/Model"
@@ -10,7 +9,14 @@ import { assertTweakedObject } from "../tweaker/core"
 import { typesArray } from "../types/arrayBased/typesArray"
 import { tProp } from "../types/tProp"
 import { typesUnchecked } from "../types/utility/typesUnchecked"
-import { failure, getMobxVersion, mobx6, namespace } from "../utils"
+import {
+  failure,
+  getMobxVersion,
+  makeObservableCompat,
+  mobxAction,
+  mobxComputed,
+  namespace,
+} from "../utils"
 import { actionTrackingMiddleware, type SimpleActionContext } from "./actionTrackingMiddleware"
 
 /**
@@ -306,7 +312,7 @@ export class UndoManager {
    * The undo stack, where the first operation to undo will be the last of the array.
    * Do not manipulate this array directly.
    */
-  @computed
+  @mobxComputed
   get undoQueue(): ReadonlyArray<UndoEvent> {
     return this.store.undoEvents
   }
@@ -315,7 +321,7 @@ export class UndoManager {
    * The redo stack, where the first operation to redo will be the last of the array.
    * Do not manipulate this array directly.
    */
-  @computed
+  @mobxComputed
   get redoQueue(): ReadonlyArray<UndoEvent> {
     return this.store.redoEvents
   }
@@ -323,7 +329,7 @@ export class UndoManager {
   /**
    * The number of undo actions available.
    */
-  @computed
+  @mobxComputed
   get undoLevels() {
     return this.undoQueue.length
   }
@@ -331,7 +337,7 @@ export class UndoManager {
   /**
    * If undo can be performed (if there is at least one undo action available).
    */
-  @computed
+  @mobxComputed
   get canUndo() {
     return this.undoLevels > 0
   }
@@ -339,7 +345,7 @@ export class UndoManager {
   /**
    * Clears the undo queue.
    */
-  @action
+  @mobxAction
   clearUndo() {
     this.store._clearUndo()
   }
@@ -347,7 +353,7 @@ export class UndoManager {
   /**
    * The number of redo actions available.
    */
-  @computed
+  @mobxComputed
   get redoLevels() {
     return this.redoQueue.length
   }
@@ -355,7 +361,7 @@ export class UndoManager {
   /**
    * If redo can be performed (if there is at least one redo action available)
    */
-  @computed
+  @mobxComputed
   get canRedo() {
     return this.redoLevels > 0
   }
@@ -363,7 +369,7 @@ export class UndoManager {
   /**
    * Clears the redo queue.
    */
-  @action
+  @mobxAction
   clearRedo() {
     this.store._clearRedo()
   }
@@ -372,7 +378,7 @@ export class UndoManager {
    * Undoes the last action.
    * Will throw if there is no action to undo.
    */
-  @action
+  @mobxAction
   undo() {
     if (!this.canUndo) {
       throw failure("nothing to undo")
@@ -397,7 +403,7 @@ export class UndoManager {
    * Redoes the previous action.
    * Will throw if there is no action to redo.
    */
-  @action
+  @mobxAction
   redo() {
     if (!this.canRedo) {
       throw failure("nothing to redo")
@@ -619,7 +625,7 @@ export class UndoManager {
     this.options = options
 
     if (getMobxVersion() >= 6) {
-      mobx6.makeObservable(this)
+      makeObservableCompat(this)
     }
 
     this.store = store ?? new UndoStore({})

package/src/modelShared/modelDecorator.ts

@@ -15,10 +15,11 @@ import {
 } from "../modelShared/modelSymbols"
 import { refreshInternalSnapshot } from "../snapshot/internal"
 import {
+  addLateInitializationFunction,
   failure,
   getMobxVersion,
   logWarning,
-  mobx6,
+  makeObservableCompat,
   runAfterNewSymbol,
   runBeforeOnInitSymbol,
   runLateInitializationFunctions,
@@ -34,11 +35,11 @@ import type { AnyFunction } from "../utils/AnyFunction"
  */
 export const model =
   (name: string) =>
-  <MC extends ModelClass<AnyModel | AnyDataModel>>(clazz: MC, ...args: any[]): MC => {
-    const ctx = typeof args[1] === "object" ? (args[1] as ClassDecoratorContext) : undefined
-
-    return internalModel(name, clazz, ctx?.addInitializer) as any
-  }
+  <MC extends ModelClass<AnyModel | AnyDataModel>>(
+    clazz: MC,
+    _context?: ClassDecoratorContext<MC>
+  ): MC =>
+    internalModel(name, clazz) as any
 
 const afterClassInitializationData = new WeakMap<
   ModelClass<AnyModel | AnyDataModel>,
@@ -56,14 +57,14 @@ const runAfterClassInitialization = (
 
   const tag = afterClassInitializationData.get(target)!
 
-  // compatibility with mobx 6
+  // compatibility with mobx 6 and 7
   if (tag.needsMakeObservable) {
     // we know it can be done and shouldn't fail
-    mobx6.makeObservable(instance)
+    makeObservableCompat(instance)
   } else if (tag.needsMakeObservable === undefined) {
     if (getMobxVersion() >= 6) {
       try {
-        mobx6.makeObservable(instance)
+        makeObservableCompat(instance)
         tag.needsMakeObservable = true
       } catch (e) {
         const err = e as Error
@@ -121,8 +122,7 @@ const proxyClassHandler: ProxyHandler<ModelClass<AnyModel | AnyDataModel>> = {
 
 const internalModel = <MC extends ModelClass<AnyModel | AnyDataModel>>(
   name: string,
-  clazz: MC,
-  addInitializer: ((initializer: (this: any) => void) => void) | undefined
+  clazz: MC
 ): MC | void => {
   const type = isModelClass(clazz) ? "class" : isDataModelClass(clazz) ? "data" : undefined
   if (!type) {
@@ -151,48 +151,24 @@ const internalModel = <MC extends ModelClass<AnyModel | AnyDataModel>>(
   // track if we fail so we only try it once per class
   afterClassInitializationData.set(clazz, { needsMakeObservable: undefined, type })
 
-  if (addInitializer) {
-    // standard decorator API, avoid proxies
-    addInitializer(function (this: any) {
-      runAfterClassInitialization(clazz, this)
-    })
-
-    const modelInfo = {
-      name,
-      class: clazz,
-    }
-
-    modelInfoByName[name] = modelInfo
+  const decoratedClass = new Proxy<MC>(clazz, proxyClassHandler)
+  ;(decoratedClass as any)[modelUnwrappedClassSymbol] = clazz
 
-    modelInfoByClass.set(clazz, modelInfo)
+  decoratedClass.prototype.constructor = decoratedClass
 
-    runLateInitializationFunctions(clazz, runAfterModelDecoratorSymbol)
-
-    return undefined // use same class
-  } else {
-    // non-standard decorator API, use proxies
-
-    // trick so plain new works
-    const proxyClass = new Proxy<MC>(clazz, proxyClassHandler)
-
-    // set or else it points to the undecorated class
-    proxyClass.prototype.constructor = proxyClass
-    ;(proxyClass as any)[modelUnwrappedClassSymbol] = clazz
-
-    const modelInfo = {
-      name,
-      class: proxyClass,
-    }
+  const modelInfo = {
+    name,
+    class: decoratedClass,
+  }
 
-    modelInfoByName[name] = modelInfo
+  modelInfoByName[name] = modelInfo
 
-    modelInfoByClass.set(proxyClass, modelInfo)
-    modelInfoByClass.set(clazz, modelInfo)
+  modelInfoByClass.set(decoratedClass, modelInfo)
+  modelInfoByClass.set(clazz, modelInfo)
 
-    runLateInitializationFunctions(clazz, runAfterModelDecoratorSymbol)
+  runLateInitializationFunctions(clazz, runAfterModelDecoratorSymbol)
 
-    return proxyClass
-  }
+  return decoratedClass
 }
 
 // basically taken from TS
@@ -243,18 +219,53 @@ export function decoratedModel<M, MC extends abstract new (...ags: any) => M>(
     [k in keyof M]?: AnyFunction | ReadonlyArray<AnyFunction>
   }
 ): MC {
+  const mobx7Annotations: Record<string, unknown> = {}
+
   // decorate class members
   for (const [k, decorator] of Object.entries(decorators)) {
+    const decoratorList = Array.isArray(decorator) ? decorator : [decorator]
+    const mobx7Annotation = decoratorList.find(isMobxAnnotation)
+    if (getMobxVersion() >= 7 && mobx7Annotation) {
+      if (decoratorList.length !== 1) {
+        throw failure("MobX 7 decorators cannot be combined in decoratedModel")
+      }
+      mobx7Annotations[k] = mobx7Annotation
+      continue
+    }
+
     const prototypeValueDesc = Object.getOwnPropertyDescriptor(clazz.prototype, k)
     // TS seems to send null for methods in the prototype
     // (which we substitute for the descriptor to avoid a double look-up) and void 0 (undefined) for props
-    tsDecorate(
-      Array.isArray(decorator) ? decorator : [decorator],
-      clazz.prototype,
-      k,
-      prototypeValueDesc ? prototypeValueDesc : void 0
-    )
+    tsDecorate(decoratorList, clazz.prototype, k, prototypeValueDesc ? prototypeValueDesc : void 0)
+  }
+
+  if (getMobxVersion() >= 7 && Object.keys(mobx7Annotations).length > 0) {
+    addLateInitializationFunction(clazz.prototype, runAfterNewSymbol, (instance) => {
+      makeObservableCompat(instance, mobx7Annotations)
+    })
   }
 
   return (name ? model(name)(clazz as unknown as ModelClass<AnyModel>) : clazz) as MC
 }
+
+type MobxAnnotation = {
+  annotationType_: string
+  make_: AnyFunction
+  extend_: AnyFunction
+}
+
+// MobX uses this same structural check in its internal `isAnnotation` helper.
+// That helper is not part of MobX's public root API, so mirror it here instead
+// of depending on a private deep import that may not exist in every supported version.
+function isMobxAnnotation(value: unknown): value is MobxAnnotation {
+  if ((typeof value !== "object" || value === null) && typeof value !== "function") {
+    return false
+  }
+
+  const annotation = value as Partial<MobxAnnotation>
+  return (
+    typeof annotation.annotationType_ === "string" &&
+    typeof annotation.make_ === "function" &&
+    typeof annotation.extend_ === "function"
+  )
+}

package/src/ref/Ref.ts

@@ -1,10 +1,9 @@
-import { computed } from "mobx"
 import { Model } from "../model/Model"
 import { modelTypeKey } from "../model/metadata"
 import type { ModelClass } from "../modelShared/BaseModelShared"
 import { typesString } from "../types/primitiveBased/typesPrimitive"
 import { tProp } from "../types/tProp"
-import { failure } from "../utils"
+import { failure, mobxComputed } from "../utils"
 
 /**
  * A reference model base type.
@@ -21,7 +20,7 @@ export abstract class Ref<T extends object> extends Model({
   /**
    * The object this reference points to, or `undefined` if the reference is currently invalid.
    */
-  @computed
+  @mobxComputed
   get maybeCurrent(): T | undefined {
     return this.resolve()
   }
@@ -29,7 +28,7 @@ export abstract class Ref<T extends object> extends Model({
   /**
    * If the reference is currently valid.
    */
-  @computed
+  @mobxComputed
   get isValid(): boolean {
     return !!this.maybeCurrent
   }
@@ -37,7 +36,7 @@ export abstract class Ref<T extends object> extends Model({
   /**
    * The object this reference points to, or throws if invalid.
    */
-  @computed
+  @mobxComputed
   get current(): T {
     const current = this.maybeCurrent
 

package/src/ref/core.ts

@@ -9,7 +9,7 @@ import {
 import { fastGetRoot } from "../parent/path"
 import { type ComputedWalkTreeAggregate, computedWalkTreeAggregate } from "../parent/walkTree"
 import { assertTweakedObject } from "../tweaker/core"
-import { assertIsObject, failure } from "../utils"
+import { assertIsObject, failure, mobxAction } from "../utils"
 import { getOrCreate } from "../utils/mapUtils"
 import { Ref, type RefConstructor } from "./Ref"
 
@@ -103,7 +103,7 @@ export function internalCustomRef<T extends object>(
       return true
     }
 
-    @action
+    @mobxAction
     forceUpdateBackRefs() {
       const currentTarget = this.maybeCurrent
       if (!this.startTracking(currentTarget)) {

package/src/treeUtils/draft.ts

@@ -1,4 +1,3 @@
-import { action, computed } from "mobx"
 import { pathToTargetPathIds } from "../actionMiddlewares/utils"
 import { resolvePath, resolvePathCheckingIds, skipIdChecking } from "../parent/path"
 import type { Path } from "../parent/pathTypes"
@@ -7,7 +6,7 @@ import { applySnapshot } from "../snapshot/applySnapshot"
 import { fromSnapshot } from "../snapshot/fromSnapshot"
 import { getSnapshot } from "../snapshot/getSnapshot"
 import { assertTweakedObject } from "../tweaker/core"
-import { failure } from "../utils"
+import { failure, mobxAction, mobxComputed } from "../utils"
 import { deepEquals } from "./deepEquals"
 
 /**
@@ -25,7 +24,7 @@ export class Draft<T extends object> {
   /**
    * Commits current draft changes to the original object.
    */
-  @action
+  @mobxAction
   commit(): void {
     applySnapshot(this.originalData, getSnapshot(this.data))
   }
@@ -37,7 +36,7 @@ export class Draft<T extends object> {
    *
    * @param path Path to commit.
    */
-  @action
+  @mobxAction
   commitByPath(path: Path): void {
     const draftTarget = resolvePath(this.data, path)
     if (!draftTarget.resolved) {
@@ -63,7 +62,7 @@ export class Draft<T extends object> {
   /**
    * Resets the draft to be an exact copy of the current state of the original object.
    */
-  @action
+  @mobxAction
   reset(): void {
     applySnapshot(this.data, this.originalSnapshot)
   }
@@ -75,7 +74,7 @@ export class Draft<T extends object> {
    *
    * @param path Path to reset.
    */
-  @action
+  @mobxAction
   resetByPath(path: Path): void {
     const originalTarget = resolvePath(this.originalData, path)
     if (!originalTarget.resolved) {
@@ -101,7 +100,7 @@ export class Draft<T extends object> {
   /**
    * Returns `true` if the draft has changed compared to the original object, `false` otherwise.
    */
-  @computed
+  @mobxComputed
   get isDirty(): boolean {
     return !deepEquals(getSnapshot(this.data), this.originalSnapshot)
   }
@@ -135,7 +134,7 @@ export class Draft<T extends object> {
    */
   readonly originalData: T
 
-  @computed
+  @mobxComputed
   private get originalSnapshot() {
     return getSnapshot(this.originalData)
   }

package/src/tweaker/tweakPlainObject.ts

@@ -48,7 +48,8 @@ export function tweakPlainObject<T extends Record<string, any>>(
   isDataObject: boolean
 ): T {
   const originalObj: Record<string, any> = value
-  const tweakedObj = isObservableObject(originalObj)
+  const originalIsObservableObject = isObservableObject(originalObj)
+  const tweakedObj = originalIsObservableObject
     ? originalObj
     : observable.object({}, undefined, observableOptions)
 
@@ -78,7 +79,7 @@ export function tweakPlainObject<T extends Record<string, any>>(
     const v = originalObj[k]
 
     if (isPrimitive(v)) {
-      if (!doNotTweakChildren) {
+      if (!doNotTweakChildren && !originalIsObservableObject) {
         setIfDifferent(tweakedObj, k, v)
       }
       if (k === "__proto__") {

package/src/utils/index.ts

@@ -1,5 +1,6 @@
 import * as mobx from "mobx"
 import {
+  type IComputedValue,
   type IObservableArray,
   isObservableArray,
   isObservableMap,
@@ -419,6 +420,127 @@ export const mobx6 = {
   ],
 }
 
+/**
+ * MobX method action decorator compatible with both legacy decorators and
+ * MobX 7's standard decorator API.
+ *
+ * This is a decorator compatibility helper, not a replacement for other
+ * `action` overloads such as `action(fn)`. Field decorators are not supported.
+ *
+ * @hidden
+ */
+export function mobxAction<This, Args extends unknown[], Return>(
+  value: (this: This, ...args: Args) => Return,
+  context: ClassMethodDecoratorContext<This, (this: This, ...args: Args) => Return>
+): (this: This, ...args: Args) => Return
+export function mobxAction<This, Args extends unknown[], Return>(
+  target: object,
+  propertyKey: string | symbol,
+  descriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Return>
+): TypedPropertyDescriptor<(this: This, ...args: Args) => Return> | void
+export function mobxAction(...args: any[]): any {
+  if (isStandardDecoratorContext(args[1])) {
+    return (mobx.action as any)(args[0], args[1])
+  }
+
+  if (getMobxVersion() < 7) {
+    return (mobx.action as any)(...args)
+  }
+
+  const descriptor = args[2] as PropertyDescriptor | undefined
+  if (!descriptor?.value) {
+    return descriptor
+  }
+
+  if (mobx.isAction(descriptor.value)) {
+    return descriptor
+  }
+
+  return {
+    ...descriptor,
+    value: mobx.action(String(args[1]), descriptor.value),
+  }
+}
+
+/**
+ * MobX getter computed decorator compatible with both legacy decorators and
+ * MobX 7's standard decorator API.
+ *
+ * This is a decorator compatibility helper, not a replacement for other
+ * `computed` overloads. Field decorators and decorator options are not supported.
+ * Under MobX 7's legacy decorator transform the getter is backed by a computed
+ * value, but is not registered as a computed property for MobX introspection.
+ *
+ * @hidden
+ */
+export function mobxComputed<This, Value>(
+  value: (this: This) => Value,
+  context: ClassGetterDecoratorContext<This, Value>
+): ((this: This) => Value) | void
+export function mobxComputed<Value>(
+  target: object,
+  propertyKey: string | symbol,
+  descriptor: TypedPropertyDescriptor<Value>
+): TypedPropertyDescriptor<Value> | void
+export function mobxComputed(...args: any[]): any {
+  if (isStandardDecoratorContext(args[1])) {
+    return (mobx.computed as any)(args[0], args[1])
+  }
+
+  if (getMobxVersion() < 7) {
+    return (mobx.computed as any)(...args)
+  }
+
+  const descriptor = args[2] as PropertyDescriptor | undefined
+  if (!descriptor?.get) {
+    return descriptor
+  }
+
+  const getter = descriptor.get
+  const computedValues = new WeakMap<object, IComputedValue<unknown>>()
+
+  return {
+    ...descriptor,
+    get(this: object) {
+      let computedValue = computedValues.get(this)
+      if (!computedValue) {
+        const newComputedValue = mobx.computed(() => getter.call(this), {
+          name: String(args[1]),
+        })
+        computedValues.set(this, newComputedValue)
+        computedValue = newComputedValue
+      }
+      return computedValue.get()
+    },
+  }
+}
+
+// Mirrors MobX's standard-decorator call detection. Legacy decorator calls use
+// a string or symbol property key as their second argument, so checking `kind`
+// distinguishes the call shapes without claiming to validate the full context.
+function isStandardDecoratorContext(value: unknown): boolean {
+  return (
+    typeof value === "object" &&
+    value !== null &&
+    typeof (value as { kind?: unknown }).kind === "string"
+  )
+}
+
+/**
+ * Calls `makeObservable` across MobX versions. MobX 7 requires an annotations
+ * object, while MobX 6 and older versions use decorator metadata when no
+ * annotations are passed.
+ *
+ * @internal
+ */
+export function makeObservableCompat(target: object, annotations?: object): void {
+  if (getMobxVersion() >= 7) {
+    mobx6.makeObservable(target, annotations ?? {})
+  } else {
+    mobx6.makeObservable(target)
+  }
+}
+
 /**
  * @internal
  */
@@ -426,17 +548,26 @@ export function propNameToSetterName(propName: string): string {
   return `set${propName[0].toUpperCase()}${propName.slice(1)}`
 }
 
+let cachedMobxVersion: number | undefined
+
 /**
  * @internal
  */
 export function getMobxVersion(): number {
+  if (cachedMobxVersion !== undefined) {
+    return cachedMobxVersion
+  }
+
   if (mobx6.makeObservable!) {
-    return 6
+    const version = (mobx as any)._getGlobalState?.().version
+    cachedMobxVersion = typeof version === "number" && version >= 7 ? version : 6
   } else if ("extendShallowObservable" in mobx) {
-    return 4
+    cachedMobxVersion = 4
   } else {
-    return 5
+    cachedMobxVersion = 5
   }
+
+  return cachedMobxVersion
 }
 
 /**