ts-ioc-container 41.1.0 → 41.1.1

package/README.md

@@ -522,7 +522,6 @@ describe('ProxyInjector', function () {
     mockContainer.addRegistration(R.fromClass(Service).bindToKey('service'));
 
     const app = mockContainer.resolveOne(App);
-    console.log('App loggers:', app.loggers);
     expect(app.loggers).toBeInstanceOf(Array);
     expect(app.loggers.length).toBe(1);
     expect(app.loggers[0]).toBe(mockLogger);
@@ -752,7 +751,7 @@ describe('Provider', () => {
     }
 
     const root = new Container({ tags: ['root'] }).addRegistration(R.fromClass(Logger));
-    const main = root.resolveByClass(Main);
+    const main = root.resolveClass(Main);
 
     expect(isLoggerCreated).toBe(false);
 
@@ -780,7 +779,7 @@ describe('Provider', () => {
     }
 
     const root = new Container({ tags: ['root'] }).addRegistration(R.fromClass(Logger));
-    const main = root.resolveByClass(Main);
+    const main = root.resolveClass(Main);
 
     expect(main.getChannel()).toBe('file');
   });
@@ -809,7 +808,7 @@ describe('Provider', () => {
       .addRegistration(R.fromValue('file').bindToKey('channel'))
       .addRegistration(R.fromClass(Logger));
 
-    const main = root.resolveByClass(Main);
+    const main = root.resolveClass(Main);
 
     expect(main.getChannel()).toBe('file');
   });
@@ -1552,7 +1551,7 @@ export class MoqContainer extends AutoMockedContainer {
     return this.mocks.get(key) as IMock<T>;
   }
 
-  resolveByClass<T>(target: any, options?: { args?: unknown[] }): T {
+  resolveClass<T>(target: any, options?: { args?: unknown[] }): T {
     throw new Error('Method not implemented.');
   }
 

package/cjm/container/Container.js

@@ -20,12 +20,14 @@ class Container {
     onConstruct;
     onDispose;
     injector;
+    resolveOneStrategy;
     constructor(options = {}) {
         this.injector = options.injector ?? new MetadataInjector_1.MetadataInjector();
         this.parent = options.parent ?? new EmptyContainer_1.EmptyContainer();
         this.tags = new Set(options.tags ?? []);
         this.onConstruct = options.onConstruct ?? (() => { });
         this.onDispose = options.onDispose ?? (() => { });
+        this.resolveOneStrategy = options.resolveOneStrategy ?? IContainer_1.DEFAULT_CONTAINER_RESOLVER;
     }
     register(key, provider, { aliases = [] } = {}) {
         this.validateContainer();
@@ -42,7 +44,7 @@ class Container {
     getRegistrations() {
         return [...this.parent.getRegistrations(), ...this.registrations];
     }
-    resolveByClass(token, { args = [] } = {}) {
+    resolveClass(token, { args = [] } = {}) {
         this.validateContainer();
         const instance = this.injector.resolve(this, token, { args });
         this.instances.add(instance);
@@ -50,7 +52,7 @@ class Container {
         return instance;
     }
     resolveOne(keyOrAlias, options) {
-        return (0, IContainer_1.DEFAULT_CONTAINER_RESOLVER)(this, keyOrAlias, options);
+        return this.resolveOneStrategy(this, keyOrAlias, options);
     }
     resolveOneByKey(keyOrAlias, { args = [], child = this, lazy } = {}) {
         this.validateContainer();

package/cjm/container/EmptyContainer.js

@@ -10,7 +10,7 @@ class EmptyContainer {
     getParent() {
         return undefined;
     }
-    resolveByClass(token, options) {
+    resolveClass(token, options) {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
     getScopes() {

package/cjm/container/IContainer.js

@@ -9,7 +9,7 @@ function isDependencyKey(token) {
 }
 const DEFAULT_CONTAINER_RESOLVER = (scope, keyOrAlias, options) => {
     if ((0, utils_1.isConstructor)(keyOrAlias)) {
-        return scope.resolveByClass(keyOrAlias, options);
+        return scope.resolveClass(keyOrAlias, options);
     }
     try {
         return scope.resolveOneByKey(keyOrAlias, options);

package/cjm/injector/inject.js

@@ -17,7 +17,7 @@ const toInjectFn = (target) => {
         return (s) => target.resolve(s);
     }
     if ((0, utils_1.isConstructor)(target)) {
-        return (scope) => scope.resolveByClass(target);
+        return (scope) => scope.resolveClass(target);
     }
     if ((0, IContainer_1.isDependencyKey)(target)) {
         return (scope) => scope.resolveOne(target);

package/cjm/provider/Provider.js

@@ -6,7 +6,7 @@ const ProviderPipe_1 = require("./ProviderPipe");
 class Provider {
     resolveDependency;
     static fromClass(Target) {
-        return new Provider((container, options) => container.resolveByClass(Target, options));
+        return new Provider((container, options) => container.resolveClass(Target, options));
     }
     static fromValue(value) {
         return new Provider(() => value);

package/esm/container/Container.js

@@ -1,4 +1,4 @@
-import { DEFAULT_CONTAINER_RESOLVER as resolveOne, } from './IContainer';
+import { DEFAULT_CONTAINER_RESOLVER, } from './IContainer';
 import { EmptyContainer } from './EmptyContainer';
 import { ContainerDisposedError } from '../errors/ContainerDisposedError';
 import { MetadataInjector } from '../injector/MetadataInjector';
@@ -17,12 +17,14 @@ export class Container {
     onConstruct;
     onDispose;
     injector;
+    resolveOneStrategy;
     constructor(options = {}) {
         this.injector = options.injector ?? new MetadataInjector();
         this.parent = options.parent ?? new EmptyContainer();
         this.tags = new Set(options.tags ?? []);
         this.onConstruct = options.onConstruct ?? (() => { });
         this.onDispose = options.onDispose ?? (() => { });
+        this.resolveOneStrategy = options.resolveOneStrategy ?? DEFAULT_CONTAINER_RESOLVER;
     }
     register(key, provider, { aliases = [] } = {}) {
         this.validateContainer();
@@ -39,7 +41,7 @@ export class Container {
     getRegistrations() {
         return [...this.parent.getRegistrations(), ...this.registrations];
     }
-    resolveByClass(token, { args = [] } = {}) {
+    resolveClass(token, { args = [] } = {}) {
         this.validateContainer();
         const instance = this.injector.resolve(this, token, { args });
         this.instances.add(instance);
@@ -47,7 +49,7 @@ export class Container {
         return instance;
     }
     resolveOne(keyOrAlias, options) {
-        return resolveOne(this, keyOrAlias, options);
+        return this.resolveOneStrategy(this, keyOrAlias, options);
     }
     resolveOneByKey(keyOrAlias, { args = [], child = this, lazy } = {}) {
         this.validateContainer();

package/esm/container/EmptyContainer.js

@@ -7,7 +7,7 @@ export class EmptyContainer {
     getParent() {
         return undefined;
     }
-    resolveByClass(token, options) {
+    resolveClass(token, options) {
         throw new MethodNotImplementedError();
     }
     getScopes() {

package/esm/container/IContainer.js

@@ -5,7 +5,7 @@ export function isDependencyKey(token) {
 }
 export const DEFAULT_CONTAINER_RESOLVER = (scope, keyOrAlias, options) => {
     if (isConstructor(keyOrAlias)) {
-        return scope.resolveByClass(keyOrAlias, options);
+        return scope.resolveClass(keyOrAlias, options);
     }
     try {
         return scope.resolveOneByKey(keyOrAlias, options);

package/esm/injector/inject.js

@@ -13,7 +13,7 @@ export const toInjectFn = (target) => {
         return (s) => target.resolve(s);
     }
     if (isConstructor(target)) {
-        return (scope) => scope.resolveByClass(target);
+        return (scope) => scope.resolveClass(target);
     }
     if (isDependencyKey(target)) {
         return (scope) => scope.resolveOne(target);

package/esm/provider/Provider.js

@@ -3,7 +3,7 @@ import { isProviderPipe } from './ProviderPipe';
 export class Provider {
     resolveDependency;
     static fromClass(Target) {
-        return new Provider((container, options) => container.resolveByClass(Target, options));
+        return new Provider((container, options) => container.resolveClass(Target, options));
     }
     static fromValue(value) {
         return new Provider(() => value);

package/package.json

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

package/typings/container/AutoMockedContainer.d.ts

@@ -15,7 +15,7 @@ export declare abstract class AutoMockedContainer implements IContainer {
     getRegistrations(): never[];
     addRegistration(registration: IRegistration): this;
     abstract resolveMany<T>(alias: DependencyKey, options?: ResolveManyOptions): T[];
-    abstract resolveByClass<T>(target: constructor<T>, options?: {
+    abstract resolveClass<T>(target: constructor<T>, options?: {
         args?: unknown[];
     }): T;
     abstract resolveOneByKey<T>(keyOrAlias: DependencyKey, options?: ResolveOneOptions): T;

package/typings/container/Container.d.ts

@@ -3,6 +3,7 @@ import { type IInjector } from '../injector/IInjector';
 import { type IProvider } from '../provider/IProvider';
 import { type IRegistration } from '../registration/IRegistration';
 import { type constructor } from '../utils';
+type ResolveOneStrategy = <T>(scope: IContainer, keyOrAlias: constructor<T> | DependencyKey, options?: ResolveOneOptions) => T;
 export declare class Container implements IContainer {
     isDisposed: boolean;
     private parent;
@@ -15,17 +16,19 @@ export declare class Container implements IContainer {
     private readonly onConstruct;
     private readonly onDispose;
     private readonly injector;
+    private readonly resolveOneStrategy;
     constructor(options?: {
         injector?: IInjector;
         parent?: IContainer;
         tags?: Tag[];
         onConstruct?: (instance: Instance, scope: IContainer) => void;
         onDispose?: (scope: IContainer) => void;
+        resolveOneStrategy?: ResolveOneStrategy;
     });
     register(key: DependencyKey, provider: IProvider, { aliases }?: RegisterOptions): this;
     addRegistration(registration: IRegistration): this;
     getRegistrations(): IRegistration[];
-    resolveByClass<T>(token: constructor<T>, { args }?: {
+    resolveClass<T>(token: constructor<T>, { args }?: {
         args?: unknown[];
     }): T;
     resolveOne<T>(keyOrAlias: constructor<T> | DependencyKey, options?: ResolveOneOptions): T;
@@ -47,3 +50,4 @@ export declare class Container implements IContainer {
     private validateContainer;
     private findProviderByKeyOrFail;
 }
+export {};

package/typings/container/EmptyContainer.d.ts

@@ -5,7 +5,7 @@ import { type constructor } from '../utils';
 export declare class EmptyContainer implements IContainer {
     get isDisposed(): boolean;
     getParent(): undefined;
-    resolveByClass<T>(token: constructor<T>, options?: {
+    resolveClass<T>(token: constructor<T>, options?: {
         args?: [];
     }): T;
     getScopes(): never[];

package/typings/container/IContainer.d.ts

@@ -36,7 +36,7 @@ export interface IContainer extends Tagged {
     register(key: DependencyKey, value: IProvider, options?: RegisterOptions): this;
     addRegistration(registration: IRegistration): this;
     getRegistrations(): IRegistration[];
-    resolveByClass<T>(target: constructor<T>, options?: {
+    resolveClass<T>(target: constructor<T>, options?: {
         args?: unknown[];
     }): T;
     resolveOne<T>(alias: constructor<T> | DependencyKey, options?: ResolveManyOptions): T;