ts-ioc-container 30.2.0 → 30.3.1

package/README.md

@@ -318,7 +318,7 @@ describe('SimpleInjector', function () {
     }
 
     const container = new Container(new SimpleInjector()).use(R.fromClass(App).to('App'));
-    const app = container.resolve<App>('App', 'Hello world');
+    const app = container.resolve<App>('App', { args: ['Hello world'] });
 
     expect(app.greeting).toBe('Hello world');
   });
@@ -378,7 +378,7 @@ describe('ProxyInjector', function () {
       .use(R.fromClass(App).to('App').pipe(args({ greetingTemplate })))
       .use(R.fromClass(Logger).to('logger'));
 
-    const app = container.resolve<App>('App', { name: `world` });
+    const app = container.resolve<App>('App', { args: [{ name: `world` }] });
     expect(app.greeting).toBe('Hello world');
   });
 });
@@ -592,7 +592,7 @@ describe('ArgsProvider', function () {
   it('should set provider arguments with highest priority in compare to resolve arguments', function () {
     const root = createContainer().use(R.fromClass(Logger).pipe(args('name')));
 
-    const logger = root.resolve<Logger>('logger', 'file');
+    const logger = root.resolve<Logger>('logger', { args: ['file'] });
 
     expect(logger.name).toBe('name');
     expect(logger.type).toBe('file');
@@ -849,13 +849,13 @@ describe('onDispose', function () {
 Sometimes you need to automatically mock all dependencies in container. This is what `AutoMockedContainer` is for.
 
 ```typescript
-import { AutoMockedContainer, Container, DependencyKey, MetadataInjector, Tagged } from 'ts-ioc-container';
+import { AutoMockedContainer, Container, DependencyKey, MetadataInjector } from 'ts-ioc-container';
 import { IMock, Mock } from 'moq.ts';
 
 export class MoqContainer extends AutoMockedContainer {
   private mocks = new Map<DependencyKey, IMock<any>>();
 
-  resolveFromChild<T>(child: Tagged, key: DependencyKey): T {
+  resolve<T>(key: DependencyKey): T {
     return this.resolveMock<T>(key).object();
   }
 

package/cjm/by.js

@@ -8,7 +8,7 @@ const isPresent = (value) => value !== null && value !== undefined;
 exports.isPresent = isPresent;
 const resolveSilently = (c, ...args) => (key) => {
     try {
-        return c.resolve(key, ...args);
+        return c.resolve(key, { args });
     }
     catch (e) {
         if (e instanceof DependencyNotFoundError_1.DependencyNotFoundError) {
@@ -27,13 +27,13 @@ exports.by = {
      * Get all instances that match the given keys
      * @param keys
      */
-    keys: (...keys) => (с, ...args) => keys.map((t) => с.resolve(t, ...args)),
+    keys: (...keys) => (с, ...args) => keys.map((t) => с.resolve(t, { args })),
     /**
      * Get the instance that matches the given key
      * @param key
      * @param deps
      */
-    key: (key, ...deps) => (c, ...args) => c.resolve(key, ...deps, ...args),
+    key: (key, ...deps) => (c, ...args) => c.resolve(key, { args: [...deps, ...args] }),
     /**
      * Get all instances that match the given predicate
      * @param predicate

package/cjm/container/AutoMockedContainer.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoMockedContainer = void 0;
 const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
-const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
 class AutoMockedContainer {
     getKeysByAlias(alias) {
         return [];
@@ -13,9 +12,6 @@ class AutoMockedContainer {
     createScope() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
-    resolve(key, ...args) {
-        throw new DependencyNotFoundError_1.DependencyNotFoundError(`Cannot find ${key.toString()}`);
-    }
     dispose() { }
     register() {
         return this;

package/cjm/container/Container.js

@@ -23,30 +23,17 @@ class Container {
         }
         return this;
     }
-    resolve(token, ...args) {
+    resolve(token, { args = [], child = this } = {}) {
         this.validateContainer();
         if ((0, IContainer_1.isConstructor)(token)) {
-            return this.resolveByConstructor(token, ...args);
-        }
-        const provider = this.providers.get(token);
-        return provider?.isVisible(this, this)
-            ? provider.resolve(this, ...args)
-            : this.parent.resolveFromChild(this, token, ...args);
-    }
-    resolveFromChild(child, token, ...args) {
-        this.validateContainer();
-        if ((0, IContainer_1.isConstructor)(token)) {
-            return this.resolveByConstructor(token, ...args);
+            const instance = this.injector.resolve(this, token, ...args);
+            this.instances.add(instance);
+            return instance;
         }
         const provider = this.providers.get(token);
         return provider?.isVisible(this, child)
             ? provider.resolve(this, ...args)
-            : this.parent.resolveFromChild(child, token, ...args);
-    }
-    resolveByConstructor(token, ...args) {
-        const instance = this.injector.resolve(this, token, ...args);
-        this.instances.add(instance);
-        return instance;
+            : this.parent.resolve(token, { args, child });
     }
     createScope(...tags) {
         this.validateContainer();

package/cjm/container/EmptyContainer.js

@@ -22,10 +22,7 @@ class EmptyContainer {
     register(key, value) {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
-    resolve(key) {
-        throw new DependencyNotFoundError_1.DependencyNotFoundError(`Cannot find ${key.toString()}`);
-    }
-    resolveFromChild(child, key, ...args) {
+    resolve(key, options) {
         throw new DependencyNotFoundError_1.DependencyNotFoundError(`Cannot find ${key.toString()}`);
     }
     getAllProviders() {

package/cjm/provider/Provider.js

@@ -11,7 +11,7 @@ exports.setVisibility = setVisibility;
 class Provider {
     static fromClass(Target) {
         const mappers = (0, metadata_1.getMetadata)(Target, PROVIDER_KEY) ?? [];
-        return new Provider((container, ...args) => container.resolve(Target, ...args)).pipe(...mappers);
+        return new Provider((container, ...args) => container.resolve(Target, { args })).pipe(...mappers);
     }
     static fromValue(value) {
         return new Provider(() => value);

package/esm/by.js

@@ -3,7 +3,7 @@ export const all = () => true;
 export const isPresent = (value) => value !== null && value !== undefined;
 export const resolveSilently = (c, ...args) => (key) => {
     try {
-        return c.resolve(key, ...args);
+        return c.resolve(key, { args });
     }
     catch (e) {
         if (e instanceof DependencyNotFoundError) {
@@ -21,13 +21,13 @@ export const by = {
      * Get all instances that match the given keys
      * @param keys
      */
-    keys: (...keys) => (с, ...args) => keys.map((t) => с.resolve(t, ...args)),
+    keys: (...keys) => (с, ...args) => keys.map((t) => с.resolve(t, { args })),
     /**
      * Get the instance that matches the given key
      * @param key
      * @param deps
      */
-    key: (key, ...deps) => (c, ...args) => c.resolve(key, ...deps, ...args),
+    key: (key, ...deps) => (c, ...args) => c.resolve(key, { args: [...deps, ...args] }),
     /**
      * Get all instances that match the given predicate
      * @param predicate

package/esm/container/AutoMockedContainer.js

@@ -1,5 +1,4 @@
 import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
-import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
 export class AutoMockedContainer {
     getKeysByAlias(alias) {
         return [];
@@ -10,9 +9,6 @@ export class AutoMockedContainer {
     createScope() {
         throw new MethodNotImplementedError();
     }
-    resolve(key, ...args) {
-        throw new DependencyNotFoundError(`Cannot find ${key.toString()}`);
-    }
     dispose() { }
     register() {
         return this;

package/esm/container/Container.js

@@ -20,30 +20,17 @@ export class Container {
         }
         return this;
     }
-    resolve(token, ...args) {
+    resolve(token, { args = [], child = this } = {}) {
         this.validateContainer();
         if (isConstructor(token)) {
-            return this.resolveByConstructor(token, ...args);
-        }
-        const provider = this.providers.get(token);
-        return provider?.isVisible(this, this)
-            ? provider.resolve(this, ...args)
-            : this.parent.resolveFromChild(this, token, ...args);
-    }
-    resolveFromChild(child, token, ...args) {
-        this.validateContainer();
-        if (isConstructor(token)) {
-            return this.resolveByConstructor(token, ...args);
+            const instance = this.injector.resolve(this, token, ...args);
+            this.instances.add(instance);
+            return instance;
         }
         const provider = this.providers.get(token);
         return provider?.isVisible(this, child)
             ? provider.resolve(this, ...args)
-            : this.parent.resolveFromChild(child, token, ...args);
-    }
-    resolveByConstructor(token, ...args) {
-        const instance = this.injector.resolve(this, token, ...args);
-        this.instances.add(instance);
-        return instance;
+            : this.parent.resolve(token, { args, child });
     }
     createScope(...tags) {
         this.validateContainer();

package/esm/container/EmptyContainer.js

@@ -19,10 +19,7 @@ export class EmptyContainer {
     register(key, value) {
         throw new MethodNotImplementedError();
     }
-    resolve(key) {
-        throw new DependencyNotFoundError(`Cannot find ${key.toString()}`);
-    }
-    resolveFromChild(child, key, ...args) {
+    resolve(key, options) {
         throw new DependencyNotFoundError(`Cannot find ${key.toString()}`);
     }
     getAllProviders() {

package/esm/provider/Provider.js

@@ -6,7 +6,7 @@ export const setVisibility = (isVisibleWhen) => (p) => p.setVisibility(isVisible
 export class Provider {
     static fromClass(Target) {
         const mappers = getMetadata(Target, PROVIDER_KEY) ?? [];
-        return new Provider((container, ...args) => container.resolve(Target, ...args)).pipe(...mappers);
+        return new Provider((container, ...args) => container.resolve(Target, { args })).pipe(...mappers);
     }
     static fromValue(value) {
         return new Provider(() => value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "30.2.0",
+  "version": "30.3.1",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -59,5 +59,5 @@
     "ts-node": "^10.9.1",
     "typescript": "5.4.3"
   },
-  "gitHead": "fff52c43fd598f708261a295a5eb85c2385c32be"
+  "gitHead": "43c40c903f8822f679e2f832d657bd72945a8680"
 }

package/typings/container/AutoMockedContainer.d.ts

@@ -1,11 +1,10 @@
-import { AliasPredicate, DependencyKey, IContainer, InjectionToken, Tagged } from './IContainer';
+import { AliasPredicate, DependencyKey, IContainer, InjectionToken, ResolveOptions } from './IContainer';
 import { IProvider } from '../provider/IProvider';
 export declare abstract class AutoMockedContainer implements IContainer {
     getKeysByAlias(alias: AliasPredicate): DependencyKey[];
     hasDependency(key: string): boolean;
     createScope(): IContainer;
-    resolve<T>(key: InjectionToken<T>, ...args: unknown[]): T;
-    abstract resolveFromChild<T>(child: Tagged, key: InjectionToken<T>, ...args: unknown[]): T;
+    abstract resolve<T>(key: InjectionToken<T>, options?: ResolveOptions): T;
     dispose(): void;
     register(): this;
     getInstances(): unknown[];

package/typings/container/Container.d.ts

@@ -1,4 +1,4 @@
-import { Alias, AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, Tag, Tagged } from './IContainer';
+import { Alias, AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, ResolveOptions, Tag } from './IContainer';
 import { IInjector } from '../injector/IInjector';
 import { IProvider } from '../provider/IProvider';
 export declare class Container implements IContainer {
@@ -15,9 +15,7 @@ export declare class Container implements IContainer {
         tags?: Tag[];
     });
     register(key: DependencyKey, provider: IProvider, aliases?: Alias[]): this;
-    resolve<T>(token: InjectionToken<T>, ...args: unknown[]): T;
-    resolveFromChild<T>(child: Tagged, token: InjectionToken<T>, ...args: unknown[]): T;
-    private resolveByConstructor;
+    resolve<T>(token: InjectionToken<T>, { args, child }?: ResolveOptions): T;
     createScope(...tags: Tag[]): Container;
     dispose(): void;
     getInstances(): unknown[];

package/typings/container/EmptyContainer.d.ts

@@ -1,4 +1,4 @@
-import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, Tagged } from './IContainer';
+import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionToken, ResolveOptions } from './IContainer';
 import { IProvider } from '../provider/IProvider';
 export declare class EmptyContainer implements IContainer {
     getKeysByAlias(alias: AliasPredicate): DependencyKey[];
@@ -7,8 +7,7 @@ export declare class EmptyContainer implements IContainer {
     createScope(): IContainer;
     dispose(): void;
     register(key: DependencyKey, value: IProvider): this;
-    resolve<T>(key: InjectionToken<T>): T;
-    resolveFromChild<T>(child: Tagged, key: InjectionToken<T>, ...args: unknown[]): T;
+    resolve<T>(key: InjectionToken<T>, options: ResolveOptions): T;
     getAllProviders(): Map<DependencyKey, IProvider>;
     getInstances(): unknown[];
     removeScope(): void;

package/typings/container/IContainer.d.ts

@@ -5,9 +5,12 @@ export type DependencyKey = string | symbol;
 export declare function isDependencyKey<T>(token: InjectionToken<T>): token is DependencyKey;
 export declare function isConstructor<T>(token: InjectionToken<T>): token is constructor<T>;
 export type InjectionToken<T = unknown> = constructor<T> | DependencyKey;
+export type ResolveOptions = {
+    args?: unknown[];
+    child?: Tagged;
+};
 export interface Resolvable {
-    resolve<T>(key: InjectionToken<T>, ...args: unknown[]): T;
-    resolveFromChild<T>(child: Tagged, key: InjectionToken<T>, ...args: unknown[]): T;
+    resolve<T>(key: InjectionToken<T>, options?: ResolveOptions): T;
 }
 export interface IContainerModule {
     applyTo(container: IContainer): void;