ts-ioc-container 35.1.0 → 35.2.0

package/cjm/registration/IRegistration.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = exports.getTransformers = exports.scope = exports.redirectFrom = exports.key = void 0;
 const metadata_1 = require("../metadata");
+const by_1 = require("../by");
 const key = (...keys) => (r) => {
     const [originalKey, ...redirectKeys] = keys;
     return r.fromKey(originalKey).redirectFrom(...redirectKeys);
@@ -14,5 +15,10 @@ exports.scope = scope;
 const METADATA_KEY = 'registration';
 const getTransformers = (Target) => (0, metadata_1.getMetadata)(Target, METADATA_KEY) ?? [];
 exports.getTransformers = getTransformers;
-const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappers);
+const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappers.map((m, index) => {
+    if ((0, by_1.isDepKey)(m)) {
+        return index === 0 ? m.register : m.redirectFrom;
+    }
+    return m;
+}));
 exports.register = register;

package/esm/registration/IRegistration.js

@@ -1,4 +1,5 @@
 import { getMetadata, setMetadata } from '../metadata';
+import { isDepKey } from '../by';
 export const key = (...keys) => (r) => {
     const [originalKey, ...redirectKeys] = keys;
     return r.fromKey(originalKey).redirectFrom(...redirectKeys);
@@ -7,4 +8,9 @@ export const redirectFrom = (...keys) => (r) => r.redirectFrom(...keys);
 export const scope = (predicate) => (r) => r.when(predicate);
 const METADATA_KEY = 'registration';
 export const getTransformers = (Target) => getMetadata(Target, METADATA_KEY) ?? [];
-export const register = (...mappers) => setMetadata(METADATA_KEY, mappers);
+export const register = (...mappers) => setMetadata(METADATA_KEY, mappers.map((m, index) => {
+    if (isDepKey(m)) {
+        return index === 0 ? m.register : m.redirectFrom;
+    }
+    return m;
+}));

package/package.json

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

package/typings/by.d.ts

@@ -26,7 +26,7 @@ export declare const by: {
         create: (options: CreateScopeOptions) => (l: IContainer) => IContainer;
     };
 };
-export type DepKey<T = unknown> = {
+export type DepKey<T> = {
     key: DependencyKey;
     assignTo: (registration: IRegistration<T>) => IRegistration<T>;
     register: (fn: (s: IContainer, ...args: unknown[]) => T) => IRegistration<T>;

package/typings/injector/inject.d.ts

@@ -2,5 +2,5 @@ import { constructor } from '../utils';
 import { IContainer } from '../container/IContainer';
 import { InjectFn } from '../hooks/HookContext';
 import { DepKey } from '../by';
-export declare const inject: (fn: InjectFn | DepKey) => ParameterDecorator;
+export declare const inject: <T>(fn: InjectFn | DepKey<T>) => ParameterDecorator;
 export declare const resolveArgs: (Target: constructor<unknown>, methodName?: string) => (scope: IContainer, ...deps: unknown[]) => unknown[];

package/typings/registration/IRegistration.d.ts

@@ -1,6 +1,7 @@
 import { DependencyKey, IContainer, IContainerModule } from '../container/IContainer';
 import { constructor, MapFn } from '../utils';
 import { IProvider } from '../provider/IProvider';
+import { DepKey } from '../by';
 export type ScopePredicate = (s: IContainer) => boolean;
 export interface IRegistration<T = any> extends IContainerModule {
     when(isValidWhen: ScopePredicate): this;
@@ -13,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>[]) => ClassDecorator;
+export declare const register: (...mappers: (MapFn<IRegistration> | DepKey<unknown>)[]) => ClassDecorator;