make injector great again

Author: Florent Gouget

build/app.js

@@ -53,8 +53,20 @@ function ActiveRecord(model, name) {
       function ActiveRecord($injector, rootUrl, options) {
         _classCallCheck(this, ActiveRecord);
 
-        this.$injector = $injector;
-        this.rootUrl = rootUrl;
+        //this.$injector = $injector;
+        Object.defineProperty(this, '$injector', {
+          get: function get() {
+            return $injector;
+          },
+          enumerable: false
+        });
+        Object.defineProperty(this, 'rootUrl', {
+          get: function get() {
+            return rootUrl;
+          },
+          enumerable: false
+        });
+
         this.build(options);
       }
 
@@ -405,19 +417,11 @@ function ActiveRecord(model, name) {
               }
             }
           });
-          var $q = this._injector.get('$q');
+          var $q = this.$injector.get('$q');
           return $q.all(promises).then(function () {
             return _this5.save(populate);
           });
         }
-      }, {
-        key: '$injector',
-        get: function get() {
-          return this._injector;
-        },
-        set: function set($injector) {
-          this._injector = $injector;
-        }
       }, {
         key: '$http',
         get: function get() {

dest/temp/ActiveRecord.js

@@ -52,8 +52,20 @@ function ActiveRecord(model, name) {
       function ActiveRecord($injector, rootUrl, options) {
         _classCallCheck(this, ActiveRecord);
 
-        this.$injector = $injector;
-        this.rootUrl = rootUrl;
+        //this.$injector = $injector;
+        Object.defineProperty(this, '$injector', {
+          get: function get() {
+            return $injector;
+          },
+          enumerable: false
+        });
+        Object.defineProperty(this, 'rootUrl', {
+          get: function get() {
+            return rootUrl;
+          },
+          enumerable: false
+        });
+
         this.build(options);
       }
 
@@ -404,19 +416,11 @@ function ActiveRecord(model, name) {
               }
             }
           });
-          var $q = this._injector.get('$q');
+          var $q = this.$injector.get('$q');
           return $q.all(promises).then(function () {
             return _this5.save(populate);
           });
         }
-      }, {
-        key: '$injector',
-        get: function get() {
-          return this._injector;
-        },
-        set: function set($injector) {
-          this._injector = $injector;
-        }
       }, {
         key: '$http',
         get: function get() {

package.json

@@ -1,7 +1,7 @@
 {
   "author": "flogou <florent.gouget@gmail.com>",
   "name": "angular-orm",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "",
   "homepage": "",
   "dependencies": {

src/ActiveRecord.js

@@ -20,8 +20,14 @@ export default function ActiveRecord (model, name, SManager = SessionManager(mod
 
   let ActiveRecord = class {
     constructor ($injector, rootUrl, options) {
-      this.$injector = $injector;
-      this.rootUrl = rootUrl;
+      Object.defineProperty(this, '$injector', {
+        get: function(){return $injector},
+        enumerable: false
+      })
+      Object.defineProperty(this, 'rootUrl', {
+        get: function(){return rootUrl},
+        enumerable: false
+      })
       this.build(options);
     }
 
@@ -135,14 +141,6 @@ export default function ActiveRecord (model, name, SManager = SessionManager(mod
       return clone
     }
 
-    get $injector () {
-      return this._injector;
-    }
-
-    set $injector ($injector) {
-      this._injector = $injector;
-    }
-
     get $http () {
       return this.$injector.get('$http');
     }
@@ -342,7 +340,7 @@ export default function ActiveRecord (model, name, SManager = SessionManager(mod
           }
         }
       })
-      var $q = this._injector.get('$q')
+      var $q = this.$injector.get('$q')
       return $q.all(promises).then(() => {
         return this.save(populate)
       })