ts-ioc-container 39.2.0 → 39.3.0

package/cjm/resolvers/by.js

@@ -9,12 +9,13 @@ const AliasManyResolver_1 = require("./AliasManyResolver");
 const ClassResolver_1 = require("./ClassResolver");
 const AliasOneResolver_1 = require("./AliasOneResolver");
 const OneResolver_1 = require("./OneResolver");
+const DepKey_1 = require("../DepKey");
 exports.by = {
-    many: (alias) => new AliasManyResolver_1.AliasManyResolver((0, IContainer_1.isDependencyKey)(alias) ? alias : alias.key),
-    one: (key) => new OneResolver_1.OneResolver(key),
-    aliasOne: (alias) => new AliasOneResolver_1.AliasOneResolver(alias),
+    many: (target) => new AliasManyResolver_1.AliasManyResolver((0, IContainer_1.isDependencyKey)(target) ? target : target.key),
+    one: (target) => new OneResolver_1.OneResolver((0, DepKey_1.isDepKey)(target) ? target.key : target),
+    aliasOne: (target) => new AliasOneResolver_1.AliasOneResolver((0, DepKey_1.isDepKey)(target) ? target.key : target),
     classOne: (Target) => new ClassResolver_1.ClassResolver(Target),
-    keyOne: (Target) => new KeyResolver_1.KeyResolver(Target),
+    keyOne: (target) => new KeyResolver_1.KeyResolver((0, DepKey_1.isDepKey)(target) ? target.key : target),
     instances: (predicate = InjectionResolver_1.all) => new InstancesResolver_1.InstancesResolver(predicate),
     scope: {
         current: (container) => container,

package/esm/resolvers/by.js

@@ -6,12 +6,13 @@ import { AliasManyResolver } from './AliasManyResolver';
 import { ClassResolver } from './ClassResolver';
 import { AliasOneResolver } from './AliasOneResolver';
 import { OneResolver } from './OneResolver';
+import { isDepKey } from '../DepKey';
 export const by = {
-    many: (alias) => new AliasManyResolver(isDependencyKey(alias) ? alias : alias.key),
-    one: (key) => new OneResolver(key),
-    aliasOne: (alias) => new AliasOneResolver(alias),
+    many: (target) => new AliasManyResolver(isDependencyKey(target) ? target : target.key),
+    one: (target) => new OneResolver(isDepKey(target) ? target.key : target),
+    aliasOne: (target) => new AliasOneResolver(isDepKey(target) ? target.key : target),
     classOne: (Target) => new ClassResolver(Target),
-    keyOne: (Target) => new KeyResolver(Target),
+    keyOne: (target) => new KeyResolver(isDepKey(target) ? target.key : target),
     instances: (predicate = all) => new InstancesResolver(predicate),
     scope: {
         current: (container) => container,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "39.2.0",
+  "version": "39.3.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",

package/typings/resolvers/by.d.ts

@@ -9,11 +9,11 @@ import { AliasOneResolver } from './AliasOneResolver';
 import { OneResolver } from './OneResolver';
 import { DepKey } from '../DepKey';
 export declare const by: {
-    many: <T>(alias: DependencyKey | DepKey<T>) => AliasManyResolver<T>;
-    one: <T>(key: DependencyKey | constructor<T>) => OneResolver<T>;
-    aliasOne: <T>(alias: DependencyKey) => AliasOneResolver<T>;
+    many: <T>(target: DependencyKey | DepKey<T>) => AliasManyResolver<T>;
+    one: <T>(target: DependencyKey | constructor<T> | DepKey<T>) => OneResolver<T>;
+    aliasOne: <T>(target: DependencyKey | DepKey<T>) => AliasOneResolver<T>;
     classOne: <T>(Target: constructor<T>) => ClassResolver<T>;
-    keyOne: <T>(Target: DependencyKey) => KeyResolver<T>;
+    keyOne: <T>(target: DependencyKey | DepKey<T>) => KeyResolver<T>;
     instances: (predicate?: InstancePredicate) => InstancesResolver;
     scope: {
         current: (container: IContainer) => IContainer;