ts-ioc-container 33.2.0 → 33.4.0

package/README.md

@@ -1083,6 +1083,17 @@ describe('Registration module', function () {
 
     expect(root.resolve('FileLogger')).toBeInstanceOf(FileLogger);
   });
+
+  it('should assign additional key which redirects to original one', function () {
+    @register(key('ILogger', 'Logger'))
+    @provider(singleton())
+    class Logger {}
+
+    const root = createContainer().add(R.fromClass(Logger));
+
+    expect(root.resolve('Logger')).toBeInstanceOf(Logger);
+    expect(root.resolve('Logger')).toBe(root.resolve('ILogger'));
+  });
 });
 
 ```

package/cjm/hooks/hook.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.getHooks = exports.hook = void 0;
 const HookContext_1 = require("./HookContext");
 const utils_1 = require("../utils");
+const isHookClassConstructor = (execute) => {
+    return (0, utils_1.isConstructor)(execute) && execute.prototype.execute;
+};
 const hook = (key, ...fns) => (target, propertyKey) => {
     const hooks = Reflect.hasMetadata(key, target.constructor)
         ? Reflect.getMetadata(key, target.constructor)
@@ -23,14 +26,22 @@ const runHooks = (target, key, { scope, createContext = HookContext_1.createHook
     const hooks = Array.from(getHooks(target, key).entries()).filter(([methodName]) => predicate(methodName));
     for (const [methodName, executions] of hooks) {
         for (const execute of executions) {
-            execute(createContext(target, scope, methodName));
+            const context = createContext(target, scope, methodName);
+            if (isHookClassConstructor(execute)) {
+                scope.resolve(execute).execute(context);
+            }
+            else {
+                execute(context);
+            }
         }
     }
 };
 exports.runHooks = runHooks;
 const runHooksAsync = (target, key, { scope, createContext = HookContext_1.createHookContext, predicate = () => true, }) => {
     const hooks = Array.from(getHooks(target, key).entries()).filter(([methodName]) => predicate(methodName));
-    const runExecution = (execute, context) => (0, utils_1.promisify)(execute(context));
+    const runExecution = (execute, context) => isHookClassConstructor(execute)
+        ? (0, utils_1.promisify)(context.scope.resolve(execute).execute(context))
+        : (0, utils_1.promisify)(execute(context));
     return Promise.all(hooks.flatMap(([methodName, executions]) => {
         const context = createContext(target, scope, methodName);
         return executions.map((execute) => runExecution(execute, context));

package/cjm/registration/IRegistration.js

@@ -2,7 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = exports.getTransformers = exports.scope = exports.key = void 0;
 const metadata_1 = require("../metadata");
-const key = (key) => (r) => r.to(key);
+const key = (...keys) => (r) => {
+    const [originalKey, ...redirectKeys] = keys;
+    let registration = r.to(originalKey);
+    for (const key of redirectKeys) {
+        registration = registration.redirectFrom(key);
+    }
+    return registration;
+};
 exports.key = key;
 const scope = (predicate) => (r) => r.when(predicate);
 exports.scope = scope;

package/cjm/registration/Registration.js

@@ -24,12 +24,17 @@ class Registration {
         this.createProvider = createProvider;
         this.key = key;
         this.matchScope = matchScope;
+        this.redirectKeys = new Set();
         this.mappers = [];
     }
     to(key) {
         this.key = key;
         return this;
     }
+    redirectFrom(key) {
+        this.redirectKeys.add(key);
+        return this;
+    }
     pipe(...mappers) {
         this.mappers.push(...mappers);
         return this;
@@ -45,7 +50,11 @@ class Registration {
         if (!this.key) {
             throw new DependencyMissingKeyError_1.DependencyMissingKeyError('No key provided for registration');
         }
-        container.register(this.key, this.createProvider(this.key).pipe(...this.mappers));
+        const key = this.key;
+        container.register(key, this.createProvider(key).pipe(...this.mappers));
+        for (const redirectKey of this.redirectKeys) {
+            container.register(redirectKey, new Provider_1.Provider((s) => s.resolve(key)));
+        }
     }
 }
 exports.Registration = Registration;

package/esm/hooks/hook.js

@@ -1,5 +1,8 @@
 import { createHookContext } from './HookContext';
-import { promisify } from '../utils';
+import { isConstructor, promisify } from '../utils';
+const isHookClassConstructor = (execute) => {
+    return isConstructor(execute) && execute.prototype.execute;
+};
 export const hook = (key, ...fns) => (target, propertyKey) => {
     const hooks = Reflect.hasMetadata(key, target.constructor)
         ? Reflect.getMetadata(key, target.constructor)
@@ -17,13 +20,21 @@ export const runHooks = (target, key, { scope, createContext = createHookContext
     const hooks = Array.from(getHooks(target, key).entries()).filter(([methodName]) => predicate(methodName));
     for (const [methodName, executions] of hooks) {
         for (const execute of executions) {
-            execute(createContext(target, scope, methodName));
+            const context = createContext(target, scope, methodName);
+            if (isHookClassConstructor(execute)) {
+                scope.resolve(execute).execute(context);
+            }
+            else {
+                execute(context);
+            }
         }
     }
 };
 export const runHooksAsync = (target, key, { scope, createContext = createHookContext, predicate = () => true, }) => {
     const hooks = Array.from(getHooks(target, key).entries()).filter(([methodName]) => predicate(methodName));
-    const runExecution = (execute, context) => promisify(execute(context));
+    const runExecution = (execute, context) => isHookClassConstructor(execute)
+        ? promisify(context.scope.resolve(execute).execute(context))
+        : promisify(execute(context));
     return Promise.all(hooks.flatMap(([methodName, executions]) => {
         const context = createContext(target, scope, methodName);
         return executions.map((execute) => runExecution(execute, context));

package/esm/registration/IRegistration.js

@@ -1,5 +1,12 @@
 import { getMetadata, setMetadata } from '../metadata';
-export const key = (key) => (r) => r.to(key);
+export const key = (...keys) => (r) => {
+    const [originalKey, ...redirectKeys] = keys;
+    let registration = r.to(originalKey);
+    for (const key of redirectKeys) {
+        registration = registration.redirectFrom(key);
+    }
+    return registration;
+};
 export const scope = (predicate) => (r) => r.when(predicate);
 const METADATA_KEY = 'registration';
 export const getTransformers = (Target) => getMetadata(Target, METADATA_KEY) ?? [];

package/esm/registration/Registration.js

@@ -21,12 +21,17 @@ export class Registration {
         this.createProvider = createProvider;
         this.key = key;
         this.matchScope = matchScope;
+        this.redirectKeys = new Set();
         this.mappers = [];
     }
     to(key) {
         this.key = key;
         return this;
     }
+    redirectFrom(key) {
+        this.redirectKeys.add(key);
+        return this;
+    }
     pipe(...mappers) {
         this.mappers.push(...mappers);
         return this;
@@ -42,6 +47,10 @@ export class Registration {
         if (!this.key) {
             throw new DependencyMissingKeyError('No key provided for registration');
         }
-        container.register(this.key, this.createProvider(this.key).pipe(...this.mappers));
+        const key = this.key;
+        container.register(key, this.createProvider(key).pipe(...this.mappers));
+        for (const redirectKey of this.redirectKeys) {
+            container.register(redirectKey, new Provider((s) => s.resolve(key)));
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "33.2.0",
+  "version": "33.4.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "f012d80a2d1e681d4babb127e35c6584620773d3"
+  "gitHead": "11b2d0ad78a1b6a6e800c94ac9439f6275c95342"
 }

package/typings/hooks/HookContext.d.ts

@@ -23,5 +23,6 @@ export declare class HookContext implements IHookContext {
     setProperty(fn: InjectFn): void;
     getProperty(): unknown;
 }
-export declare const createHookContext: (Target: object, scope: IContainer, methodName?: string) => IHookContext;
+export type CreateHookContext = (Target: object, scope: IContainer, methodName?: string) => IHookContext;
+export declare const createHookContext: CreateHookContext;
 export declare const hookMetaKey: (methodName?: string) => string;

package/typings/hooks/hook.d.ts

@@ -1,19 +1,23 @@
 import { IContainer } from '../container/IContainer';
-import { createHookContext, IHookContext, InjectFn } from './HookContext';
-export type Hook<T extends IHookContext = IHookContext> = (context: T) => void | Promise<void>;
-type HooksOfClass = Map<string, Hook[]>;
-export declare const hook: (key: string | symbol, ...fns: Hook[]) => (target: object, propertyKey: string | symbol) => void;
+import { CreateHookContext, createHookContext, IHookContext, InjectFn } from './HookContext';
+import { constructor } from '../utils';
+export type HookFn<T extends IHookContext = IHookContext> = (context: T) => void | Promise<void>;
+export interface HookClass<T extends IHookContext = IHookContext> {
+    execute(context: Omit<T, 'scope'>): void | Promise<void>;
+}
+type HooksOfClass = Map<string, (HookFn | constructor<HookClass>)[]>;
+export declare const hook: (key: string | symbol, ...fns: (HookFn | constructor<HookClass>)[]) => (target: object, propertyKey: string | symbol) => void;
 export declare function getHooks(target: object, key: string | symbol): HooksOfClass;
 export declare function hasHooks(target: object, key: string | symbol): boolean;
 export declare const runHooks: (target: object, key: string | symbol, { scope, createContext, predicate, }: {
     scope: IContainer;
-    createContext?: ((Target: object, scope: IContainer, methodName?: string) => IHookContext) | undefined;
+    createContext?: CreateHookContext | undefined;
     predicate?: ((methodName: string) => boolean) | undefined;
 }) => void;
 export declare const runHooksAsync: (target: object, key: string | symbol, { scope, createContext, predicate, }: {
     scope: IContainer;
-    createContext?: ((Target: object, scope: IContainer, methodName?: string) => IHookContext) | undefined;
+    createContext?: CreateHookContext | undefined;
     predicate?: ((methodName: string) => boolean) | undefined;
 }) => Promise<void[]>;
-export declare const injectProp: (fn: InjectFn) => Hook;
+export declare const injectProp: (fn: InjectFn) => HookFn;
 export {};

package/typings/index.d.ts

@@ -18,7 +18,7 @@ export { Registration } from './registration/Registration';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
 export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
 export { ContainerDisposedError } from './errors/ContainerDisposedError';
-export { getHooks, hook, hasHooks, Hook, runHooks, runHooksAsync, injectProp } from './hooks/hook';
+export { getHooks, hook, hasHooks, HookFn, HookClass, runHooks, runHooksAsync, injectProp } from './hooks/hook';
 export { HookContext, InjectFn, IHookContext } from './hooks/HookContext';
 export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases, depKey } from './by';
 export { constructor } from './utils';

package/typings/registration/IRegistration.d.ts

@@ -6,9 +6,10 @@ export interface IRegistration<T = any> extends IContainerModule {
     when(isValidWhen: ScopePredicate): this;
     to(key: DependencyKey): this;
     pipe(...mappers: MapFn<IProvider<T>>[]): this;
+    redirectFrom(key: DependencyKey): this;
 }
 export type ReturnTypeOfRegistration<T> = T extends IRegistration<infer R> ? R : never;
-export declare const key: (key: DependencyKey) => MapFn<IRegistration>;
+export declare const key: (...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;

package/typings/registration/Registration.d.ts

@@ -6,12 +6,14 @@ export declare class Registration<T = any> implements IRegistration<T> {
     private createProvider;
     private key?;
     private matchScope;
+    private redirectKeys;
     static fromClass<T>(Target: constructor<T>): IRegistration<any>;
     static fromValue<T>(value: T): IRegistration<any>;
     static fromFn<T>(fn: ResolveDependency<T>): Registration<T>;
     private mappers;
     constructor(createProvider: (key: DependencyKey) => IProvider<T>, key?: DependencyKey | undefined, matchScope?: ScopePredicate);
     to(key: DependencyKey): this;
+    redirectFrom(key: DependencyKey): this;
     pipe(...mappers: MapFn<IProvider<T>>[]): this;
     when(isValidWhen: ScopePredicate): this;
     applyTo(container: IContainer): void;