ts-ioc-container 57.1.0 → 57.3.0

package/cjm/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onConstructAsyncHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = exports.createHookContext = exports.createHookContextFactory = exports.HookContext = exports.prepend = exports.append = exports.prependHooks = exports.appendHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnsupportedTokenTypeError = exports.CannonSingletonApplyTwiceError = exports.UnexpectedHookResultError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.ContainerError = exports.Registration = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.arg = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.AutoResolveModule = exports.Container = exports.isDependencyKey = void 0;
-exports.resolveConstructor = exports.Is = exports.pipe = exports.select = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.argToToken = exports.toMappedToken = exports.toToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = exports.AddOnConstructAsyncHookModule = exports.onConstructAsync = void 0;
+exports.createHookContext = exports.createHookContextFactory = exports.HookContext = exports.prepend = exports.append = exports.prependHooks = exports.appendHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnsupportedTokenTypeError = exports.CannonSingletonApplyTwiceError = exports.UnexpectedHookResultError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.ContainerError = exports.Registration = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.argsFn = exports.args = exports.arg = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.AutoResolveModule = exports.Container = exports.isDependencyKey = void 0;
+exports.pipe = exports.select = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.handleAsyncError = exports.handleError = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.argToToken = exports.toMappedToken = exports.toToken = exports.InjectionToken = exports.HooksRunner = exports.AddOnDisposeHookModule = exports.onContainerDisposed = exports.onContainerDisposedHooksRunner = exports.AddOnConstructAsyncHookModule = exports.onConstructAsync = exports.onConstructAsyncHooksRunner = exports.AddOnConstructHookModule = exports.onConstruct = exports.onConstructHooksRunner = exports.injectProp = void 0;
+exports.resolveConstructor = exports.Is = 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");
@@ -26,6 +27,11 @@ Object.defineProperty(exports, "ProxyInjector", { enumerable: true, get: functio
 var Provider_1 = require("./provider/Provider");
 Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return Provider_1.Provider; } });
 var IRegistration_1 = require("./registration/IRegistration");
+Object.defineProperty(exports, "isProviderPipe", { enumerable: true, get: function () { return IRegistration_1.isProviderPipe; } });
+Object.defineProperty(exports, "registerPipe", { enumerable: true, get: function () { return IRegistration_1.registerPipe; } });
+Object.defineProperty(exports, "toBindToken", { enumerable: true, get: function () { return IRegistration_1.toBindToken; } });
+Object.defineProperty(exports, "toProviderFn", { enumerable: true, get: function () { return IRegistration_1.toProviderFn; } });
+Object.defineProperty(exports, "toRegistrationFn", { enumerable: true, get: function () { return IRegistration_1.toRegistrationFn; } });
 Object.defineProperty(exports, "register", { enumerable: true, get: function () { return IRegistration_1.register; } });
 Object.defineProperty(exports, "bindTo", { enumerable: true, get: function () { return IRegistration_1.bindTo; } });
 Object.defineProperty(exports, "scope", { enumerable: true, get: function () { return IRegistration_1.scope; } });

package/cjm/registration/IRegistration.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.singleton = exports.decorate = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.appendArgsFn = exports.appendArgs = exports.scope = exports.bindTo = exports.register = exports.getTransformers = exports.registerPipe = exports.isProviderPipe = void 0;
+exports.singleton = exports.decorate = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.appendArgsFn = exports.appendArgs = exports.scope = exports.bindTo = exports.register = exports.getTransformers = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = void 0;
 const IContainer_1 = require("../container/IContainer");
 const SingleToken_1 = require("../token/SingleToken");
-const BindToken_1 = require("../token/BindToken");
 const class_1 = require("../metadata/class");
 const isProviderPipe = (obj) => obj !== null && typeof obj === 'object' && 'mapProvider' in obj;
 exports.isProviderPipe = isProviderPipe;
@@ -12,24 +11,29 @@ const registerPipe = (mapProvider) => ({
     mapRegistration: (r) => r.pipe(mapProvider),
 });
 exports.registerPipe = registerPipe;
+const toBindToken = (target) => (0, IContainer_1.isDependencyKey)(target) ? new SingleToken_1.SingleToken(target) : target;
+exports.toBindToken = toBindToken;
+const toProviderFn = (mapper) => (0, exports.isProviderPipe)(mapper) ? mapper.mapProvider.bind(mapper) : mapper;
+exports.toProviderFn = toProviderFn;
+const toRegistrationFn = (mapper) => {
+    if (typeof mapper === 'function')
+        return mapper;
+    if ((0, exports.isProviderPipe)(mapper))
+        return (r) => mapper.mapRegistration(r);
+    return (0, exports.bindTo)(mapper);
+};
+exports.toRegistrationFn = toRegistrationFn;
 const METADATA_KEY = 'registration';
 const getTransformers = (Target) => (0, class_1.getClassMeta)(Target, METADATA_KEY) ?? [];
 exports.getTransformers = getTransformers;
 const register = (...mappers) => (0, class_1.addClassMeta)(METADATA_KEY, (acc) => {
-    const result = mappers.map((m) => {
-        if ((0, exports.isProviderPipe)(m))
-            return (r) => m.mapRegistration(r);
-        if ((0, BindToken_1.isBindToken)(m) || (0, IContainer_1.isDependencyKey)(m))
-            return (0, exports.bindTo)(m);
-        return m;
-    });
+    const result = mappers.map((m) => (0, exports.toRegistrationFn)(m));
     return acc ? [...result, ...acc] : result;
 });
 exports.register = register;
 const bindTo = (...tokens) => (r) => {
     for (const token of tokens) {
-        const targetToken = (0, BindToken_1.isBindToken)(token) ? token : new SingleToken_1.SingleToken(token);
-        targetToken.bindTo(r);
+        (0, exports.toBindToken)(token).bindTo(r);
     }
     return r;
 };

package/cjm/registration/Registration.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Registration = void 0;
-const IContainer_1 = require("../container/IContainer");
 const Provider_1 = require("../provider/Provider");
 const DependencyMissingKeyError_1 = require("../errors/DependencyMissingKeyError");
 const IRegistration_1 = require("./IRegistration");
-const IRegistration_2 = require("./IRegistration");
-const SingleToken_1 = require("../token/SingleToken");
 const fp_1 = require("../utils/fp");
 const basic_1 = require("../utils/basic");
 class Registration {
@@ -14,12 +11,12 @@ class Registration {
     key;
     scopeRules;
     static fromClass(Target, { name } = {}) {
-        const transform = (0, fp_1.pipe)(...(0, IRegistration_2.getTransformers)(Target));
+        const transform = (0, fp_1.pipe)(...(0, IRegistration_1.getTransformers)(Target));
         return transform(new Registration(() => Provider_1.Provider.fromClass(Target), name ?? Target.name));
     }
     static fromValue(value) {
         if (basic_1.Is.constructor(value)) {
-            const transform = (0, fp_1.pipe)(...(0, IRegistration_2.getTransformers)(value));
+            const transform = (0, fp_1.pipe)(...(0, IRegistration_1.getTransformers)(value));
             return transform(new Registration(() => Provider_1.Provider.fromValue(value), value.name));
         }
         return new Registration(() => Provider_1.Provider.fromValue(value));
@@ -46,8 +43,7 @@ class Registration {
         return this;
     }
     pipe(...mappers) {
-        const fns = mappers.map((m) => ((0, IRegistration_1.isProviderPipe)(m) ? m.mapProvider.bind(m) : m));
-        this.mappers.push(...fns);
+        this.mappers.push(...mappers.map(IRegistration_1.toProviderFn));
         return this;
     }
     when(...predicates) {
@@ -55,11 +51,7 @@ class Registration {
         return this;
     }
     bindTo(key) {
-        if ((0, IContainer_1.isDependencyKey)(key)) {
-            new SingleToken_1.SingleToken(key).bindTo(this);
-            return this;
-        }
-        key.bindTo(this);
+        (0, IRegistration_1.toBindToken)(key).bindTo(this);
         return this;
     }
     matchScope(container) {

package/esm/index.js

@@ -7,7 +7,7 @@ export { MetadataInjector, inject, arg, args, argsFn, resolveArgs } from './inje
 export { SimpleInjector } from './injector/SimpleInjector.js';
 export { ProxyInjector } from './injector/ProxyInjector.js';
 export { Provider } from './provider/Provider.js';
-export { register, bindTo, scope, scopeAccess, lazy, autoResolve, singleton, decorate, appendArgs, appendArgsFn, } from './registration/IRegistration.js';
+export { isProviderPipe, registerPipe, toBindToken, toProviderFn, toRegistrationFn, register, bindTo, scope, scopeAccess, lazy, autoResolve, singleton, decorate, appendArgs, appendArgsFn, } from './registration/IRegistration.js';
 export { Registration } from './registration/Registration.js';
 export { ContainerError } from './errors/ContainerError.js';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError.js';

package/esm/registration/IRegistration.js

@@ -1,28 +1,29 @@
 import { isDependencyKey } from '../container/IContainer.js';
 import { SingleToken } from '../token/SingleToken.js';
-import { isBindToken } from '../token/BindToken.js';
 import { addClassMeta, getClassMeta } from '../metadata/class.js';
 export const isProviderPipe = (obj) => obj !== null && typeof obj === 'object' && 'mapProvider' in obj;
 export const registerPipe = (mapProvider) => ({
     mapProvider,
     mapRegistration: (r) => r.pipe(mapProvider),
 });
+export const toBindToken = (target) => isDependencyKey(target) ? new SingleToken(target) : target;
+export const toProviderFn = (mapper) => isProviderPipe(mapper) ? mapper.mapProvider.bind(mapper) : mapper;
+export const toRegistrationFn = (mapper) => {
+    if (typeof mapper === 'function')
+        return mapper;
+    if (isProviderPipe(mapper))
+        return (r) => mapper.mapRegistration(r);
+    return bindTo(mapper);
+};
 const METADATA_KEY = 'registration';
 export const getTransformers = (Target) => getClassMeta(Target, METADATA_KEY) ?? [];
 export const register = (...mappers) => addClassMeta(METADATA_KEY, (acc) => {
-    const result = mappers.map((m) => {
-        if (isProviderPipe(m))
-            return (r) => m.mapRegistration(r);
-        if (isBindToken(m) || isDependencyKey(m))
-            return bindTo(m);
-        return m;
-    });
+    const result = mappers.map((m) => toRegistrationFn(m));
     return acc ? [...result, ...acc] : result;
 });
 export const bindTo = (...tokens) => (r) => {
     for (const token of tokens) {
-        const targetToken = isBindToken(token) ? token : new SingleToken(token);
-        targetToken.bindTo(r);
+        toBindToken(token).bindTo(r);
     }
     return r;
 };

package/esm/registration/Registration.js

@@ -1,9 +1,6 @@
-import { isDependencyKey } from '../container/IContainer.js';
 import { Provider } from '../provider/Provider.js';
 import { DependencyMissingKeyError } from '../errors/DependencyMissingKeyError.js';
-import { isProviderPipe } from './IRegistration.js';
-import { getTransformers } from './IRegistration.js';
-import { SingleToken } from '../token/SingleToken.js';
+import { getTransformers, toBindToken, toProviderFn, } from './IRegistration.js';
 import { pipe } from '../utils/fp.js';
 import { Is } from '../utils/basic.js';
 export class Registration {
@@ -43,8 +40,7 @@ export class Registration {
         return this;
     }
     pipe(...mappers) {
-        const fns = mappers.map((m) => (isProviderPipe(m) ? m.mapProvider.bind(m) : m));
-        this.mappers.push(...fns);
+        this.mappers.push(...mappers.map(toProviderFn));
         return this;
     }
     when(...predicates) {
@@ -52,11 +48,7 @@ export class Registration {
         return this;
     }
     bindTo(key) {
-        if (isDependencyKey(key)) {
-            new SingleToken(key).bindTo(this);
-            return this;
-        }
-        key.bindTo(this);
+        toBindToken(key).bindTo(this);
         return this;
     }
     matchScope(container) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "57.1.0",
+  "version": "57.3.0",
   "description": "Fast, lightweight TypeScript dependency injection container with a clean API, scoped lifecycles, decorators, tokens, hooks, lazy injection, customizable providers, and no global container objects.",
   "publishConfig": {
     "access": "public",

package/typings/index.d.ts

@@ -8,7 +8,7 @@ export { SimpleInjector } from './injector/SimpleInjector.js';
 export { ProxyInjector } from './injector/ProxyInjector.js';
 export { type ResolveDependency, type IProvider, type DecorateFn, type ArgsFn, type ProviderOptions, type GetCacheKey, type ScopeAccessOptions, type ScopeAccessRule, } from './provider/IProvider.js';
 export { Provider } from './provider/Provider.js';
-export { type IRegistration, type ReturnTypeOfRegistration, type ScopeMatchRule, type ProviderPipe, register, bindTo, scope, scopeAccess, lazy, autoResolve, singleton, decorate, appendArgs, appendArgsFn, } from './registration/IRegistration.js';
+export { type IRegistration, type ReturnTypeOfRegistration, type ScopeMatchRule, type ProviderPipe, type Bindable, type ProviderMapper, type RegistrationMapper, isProviderPipe, registerPipe, toBindToken, toProviderFn, toRegistrationFn, register, bindTo, scope, scopeAccess, lazy, autoResolve, singleton, decorate, appendArgs, appendArgsFn, } from './registration/IRegistration.js';
 export { Registration } from './registration/Registration.js';
 export { ContainerError } from './errors/ContainerError.js';
 export { DependencyNotFoundError } from './errors/DependencyNotFoundError.js';

package/typings/registration/IRegistration.d.ts

@@ -10,18 +10,24 @@ export interface ProviderPipe<T = unknown> {
 }
 export declare const isProviderPipe: <T>(obj: unknown) => obj is ProviderPipe<T>;
 export declare const registerPipe: <T>(mapProvider: (p: IProvider<T>) => IProvider<T>) => ProviderPipe<T>;
+export type Bindable<T = any> = DependencyKey | BindToken<T>;
+export declare const toBindToken: <T>(target: Bindable<T>) => BindToken<T>;
+export type ProviderMapper<T = any> = MapFn<IProvider<T>> | ProviderPipe<T>;
+export declare const toProviderFn: <T>(mapper: ProviderMapper<T>) => MapFn<IProvider<T>>;
+export type RegistrationMapper<T = any> = MapFn<IRegistration<T>> | ProviderPipe<T> | Bindable<T>;
+export declare const toRegistrationFn: <T>(mapper: RegistrationMapper<T>) => MapFn<IRegistration<T>>;
 export interface IRegistration<T = any> extends IContainerModule {
     getKeyOrFail(): DependencyKey;
     when(...predicates: ScopeMatchRule[]): this;
     bindToKey(key: DependencyKey): this;
-    bindTo(key: DependencyKey | BindToken): this;
-    pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): this;
+    bindTo(key: Bindable): this;
+    pipe(...mappers: ProviderMapper<T>[]): this;
     bindToAlias(alias: DependencyKey): this;
 }
 export type ReturnTypeOfRegistration<T> = T extends IRegistration<infer R> ? R : never;
 export declare const getTransformers: (Target: constructor<unknown>) => MapFn<IRegistration<any>>[];
-export declare const register: (...mappers: Array<MapFn<IRegistration> | ProviderPipe | BindToken | DependencyKey>) => ClassDecorator;
-export declare const bindTo: (...tokens: (DependencyKey | BindToken)[]) => MapFn<IRegistration>;
+export declare const register: (...mappers: RegistrationMapper[]) => ClassDecorator;
+export declare const bindTo: (...tokens: Bindable[]) => MapFn<IRegistration>;
 export declare const scope: (...rules: ScopeMatchRule[]) => MapFn<IRegistration>;
 export declare const appendArgs: <T>(...extraArgs: unknown[]) => ProviderPipe<T>;
 export declare const appendArgsFn: <T>(fn: ArgsFn) => ProviderPipe<T>;

package/typings/registration/Registration.d.ts

@@ -1,8 +1,6 @@
 import { DependencyKey, IContainer } from '../container/IContainer.js';
 import type { IProvider, ResolveDependency } from '../provider/IProvider.js';
-import { IRegistration, ProviderPipe, ScopeMatchRule } from './IRegistration.js';
-import { BindToken } from '../token/BindToken.js';
-import { type MapFn } from '../utils/fp.js';
+import { type Bindable, type IRegistration, type ProviderMapper, type ScopeMatchRule } from './IRegistration.js';
 import { type constructor } from '../utils/basic.js';
 export declare class Registration<T = any> implements IRegistration<T> {
     private createProvider;
@@ -19,9 +17,9 @@ export declare class Registration<T = any> implements IRegistration<T> {
     constructor(createProvider: () => IProvider<T>, key?: DependencyKey | undefined, scopeRules?: ScopeMatchRule[]);
     bindToKey(key: DependencyKey): this;
     bindToAlias(alias: DependencyKey): this;
-    pipe(...mappers: (MapFn<IProvider<T>> | ProviderPipe<T>)[]): this;
+    pipe(...mappers: ProviderMapper<T>[]): this;
     when(...predicates: ScopeMatchRule[]): this;
-    bindTo(key: DependencyKey | BindToken): this;
+    bindTo(key: Bindable): this;
     private matchScope;
     applyTo(container: IContainer): void;
     getKeyOrFail(): DependencyKey;