ts-ioc-container 41.1.1 → 41.2.0

package/README.md

@@ -84,7 +84,6 @@ And `tsconfig.json` should have next options:
 ### Basic usage
 
 ```typescript
-import 'reflect-metadata';
 import { type IContainer, by, Container, inject, Registration as R } from 'ts-ioc-container';
 
 describe('Basic usage', function () {
@@ -125,7 +124,6 @@ Sometimes you need to create a scope of container. For example, when you want to
 - NOTICE: when you create a scope then we clone ONLY tags-matched providers.
 
 ```typescript
-import 'reflect-metadata';
 import {
   asKey,
   by,
@@ -173,7 +171,6 @@ Sometimes you want to get all instances from container and its scopes. For examp
 - you can get instances from container and scope which were created by injector
 
 ```typescript
-import 'reflect-metadata';
 import { asKey, by, Container, inject, register, Registration as R } from 'ts-ioc-container';
 
 describe('Instances', function () {
@@ -243,7 +240,6 @@ Sometimes you want to dispose container and all its scopes. For example, when yo
 - when container is disposed then it unregisters all providers and remove all instances
 
 ```typescript
-import 'reflect-metadata';
 import { by, Container, ContainerDisposedError, Registration as R } from 'ts-ioc-container';
 
 class Logger {}
@@ -369,7 +365,6 @@ This type of injector uses `@inject` decorator to mark where dependencies should
 Also you can [inject property.](#inject-property)
 
 ```typescript
-import 'reflect-metadata';
 import { Container, inject, Registration as R } from 'ts-ioc-container';
 
 class Logger {
@@ -404,7 +399,6 @@ describe('Reflection Injector', function () {
 This type of injector just passes container to constructor with others arguments.
 
 ```typescript
-import 'reflect-metadata';
 import { Container, type IContainer, Registration as R, SimpleInjector } from 'ts-ioc-container';
 
 describe('SimpleInjector', function () {
@@ -444,7 +438,6 @@ describe('SimpleInjector', function () {
 This type of injector injects dependencies as dictionary `Record<string, unknown>`.
 
 ```typescript
-import 'reflect-metadata';
 import { Container, ProxyInjector, args, Registration as R } from 'ts-ioc-container';
 
 describe('ProxyInjector', function () {
@@ -541,7 +534,6 @@ Provider is dependency factory which creates dependency.
 - `new Provider((container, ...args) => container.resolve(Logger, {args}))`
 
 ```typescript
-import 'reflect-metadata';
 import {
   args,
   argsFn,
@@ -823,7 +815,6 @@ Sometimes you need to create only one instance of dependency per scope. For exam
 - NOTICE: if you create a scope 'A' of container 'root' then Logger of A !== Logger of root.
 
 ```typescript
-import 'reflect-metadata';
 import { asKey, Container, register, Registration as R, singleton } from 'ts-ioc-container';
 
 @register(asKey('logger'), singleton())
@@ -865,19 +856,20 @@ Sometimes you want to bind some arguments to provider. This is what `ArgsProvide
 - NOTICE: args from this provider has higher priority than args from `resolve` method.
 
 ```typescript
-import 'reflect-metadata';
 import {
   args,
   argsFn,
   asKey,
+  by,
   Container,
-  type DependencyKey,
+  depKey,
   inject,
   MultiCache,
   register,
   Registration as R,
   singleton,
 } from 'ts-ioc-container';
+import { resolveByArgs } from '../lib/provider/IProvider';
 
 @register(asKey('logger'))
 class Logger {
@@ -893,7 +885,7 @@ describe('ArgsProvider', function () {
   }
 
   it('can assign argument function to provider', function () {
-    const root = createContainer().addRegistration(R.fromClass(Logger).pipe(argsFn((container, ...args) => ['name'])));
+    const root = createContainer().addRegistration(R.fromClass(Logger).pipe(argsFn(() => ['name'])));
 
     const logger = root.createScope().resolveOne<Logger>('logger');
     expect(logger.name).toBe('name');
@@ -920,25 +912,34 @@ describe('ArgsProvider', function () {
       name: string;
     }
 
-    @register(asKey('UserRepository'))
+    const IUserRepositoryKey = depKey<IRepository>('IUserRepository');
+    const ITodoRepositoryKey = depKey<IRepository>('ITodoRepository');
+
+    @register(IUserRepositoryKey.asKey)
     class UserRepository implements IRepository {
       name = 'UserRepository';
     }
 
-    @register(asKey('TodoRepository'))
+    @register(ITodoRepositoryKey.asKey)
     class TodoRepository implements IRepository {
       name = 'TodoRepository';
     }
 
-    @register(asKey('EntityManager'), argsFn((container, token) => [container.resolveOne(token as DependencyKey)]))
+    interface IEntityManager {
+      repository: IRepository;
+    }
+
+    const IEntityManagerKey = depKey<IEntityManager>('IEntityManager');
+
+    @register(IEntityManagerKey.asKey, argsFn(resolveByArgs))
     class EntityManager {
       constructor(public repository: IRepository) {}
     }
 
     class Main {
       constructor(
-        @inject((s) => s.resolveOne('EntityManager', { args: ['UserRepository'] })) public userEntities: EntityManager,
-        @inject((s) => s.resolveOne('EntityManager', { args: ['TodoRepository'] })) public todoEntities: EntityManager,
+        @inject(by.one(IEntityManagerKey).args(IUserRepositoryKey)) public userEntities: EntityManager,
+        @inject(by.one(IEntityManagerKey).args(ITodoRepositoryKey)) public todoEntities: EntityManager,
       ) {}
     }
 
@@ -957,29 +958,34 @@ describe('ArgsProvider', function () {
       name: string;
     }
 
-    @register(asKey('UserRepository'))
+    const IUserRepositoryKey = depKey<IRepository>('IUserRepository');
+    const ITodoRepositoryKey = depKey<IRepository>('ITodoRepository');
+
+    @register(IUserRepositoryKey.asKey)
     class UserRepository implements IRepository {
       name = 'UserRepository';
     }
 
-    @register(asKey('TodoRepository'))
+    @register(ITodoRepositoryKey.asKey)
     class TodoRepository implements IRepository {
       name = 'TodoRepository';
     }
 
-    @register(
-      asKey('EntityManager'),
-      argsFn((container, token) => [container.resolveOne(token as DependencyKey)]),
-      singleton(() => new MultiCache((...args: unknown[]) => args[0] as DependencyKey)),
-    )
+    interface IEntityManager {
+      repository: IRepository;
+    }
+
+    const IEntityManagerKey = depKey<IEntityManager>('IEntityManager');
+
+    @register(IEntityManagerKey.asKey, argsFn(resolveByArgs), singleton(MultiCache.fromFirstArg))
     class EntityManager {
       constructor(public repository: IRepository) {}
     }
 
     class Main {
       constructor(
-        @inject((s) => s.resolveOne('EntityManager', { args: ['UserRepository'] })) public userEntities: EntityManager,
-        @inject((s) => s.resolveOne('EntityManager', { args: ['TodoRepository'] })) public todoEntities: EntityManager,
+        @inject(by.one(IEntityManagerKey).args(IUserRepositoryKey)) public userEntities: EntityManager,
+        @inject(by.one(IEntityManagerKey).args(ITodoRepositoryKey)) public todoEntities: EntityManager,
       ) {}
     }
 
@@ -989,11 +995,11 @@ describe('ArgsProvider', function () {
       .addRegistration(R.fromClass(TodoRepository));
     const main = root.resolveOne(Main);
 
-    const userRepository = root.resolveOne<EntityManager>('EntityManager', { args: ['UserRepository'] }).repository;
+    const userRepository = IEntityManagerKey.resolve(root, { args: [IUserRepositoryKey] }).repository;
     expect(userRepository).toBeInstanceOf(UserRepository);
     expect(main.userEntities.repository).toBe(userRepository);
 
-    const todoRepository = root.resolveOne<EntityManager>('EntityManager', { args: ['TodoRepository'] }).repository;
+    const todoRepository = IEntityManagerKey.resolve(root, { args: [ITodoRepositoryKey] }).repository;
     expect(todoRepository).toBeInstanceOf(TodoRepository);
     expect(main.todoEntities.repository).toBe(todoRepository);
   });
@@ -1007,7 +1013,6 @@ Sometimes you want to hide dependency if somebody wants to resolve it from certa
 - `Provider.fromClass(Logger).pipe(visible(({ isParent, child }) => isParent || child.hasTag('root')))`
 
 ```typescript
-import 'reflect-metadata';
 import {
   asKey,
   Container,
@@ -1047,7 +1052,6 @@ Alias is needed to group keys
 - `Provider.fromClass(Logger).pipe(alias('logger'))`
 
 ```typescript
-import 'reflect-metadata';
 import { asAlias, by, Container, DependencyNotFoundError, inject, register, Registration as R, scope } from 'ts-ioc-container';
 
 describe('alias', () => {
@@ -1271,7 +1275,6 @@ Sometimes you want to register provider with certain key. This is what `key` is
 - you can assign the same key to different registrations
 
 ```typescript
-import 'reflect-metadata';
 import { asAlias, asKey, Container, register, Registration as R, scope, singleton } from 'ts-ioc-container';
 import { DependencyMissingKeyError } from '../../lib/errors/DependencyMissingKeyError';
 
@@ -1332,7 +1335,6 @@ Sometimes you need to register provider only in scope which matches to certain c
 - `Registration.fromClass(Logger).when((container) => container.hasTag('root'))`
 
 ```typescript
-import 'reflect-metadata';
 import { singleton, Container, Registration as R, scope, register, asKey } from 'ts-ioc-container';
 
 @register(asKey('ILogger'), scope((s) => s.hasTag('root')), singleton())
@@ -1351,7 +1353,6 @@ describe('ScopeProvider', function () {
 Sometimes you want to encapsulate registration logic in separate module. This is what `IContainerModule` is for.
 
 ```typescript
-import 'reflect-metadata';
 import { asKey, Container, type IContainer, type IContainerModule, register, Registration as R } from 'ts-ioc-container';
 
 @register(asKey('ILogger'))
@@ -1397,7 +1398,6 @@ Sometimes you need to invoke methods after construct or dispose of class. This i
 
 ### OnConstruct
 ```typescript
-import 'reflect-metadata';
 import {
   asKey,
   type constructor,
@@ -1452,7 +1452,6 @@ describe('onConstruct', function () {
 
 ### OnDispose
 ```typescript
-import 'reflect-metadata';
 import { asKey, by, Container, hook, inject, register, Registration as R, runHooks, singleton } from 'ts-ioc-container';
 
 @register(asKey('logsRepo'), singleton())

package/cjm/DepKey.js

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.depKey = exports.isDepKey = void 0;
+exports.depKey = void 0;
 const Registration_1 = require("./registration/Registration");
 const Provider_1 = require("./provider/Provider");
-const isDepKey = (key) => {
-    return typeof key === 'object' && key !== null && 'key' in key;
-};
-exports.isDepKey = isDepKey;
 const depKey = (key) => {
     const scopePredicates = [];
     const mappers = [];
@@ -26,7 +22,7 @@ const depKey = (key) => {
             }
             return registration;
         },
-        resolve: (s) => s.resolveOne(key),
+        resolve: (s, options) => s.resolveOne(key, options),
         pipe(...values) {
             mappers.push(...values);
             return this;

package/cjm/container/IContainer.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_CONTAINER_RESOLVER = void 0;
-exports.isDependencyKey = isDependencyKey;
 const utils_1 = require("../utils");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
-function isDependencyKey(token) {
-    return ['string', 'symbol'].includes(typeof token);
-}
 const DEFAULT_CONTAINER_RESOLVER = (scope, keyOrAlias, options) => {
-    if ((0, utils_1.isConstructor)(keyOrAlias)) {
+    if (utils_1.Is.constructor(keyOrAlias)) {
         return scope.resolveClass(keyOrAlias, options);
     }
     try {

package/cjm/hooks/hook.js

@@ -8,7 +8,7 @@ const utils_1 = require("../utils");
 const UnexpectedHookResultError_1 = require("../errors/UnexpectedHookResultError");
 const inject_1 = require("../injector/inject");
 const isHookClassConstructor = (execute) => {
-    return (0, utils_1.isConstructor)(execute) && execute.prototype.execute;
+    return utils_1.Is.constructor(execute) && execute.prototype.execute;
 };
 const toHookFn = (execute) => isHookClassConstructor(execute) ? (context) => context.scope.resolveOne(execute).execute(context) : execute;
 exports.toHookFn = toHookFn;

package/cjm/index.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.depKey = exports.by = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.HookContext = exports.runOnDisposeHooks = exports.runOnConstructHooks = exports.onConstruct = exports.onDispose = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.register = exports.scope = exports.asAlias = exports.asKey = exports.decorate = exports.MultiCache = exports.multiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.lazy = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
-// Containers
-var IContainer_1 = require("./container/IContainer");
-Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
+exports.depKey = exports.Is = exports.by = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.HookContext = exports.runOnDisposeHooks = exports.runOnConstructHooks = exports.onConstruct = exports.onDispose = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.register = exports.scope = exports.asAlias = exports.asKey = exports.decorate = exports.MultiCache = exports.multiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.lazy = exports.scopeAccess = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = void 0;
 var Container_1 = require("./container/Container");
 Object.defineProperty(exports, "Container", { enumerable: true, get: function () { return Container_1.Container; } });
 var EmptyContainer_1 = require("./container/EmptyContainer");
@@ -79,5 +76,7 @@ Object.defineProperty(exports, "getParameterMetadata", { enumerable: true, get:
 // Others
 var resolve_1 = require("./resolve");
 Object.defineProperty(exports, "by", { enumerable: true, get: function () { return resolve_1.by; } });
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "Is", { enumerable: true, get: function () { return utils_1.Is; } });
 var DepKey_1 = require("./DepKey");
 Object.defineProperty(exports, "depKey", { enumerable: true, get: function () { return DepKey_1.depKey; } });

package/cjm/injector/inject.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveArgs = exports.toInjectFn = exports.inject = void 0;
+exports.isInjectBuilder = isInjectBuilder;
 const metadata_1 = require("../metadata");
 const utils_1 = require("../utils");
-const IContainer_1 = require("../container/IContainer");
 const HookContext_1 = require("../hooks/HookContext");
 const inject = (fn) => (target, propertyKey, parameterIndex) => {
-    (0, metadata_1.setParameterMetadata)((0, HookContext_1.hookMetaKey)(propertyKey), (0, exports.toInjectFn)(fn))((0, utils_1.isInstance)(target) ? target.constructor : target, propertyKey, parameterIndex);
+    (0, metadata_1.setParameterMetadata)((0, HookContext_1.hookMetaKey)(propertyKey), (0, exports.toInjectFn)(fn))(utils_1.Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
 };
 exports.inject = inject;
 function isInjectBuilder(fn) {
@@ -16,10 +16,10 @@ const toInjectFn = (target) => {
     if (typeof target === 'object' && isInjectBuilder(target)) {
         return (s) => target.resolve(s);
     }
-    if ((0, utils_1.isConstructor)(target)) {
+    if (utils_1.Is.constructor(target)) {
         return (scope) => scope.resolveClass(target);
     }
-    if ((0, IContainer_1.isDependencyKey)(target)) {
+    if (utils_1.Is.dependencyKey(target)) {
         return (scope) => scope.resolveOne(target);
     }
     return target;

package/cjm/provider/Cache.js

@@ -4,6 +4,9 @@ exports.SingleCache = exports.multiCache = exports.MultiCache = void 0;
 class MultiCache {
     getKey;
     instances = new Map();
+    static fromFirstArg() {
+        return new MultiCache((key) => key);
+    }
     constructor(getKey = () => '1') {
         this.getKey = getKey;
     }

package/cjm/provider/IProvider.js

@@ -1,11 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProviderDecorator = exports.lazy = exports.scopeAccess = exports.argsFn = exports.args = void 0;
+exports.ProviderDecorator = exports.lazy = exports.scopeAccess = exports.resolveByArgs = exports.argsFn = exports.args = void 0;
+const utils_1 = require("../utils");
 const ProviderPipe_1 = require("./ProviderPipe");
 const args = (...extraArgs) => (0, ProviderPipe_1.registerPipe)((p) => p.setArgs(() => extraArgs));
 exports.args = args;
 const argsFn = (fn) => (0, ProviderPipe_1.registerPipe)((p) => p.setArgs(fn));
 exports.argsFn = argsFn;
+const resolveByArgs = (s, ...deps) => deps.map((d) => {
+    if (utils_1.Is.injectBuilder(d)) {
+        return d.resolve(s);
+    }
+    if (utils_1.Is.constructor(d)) {
+        return s.resolveClass(d);
+    }
+    return d;
+});
+exports.resolveByArgs = resolveByArgs;
 const scopeAccess = (predicate) => (0, ProviderPipe_1.registerPipe)((p) => p.setAccessPredicate(predicate));
 exports.scopeAccess = scopeAccess;
 const lazy = () => (0, ProviderPipe_1.registerPipe)((p) => p.lazy());

package/cjm/registration/IRegistration.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.asKey = exports.asAlias = exports.register = exports.getTransformers = exports.scope = void 0;
-const IContainer_1 = require("../container/IContainer");
+const utils_1 = require("../utils");
 const metadata_1 = require("../metadata");
 const ProviderPipe_1 = require("../provider/ProviderPipe");
 const scope = (...predicates) => (r) => r.when(...predicates);
@@ -11,7 +11,7 @@ const getTransformers = (Target) => (0, metadata_1.getMetadata)(Target, METADATA
 exports.getTransformers = getTransformers;
 const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappers.map((m) => ((0, ProviderPipe_1.isProviderPipe)(m) ? (r) => m.mapRegistration(r) : m)));
 exports.register = register;
-const asAlias = (target) => (r) => r.bindToAlias((0, IContainer_1.isDependencyKey)(target) ? target : target.key);
+const asAlias = (target) => (r) => r.bindToAlias(utils_1.Is.dependencyKey(target) ? target : target.key);
 exports.asAlias = asAlias;
 const asKey = (key) => (r) => r.bindToKey(key);
 exports.asKey = asKey;

package/cjm/registration/Registration.js

@@ -15,7 +15,7 @@ class Registration {
         return transform(new Registration(() => Provider_1.Provider.fromClass(Target), Target.name));
     }
     static fromValue(value) {
-        if ((0, utils_1.isConstructor)(value)) {
+        if (utils_1.Is.constructor(value)) {
             const transform = (0, utils_1.pipe)(...(0, IRegistration_1.getTransformers)(value));
             return transform(new Registration(() => Provider_1.Provider.fromValue(value), value.name));
         }

package/cjm/resolve.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.by = exports.InstancesResolver = exports.InjectionResolver = void 0;
-const IContainer_1 = require("./container/IContainer");
-const DepKey_1 = require("./DepKey");
+const utils_1 = require("./utils");
 class InjectionResolver {
     resolveByOptions;
     isLazy = false;
@@ -55,18 +54,18 @@ class InstancesResolver {
 exports.InstancesResolver = InstancesResolver;
 exports.by = {
     many: (target) => {
-        const alias = (0, IContainer_1.isDependencyKey)(target) ? target : target.key;
+        const alias = utils_1.Is.dependencyKey(target) ? target : target.key;
         return new InjectionResolver((s, options) => s.resolveMany(alias, options));
     },
     one: (target) => {
-        const key = (0, DepKey_1.isDepKey)(target) ? target.key : target;
+        const key = utils_1.Is.DepKey(target) ? target.key : target;
         return new InjectionResolver((s, options) => s.resolveOne(key, options));
     },
     /**
      * Use it only for optimization. Otherwise, recommended to use `by.one`
      */
     aliasOne: (target) => {
-        const alias = (0, DepKey_1.isDepKey)(target) ? target.key : target;
+        const alias = utils_1.Is.DepKey(target) ? target.key : target;
         return new InjectionResolver((s, options) => s.resolveOneByAlias(alias, options));
     },
     instances: (predicate = () => true) => new InstancesResolver(predicate),

package/cjm/utils.js

@@ -1,14 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Filter = exports.List = exports.promisify = exports.constant = exports.pipe = exports.isConstructor = void 0;
-exports.isInstance = isInstance;
+exports.Is = exports.Filter = exports.List = exports.promisify = exports.constant = exports.pipe = void 0;
 exports.fillEmptyIndexes = fillEmptyIndexes;
 exports.lazyProxy = lazyProxy;
-const isConstructor = (T) => typeof T === 'function' && !!T.prototype;
-exports.isConstructor = isConstructor;
-function isInstance(target) {
-    return Object.prototype.hasOwnProperty.call(target, 'constructor');
-}
 const pipe = (...mappers) => (value) => mappers.reduce((acc, current) => current(acc), value);
 exports.pipe = pipe;
 function fillEmptyIndexes(baseArr, insertArr) {
@@ -44,3 +38,13 @@ exports.Filter = {
         return (v) => !excludeSet.has(v);
     },
 };
+exports.Is = {
+    object: (target) => target !== null && typeof target === 'object',
+    instance: (target) => Object.prototype.hasOwnProperty.call(target, 'constructor'),
+    constructor: (target) => typeof target === 'function' && !!target.prototype,
+    dependencyKey: (target) => ['string', 'symbol'].includes(typeof target),
+    injectBuilder: (target) => exports.Is.object(target) && 'resolve' in target && typeof target['resolve'] === 'function',
+    DepKey: (key) => {
+        return typeof key === 'object' && key !== null && 'key' in key;
+    },
+};

package/esm/DepKey.js

@@ -1,8 +1,5 @@
 import { Registration } from './registration/Registration';
 import { Provider } from './provider/Provider';
-export const isDepKey = (key) => {
-    return typeof key === 'object' && key !== null && 'key' in key;
-};
 export const depKey = (key) => {
     const scopePredicates = [];
     const mappers = [];
@@ -22,7 +19,7 @@ export const depKey = (key) => {
             }
             return registration;
         },
-        resolve: (s) => s.resolveOne(key),
+        resolve: (s, options) => s.resolveOne(key, options),
         pipe(...values) {
             mappers.push(...values);
             return this;

package/esm/container/IContainer.js

@@ -1,10 +1,7 @@
-import { isConstructor } from '../utils';
+import { Is } from '../utils';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
-export function isDependencyKey(token) {
-    return ['string', 'symbol'].includes(typeof token);
-}
 export const DEFAULT_CONTAINER_RESOLVER = (scope, keyOrAlias, options) => {
-    if (isConstructor(keyOrAlias)) {
+    if (Is.constructor(keyOrAlias)) {
         return scope.resolveClass(keyOrAlias, options);
     }
     try {

package/esm/hooks/hook.js

@@ -1,9 +1,9 @@
 import { createHookContext } from './HookContext';
-import { isConstructor, promisify } from '../utils';
+import { Is, promisify } from '../utils';
 import { UnexpectedHookResultError } from '../errors/UnexpectedHookResultError';
 import { toInjectFn } from '../injector/inject';
 const isHookClassConstructor = (execute) => {
-    return isConstructor(execute) && execute.prototype.execute;
+    return Is.constructor(execute) && execute.prototype.execute;
 };
 export const toHookFn = (execute) => isHookClassConstructor(execute) ? (context) => context.scope.resolveOne(execute).execute(context) : execute;
 export const hook = (key, ...fns) => (target, propertyKey) => {

package/esm/index.js

@@ -1,5 +1,3 @@
-// Containers
-export { isDependencyKey, } from './container/IContainer';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
@@ -29,4 +27,5 @@ export { HookContext } from './hooks/HookContext';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
 // Others
 export { by } from './resolve';
+export { Is } from './utils';
 export { depKey } from './DepKey';

package/esm/injector/inject.js

@@ -1,21 +1,20 @@
 import { getParameterMetadata, setParameterMetadata } from '../metadata';
-import { constant, fillEmptyIndexes, isConstructor, isInstance } from '../utils';
-import { isDependencyKey } from '../container/IContainer';
+import { constant, fillEmptyIndexes, Is } from '../utils';
 import { hookMetaKey } from '../hooks/HookContext';
 export const inject = (fn) => (target, propertyKey, parameterIndex) => {
-    setParameterMetadata(hookMetaKey(propertyKey), toInjectFn(fn))(isInstance(target) ? target.constructor : target, propertyKey, parameterIndex);
+    setParameterMetadata(hookMetaKey(propertyKey), toInjectFn(fn))(Is.instance(target) ? target.constructor : target, propertyKey, parameterIndex);
 };
-function isInjectBuilder(fn) {
+export function isInjectBuilder(fn) {
     return 'resolve' in fn && typeof fn['resolve'] === 'function';
 }
 export const toInjectFn = (target) => {
     if (typeof target === 'object' && isInjectBuilder(target)) {
         return (s) => target.resolve(s);
     }
-    if (isConstructor(target)) {
+    if (Is.constructor(target)) {
         return (scope) => scope.resolveClass(target);
     }
-    if (isDependencyKey(target)) {
+    if (Is.dependencyKey(target)) {
         return (scope) => scope.resolveOne(target);
     }
     return target;

package/esm/provider/Cache.js

@@ -1,6 +1,9 @@
 export class MultiCache {
     getKey;
     instances = new Map();
+    static fromFirstArg() {
+        return new MultiCache((key) => key);
+    }
     constructor(getKey = () => '1') {
         this.getKey = getKey;
     }

package/esm/provider/IProvider.js

@@ -1,6 +1,16 @@
+import { Is } from '../utils';
 import { isProviderPipe, registerPipe } from './ProviderPipe';
 export const args = (...extraArgs) => registerPipe((p) => p.setArgs(() => extraArgs));
 export const argsFn = (fn) => registerPipe((p) => p.setArgs(fn));
+export const resolveByArgs = (s, ...deps) => deps.map((d) => {
+    if (Is.injectBuilder(d)) {
+        return d.resolve(s);
+    }
+    if (Is.constructor(d)) {
+        return s.resolveClass(d);
+    }
+    return d;
+});
 export const scopeAccess = (predicate) => registerPipe((p) => p.setAccessPredicate(predicate));
 export const lazy = () => registerPipe((p) => p.lazy());
 export class ProviderDecorator {

package/esm/registration/IRegistration.js

@@ -1,9 +1,9 @@
-import { isDependencyKey } from '../container/IContainer';
+import { Is } from '../utils';
 import { getMetadata, setMetadata } from '../metadata';
 import { isProviderPipe } from '../provider/ProviderPipe';
 export const scope = (...predicates) => (r) => r.when(...predicates);
 const METADATA_KEY = 'registration';
 export const getTransformers = (Target) => getMetadata(Target, METADATA_KEY) ?? [];
 export const register = (...mappers) => setMetadata(METADATA_KEY, mappers.map((m) => (isProviderPipe(m) ? (r) => m.mapRegistration(r) : m)));
-export const asAlias = (target) => (r) => r.bindToAlias(isDependencyKey(target) ? target : target.key);
+export const asAlias = (target) => (r) => r.bindToAlias(Is.dependencyKey(target) ? target : target.key);
 export const asKey = (key) => (r) => r.bindToKey(key);

package/esm/registration/Registration.js

@@ -1,4 +1,4 @@
-import { isConstructor, pipe } from '../utils';
+import { Is, pipe } from '../utils';
 import { Provider } from '../provider/Provider';
 import { DependencyMissingKeyError } from '../errors/DependencyMissingKeyError';
 import { getTransformers } from './IRegistration';
@@ -12,7 +12,7 @@ export class Registration {
         return transform(new Registration(() => Provider.fromClass(Target), Target.name));
     }
     static fromValue(value) {
-        if (isConstructor(value)) {
+        if (Is.constructor(value)) {
             const transform = pipe(...getTransformers(value));
             return transform(new Registration(() => Provider.fromValue(value), value.name));
         }

package/esm/resolve.js

@@ -1,5 +1,4 @@
-import { isDependencyKey, } from './container/IContainer';
-import { isDepKey } from './DepKey';
+import { Is } from './utils';
 export class InjectionResolver {
     resolveByOptions;
     isLazy = false;
@@ -50,18 +49,18 @@ export class InstancesResolver {
 }
 export const by = {
     many: (target) => {
-        const alias = isDependencyKey(target) ? target : target.key;
+        const alias = Is.dependencyKey(target) ? target : target.key;
         return new InjectionResolver((s, options) => s.resolveMany(alias, options));
     },
     one: (target) => {
-        const key = isDepKey(target) ? target.key : target;
+        const key = Is.DepKey(target) ? target.key : target;
         return new InjectionResolver((s, options) => s.resolveOne(key, options));
     },
     /**
      * Use it only for optimization. Otherwise, recommended to use `by.one`
      */
     aliasOne: (target) => {
-        const alias = isDepKey(target) ? target.key : target;
+        const alias = Is.DepKey(target) ? target.key : target;
         return new InjectionResolver((s, options) => s.resolveOneByAlias(alias, options));
     },
     instances: (predicate = () => true) => new InstancesResolver(predicate),

package/esm/utils.js

@@ -1,7 +1,3 @@
-export const isConstructor = (T) => typeof T === 'function' && !!T.prototype;
-export function isInstance(target) {
-    return Object.prototype.hasOwnProperty.call(target, 'constructor');
-}
 export const pipe = (...mappers) => (value) => mappers.reduce((acc, current) => current(acc), value);
 export function fillEmptyIndexes(baseArr, insertArr) {
     const a = [...baseArr];
@@ -34,3 +30,13 @@ export const Filter = {
         return (v) => !excludeSet.has(v);
     },
 };
+export const Is = {
+    object: (target) => target !== null && typeof target === 'object',
+    instance: (target) => Object.prototype.hasOwnProperty.call(target, 'constructor'),
+    constructor: (target) => typeof target === 'function' && !!target.prototype,
+    dependencyKey: (target) => ['string', 'symbol'].includes(typeof target),
+    injectBuilder: (target) => Is.object(target) && 'resolve' in target && typeof target['resolve'] === 'function',
+    DepKey: (key) => {
+        return typeof key === 'object' && key !== null && 'key' in key;
+    },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "41.1.1",
+  "version": "41.2.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",

package/typings/DepKey.d.ts

@@ -12,5 +12,4 @@ export type DepKey<T> = IInjectFnResolver<T> & {
     when(value: ScopePredicate): DepKey<T>;
     asAlias: (registration: IRegistration<T>) => IRegistration<T>;
 };
-export declare const isDepKey: <T>(key: unknown) => key is DepKey<T>;
 export declare const depKey: <T>(key: DependencyKey) => DepKey<T>;

package/typings/container/IContainer.d.ts

@@ -3,7 +3,6 @@ import { type constructor } from '../utils';
 import { type IRegistration } from '../registration/IRegistration';
 export type Tag = string;
 export type DependencyKey = string | symbol;
-export declare function isDependencyKey(token: unknown): token is DependencyKey;
 export type InjectionToken<T = unknown> = constructor<T> | DependencyKey;
 export type ResolveOneOptions = {
     args?: unknown[];
@@ -39,7 +38,7 @@ export interface IContainer extends Tagged {
     resolveClass<T>(target: constructor<T>, options?: {
         args?: unknown[];
     }): T;
-    resolveOne<T>(alias: constructor<T> | DependencyKey, options?: ResolveManyOptions): T;
+    resolveOne<T>(alias: constructor<T> | DependencyKey, options?: ResolveOneOptions): T;
     resolveOneByKey<T>(key: DependencyKey, options?: ResolveOneOptions): T;
     resolveOneByAlias<T>(key: DependencyKey, options?: ResolveOneOptions): T;
     resolveMany<T>(alias: DependencyKey, options?: ResolveManyOptions): T[];

package/typings/index.d.ts

@@ -1,4 +1,4 @@
-export { type IContainer, type Resolvable, type IContainerModule, isDependencyKey, type DependencyKey, type InjectionToken, type Tag, type Tagged, type Instance, } from './container/IContainer';
+export { type IContainer, type Resolvable, type IContainerModule, type DependencyKey, type InjectionToken, type Tag, type Tagged, type Instance, } from './container/IContainer';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
@@ -23,6 +23,6 @@ export { getHooks, hook, hasHooks, type HookFn, type HookClass, runHooks, runHoo
 export { HookContext, type InjectFn, type IHookContext } from './hooks/HookContext';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
 export { by } from './resolve';
-export { type constructor } from './utils';
+export { type constructor, Is } from './utils';
 export { depKey, type DepKey } from './DepKey';
 export { type InstancePredicate } from './resolve';

package/typings/injector/IInjector.d.ts

@@ -1,5 +1,5 @@
 import { type constructor } from '../utils';
-import { type IContainer } from '../container/IContainer';
+import { type IContainer, ResolveOneOptions } from '../container/IContainer';
 export type InjectOptions = {
     args: unknown[];
 };
@@ -7,5 +7,5 @@ export interface IInjector {
     resolve<T>(container: IContainer, value: constructor<T>, options: InjectOptions): T;
 }
 export interface IInjectFnResolver<T> {
-    resolve(s: IContainer): T;
+    resolve(s: IContainer, options?: ResolveOneOptions): T;
 }

package/typings/injector/inject.d.ts

@@ -3,5 +3,6 @@ import { DependencyKey, type IContainer } from '../container/IContainer';
 import { type InjectFn } from '../hooks/HookContext';
 import { type IInjectFnResolver } from './IInjector';
 export declare const inject: <T>(fn: InjectFn<T> | IInjectFnResolver<T> | DependencyKey | constructor<T>) => ParameterDecorator;
+export declare function isInjectBuilder<T>(fn: object): fn is IInjectFnResolver<T>;
 export declare const toInjectFn: <T>(target: InjectFn<T> | IInjectFnResolver<T> | DependencyKey | constructor<T>) => InjectFn<T>;
 export declare const resolveArgs: (Target: constructor<unknown>, methodName?: string) => (scope: IContainer, ...deps: unknown[]) => unknown[];

package/typings/provider/Cache.d.ts

@@ -1,3 +1,4 @@
+import type { DependencyKey } from '../container/IContainer';
 export interface Cache<K, V> {
     getKey(...args: unknown[]): K;
     hasValue(key: K): boolean;
@@ -7,6 +8,7 @@ export interface Cache<K, V> {
 export declare class MultiCache<K, V> implements Cache<K, V> {
     readonly getKey: (...args: unknown[]) => K;
     private instances;
+    static fromFirstArg(): MultiCache<DependencyKey, unknown>;
     constructor(getKey?: (...args: unknown[]) => K);
     hasValue(token: K): boolean;
     getValue(token: K): V;

package/typings/provider/IProvider.d.ts

@@ -1,5 +1,5 @@
-import type { IContainer, Tagged } from '../container/IContainer';
-import type { MapFn } from '../utils';
+import { IContainer, Tagged } from '../container/IContainer';
+import { MapFn } from '../utils';
 import { ProviderPipe } from './ProviderPipe';
 export type ProviderResolveOptions = {
     args: unknown[];
@@ -25,6 +25,7 @@ export interface IProvider<T = any> {
 }
 export declare const args: <T>(...extraArgs: unknown[]) => ProviderPipe<T>;
 export declare const argsFn: <T>(fn: ArgsFn) => ProviderPipe<T>;
+export declare const resolveByArgs: (s: IContainer, ...deps: unknown[]) => unknown[];
 export declare const scopeAccess: <T>(predicate: ScopeAccessFn) => ProviderPipe<T>;
 export declare const lazy: <T>() => ProviderPipe<T>;
 export declare abstract class ProviderDecorator<T> implements IProvider<T> {

package/typings/registration/IRegistration.d.ts

@@ -1,5 +1,5 @@
 import type { DependencyKey, IContainer, IContainerModule } from '../container/IContainer';
-import type { constructor, MapFn } from '../utils';
+import { constructor, MapFn } from '../utils';
 import type { IProvider } from '../provider/IProvider';
 import type { DepKey } from '../DepKey';
 import { ProviderPipe } from '../provider/ProviderPipe';

package/typings/registration/Registration.d.ts

@@ -1,5 +1,5 @@
 import type { DependencyKey, IContainer } from '../container/IContainer';
-import type { constructor, MapFn } from '../utils';
+import { constructor, MapFn } from '../utils';
 import type { IProvider, ResolveDependency } from '../provider/IProvider';
 import type { IRegistration, ScopePredicate } from './IRegistration';
 import type { ProviderPipe } from '../provider/ProviderPipe';

package/typings/utils.d.ts

@@ -1,9 +1,10 @@
+import { DependencyKey } from './container/IContainer';
+import { IInjectFnResolver } from './injector/IInjector';
+import { DepKey } from './DepKey';
 export type constructor<T> = new (...args: any[]) => T;
-export declare const isConstructor: (T: unknown) => T is constructor<unknown>;
 export interface InstanceOfClass<T = unknown> {
     new (...args: unknown[]): T;
 }
-export declare function isInstance(target: object): target is InstanceOfClass;
 export type MapFn<T> = (value: T) => T;
 export declare const pipe: <T>(...mappers: MapFn<T>[]) => MapFn<T>;
 export declare function fillEmptyIndexes<T>(baseArr: (T | undefined)[], insertArr: T[]): T[];
@@ -16,3 +17,11 @@ export declare const List: {
 export declare const Filter: {
     exclude: <T>(arr: Set<T> | T[]) => (v: T) => boolean;
 };
+export declare const Is: {
+    object: (target: unknown) => target is object;
+    instance: (target: unknown) => target is InstanceOfClass;
+    constructor: (target: unknown) => target is constructor<unknown>;
+    dependencyKey: (target: unknown) => target is DependencyKey;
+    injectBuilder: (target: unknown) => target is IInjectFnResolver<unknown>;
+    DepKey: <T>(key: unknown) => key is DepKey<T>;
+};