ts-ioc-container 35.2.0 → 35.2.2

package/cjm/container/IContainer.js

@@ -5,7 +5,7 @@ function isDependencyKey(token) {
     return ['string', 'symbol'].includes(typeof token);
 }
 exports.isDependencyKey = isDependencyKey;
-function isConstructor(token) {
-    return typeof token === 'function';
-}
+const isConstructor = (T) => {
+    return typeof T === 'function' && !!T.prototype && !!T.prototype.constructor;
+};
 exports.isConstructor = isConstructor;

package/cjm/registration/IRegistration.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = exports.getTransformers = exports.scope = exports.redirectFrom = exports.key = void 0;
+const IContainer_1 = require("../container/IContainer");
 const metadata_1 = require("../metadata");
 const by_1 = require("../by");
 const key = (...keys) => (r) => {
@@ -19,6 +20,9 @@ const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappe
     if ((0, by_1.isDepKey)(m)) {
         return index === 0 ? m.register : m.redirectFrom;
     }
+    if ((0, IContainer_1.isDependencyKey)(m)) {
+        return (r) => (index === 0 ? r.fromKey(m) : r.redirectFrom(m));
+    }
     return m;
 }));
 exports.register = register;

package/esm/container/IContainer.js

@@ -1,6 +1,6 @@
 export function isDependencyKey(token) {
     return ['string', 'symbol'].includes(typeof token);
 }
-export function isConstructor(token) {
-    return typeof token === 'function';
-}
+export const isConstructor = (T) => {
+    return typeof T === 'function' && !!T.prototype && !!T.prototype.constructor;
+};

package/esm/registration/IRegistration.js

@@ -1,3 +1,4 @@
+import { isDependencyKey } from '../container/IContainer';
 import { getMetadata, setMetadata } from '../metadata';
 import { isDepKey } from '../by';
 export const key = (...keys) => (r) => {
@@ -12,5 +13,8 @@ export const register = (...mappers) => setMetadata(METADATA_KEY, mappers.map((m
     if (isDepKey(m)) {
         return index === 0 ? m.register : m.redirectFrom;
     }
+    if (isDependencyKey(m)) {
+        return (r) => (index === 0 ? r.fromKey(m) : r.redirectFrom(m));
+    }
     return m;
 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "35.2.0",
+  "version": "35.2.2",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "a0c568ba141c21f43115797b9b3f0bc8a70751f2"
+  "gitHead": "9084581b693b3e8644fda248392cc3ec5f07423d"
 }

package/typings/container/IContainer.d.ts

@@ -1,10 +1,10 @@
 import { IProvider } from '../provider/IProvider';
-import { constructor } from '../utils';
+import { constructor, MapFn } from '../utils';
 import { IRegistration } from '../registration/IRegistration';
 export type Tag = string;
 export type DependencyKey = string | symbol;
-export declare function isDependencyKey<T>(token: InjectionToken<T>): token is DependencyKey;
-export declare function isConstructor<T>(token: InjectionToken<T>): token is constructor<T>;
+export declare function isDependencyKey(token: constructor<any> | DependencyKey | MapFn<any>): token is DependencyKey;
+export declare const isConstructor: <T>(T: unknown) => T is constructor<T>;
 export type InjectionToken<T = unknown> = constructor<T> | DependencyKey;
 export type ResolveOptions = {
     args?: unknown[];

package/typings/registration/IRegistration.d.ts

@@ -14,4 +14,4 @@ export declare const key: (...keys: DependencyKey[]) => MapFn<IRegistration>;
 export declare const redirectFrom: (...keys: DependencyKey[]) => MapFn<IRegistration>;
 export declare const scope: (predicate: ScopePredicate) => MapFn<IRegistration>;
 export declare const getTransformers: (Target: constructor<unknown>) => MapFn<IRegistration<any>>[];
-export declare const register: (...mappers: (MapFn<IRegistration> | DepKey<unknown>)[]) => ClassDecorator;
+export declare const register: (...mappers: (MapFn<IRegistration> | DepKey<any> | DependencyKey)[]) => ClassDecorator;