Merge pull request #1691 from ramybenaroya/compose-property-decorator-mobx4

decorate - compose decorators for a single prop (mobx4)

Author: mweststrate

package.json

@@ -66,6 +66,7 @@
     "rollup": "^0.41.6",
     "rollup-plugin-filesize": "^1.3.2",
     "rollup-plugin-node-resolve": "^3.0.0",
+    "serializr": "^1.3.0",
     "size-limit": "^0.2.0",
     "tape": "^4.2.2",
     "ts-jest": "^22.0.0",
@@ -115,4 +116,4 @@
       "<rootDir>/node_modules/"
     ]
   }
-}
+}

src/api/decorate.ts

@@ -2,25 +2,43 @@ import { invariant, isPlainObject } from "../utils/utils"
 
 export function decorate<T>(
     clazz: new (...args: any[]) => T,
-    decorators: { [P in keyof T]?: MethodDecorator | PropertyDecorator }
+    decorators: {
+        [P in keyof T]?:
+            | MethodDecorator
+            | PropertyDecorator
+            | Array<MethodDecorator>
+            | Array<PropertyDecorator>
+    }
 ): void
 export function decorate<T>(
     object: T,
-    decorators: { [P in keyof T]?: MethodDecorator | PropertyDecorator }
+    decorators: {
+        [P in keyof T]?:
+            | MethodDecorator
+            | PropertyDecorator
+            | Array<MethodDecorator>
+            | Array<PropertyDecorator>
+    }
 ): T
 export function decorate(thing: any, decorators: any) {
     process.env.NODE_ENV !== "production" &&
         invariant(isPlainObject(decorators), "Decorators should be a key value map")
     const target = typeof thing === "function" ? thing.prototype : thing
     for (let prop in decorators) {
-        const decorator = decorators[prop]
+        let propertyDecorators = decorators[prop]
+        if (!Array.isArray(propertyDecorators)) {
+            propertyDecorators = [propertyDecorators]
+        }
         process.env.NODE_ENV !== "production" &&
             invariant(
-                typeof decorator === "function",
-                `Decorate: expected a decorator function for '${prop}'`
+                propertyDecorators.every(decorator => typeof decorator === "function"),
+                `Decorate: expected a decorator function or array of decorator functions for '${prop}'`
             )
         const descriptor = Object.getOwnPropertyDescriptor(target, prop)
-        const newDescriptor = decorator(target, prop, descriptor)
+        const newDescriptor = propertyDecorators.reduce(
+            (accDescriptor, decorator) => decorator(target, prop, accDescriptor),
+            descriptor
+        )
         if (newDescriptor) Object.defineProperty(target, prop, newDescriptor)
     }
     return thing

test/base/decorate.js

@@ -14,9 +14,12 @@ import {
     isComputedProp,
     spy,
     isAction,
-    decorate
+    decorate,
+    reaction
 } from "../../src/mobx"
 
+import { serializable, primitive, serialize, deserialize } from "serializr"
+
 test("decorate should work", function() {
     class Box {
         // @ts-ignore
@@ -368,3 +371,79 @@ test("decorate should not allow @observable on getter", function() {
     expect(() => obj.x).toThrow(/"y"/)
     expect(() => obj.y).toThrow()
 })
+
+test("decorate a function property with two decorators", function() {
+    let callsCount = 0
+    let spyCount = 0
+    const spyDisposer = spy(ev => {
+        if (ev.type === "action" && ev.name === "fn") spyCount++
+    })
+
+    const countFunctionCallsDecorator = (target, key, descriptor) => {
+        const func = descriptor.value
+        descriptor.value = function wrapper(...args) {
+            const result = func.call(this, ...args)
+            callsCount++
+            return result
+        }
+        for (const key in func) {
+            descriptor.value[key] = func[key]
+        }
+        return descriptor
+    }
+
+    class Obj {
+        fn() {}
+    }
+
+    decorate(Obj, {
+        fn: [action("fn"), countFunctionCallsDecorator]
+    })
+
+    const obj = new Obj()
+
+    expect(isAction(obj.fn)).toBe(true)
+
+    obj.fn()
+
+    expect(callsCount).toEqual(1)
+    expect(spyCount).toEqual(1)
+
+    obj.fn()
+
+    expect(callsCount).toEqual(2)
+    expect(spyCount).toEqual(2)
+
+    spyDisposer()
+})
+
+test("decorate a property with two decorators", function() {
+    let updatedByAutorun
+
+    class Obj {
+        x = null
+    }
+
+    decorate(Obj, {
+        x: [serializable(primitive()), observable]
+    })
+
+    const obj = deserialize(Obj, {
+        x: 0
+    })
+
+    const d = autorun(() => {
+        updatedByAutorun = obj.x
+    })
+
+    expect(isObservableProp(obj, "x")).toBe(true)
+    expect(updatedByAutorun).toEqual(0)
+
+    obj.x++
+
+    expect(obj.x).toEqual(1)
+    expect(updatedByAutorun).toEqual(1)
+    expect(serialize(obj).x).toEqual(1)
+
+    d()
+})

yarn.lock

@@ -4982,6 +4982,10 @@ [email protected]:
     range-parser "~1.2.0"
     statuses "~1.3.1"
 
+serializr@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/serializr/-/serializr-1.3.0.tgz#6c7f977461d54a24bb1f17a03ed0ce61d239b010"
+
 [email protected]:
   version "1.12.3"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.12.3.tgz#9f4ba19e2f3030c547f8af99107838ec38d5b1e2"