From c7e8d3e604257db1394cbce8e6640fe21f9a54b4 Mon Sep 17 00:00:00 2001 From: Rob Eisenberg Date: Tue, 13 Dec 2016 16:54:33 -0500 Subject: [PATCH] chore(all): prepare release 1.2.1 --- bower.json | 2 +- dist/amd/aurelia-dependency-injection.js | 11 +++++++++-- dist/aurelia-dependency-injection.js | 11 +++++++++-- dist/commonjs/aurelia-dependency-injection.js | 11 +++++++++-- dist/es2015/aurelia-dependency-injection.js | 11 +++++++++-- dist/native-modules/aurelia-dependency-injection.js | 11 +++++++++-- dist/system/aurelia-dependency-injection.js | 11 +++++++++-- doc/CHANGELOG.md | 11 +++++++++++ package.json | 2 +- 9 files changed, 67 insertions(+), 14 deletions(-) diff --git a/bower.json b/bower.json index f9cdcc9..b355bf8 100644 --- a/bower.json +++ b/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", diff --git a/dist/amd/aurelia-dependency-injection.js b/dist/amd/aurelia-dependency-injection.js index 9bc0328..cd608b5 100644 --- a/dist/amd/aurelia-dependency-injection.js +++ b/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; } }; diff --git a/dist/aurelia-dependency-injection.js b/dist/aurelia-dependency-injection.js index 09286d3..6f5a882 100644 --- a/dist/aurelia-dependency-injection.js +++ b/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; } }; diff --git a/dist/commonjs/aurelia-dependency-injection.js b/dist/commonjs/aurelia-dependency-injection.js index 7e1f94e..faba41a 100644 --- a/dist/commonjs/aurelia-dependency-injection.js +++ b/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; } }; diff --git a/dist/es2015/aurelia-dependency-injection.js b/dist/es2015/aurelia-dependency-injection.js index 3555258..118280b 100644 --- a/dist/es2015/aurelia-dependency-injection.js +++ b/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; } }; diff --git a/dist/native-modules/aurelia-dependency-injection.js b/dist/native-modules/aurelia-dependency-injection.js index a2ddddb..0b5be9a 100644 --- a/dist/native-modules/aurelia-dependency-injection.js +++ b/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; } }; diff --git a/dist/system/aurelia-dependency-injection.js b/dist/system/aurelia-dependency-injection.js index 8237fd8..94323cf 100644 --- a/dist/system/aurelia-dependency-injection.js +++ b/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); diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md index 39b55e8..b4cc7d7 100644 --- a/doc/CHANGELOG.md +++ b/doc/CHANGELOG.md @@ -1,3 +1,14 @@ + +## [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 diff --git a/package.json b/package.json index dd76387..98e2eb0 100644 --- a/package.json +++ b/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",