ts-ioc-container 27.0.0 → 27.1.0

package/README.md

@@ -129,33 +129,25 @@ describe('Basic usage', function () {
     expect(app.scope).toBe(root);
   });
 
-  it('should raise an error when key is busy', () => {
-    expect(() => {
-      new Container(new ReflectionInjector())
-        .register('ILogger', Provider.fromClass(Logger))
-        .register('ILogger', Provider.fromClass(Logger));
-    }).toThrowError(RegistrationConflictError);
-  });
-
   it('should not raise an error when key is busy', () => {
     expect(() => {
       new Container(new ReflectionInjector())
         .register('ILogger', Provider.fromClass(Logger))
-        .register('ILogger', Provider.fromClass(Logger), { override: true });
+        .register('ILogger', Provider.fromClass(Logger));
     }).not.toThrowError(RegistrationConflictError);
   });
 
   it('registration -> should raise an error when key is busy', () => {
     expect(() => {
-      new Container(new ReflectionInjector()).use(Registration.fromClass(Logger)).use(Registration.fromClass(Logger));
+      new Container(new ReflectionInjector())
+        .use(Registration.fromClass(Logger))
+        .use(Registration.fromClass(Logger).throwErrorOnConfict());
     }).toThrowError(RegistrationConflictError);
   });
 
   it('registration -> should not raise an error when key is busy', () => {
     expect(() => {
-      new Container(new ReflectionInjector())
-        .use(Registration.fromClass(Logger))
-        .use(Registration.fromClass(Logger).options({ override: true }));
+      new Container(new ReflectionInjector()).use(Registration.fromClass(Logger)).use(Registration.fromClass(Logger));
     }).not.toThrowError(RegistrationConflictError);
   });
 
@@ -167,27 +159,15 @@ describe('Basic usage', function () {
     class Logger2 {}
 
     expect(() => {
-      new Container(new ReflectionInjector()).use(Registration.fromClass(Logger1)).use(Registration.fromClass(Logger2));
+      new Container(new ReflectionInjector())
+        .use(Registration.fromClass(Logger1))
+        .use(Registration.fromClass(Logger2).throwErrorOnConfict());
     }).toThrowError(RegistrationConflictError);
   });
 
-  it('@key -> should not raise an error when key is busy', () => {
-    @key('Logger')
-    class Logger1 {}
-
-    @key('Logger', { override: true })
-    class Logger2 {}
-
-    expect(() => {
-      new Container(new ReflectionInjector()).use(Registration.fromClass(Logger1)).use(Registration.fromClass(Logger2));
-    }).not.toThrowError(RegistrationConflictError);
-  });
-
   it('registration -> should not raise an error when key is busy', () => {
     expect(() => {
-      new Container(new ReflectionInjector())
-        .use(Registration.fromClass(Logger))
-        .use(Registration.fromClass(Logger).options({ override: true }));
+      new Container(new ReflectionInjector()).use(Registration.fromClass(Logger)).use(Registration.fromClass(Logger));
     }).not.toThrowError(RegistrationConflictError);
   });
 });

package/cjm/container/AutoMockedContainer.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutoMockedContainer = void 0;
 const index_1 = require("../index");
 class AutoMockedContainer {
-    findProvider(key) {
-        return undefined;
+    hasDependency(key) {
+        return false;
     }
     getTokensByProvider() {
         return [];

package/cjm/container/Container.js

@@ -4,7 +4,6 @@ exports.Container = void 0;
 const IContainer_1 = require("./IContainer");
 const EmptyContainer_1 = require("./EmptyContainer");
 const ContainerDisposedError_1 = require("../errors/ContainerDisposedError");
-const OverrideGuard_1 = require("./OverrideGuard");
 class Container {
     constructor(injector, options = {}) {
         var _a, _b;
@@ -13,15 +12,11 @@ class Container {
         this.isDisposed = false;
         this.scopes = new Set();
         this.instances = new Set();
-        this.overrideGuard = new OverrideGuard_1.OverrideGuard();
         this.parent = (_a = options.parent) !== null && _a !== void 0 ? _a : new EmptyContainer_1.EmptyContainer();
         this.tags = (_b = options.tags) !== null && _b !== void 0 ? _b : [];
     }
-    register(key, provider, { override } = {}) {
+    register(key, provider) {
         this.validateContainer();
-        if (!override) {
-            this.overrideGuard.applyTo(this, key);
-        }
         this.providers.set(key, provider);
         return this;
     }
@@ -76,9 +71,9 @@ class Container {
         module.applyTo(this);
         return this;
     }
-    findProvider(key) {
+    hasDependency(key) {
         var _a;
-        return (_a = this.providers.get(key)) !== null && _a !== void 0 ? _a : this.parent.findProvider(key);
+        return (_a = this.providers.has(key)) !== null && _a !== void 0 ? _a : this.parent.hasDependency(key);
     }
     /**
      * @private

package/cjm/container/EmptyContainer.js

@@ -4,8 +4,8 @@ exports.EmptyContainer = void 0;
 const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
 class EmptyContainer {
-    findProvider(key) {
-        return undefined;
+    hasDependency(key) {
+        return false;
     }
     getTokensByProvider() {
         return [];

package/cjm/index.js

@@ -32,7 +32,7 @@ Object.defineProperty(exports, "tags", { enumerable: true, get: function () { re
 Object.defineProperty(exports, "TaggedProvider", { enumerable: true, get: function () { return TaggedProvider_1.TaggedProvider; } });
 var AutoMockedContainer_1 = require("./container/AutoMockedContainer");
 Object.defineProperty(exports, "AutoMockedContainer", { enumerable: true, get: function () { return AutoMockedContainer_1.AutoMockedContainer; } });
-var Registration_1 = require("./provider/Registration");
+var Registration_1 = require("./registration/Registration");
 Object.defineProperty(exports, "key", { enumerable: true, get: function () { return Registration_1.key; } });
 Object.defineProperty(exports, "Registration", { enumerable: true, get: function () { return Registration_1.Registration; } });
 var ReflectionInjector_1 = require("./injector/ReflectionInjector");

package/cjm/registration/IRegistration.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/cjm/registration/Registration.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Registration = exports.key = void 0;
+const metadata_1 = require("../metadata");
+const Provider_1 = require("../provider/Provider");
+const ThrowErrorIfNoDependency_1 = require("./ThrowErrorIfNoDependency");
+const DEPENDENCY_KEY = 'DependencyKey';
+const key = (value) => (0, metadata_1.setMetadata)(DEPENDENCY_KEY, value);
+exports.key = key;
+class Registration {
+    constructor(key, provider) {
+        this.key = key;
+        this.provider = provider;
+    }
+    static fromClass(Target) {
+        const dependencyKey = (0, metadata_1.getMetadata)(Target, DEPENDENCY_KEY);
+        return new Registration(dependencyKey !== null && dependencyKey !== void 0 ? dependencyKey : Target.name, Provider_1.Provider.fromClass(Target));
+    }
+    getKey() {
+        return this.key;
+    }
+    setKey(key) {
+        this.key = key;
+        return this;
+    }
+    throwErrorOnConfict() {
+        return new ThrowErrorIfNoDependency_1.ThrowErrorIfNoDependency(this);
+    }
+    pipe(...mappers) {
+        this.provider = this.provider.pipe(...mappers);
+        return this;
+    }
+    applyTo(container) {
+        container.register(this.key, this.provider);
+    }
+}
+exports.Registration = Registration;

package/cjm/registration/ThrowErrorIfNoDependency.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ThrowErrorIfNoDependency = void 0;
+const RegistrationConflictError_1 = require("../errors/RegistrationConflictError");
+class ThrowErrorIfNoDependency {
+    constructor(module) {
+        this.module = module;
+    }
+    getKey() {
+        return this.module.getKey();
+    }
+    applyTo(container) {
+        RegistrationConflictError_1.RegistrationConflictError.assert(container.hasDependency(this.module.getKey()) === undefined, `Provider for key ${this.module.getKey().toString()} is already registered`);
+        this.module.applyTo(container);
+    }
+}
+exports.ThrowErrorIfNoDependency = ThrowErrorIfNoDependency;

package/esm/container/AutoMockedContainer.js

@@ -1,7 +1,7 @@
 import { MethodNotImplementedError } from '../index';
 export class AutoMockedContainer {
-    findProvider(key) {
-        return undefined;
+    hasDependency(key) {
+        return false;
     }
     getTokensByProvider() {
         return [];

package/esm/container/Container.js

@@ -1,7 +1,6 @@
-import { isConstructor, } from './IContainer';
+import { isConstructor } from './IContainer';
 import { EmptyContainer } from './EmptyContainer';
 import { ContainerDisposedError } from '../errors/ContainerDisposedError';
-import { OverrideGuard } from './OverrideGuard';
 export class Container {
     constructor(injector, options = {}) {
         var _a, _b;
@@ -10,15 +9,11 @@ export class Container {
         this.isDisposed = false;
         this.scopes = new Set();
         this.instances = new Set();
-        this.overrideGuard = new OverrideGuard();
         this.parent = (_a = options.parent) !== null && _a !== void 0 ? _a : new EmptyContainer();
         this.tags = (_b = options.tags) !== null && _b !== void 0 ? _b : [];
     }
-    register(key, provider, { override } = {}) {
+    register(key, provider) {
         this.validateContainer();
-        if (!override) {
-            this.overrideGuard.applyTo(this, key);
-        }
         this.providers.set(key, provider);
         return this;
     }
@@ -73,9 +68,9 @@ export class Container {
         module.applyTo(this);
         return this;
     }
-    findProvider(key) {
+    hasDependency(key) {
         var _a;
-        return (_a = this.providers.get(key)) !== null && _a !== void 0 ? _a : this.parent.findProvider(key);
+        return (_a = this.providers.has(key)) !== null && _a !== void 0 ? _a : this.parent.hasDependency(key);
     }
     /**
      * @private

package/esm/container/EmptyContainer.js

@@ -1,8 +1,8 @@
 import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
 export class EmptyContainer {
-    findProvider(key) {
-        return undefined;
+    hasDependency(key) {
+        return false;
     }
     getTokensByProvider() {
         return [];

package/esm/index.js

@@ -11,7 +11,7 @@ export { argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { tags, TaggedProvider } from './provider/TaggedProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
-export { key, Registration } from './provider/Registration';
+export { key, Registration } from './registration/Registration';
 export { ReflectionInjector, inject } from './injector/ReflectionInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';

package/esm/registration/IRegistration.js

@@ -0,0 +1 @@
+export {};

package/esm/registration/Registration.js

@@ -0,0 +1,32 @@
+import { getMetadata, setMetadata } from '../metadata';
+import { Provider } from '../provider/Provider';
+import { ThrowErrorIfNoDependency } from './ThrowErrorIfNoDependency';
+const DEPENDENCY_KEY = 'DependencyKey';
+export const key = (value) => setMetadata(DEPENDENCY_KEY, value);
+export class Registration {
+    constructor(key, provider) {
+        this.key = key;
+        this.provider = provider;
+    }
+    static fromClass(Target) {
+        const dependencyKey = getMetadata(Target, DEPENDENCY_KEY);
+        return new Registration(dependencyKey !== null && dependencyKey !== void 0 ? dependencyKey : Target.name, Provider.fromClass(Target));
+    }
+    getKey() {
+        return this.key;
+    }
+    setKey(key) {
+        this.key = key;
+        return this;
+    }
+    throwErrorOnConfict() {
+        return new ThrowErrorIfNoDependency(this);
+    }
+    pipe(...mappers) {
+        this.provider = this.provider.pipe(...mappers);
+        return this;
+    }
+    applyTo(container) {
+        container.register(this.key, this.provider);
+    }
+}

package/esm/registration/ThrowErrorIfNoDependency.js

@@ -0,0 +1,13 @@
+import { RegistrationConflictError } from '../errors/RegistrationConflictError';
+export class ThrowErrorIfNoDependency {
+    constructor(module) {
+        this.module = module;
+    }
+    getKey() {
+        return this.module.getKey();
+    }
+    applyTo(container) {
+        RegistrationConflictError.assert(container.hasDependency(this.module.getKey()) === undefined, `Provider for key ${this.module.getKey().toString()} is already registered`);
+        this.module.applyTo(container);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "27.0.0",
+  "version": "27.1.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -60,5 +60,5 @@
     "ts-node": "^10.9.1",
     "typescript": "4.4.3"
   },
-  "gitHead": "e52571491b720f7f869cbc638273b0b64ee7fa87"
+  "gitHead": "751f480d689211f2b52913a5fad224aa054b39ff"
 }

package/typings/container/AutoMockedContainer.d.ts

@@ -1,6 +1,6 @@
 import { IContainer, InjectionToken, IProvider, DependencyKey } from '../index';
 export declare abstract class AutoMockedContainer implements IContainer {
-    findProvider(key: string): IProvider<unknown> | undefined;
+    hasDependency(key: string): boolean;
     getTokensByProvider(): DependencyKey[];
     createScope(): IContainer;
     abstract resolve<T>(key: InjectionToken<T>): T;

package/typings/container/Container.d.ts

@@ -1,4 +1,4 @@
-import { DependencyKey, IContainer, IContainerModule, InjectionToken, IRegistrationOptions, Tag, Tagged } from './IContainer';
+import { DependencyKey, IContainer, IContainerModule, InjectionToken, Tag, Tagged } from './IContainer';
 import { IInjector } from '../injector/IInjector';
 import { IProvider } from '../provider/IProvider';
 export declare class Container implements IContainer, Tagged {
@@ -9,12 +9,11 @@ export declare class Container implements IContainer, Tagged {
     private parent;
     private scopes;
     private instances;
-    private overrideGuard;
     constructor(injector: IInjector, options?: {
         parent?: IContainer;
         tags?: Tag[];
     });
-    register(key: DependencyKey, provider: IProvider, { override }?: IRegistrationOptions): this;
+    register(key: DependencyKey, provider: IProvider): this;
     resolve<T>(token: InjectionToken<T>, ...args: unknown[]): T;
     getTokensByProvider(predicate: (provider: IProvider) => boolean): DependencyKey[];
     createScope(...tags: Tag[]): Container;
@@ -22,7 +21,7 @@ export declare class Container implements IContainer, Tagged {
     getInstances(): unknown[];
     hasTag(tag: Tag): boolean;
     use(module: IContainerModule): this;
-    findProvider(key: string): IProvider | undefined;
+    hasDependency(key: DependencyKey): boolean;
     /**
      * @private
      */

package/typings/container/EmptyContainer.d.ts

@@ -1,7 +1,7 @@
 import { DependencyKey, IContainer, InjectionToken } from './IContainer';
 import { IProvider } from '../provider/IProvider';
 export declare class EmptyContainer implements IContainer {
-    findProvider(key: string): IProvider<unknown> | undefined;
+    hasDependency(key: string): boolean;
     getTokensByProvider(): DependencyKey[];
     hasTag(): boolean;
     createScope(): IContainer;

package/typings/container/IContainer.d.ts

@@ -19,7 +19,7 @@ export interface IRegistrationOptions {
 }
 export interface IContainer extends Resolvable {
     createScope(...tags: Tag[]): IContainer;
-    register(key: DependencyKey, value: IProvider, options?: IRegistrationOptions): this;
+    register(key: DependencyKey, value: IProvider): this;
     removeScope(child: IContainer): void;
     getInstances(): unknown[];
     dispose(): void;
@@ -27,5 +27,5 @@ export interface IContainer extends Resolvable {
     hasTag(tag: Tag): boolean;
     getAllProviders(): Map<DependencyKey, IProvider>;
     getTokensByProvider(predicate: (provider: IProvider) => boolean): DependencyKey[];
-    findProvider(key: DependencyKey): IProvider | undefined;
+    hasDependency(key: DependencyKey): boolean;
 }

package/typings/index.d.ts

@@ -13,7 +13,7 @@ export { ArgsFn, argsFn, args, ArgsProvider } from './provider/ArgsProvider';
 export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { tags, TaggedProvider } from './provider/TaggedProvider';
 export { AutoMockedContainer } from './container/AutoMockedContainer';
-export { key, Registration } from './provider/Registration';
+export { key, Registration } from './registration/Registration';
 export { ReflectionInjector, inject } from './injector/ReflectionInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';

package/typings/registration/IRegistration.d.ts

@@ -0,0 +1,4 @@
+import { DependencyKey, IContainerModule } from '../container/IContainer';
+export interface IRegistration extends IContainerModule {
+    getKey(): DependencyKey;
+}

package/typings/registration/Registration.d.ts

@@ -0,0 +1,17 @@
+import { DependencyKey, IContainer } from '../container/IContainer';
+import { constructor, MapFn } from '../utils';
+import { IProvider } from '../provider/IProvider';
+import { ThrowErrorIfNoDependency } from './ThrowErrorIfNoDependency';
+import { IRegistration } from './IRegistration';
+export declare const key: (value: DependencyKey) => ClassDecorator;
+export declare class Registration implements IRegistration {
+    private key;
+    private provider;
+    static fromClass(Target: constructor<unknown>): Registration;
+    constructor(key: DependencyKey, provider: IProvider);
+    getKey(): DependencyKey;
+    setKey(key: DependencyKey): this;
+    throwErrorOnConfict(): ThrowErrorIfNoDependency;
+    pipe(...mappers: MapFn<IProvider>[]): this;
+    applyTo(container: IContainer): void;
+}

package/typings/registration/ThrowErrorIfNoDependency.d.ts

@@ -0,0 +1,8 @@
+import { DependencyKey, IContainer } from '../container/IContainer';
+import { IRegistration } from './IRegistration';
+export declare class ThrowErrorIfNoDependency implements IRegistration {
+    private module;
+    constructor(module: IRegistration);
+    getKey(): DependencyKey;
+    applyTo(container: IContainer): void;
+}

package/cjm/container/OverrideGuard.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OverrideGuard = void 0;
-const RegistrationConflictError_1 = require("../errors/RegistrationConflictError");
-class OverrideGuard {
-    applyTo(container, key) {
-        RegistrationConflictError_1.RegistrationConflictError.assert(container.findProvider(key) === undefined, `Provider for key ${key.toString()} is already registered`);
-    }
-}
-exports.OverrideGuard = OverrideGuard;

package/cjm/provider/Registration.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Registration = exports.key = void 0;
-const metadata_1 = require("../metadata");
-const Provider_1 = require("./Provider");
-const DEPENDENCY_KEY = 'DependencyKey';
-const key = (value, options) => {
-    const metadata = { key: value, options };
-    return (0, metadata_1.setMetadata)(DEPENDENCY_KEY, metadata);
-};
-exports.key = key;
-class Registration {
-    constructor(key, provider, registrationOptions = {}) {
-        this.key = key;
-        this.provider = provider;
-        this.registrationOptions = registrationOptions;
-    }
-    static fromClass(Target) {
-        var _a;
-        const metadata = (0, metadata_1.getMetadata)(Target, DEPENDENCY_KEY);
-        return new Registration((_a = metadata === null || metadata === void 0 ? void 0 : metadata.key) !== null && _a !== void 0 ? _a : Target.name, Provider_1.Provider.fromClass(Target), metadata === null || metadata === void 0 ? void 0 : metadata.options);
-    }
-    options(value) {
-        this.registrationOptions = value;
-        return this;
-    }
-    pipe(...mappers) {
-        this.provider = this.provider.pipe(...mappers);
-        return this;
-    }
-    applyTo(container) {
-        container.register(this.key, this.provider, this.registrationOptions);
-    }
-}
-exports.Registration = Registration;

package/esm/container/OverrideGuard.js

@@ -1,6 +0,0 @@
-import { RegistrationConflictError } from '../errors/RegistrationConflictError';
-export class OverrideGuard {
-    applyTo(container, key) {
-        RegistrationConflictError.assert(container.findProvider(key) === undefined, `Provider for key ${key.toString()} is already registered`);
-    }
-}

package/esm/provider/Registration.js

@@ -1,30 +0,0 @@
-import { getMetadata, setMetadata } from '../metadata';
-import { Provider } from './Provider';
-const DEPENDENCY_KEY = 'DependencyKey';
-export const key = (value, options) => {
-    const metadata = { key: value, options };
-    return setMetadata(DEPENDENCY_KEY, metadata);
-};
-export class Registration {
-    constructor(key, provider, registrationOptions = {}) {
-        this.key = key;
-        this.provider = provider;
-        this.registrationOptions = registrationOptions;
-    }
-    static fromClass(Target) {
-        var _a;
-        const metadata = getMetadata(Target, DEPENDENCY_KEY);
-        return new Registration((_a = metadata === null || metadata === void 0 ? void 0 : metadata.key) !== null && _a !== void 0 ? _a : Target.name, Provider.fromClass(Target), metadata === null || metadata === void 0 ? void 0 : metadata.options);
-    }
-    options(value) {
-        this.registrationOptions = value;
-        return this;
-    }
-    pipe(...mappers) {
-        this.provider = this.provider.pipe(...mappers);
-        return this;
-    }
-    applyTo(container) {
-        container.register(this.key, this.provider, this.registrationOptions);
-    }
-}

package/typings/container/OverrideGuard.d.ts

@@ -1,4 +0,0 @@
-import { DependencyKey, IContainer, IContainerModule } from './IContainer';
-export declare class OverrideGuard implements IContainerModule {
-    applyTo(container: IContainer, key: DependencyKey): void;
-}

package/typings/provider/Registration.d.ts

@@ -1,14 +0,0 @@
-import { DependencyKey, IContainer, IContainerModule, IRegistrationOptions } from '../container/IContainer';
-import { constructor, MapFn } from '../utils';
-import { IProvider } from './IProvider';
-export declare const key: (value: DependencyKey, options?: IRegistrationOptions | undefined) => ClassDecorator;
-export declare class Registration implements IContainerModule {
-    private key;
-    private provider;
-    private registrationOptions;
-    static fromClass(Target: constructor<unknown>): Registration;
-    constructor(key: DependencyKey, provider: IProvider, registrationOptions?: IRegistrationOptions);
-    options(value: IRegistrationOptions): this;
-    pipe(...mappers: MapFn<IProvider>[]): this;
-    applyTo(container: IContainer): void;
-}