chore(all): prepare release 1.2.0

aurelia · Oct 14, 2016 · 6bbde09 · 6bbde09
1 parent b8b0175
commit 6bbde09
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 30 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-dependency-injection",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "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
@@ -13,7 +13,7 @@ define(['exports', 'aurelia-metadata', 'aurelia-pal'], function (exports, _aurel
   exports.factory = factory;
   exports.newInstance = newInstance;
   exports.invoker = invoker;
-  exports.factory = factory;
+  exports.invokeAsFactory = invokeAsFactory;
   exports.registration = registration;
   exports.transient = transient;
   exports.singleton = singleton;
@@ -289,7 +289,7 @@ define(['exports', 'aurelia-metadata', 'aurelia-pal'], function (exports, _aurel
     };
   }
 
-  function factory(potentialTarget) {
+  function invokeAsFactory(potentialTarget) {
     var deco = function deco(target) {
       _aureliaMetadata.metadata.define(_aureliaMetadata.metadata.invoker, FactoryInvoker.instance, target);
     };
@@ -703,10 +703,10 @@ define(['exports', 'aurelia-metadata', 'aurelia-pal'], function (exports, _aurel
             var prevIndex = previousInject.indexOf(autoInject[i]);
             if (prevIndex > -1) {
               previousInject.splice(prevIndex, 1);
-              previousInject.splice(prevIndex > -1 && prevIndex < i ? i - 1 : i, 0, autoInject[i]);
-            } else if (!previousInject[i]) {
-              previousInject[i] = autoInject[i];
             }
+            previousInject.splice(prevIndex > -1 && prevIndex < i ? i - 1 : i, 0, autoInject[i]);
+          } else if (!previousInject[i]) {
+            previousInject[i] = autoInject[i];
           }
         }
       }

diff --git a/dist/aurelia-dependency-injection.d.ts b/dist/aurelia-dependency-injection.d.ts
@@ -198,6 +198,10 @@ export declare function optional(checkParentOrTarget?: boolean): (target: any, k
 */
 export declare function parent(target: any, key: any, index: any): void;
 /**
+* Decorator: Specifies the dependency to create a factory method, that can accept optional arguments
+*/
+export declare function factory(keyValue: any, asValue?: any): (target: any, key: any, index: any) => void;
+/**
 * Decorator: Specifies the dependency as a new instance
 */
 export declare function newInstance(asKeyOrTarget?: any, ...dynamicDependencies: any[]): (target: any, key: any, index: any) => void;
@@ -206,6 +210,10 @@ export declare function newInstance(asKeyOrTarget?: any, ...dynamicDependencies:
 */
 export declare function invoker(value: Invoker): any;
 /**
+* Decorator: Specifies that the decorated item should be called as a factory function, rather than a constructor.
+*/
+export declare function invokeAsFactory(potentialTarget?: any): any;
+/**
 * A strategy for invoking a function, resulting in an object instance.
 */
 export interface Invoker {

diff --git a/dist/aurelia-dependency-injection.js b/dist/aurelia-dependency-injection.js
@@ -413,7 +413,7 @@ export function invoker(value: Invoker): any {
 /**
 * Decorator: Specifies that the decorated item should be called as a factory function, rather than a constructor.
 */
-export function factory(potentialTarget?: any): any {
+export function invokeAsFactory(potentialTarget?: any): any {
   let deco = function(target) {
     metadata.define(metadata.invoker, FactoryInvoker.instance, target);
   };
@@ -1071,10 +1071,10 @@ export function autoinject(potentialTarget?: any): any {
           const prevIndex = previousInject.indexOf(autoInject[i]);
           if (prevIndex > -1) {
             previousInject.splice(prevIndex, 1);
-            previousInject.splice((prevIndex > -1 && prevIndex < i) ? i - 1 : i, 0, autoInject[i]);
-          } else if (!previousInject[i]) { //else add
-            previousInject[i] = autoInject[i];
           }
+          previousInject.splice((prevIndex > -1 && prevIndex < i) ? i - 1 : i, 0, autoInject[i]);
+        } else if (!previousInject[i]) {//else add
+          previousInject[i] = autoInject[i];
         }
       }
     }

diff --git a/dist/commonjs/aurelia-dependency-injection.js b/dist/commonjs/aurelia-dependency-injection.js
@@ -15,7 +15,7 @@ exports.parent = parent;
 exports.factory = factory;
 exports.newInstance = newInstance;
 exports.invoker = invoker;
-exports.factory = factory;
+exports.invokeAsFactory = invokeAsFactory;
 exports.registration = registration;
 exports.transient = transient;
 exports.singleton = singleton;
@@ -293,7 +293,7 @@ function invoker(value) {
   };
 }
 
-function factory(potentialTarget) {
+function invokeAsFactory(potentialTarget) {
   var deco = function deco(target) {
     _aureliaMetadata.metadata.define(_aureliaMetadata.metadata.invoker, FactoryInvoker.instance, target);
   };
@@ -707,10 +707,10 @@ function autoinject(potentialTarget) {
           var prevIndex = previousInject.indexOf(autoInject[i]);
           if (prevIndex > -1) {
             previousInject.splice(prevIndex, 1);
-            previousInject.splice(prevIndex > -1 && prevIndex < i ? i - 1 : i, 0, autoInject[i]);
-          } else if (!previousInject[i]) {
-            previousInject[i] = autoInject[i];
           }
+          previousInject.splice(prevIndex > -1 && prevIndex < i ? i - 1 : i, 0, autoInject[i]);
+        } else if (!previousInject[i]) {
+          previousInject[i] = autoInject[i];
         }
       }
     }

diff --git a/dist/es2015/aurelia-dependency-injection.js b/dist/es2015/aurelia-dependency-injection.js
@@ -214,7 +214,7 @@ export function invoker(value) {
   };
 }
 
-export function factory(potentialTarget) {
+export function invokeAsFactory(potentialTarget) {
   let deco = function (target) {
     metadata.define(metadata.invoker, FactoryInvoker.instance, target);
   };
@@ -600,10 +600,10 @@ export function autoinject(potentialTarget) {
           const prevIndex = previousInject.indexOf(autoInject[i]);
           if (prevIndex > -1) {
             previousInject.splice(prevIndex, 1);
-            previousInject.splice(prevIndex > -1 && prevIndex < i ? i - 1 : i, 0, autoInject[i]);
-          } else if (!previousInject[i]) {
-            previousInject[i] = autoInject[i];
           }
+          previousInject.splice(prevIndex > -1 && prevIndex < i ? i - 1 : i, 0, autoInject[i]);
+        } else if (!previousInject[i]) {
+          previousInject[i] = autoInject[i];
         }
       }
     }

diff --git a/dist/native-modules/aurelia-dependency-injection.js b/dist/native-modules/aurelia-dependency-injection.js
@@ -277,7 +277,7 @@ export function invoker(value) {
   };
 }
 
-export function factory(potentialTarget) {
+export function invokeAsFactory(potentialTarget) {
   var deco = function deco(target) {
     metadata.define(metadata.invoker, FactoryInvoker.instance, target);
   };
@@ -691,10 +691,10 @@ export function autoinject(potentialTarget) {
           var prevIndex = previousInject.indexOf(autoInject[i]);
           if (prevIndex > -1) {
             previousInject.splice(prevIndex, 1);
-            previousInject.splice(prevIndex > -1 && prevIndex < i ? i - 1 : i, 0, autoInject[i]);
-          } else if (!previousInject[i]) {
-            previousInject[i] = autoInject[i];
           }
+          previousInject.splice(prevIndex > -1 && prevIndex < i ? i - 1 : i, 0, autoInject[i]);
+        } else if (!previousInject[i]) {
+          previousInject[i] = autoInject[i];
         }
       }
     }

diff --git a/dist/system/aurelia-dependency-injection.js b/dist/system/aurelia-dependency-injection.js
@@ -104,15 +104,15 @@ System.register(['aurelia-metadata', 'aurelia-pal'], function (_export, _context
 
   _export('invoker', invoker);
 
-  function factory(potentialTarget) {
+  function invokeAsFactory(potentialTarget) {
     var deco = function deco(target) {
       metadata.define(metadata.invoker, FactoryInvoker.instance, target);
     };
 
     return potentialTarget ? deco(potentialTarget) : deco;
   }
 
-  _export('factory', factory);
+  _export('invokeAsFactory', invokeAsFactory);
 
   function registration(value) {
     return function (target) {
@@ -182,10 +182,10 @@ System.register(['aurelia-metadata', 'aurelia-pal'], function (_export, _context
             var prevIndex = previousInject.indexOf(autoInject[i]);
             if (prevIndex > -1) {
               previousInject.splice(prevIndex, 1);
-              previousInject.splice(prevIndex > -1 && prevIndex < i ? i - 1 : i, 0, autoInject[i]);
-            } else if (!previousInject[i]) {
-              previousInject[i] = autoInject[i];
             }
+            previousInject.splice(prevIndex > -1 && prevIndex < i ? i - 1 : i, 0, autoInject[i]);
+          } else if (!previousInject[i]) {
+            previousInject[i] = autoInject[i];
           }
         }
       }

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 1.2.0
+
+## Bug Fixes
+
+* **autoinject**: merge issue caused incorrect branching logic
+* **invokers:** remove duplicate export name
+
 <a name="1.1.0"></a>
 # [1.1.0](https://github.com/aurelia/dependency-injection/compare/1.0.0...v1.1.0) (2016-10-05)
 

diff --git a/doc/api.json b/doc/api.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-dependency-injection",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A lightweight, extensible dependency injection container for JavaScript.",
   "keywords": [
     "aurelia",