chore(all): prepare release 1.2.1

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "aurelia-dependency-injection",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A lightweight, extensible dependency injection container for JavaScript.",
   "keywords": [
     "aurelia",

dist/amd/aurelia-dependency-injection.js

@@ -596,7 +596,13 @@ define(['exports', 'aurelia-metadata', 'aurelia-pal'], function (exports, _aurel
           return this.autoRegister(key).get(this, key);
         }
 
-        return this.parent._get(key);
+        var _registration2 = _aureliaMetadata.metadata.get(_aureliaMetadata.metadata.registration, key);
+
+        if (_registration2 === undefined) {
+          return this.parent._get(key);
+        }
+
+        return _registration2.registerResolver(this, key, key).get(this, key);
       }
 
       return resolver.get(this, key);
@@ -693,7 +699,7 @@ define(['exports', 'aurelia-metadata', 'aurelia-pal'], function (exports, _aurel
 
   function autoinject(potentialTarget) {
     var deco = function deco(target) {
-      var previousInject = target.inject;
+      var previousInject = target.inject ? target.inject.slice() : null;
       var autoInject = _aureliaMetadata.metadata.getOwn(_aureliaMetadata.metadata.paramTypes, target) || _emptyParameters;
       if (!previousInject) {
         target.inject = autoInject;
@@ -709,6 +715,7 @@ define(['exports', 'aurelia-metadata', 'aurelia-pal'], function (exports, _aurel
             previousInject[i] = autoInject[i];
           }
         }
+        target.inject = previousInject;
       }
     };
 

dist/aurelia-dependency-injection.js

@@ -948,7 +948,13 @@ export class Container {
         return this.autoRegister(key).get(this, key);
       }
 
-      return this.parent._get(key);
+      let registration = metadata.get(metadata.registration, key);
+
+      if (registration === undefined) {
+        return this.parent._get(key);
+      }
+
+      return registration.registerResolver(this, key, key).get(this, key);
     }
 
     return resolver.get(this, key);
@@ -1060,7 +1066,7 @@ export class Container {
 */
 export function autoinject(potentialTarget?: any): any {
   let deco = function(target) {
-    let previousInject = target.inject;
+    let previousInject = target.inject ? target.inject.slice() : null; //make a copy of target.inject to avoid changing parent inject
     let autoInject: any = metadata.getOwn(metadata.paramTypes, target) || _emptyParameters;
     if (!previousInject) {
       target.inject = autoInject;
@@ -1077,6 +1083,7 @@ export function autoinject(potentialTarget?: any): any {
           previousInject[i] = autoInject[i];
         }
       }
+      target.inject = previousInject;
     }
   };
 

dist/commonjs/aurelia-dependency-injection.js

@@ -600,7 +600,13 @@ var Container = exports.Container = function () {
         return this.autoRegister(key).get(this, key);
       }
 
-      return this.parent._get(key);
+      var _registration2 = _aureliaMetadata.metadata.get(_aureliaMetadata.metadata.registration, key);
+
+      if (_registration2 === undefined) {
+        return this.parent._get(key);
+      }
+
+      return _registration2.registerResolver(this, key, key).get(this, key);
     }
 
     return resolver.get(this, key);
@@ -697,7 +703,7 @@ var Container = exports.Container = function () {
 
 function autoinject(potentialTarget) {
   var deco = function deco(target) {
-    var previousInject = target.inject;
+    var previousInject = target.inject ? target.inject.slice() : null;
     var autoInject = _aureliaMetadata.metadata.getOwn(_aureliaMetadata.metadata.paramTypes, target) || _emptyParameters;
     if (!previousInject) {
       target.inject = autoInject;
@@ -713,6 +719,7 @@ function autoinject(potentialTarget) {
           previousInject[i] = autoInject[i];
         }
       }
+      target.inject = previousInject;
     }
   };
 

dist/es2015/aurelia-dependency-injection.js

@@ -497,7 +497,13 @@ export let Container = class Container {
         return this.autoRegister(key).get(this, key);
       }
 
-      return this.parent._get(key);
+      let registration = metadata.get(metadata.registration, key);
+
+      if (registration === undefined) {
+        return this.parent._get(key);
+      }
+
+      return registration.registerResolver(this, key, key).get(this, key);
     }
 
     return resolver.get(this, key);
@@ -590,7 +596,7 @@ export let Container = class Container {
 
 export function autoinject(potentialTarget) {
   let deco = function (target) {
-    let previousInject = target.inject;
+    let previousInject = target.inject ? target.inject.slice() : null;
     let autoInject = metadata.getOwn(metadata.paramTypes, target) || _emptyParameters;
     if (!previousInject) {
       target.inject = autoInject;
@@ -606,6 +612,7 @@ export function autoinject(potentialTarget) {
           previousInject[i] = autoInject[i];
         }
       }
+      target.inject = previousInject;
     }
   };
 

dist/native-modules/aurelia-dependency-injection.js

@@ -584,7 +584,13 @@ export var Container = function () {
         return this.autoRegister(key).get(this, key);
       }
 
-      return this.parent._get(key);
+      var _registration2 = metadata.get(metadata.registration, key);
+
+      if (_registration2 === undefined) {
+        return this.parent._get(key);
+      }
+
+      return _registration2.registerResolver(this, key, key).get(this, key);
     }
 
     return resolver.get(this, key);
@@ -681,7 +687,7 @@ export var Container = function () {
 
 export function autoinject(potentialTarget) {
   var deco = function deco(target) {
-    var previousInject = target.inject;
+    var previousInject = target.inject ? target.inject.slice() : null;
     var autoInject = metadata.getOwn(metadata.paramTypes, target) || _emptyParameters;
     if (!previousInject) {
       target.inject = autoInject;
@@ -697,6 +703,7 @@ export function autoinject(potentialTarget) {
           previousInject[i] = autoInject[i];
         }
       }
+      target.inject = previousInject;
     }
   };
 

dist/system/aurelia-dependency-injection.js

@@ -172,7 +172,7 @@ System.register(['aurelia-metadata', 'aurelia-pal'], function (_export, _context
 
   function autoinject(potentialTarget) {
     var deco = function deco(target) {
-      var previousInject = target.inject;
+      var previousInject = target.inject ? target.inject.slice() : null;
       var autoInject = metadata.getOwn(metadata.paramTypes, target) || _emptyParameters;
       if (!previousInject) {
         target.inject = autoInject;
@@ -188,6 +188,7 @@ System.register(['aurelia-metadata', 'aurelia-pal'], function (_export, _context
             previousInject[i] = autoInject[i];
           }
         }
+        target.inject = previousInject;
       }
     };
 
@@ -702,7 +703,13 @@ System.register(['aurelia-metadata', 'aurelia-pal'], function (_export, _context
               return this.autoRegister(key).get(this, key);
             }
 
-            return this.parent._get(key);
+            var _registration2 = metadata.get(metadata.registration, key);
+
+            if (_registration2 === undefined) {
+              return this.parent._get(key);
+            }
+
+            return _registration2.registerResolver(this, key, key).get(this, key);
           }
 
           return resolver.get(this, key);

doc/CHANGELOG.md

@@ -1,3 +1,14 @@
+<a name="1.2.1"></a>
+## [1.2.1](https://github.com/aurelia/dependency-injection/compare/1.2.0...v1.2.1) (2016-12-13)
+
+
+### Bug Fixes
+
+* **autoinject:** prevent changing inject of parent classes ([aa38a34](https://github.com/aurelia/dependency-injection/commit/aa38a34))
+* **container:** check for custom registration before bubbling ([98739f2](https://github.com/aurelia/dependency-injection/commit/98739f2))
+
+
+
 # 1.2.0
 
 ## Bug Fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aurelia-dependency-injection",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A lightweight, extensible dependency injection container for JavaScript.",
   "keywords": [
     "aurelia",