ts-ioc-container 31.1.2 → 31.1.3

package/README.md

@@ -649,7 +649,7 @@ describe('alias', () => {
   it('should resolve by some alias', () => {
     class App implements IApplication {
       private appliedMiddleware: Set<string> = new Set();
-      constructor(@inject(by.aliases((it) => it.includes(IMiddlewareKey))) public middleware: IMiddleware[]) {}
+      constructor(@inject(by.aliases((it) => it.has(IMiddlewareKey))) public middleware: IMiddleware[]) {}
 
       markMiddlewareAsApplied(name: string): void {
         this.appliedMiddleware.add(name);
@@ -687,8 +687,8 @@ describe('alias', () => {
 
     const container = new Container(new MetadataInjector()).addRegistration(R.fromClass(FileLogger));
 
-    expect(by.alias((aliases) => aliases.includes('ILogger'))(container)).toBeInstanceOf(FileLogger);
-    expect(() => by.alias((aliases) => aliases.includes('logger'))(container)).toThrowError(DependencyNotFoundError);
+    expect(by.alias((aliases) => aliases.has('ILogger'))(container)).toBeInstanceOf(FileLogger);
+    expect(() => by.alias((aliases) => aliases.has('logger'))(container)).toThrowError(DependencyNotFoundError);
   });
 });
 
@@ -764,7 +764,7 @@ class MyInjector implements IInjector {
   resolve<T>(container: IContainer, value: constructor<T>, ...deps: unknown[]): T {
     const instance = this.injector.resolve(container, value, ...deps);
     // eslint-disable-next-line @typescript-eslint/ban-types
-    for (const h of getHooks(instance as object, 'onConstruct')) {
+    for (const [h] of getHooks(instance as object, 'onConstruct')) {
       // @ts-ignore
       instance[h]();
     }
@@ -814,6 +814,7 @@ import {
   MetadataInjector,
   register,
 } from 'ts-ioc-container';
+import * as console from 'node:console';
 
 @register(key('logsRepo'))
 @provider(singleton())
@@ -853,7 +854,7 @@ describe('onDispose', function () {
 
     for (const instance of container.getInstances()) {
       // eslint-disable-next-line @typescript-eslint/ban-types
-      for (const h of getHooks(instance as object, 'onDispose')) {
+      for (const [h] of getHooks(instance as object, 'onDispose')) {
         // @ts-ignore
         await instance[h]();
       }

package/cjm/container/Container.js

@@ -25,7 +25,7 @@ class Container {
         this.validateContainer();
         this.providers.set(key, provider);
         if (aliases && aliases.length > 0) {
-            this.aliases.set(key, aliases);
+            this.aliases.set(key, new Set(aliases));
         }
         return this;
     }
@@ -70,10 +70,8 @@ class Container {
     hasTag(tag) {
         return this.tags.has(tag);
     }
-    use(...modules) {
-        for (const module of modules) {
-            module.applyTo(this);
-        }
+    use(module) {
+        module.applyTo(this);
         return this;
     }
     hasDependency(key) {
@@ -108,9 +106,8 @@ class Container {
      * @private
      */
     getRegistrations() {
-        return this.registrations.length
-            ? this.parent.getRegistrations().concat(this.registrations)
-            : this.parent.getRegistrations();
+        const registrations = this.parent.getRegistrations();
+        return this.registrations.length > 0 ? registrations.concat(this.registrations) : registrations;
     }
     /**
      * @private

package/cjm/hook.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHooks = exports.hook = void 0;
-const hook = (key) => (target, propertyKey) => {
-    const hooks = Reflect.hasMetadata(key, target.constructor) ? Reflect.getMetadata(key, target.constructor) : [];
-    Reflect.defineMetadata(key, [...hooks, propertyKey], target.constructor); // eslint-disable-line @typescript-eslint/ban-types
+exports.hasHooks = exports.getHooks = exports.hook = void 0;
+const hook = (key, fn = () => []) => (target, propertyKey) => {
+    const hooks = Reflect.hasMetadata(key, target.constructor)
+        ? Reflect.getMetadata(key, target.constructor)
+        : new Map();
+    hooks.set(propertyKey, fn);
+    Reflect.defineMetadata(key, hooks, target.constructor); // eslint-disable-line @typescript-eslint/ban-types
 };
 exports.hook = hook;
-// eslint-disable-next-line @typescript-eslint/ban-types
 function getHooks(target, key) {
-    return Reflect.hasMetadata(key, target.constructor) ? Reflect.getMetadata(key, target.constructor) : [];
+    return Reflect.hasMetadata(key, target.constructor) ? Reflect.getMetadata(key, target.constructor) : new Map();
 }
 exports.getHooks = getHooks;
+function hasHooks(target, key) {
+    return Reflect.hasMetadata(key, target.constructor);
+}
+exports.hasHooks = hasHooks;

package/cjm/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.by = exports.hook = exports.getHooks = exports.ProxyInjector = exports.SimpleInjector = exports.inject = exports.MetadataInjector = exports.register = exports.scope = exports.alias = exports.key = exports.Registration = exports.AutoMockedContainer = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.ProviderDecorator = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.visible = exports.provider = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.by = exports.hasHooks = exports.hook = exports.getHooks = exports.ProxyInjector = exports.SimpleInjector = exports.inject = exports.MetadataInjector = exports.register = exports.scope = exports.alias = exports.key = exports.Registration = exports.AutoMockedContainer = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.ProviderDecorator = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.visible = exports.provider = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
 var Container_1 = require("./container/Container");
@@ -46,9 +46,13 @@ Object.defineProperty(exports, "ProxyInjector", { enumerable: true, get: functio
 var hook_1 = require("./hook");
 Object.defineProperty(exports, "getHooks", { enumerable: true, get: function () { return hook_1.getHooks; } });
 Object.defineProperty(exports, "hook", { enumerable: true, get: function () { return hook_1.hook; } });
+Object.defineProperty(exports, "hasHooks", { enumerable: true, get: function () { return hook_1.hasHooks; } });
 var by_1 = require("./by");
 Object.defineProperty(exports, "by", { enumerable: true, get: function () { return by_1.by; } });
 var metadata_1 = require("./metadata");
 Object.defineProperty(exports, "setMetadata", { enumerable: true, get: function () { return metadata_1.setMetadata; } });
 Object.defineProperty(exports, "getMetadata", { enumerable: true, get: function () { return metadata_1.getMetadata; } });
 Object.defineProperty(exports, "setParameterMetadata", { enumerable: true, get: function () { return metadata_1.setParameterMetadata; } });
+Object.defineProperty(exports, "setMethodMetadata", { enumerable: true, get: function () { return metadata_1.setMethodMetadata; } });
+Object.defineProperty(exports, "getMethodMetadata", { enumerable: true, get: function () { return metadata_1.getMethodMetadata; } });
+Object.defineProperty(exports, "getParameterMetadata", { enumerable: true, get: function () { return metadata_1.getParameterMetadata; } });

package/cjm/metadata.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getParameterMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = void 0;
+exports.getMethodMetadata = exports.setMethodMetadata = exports.getParameterMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = void 0;
 const setMetadata = (key, value) => (target) => {
     Reflect.defineMetadata(key, value, target);
 };
@@ -19,3 +19,9 @@ const getParameterMetadata = (key, target) => {
     return Reflect.getOwnMetadata(key, target) ?? [];
 };
 exports.getParameterMetadata = getParameterMetadata;
+const setMethodMetadata = (key, value) => (target, propertyKey) => {
+    Reflect.defineMetadata(key, value, target.constructor, propertyKey);
+};
+exports.setMethodMetadata = setMethodMetadata;
+const getMethodMetadata = (key, target, propertyKey) => Reflect.getMetadata(key, target.constructor, propertyKey);
+exports.getMethodMetadata = getMethodMetadata;

package/cjm/registration/IRegistration.js

@@ -6,7 +6,7 @@ const key = (key) => (r) => r.to(key);
 exports.key = key;
 const alias = (...aliases) => (r) => r.addAliases(...aliases);
 exports.alias = alias;
-const scope = (predicate) => (r) => r.setScopePredicate(predicate);
+const scope = (predicate) => (r) => r.when(predicate);
 exports.scope = scope;
 const METADATA_KEY = 'registration';
 const getTransformers = (Target) => (0, metadata_1.getMetadata)(Target, METADATA_KEY) ?? [];

package/cjm/registration/Registration.js

@@ -50,7 +50,7 @@ class Registration {
         }
         container.register(this.key, this.createProvider(), this.aliases);
     }
-    setScopePredicate(isValidWhen) {
+    when(isValidWhen) {
         this.matchScope = isValidWhen;
         return this;
     }

package/esm/container/Container.js

@@ -22,7 +22,7 @@ export class Container {
         this.validateContainer();
         this.providers.set(key, provider);
         if (aliases && aliases.length > 0) {
-            this.aliases.set(key, aliases);
+            this.aliases.set(key, new Set(aliases));
         }
         return this;
     }
@@ -67,10 +67,8 @@ export class Container {
     hasTag(tag) {
         return this.tags.has(tag);
     }
-    use(...modules) {
-        for (const module of modules) {
-            module.applyTo(this);
-        }
+    use(module) {
+        module.applyTo(this);
         return this;
     }
     hasDependency(key) {
@@ -105,9 +103,8 @@ export class Container {
      * @private
      */
     getRegistrations() {
-        return this.registrations.length
-            ? this.parent.getRegistrations().concat(this.registrations)
-            : this.parent.getRegistrations();
+        const registrations = this.parent.getRegistrations();
+        return this.registrations.length > 0 ? registrations.concat(this.registrations) : registrations;
     }
     /**
      * @private

package/esm/hook.js

@@ -1,8 +1,13 @@
-export const hook = (key) => (target, propertyKey) => {
-    const hooks = Reflect.hasMetadata(key, target.constructor) ? Reflect.getMetadata(key, target.constructor) : [];
-    Reflect.defineMetadata(key, [...hooks, propertyKey], target.constructor); // eslint-disable-line @typescript-eslint/ban-types
+export const hook = (key, fn = () => []) => (target, propertyKey) => {
+    const hooks = Reflect.hasMetadata(key, target.constructor)
+        ? Reflect.getMetadata(key, target.constructor)
+        : new Map();
+    hooks.set(propertyKey, fn);
+    Reflect.defineMetadata(key, hooks, target.constructor); // eslint-disable-line @typescript-eslint/ban-types
 };
-// eslint-disable-next-line @typescript-eslint/ban-types
 export function getHooks(target, key) {
-    return Reflect.hasMetadata(key, target.constructor) ? Reflect.getMetadata(key, target.constructor) : [];
+    return Reflect.hasMetadata(key, target.constructor) ? Reflect.getMetadata(key, target.constructor) : new Map();
+}
+export function hasHooks(target, key) {
+    return Reflect.hasMetadata(key, target.constructor);
 }

package/esm/index.js

@@ -15,6 +15,6 @@ export { key, alias, scope, register } from './registration/IRegistration';
 export { MetadataInjector, inject } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';
-export { getHooks, hook } from './hook';
+export { getHooks, hook, hasHooks } from './hook';
 export { by } from './by';
-export { setMetadata, getMetadata, setParameterMetadata } from './metadata';
+export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';

package/esm/metadata.js

@@ -12,3 +12,7 @@ export const setParameterMetadata = (key, value) => (target, propertyKey, parame
 export const getParameterMetadata = (key, target) => {
     return Reflect.getOwnMetadata(key, target) ?? [];
 };
+export const setMethodMetadata = (key, value) => (target, propertyKey) => {
+    Reflect.defineMetadata(key, value, target.constructor, propertyKey);
+};
+export const getMethodMetadata = (key, target, propertyKey) => Reflect.getMetadata(key, target.constructor, propertyKey);

package/esm/registration/IRegistration.js

@@ -1,7 +1,7 @@
 import { getMetadata, setMetadata } from '../metadata';
 export const key = (key) => (r) => r.to(key);
 export const alias = (...aliases) => (r) => r.addAliases(...aliases);
-export const scope = (predicate) => (r) => r.setScopePredicate(predicate);
+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);

package/esm/registration/Registration.js

@@ -47,7 +47,7 @@ export class Registration {
         }
         container.register(this.key, this.createProvider(), this.aliases);
     }
-    setScopePredicate(isValidWhen) {
+    when(isValidWhen) {
         this.matchScope = isValidWhen;
         return this;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "31.1.2",
+  "version": "31.1.3",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "eb63fe25a61354a09e4c88326ed40907005c9757"
+  "gitHead": "691a320cd299d32f09a22b7c36a7887a6e2b8370"
 }

package/typings/container/Container.d.ts

@@ -23,7 +23,7 @@ export declare class Container implements IContainer {
     dispose(): void;
     getInstances(): unknown[];
     hasTag(tag: Tag): boolean;
-    use(...modules: IContainerModule[]): this;
+    use(module: IContainerModule): this;
     hasDependency(key: DependencyKey): boolean;
     getKeysByAlias(predicate: AliasPredicate): DependencyKey[];
     getKeyByAlias(predicate: AliasPredicate): DependencyKey;

package/typings/container/IContainer.d.ts

@@ -20,7 +20,7 @@ export interface Tagged {
     hasTag(tag: Tag): boolean;
 }
 export type Alias = string;
-export type AliasPredicate = (aliases: Alias[]) => boolean;
+export type AliasPredicate = (aliases: Set<Alias>) => boolean;
 export interface IContainer extends Resolvable, Tagged {
     readonly isDisposed: boolean;
     createScope(...tags: Tag[]): IContainer;
@@ -29,7 +29,7 @@ export interface IContainer extends Resolvable, Tagged {
     removeScope(child: IContainer): void;
     getInstances(): unknown[];
     dispose(): void;
-    use(...modules: IContainerModule[]): this;
+    use(module: IContainerModule): this;
     getRegistrations(): IRegistration[];
     hasDependency(key: DependencyKey): boolean;
     getKeysByAlias(alias: AliasPredicate): DependencyKey[];

package/typings/hook.d.ts

@@ -1,2 +1,4 @@
-export declare const hook: (key: string | symbol) => MethodDecorator;
-export declare function getHooks(target: Object, key: string | symbol): string[];
+import { ArgsFn } from './provider/ArgsProvider';
+export declare const hook: (key: string | symbol, fn?: ArgsFn) => MethodDecorator;
+export declare function getHooks(target: object, key: string | symbol): Map<string, ArgsFn>;
+export declare function hasHooks(target: object, key: string | symbol): boolean;

package/typings/index.d.ts

@@ -17,6 +17,6 @@ export { key, alias, IRegistration, scope, register } from './registration/IRegi
 export { MetadataInjector, inject } from './injector/MetadataInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';
-export { getHooks, hook } from './hook';
+export { getHooks, hook, hasHooks } from './hook';
 export { by, InstancePredicate } from './by';
-export { setMetadata, getMetadata, setParameterMetadata } from './metadata';
+export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';

package/typings/metadata.d.ts

@@ -3,3 +3,5 @@ export declare const setMetadata: <T>(key: string | symbol, value: T) => ClassDe
 export declare function getMetadata<T>(target: object, key: string | symbol): T | undefined;
 export declare const setParameterMetadata: (key: string | symbol, value: unknown) => ParameterDecorator;
 export declare const getParameterMetadata: (key: string | symbol, target: constructor<unknown>) => unknown[];
+export declare const setMethodMetadata: (key: string, value: unknown) => MethodDecorator;
+export declare const getMethodMetadata: (key: string, target: object, propertyKey: string) => unknown;

package/typings/registration/IRegistration.d.ts

@@ -3,7 +3,7 @@ import { constructor, MapFn } from '../utils';
 export type ScopePredicate = (c: Tagged) => boolean;
 export interface IRegistration extends IContainerModule {
     addAliases(...aliases: Alias[]): this;
-    setScopePredicate(isValidWhen: ScopePredicate): this;
+    when(isValidWhen: ScopePredicate): this;
     to(key: DependencyKey): this;
 }
 export declare const key: (key: DependencyKey) => MapFn<IRegistration>;

package/typings/registration/Registration.d.ts

@@ -15,5 +15,5 @@ export declare class Registration<T = unknown> implements IRegistration {
     addAliases(...aliases: Alias[]): this;
     pipe(...mappers: MapFn<IProvider<T>>[]): this;
     applyTo(container: IContainer): void;
-    setScopePredicate(isValidWhen: ScopePredicate): this;
+    when(isValidWhen: ScopePredicate): this;
 }