Small decorators optimization (#2773)

mobxjs · Feb 2, 2021 · 3979bee · 3979bee
1 parent 5d41b64
commit 3979bee
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/.changeset/few-hotels-clean.md b/.changeset/few-hotels-clean.md
@@ -0,0 +1,5 @@
+---
+"mobx": patch
+---
+
+Decorators optimization
diff --git a/packages/mobx/src/api/annotation.ts b/packages/mobx/src/api/annotation.ts
@@ -19,7 +19,6 @@ export type Annotation = {
         proxyTrap: boolean
     ): boolean | null
     options_?: any
-    isDecorator_?: boolean
 }
 
 export type AnnotationMapEntry =

diff --git a/packages/mobx/src/api/decorators.ts b/packages/mobx/src/api/decorators.ts
@@ -38,10 +38,7 @@ export function storeAnnotation(prototype: any, key: PropertyKey, annotation: An
 
     // Ignore override
     if (!isOverride(annotation)) {
-        prototype[storedAnnotationsSymbol][key] = {
-            ...annotation,
-            isDecorator_: true
-        }
+        prototype[storedAnnotationsSymbol][key] = annotation
     }
 }
 

diff --git a/packages/mobx/src/types/actionannotation.ts b/packages/mobx/src/types/actionannotation.ts
@@ -9,7 +9,8 @@ import {
     isFunction,
     Annotation,
     recordAnnotationApplied,
-    globalState
+    globalState,
+    storedAnnotationsSymbol
 } from "../internal"
 
 export function createActionAnnotation(name: string, options?: object): Annotation {
@@ -61,7 +62,7 @@ function make_(adm: ObservableObjectAdministration, key: PropertyKey): void {
     }
     if (annotated) {
         recordAnnotationApplied(adm, this, key)
-    } else if (!this.isDecorator_) {
+    } else if (!adm.target_[storedAnnotationsSymbol]?.[key]) {
         // 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.

diff --git a/packages/mobx/src/types/computedannotation.ts b/packages/mobx/src/types/computedannotation.ts
@@ -4,7 +4,8 @@ import {
     objectPrototype,
     die,
     Annotation,
-    recordAnnotationApplied
+    recordAnnotationApplied,
+    storedAnnotationsSymbol
 } from "../internal"
 
 export function createComputedAnnotation(name: string, options?: object): Annotation {
@@ -36,7 +37,7 @@ function make_(adm: ObservableObjectAdministration, key: PropertyKey): void {
         }
         source = Object.getPrototypeOf(source)
     }
-    if (!this.isDecorator_) {
+    if (!adm.target_[storedAnnotationsSymbol]?.[key]) {
         // 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.

diff --git a/packages/mobx/src/types/flowannotation.ts b/packages/mobx/src/types/flowannotation.ts
@@ -9,7 +9,8 @@ import {
     isFlow,
     recordAnnotationApplied,
     isFunction,
-    globalState
+    globalState,
+    storedAnnotationsSymbol
 } from "../internal"
 
 export function createFlowAnnotation(name: string, options?: object): Annotation {
@@ -51,7 +52,7 @@ function make_(adm: ObservableObjectAdministration, key: PropertyKey): void {
     }
     if (annotated) {
         recordAnnotationApplied(adm, this, key)
-    } else if (!this.isDecorator_) {
+    } else if (!adm.target_[storedAnnotationsSymbol]?.[key]) {
         // 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.

diff --git a/packages/mobx/src/types/observableannotation.ts b/packages/mobx/src/types/observableannotation.ts
@@ -5,7 +5,8 @@ import {
     die,
     Annotation,
     recordAnnotationApplied,
-    objectPrototype
+    objectPrototype,
+    storedAnnotationsSymbol
 } from "../internal"
 
 export function createObservableAnnotation(name: string, options?: object): Annotation {
@@ -39,7 +40,7 @@ function make_(adm: ObservableObjectAdministration, key: PropertyKey): void {
         }
         source = Object.getPrototypeOf(source)
     }
-    if (!this.isDecorator_) {
+    if (!adm.target_[storedAnnotationsSymbol]?.[key]) {
         // 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.

diff --git a/packages/mobx/src/types/observableobject.ts b/packages/mobx/src/types/observableobject.ts
@@ -702,9 +702,7 @@ export function recordAnnotationApplied(
         adm.appliedAnnotations_![key] = annotation
     }
     // Remove applied decorator annotation so we don't try to apply it again in subclass constructor
-    if (annotation.isDecorator_) {
-        delete adm.target_[storedAnnotationsSymbol][key]
-    }
+    delete adm.target_[storedAnnotationsSymbol]?.[key]
 }
 
 function assertAnnotable(