Add decorator support

Author: Lee Richmond

package.json

@@ -26,7 +26,8 @@
     "chai-as-promised": "^6.0.0",
     "chai-things": "^0.2.0",
     "fetch-mock": "^5.10.0",
-    "lodash-es": "^4.17.4",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.snakecase": "^4.1.1",
     "mocha": "^3.2.0",
     "shx": "^0.2.2",
     "sinon": "^2.1.0",
@@ -38,7 +39,6 @@
   "dependencies": {
     "es6-promise": "^4.0.5",
     "isomorphic-fetch": "^2.2.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.snakecase": "^4.1.1"
+    "lodash-es": "^4.17.4"
   }
 }

src/attribute.ts

@@ -12,8 +12,16 @@ export default class Attribute {
   static applyAll(klass: typeof Model) : void {
     this._eachAttribute(klass, (attr) => {
       klass.attributeList.push(attr.name);
+      let instance = new klass();
+      let descriptor = attr.descriptor();
+      Object.defineProperty(klass.prototype, attr.name, descriptor);
 
-      Object.defineProperty(klass.prototype, attr.name, attr.getSet());
+      let decorators = instance['__attrDecorators'] || [];
+      decorators.forEach((d) => {
+        if (d['attrName'] === attr.name) {
+          d['decorator'](klass.prototype, attr.name, descriptor);
+        }
+      });
     });
   }
 
@@ -35,10 +43,11 @@ export default class Attribute {
   }
 
   // This returns the getters/setters for use on the *model*
-  getSet() {
+  descriptor() {
     let attr = this;
 
     return {
+      writeable: true,
       get() : any {
         return attr.getter(this);
       },

src/main.ts

@@ -6,10 +6,11 @@ patchExtends();
 import Config from './configuration';
 import Model from './model';
 import Attribute from './attribute';
+import attrDecorator from './util/attr-decorator';
 import { hasMany, hasOne, belongsTo } from './associations';
 
 const attr = function() : any {
   return new Attribute();
 }
 
-export { Config, Model, attr, hasMany, hasOne, belongsTo, patchExtends };
+export { Config, Model, attr, attrDecorator, hasMany, hasOne, belongsTo, patchExtends };

src/model.ts

@@ -8,7 +8,13 @@ import { CollectionProxy, RecordProxy } from './proxies';
 import _extend from './util/extend';
 import { camelize } from './util/string';
 import WritePayload from './util/write-payload';
+import IncludeDirective from './util/include-directive';
 import Request from './request';
+import * as _cloneDeep from './util/clonedeep';
+let cloneDeep: any = (<any>_cloneDeep).default || _cloneDeep;
+if (cloneDeep.default) {
+  cloneDeep = cloneDeep.default;
+}
 
 export default class Model {
   static baseUrl = 'http://please-set-a-base-url.com';

src/util/attr-decorator.ts

@@ -0,0 +1,6 @@
+export default function(decorator: Function) : Function {
+  return function(target: any, attrName: string, descriptor: PropertyDescriptor) : void {
+    if (!target['__attrDecorators']) target['__attrDecorators'] = [];
+    target['__attrDecorators'].push({ attrName, decorator });
+  }
+}