ts-ioc-container 26.4.5 → 26.5.0

package/README.md

@@ -81,11 +81,11 @@ import 'reflect-metadata';
 import { IContainer, by, Container, inject, ReflectionInjector, Provider } from 'ts-ioc-container';
 
 describe('Basic usage', function () {
-  it('should inject dependencies', function () {
-    class Logger {
-      name = 'Logger';
-    }
+  class Logger {
+    name = 'Logger';
+  }
 
+  it('should inject dependencies', function () {
     class App {
       constructor(@inject(by.key('ILogger')) public logger: Logger) {}
     }
@@ -95,6 +95,18 @@ describe('Basic usage', function () {
     expect(container.resolve(App).logger.name).toBe('Logger');
   });
 
+  it('should inject multiple dependencies', function () {
+    class App {
+      constructor(@inject(by.keys('ILogger1', 'ILogger2')) public loggers: Logger[]) {}
+    }
+
+    const container = new Container(new ReflectionInjector())
+      .register('ILogger1', Provider.fromClass(Logger))
+      .register('ILogger2', Provider.fromClass(Logger));
+
+    expect(container.resolve(App).loggers).toHaveLength(2);
+  });
+
   it('should inject current scope', function () {
     const root = new Container(new ReflectionInjector(), { tags: ['root'] });
 
@@ -539,51 +551,68 @@ Sometimes you want to register the same provider with different keys. This is wh
 
 ```typescript
 import 'reflect-metadata';
-import { alias, by, Container, inject, Provider, provider, ReflectionInjector } from 'ts-ioc-container';
+import { alias, by, Container, inject, provider, ReflectionInjector, Registration } from 'ts-ioc-container';
 
 describe('alias', () => {
-  interface ILogger {
-    name: string;
+  const IMiddlewareKey = Symbol('IMiddleware');
+  const middleware = provider(alias(IMiddlewareKey));
+
+  interface IMiddleware {
+    applyTo(application: IApplication): void;
+  }
+
+  interface IApplication {
+    use(module: IMiddleware): void;
+    markMiddlewareAsApplied(name: string): void;
   }
 
-  @provider(alias('ILogger', 'a'))
-  class FileLogger implements ILogger {
-    name = 'FileLogger';
+  @middleware
+  class LoggerMiddleware implements IMiddleware {
+    applyTo(application: IApplication): void {
+      application.markMiddlewareAsApplied('LoggerMiddleware');
+    }
   }
 
-  @provider(alias('ILogger', 'b'))
-  class DbLogger implements ILogger {
-    name = 'DbLogger';
+  @middleware
+  class ErrorHandlerMiddleware implements IMiddleware {
+    applyTo(application: IApplication): void {
+      application.markMiddlewareAsApplied('ErrorHandlerMiddleware');
+    }
   }
 
   it('should resolve by some alias', () => {
-    class App {
-      constructor(@inject(by.alias.some('ILogger')) public loggers: ILogger[]) {}
-    }
+    class App implements IApplication {
+      private appliedMiddleware: Set<string> = new Set();
+      constructor(@inject(by.alias.some(IMiddlewareKey)) public middleware: IMiddleware[]) {}
 
-    const container = new Container(new ReflectionInjector())
-      .register('IFileLogger', Provider.fromClass(FileLogger))
-      .register('IDbLogger', Provider.fromClass(DbLogger));
+      markMiddlewareAsApplied(name: string): void {
+        this.appliedMiddleware.add(name);
+      }
 
-    const app = container.resolve(App);
+      isMiddlewareApplied(name: string): boolean {
+        return this.appliedMiddleware.has(name);
+      }
 
-    expect(app.loggers[0]).toBeInstanceOf(FileLogger);
-    expect(app.loggers[1]).toBeInstanceOf(DbLogger);
-  });
+      use(module: IMiddleware): void {
+        module.applyTo(this);
+      }
 
-  it('should resolve by all alias', () => {
-    class App {
-      constructor(@inject(by.alias.all('ILogger', 'a')) public loggers: ILogger[]) {}
+      run() {
+        for (const module of this.middleware) {
+          module.applyTo(this);
+        }
+      }
     }
 
     const container = new Container(new ReflectionInjector())
-      .register('IFileLogger', Provider.fromClass(FileLogger))
-      .register('IDbLogger', Provider.fromClass(DbLogger));
+      .use(Registration.fromClass(LoggerMiddleware))
+      .use(Registration.fromClass(ErrorHandlerMiddleware));
 
     const app = container.resolve(App);
+    app.run();
 
-    expect(app.loggers).toHaveLength(1);
-    expect(app.loggers[0]).toBeInstanceOf(FileLogger);
+    expect(app.isMiddlewareApplied('LoggerMiddleware')).toBe(true);
+    expect(app.isMiddlewareApplied('ErrorHandlerMiddleware')).toBe(true);
   });
 });
 
@@ -826,7 +855,6 @@ describe('Mocking', () => {
 ## Errors
 
 - [DependencyNotFoundError.ts](lib%2Fcontainer%2FDependencyNotFoundError.ts)
-- [DependencyMissingKeyError.ts](lib%2Fregistration%2FDependencyMissingKeyError.ts)
 - [MethodNotImplementedError.ts](lib%2FMethodNotImplementedError.ts)
 - [ContainerDisposedError.ts](lib%2Fcontainer%2FContainerDisposedError.ts)
 

package/cjm/container/AutoMockedContainer.js

@@ -11,14 +11,14 @@ class AutoMockedContainer {
     }
     dispose() { }
     register() {
-        throw new index_1.MethodNotImplementedError();
+        return this;
     }
     getInstances() {
         return [];
     }
     removeScope() { }
     use() {
-        throw new index_1.MethodNotImplementedError();
+        return this;
     }
     getAllProviders() {
         return new Map();

package/cjm/container/Container.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Container = void 0;
 const IContainer_1 = require("./IContainer");
 const EmptyContainer_1 = require("./EmptyContainer");
-const ContainerDisposedError_1 = require("./ContainerDisposedError");
+const ContainerDisposedError_1 = require("../errors/ContainerDisposedError");
 class Container {
     constructor(injector, options = {}) {
         var _a, _b;

package/cjm/container/EmptyContainer.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmptyContainer = void 0;
-const MethodNotImplementedError_1 = require("./MethodNotImplementedError");
-const DependencyNotFoundError_1 = require("./DependencyNotFoundError");
+const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
+const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
 class EmptyContainer {
     getTokensByProvider() {
         return [];

package/cjm/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMetadata = exports.setMetadata = exports.by = exports.hook = exports.getHooks = exports.ProxyInjector = exports.SimpleInjector = exports.inject = exports.ReflectionInjector = exports.DependencyMissingKeyError = exports.Registration = exports.key = exports.AutoMockedContainer = exports.TaggedProvider = exports.tags = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.provider = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.alias = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.getMetadata = exports.setMetadata = exports.by = exports.hook = exports.getHooks = exports.ProxyInjector = exports.SimpleInjector = exports.inject = exports.ReflectionInjector = exports.Registration = exports.key = exports.AutoMockedContainer = exports.TaggedProvider = exports.tags = exports.SingletonProvider = exports.singleton = exports.ArgsProvider = exports.args = exports.argsFn = exports.provider = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.alias = exports.EmptyContainer = exports.Container = exports.isDependencyKey = 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");
@@ -9,11 +9,11 @@ var EmptyContainer_1 = require("./container/EmptyContainer");
 Object.defineProperty(exports, "EmptyContainer", { enumerable: true, get: function () { return EmptyContainer_1.EmptyContainer; } });
 var IProvider_1 = require("./provider/IProvider");
 Object.defineProperty(exports, "alias", { enumerable: true, get: function () { return IProvider_1.alias; } });
-var DependencyNotFoundError_1 = require("./container/DependencyNotFoundError");
+var DependencyNotFoundError_1 = require("./errors/DependencyNotFoundError");
 Object.defineProperty(exports, "DependencyNotFoundError", { enumerable: true, get: function () { return DependencyNotFoundError_1.DependencyNotFoundError; } });
-var MethodNotImplementedError_1 = require("./container/MethodNotImplementedError");
+var MethodNotImplementedError_1 = require("./errors/MethodNotImplementedError");
 Object.defineProperty(exports, "MethodNotImplementedError", { enumerable: true, get: function () { return MethodNotImplementedError_1.MethodNotImplementedError; } });
-var ContainerDisposedError_1 = require("./container/ContainerDisposedError");
+var ContainerDisposedError_1 = require("./errors/ContainerDisposedError");
 Object.defineProperty(exports, "ContainerDisposedError", { enumerable: true, get: function () { return ContainerDisposedError_1.ContainerDisposedError; } });
 var Provider_1 = require("./provider/Provider");
 Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return Provider_1.Provider; } });
@@ -30,11 +30,9 @@ 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("./registration/Registration");
+var Registration_1 = require("./provider/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 DependencyMissingKeyError_1 = require("./registration/DependencyMissingKeyError");
-Object.defineProperty(exports, "DependencyMissingKeyError", { enumerable: true, get: function () { return DependencyMissingKeyError_1.DependencyMissingKeyError; } });
 var ReflectionInjector_1 = require("./injector/ReflectionInjector");
 Object.defineProperty(exports, "ReflectionInjector", { enumerable: true, get: function () { return ReflectionInjector_1.ReflectionInjector; } });
 Object.defineProperty(exports, "inject", { enumerable: true, get: function () { return ReflectionInjector_1.inject; } });

package/cjm/{registration → provider}/Registration.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Registration = exports.key = void 0;
-const DependencyMissingKeyError_1 = require("./DependencyMissingKeyError");
 const metadata_1 = require("../metadata");
-const Provider_1 = require("../provider/Provider");
+const Provider_1 = require("./Provider");
 const DEPENDENCY_KEY = 'DependencyKey';
 const key = (value) => (0, metadata_1.setMetadata)(DEPENDENCY_KEY, value);
 exports.key = key;
@@ -14,10 +13,7 @@ class Registration {
     }
     static fromClass(Target) {
         const dependencyKey = (0, metadata_1.getMetadata)(Target, DEPENDENCY_KEY);
-        if (dependencyKey === undefined) {
-            throw new DependencyMissingKeyError_1.DependencyMissingKeyError(`Pls provide dependency key for ${Target.name}`);
-        }
-        return new Registration(dependencyKey, Provider_1.Provider.fromClass(Target));
+        return new Registration(dependencyKey !== null && dependencyKey !== void 0 ? dependencyKey : Target.name, Provider_1.Provider.fromClass(Target));
     }
     pipe(...mappers) {
         this.provider = this.provider.pipe(...mappers);

package/esm/container/AutoMockedContainer.js

@@ -8,14 +8,14 @@ export class AutoMockedContainer {
     }
     dispose() { }
     register() {
-        throw new MethodNotImplementedError();
+        return this;
     }
     getInstances() {
         return [];
     }
     removeScope() { }
     use() {
-        throw new MethodNotImplementedError();
+        return this;
     }
     getAllProviders() {
         return new Map();

package/esm/container/Container.js

@@ -1,6 +1,6 @@
 import { isConstructor } from './IContainer';
 import { EmptyContainer } from './EmptyContainer';
-import { ContainerDisposedError } from './ContainerDisposedError';
+import { ContainerDisposedError } from '../errors/ContainerDisposedError';
 export class Container {
     constructor(injector, options = {}) {
         var _a, _b;

package/esm/container/EmptyContainer.js

@@ -1,5 +1,5 @@
-import { MethodNotImplementedError } from './MethodNotImplementedError';
-import { DependencyNotFoundError } from './DependencyNotFoundError';
+import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
+import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
 export class EmptyContainer {
     getTokensByProvider() {
         return [];

package/esm/index.js

@@ -2,16 +2,15 @@ export { isDependencyKey, } from './container/IContainer';
 export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
 export { alias } from './provider/IProvider';
-export { DependencyNotFoundError } from './container/DependencyNotFoundError';
-export { MethodNotImplementedError } from './container/MethodNotImplementedError';
-export { ContainerDisposedError } from './container/ContainerDisposedError';
+export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
+export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
+export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { Provider, provider } from './provider/Provider';
 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 './registration/Registration';
-export { DependencyMissingKeyError } from './registration/DependencyMissingKeyError';
+export { key, Registration } from './provider/Registration';
 export { ReflectionInjector, inject } from './injector/ReflectionInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';

package/esm/{registration → provider}/Registration.js

@@ -1,6 +1,5 @@
-import { DependencyMissingKeyError } from './DependencyMissingKeyError';
 import { getMetadata, setMetadata } from '../metadata';
-import { Provider } from '../provider/Provider';
+import { Provider } from './Provider';
 const DEPENDENCY_KEY = 'DependencyKey';
 export const key = (value) => setMetadata(DEPENDENCY_KEY, value);
 export class Registration {
@@ -10,10 +9,7 @@ export class Registration {
     }
     static fromClass(Target) {
         const dependencyKey = getMetadata(Target, DEPENDENCY_KEY);
-        if (dependencyKey === undefined) {
-            throw new DependencyMissingKeyError(`Pls provide dependency key for ${Target.name}`);
-        }
-        return new Registration(dependencyKey, Provider.fromClass(Target));
+        return new Registration(dependencyKey !== null && dependencyKey !== void 0 ? dependencyKey : Target.name, Provider.fromClass(Target));
     }
     pipe(...mappers) {
         this.provider = this.provider.pipe(...mappers);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "26.4.5",
+  "version": "26.5.0",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",
@@ -60,5 +60,5 @@
     "ts-node": "^10.9.1",
     "typescript": "4.4.3"
   },
-  "gitHead": "0b20e51c3a361f72307090f7843be9414630d34f"
+  "gitHead": "24de2212259dc0b0e564d1844dc5eb52244e5798"
 }

package/typings/index.d.ts

@@ -4,16 +4,15 @@ export { Container } from './container/Container';
 export { EmptyContainer } from './container/EmptyContainer';
 export { ResolveDependency, IProvider, alias } from './provider/IProvider';
 export { IInjector } from './injector/IInjector';
-export { DependencyNotFoundError } from './container/DependencyNotFoundError';
-export { MethodNotImplementedError } from './container/MethodNotImplementedError';
-export { ContainerDisposedError } from './container/ContainerDisposedError';
+export { DependencyNotFoundError } from './errors/DependencyNotFoundError';
+export { MethodNotImplementedError } from './errors/MethodNotImplementedError';
+export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { Provider, provider } from './provider/Provider';
 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 './registration/Registration';
-export { DependencyMissingKeyError } from './registration/DependencyMissingKeyError';
+export { key, Registration } from './provider/Registration';
 export { ReflectionInjector, inject } from './injector/ReflectionInjector';
 export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';

package/typings/{registration → provider}/Registration.d.ts

@@ -1,6 +1,6 @@
 import { DependencyKey, IContainer, IContainerModule } from '../container/IContainer';
 import { constructor, MapFn } from '../utils';
-import { IProvider } from '../provider/IProvider';
+import { IProvider } from './IProvider';
 export declare const key: (value: DependencyKey) => ClassDecorator;
 export declare class Registration implements IContainerModule {
     private key;