ts-ioc-container 14.0.8 → 16.0.0

package/README.md

@@ -40,7 +40,7 @@ yarn add ts-ioc-container reflect-metadata
 How to create new container
 
 ```typescript
-import { Container, fromClass, IInjector } from "ts-ioc-container";
+import { Container, IInjector, ProviderBuilder } from "ts-ioc-container";
 import { resolve } from 'ts-constructor-injector';
 
 const injector: IInjector = {
@@ -49,20 +49,20 @@ const injector: IInjector = {
   },
 };
 const container = new Container(injector);
-container.register('ILogger', fromClass(Logger).build());
+container.register('ILogger', ProviderBuilder.fromClass(Logger).build());
 const logger = container.resolve<ILogger>('ILogger');
 ```
 
 ## ProviderBuilder
 
 ```typescript
-import { fromClass } from "ts-ioc-container";
+import { fromClass, ProviderBuilder } from "ts-ioc-container";
 
 container.register('ILogger', new ProviderBuilder((container, ...args) => new Logger(...args)).build());
-container.register('ILogger1', fromClass(Logger).forKey('ILogger').asSingleton().forLevel(0).build()); // global singleton
-container.register('ILogger2', fromClass(Logger).asSingleton().forLevel(1).build()); // first scope singleton
-container.register('ILogger3', fromClass(Logger).asSingleton().forTags(['tag1', 'tag2']).build()); // singleton for scope with tag1 or tag2
-container.register('ILogger4', fromClass(Logger).withArgs('dev').asSingleton().build()); // singleton in every scope
+container.register('ILogger1', ProviderBuilder.fromClass(Logger).forKey('ILogger').asSingleton().forLevel(0).build()); // global singleton
+container.register('ILogger2', ProviderBuilder.fromClass(Logger).asSingleton().forLevel(1).build()); // first scope singleton
+container.register('ILogger3', ProviderBuilder.fromClass(Logger).asSingleton().forTags(['tag1', 'tag2']).build()); // singleton for scope with tag1 or tag2
+container.register('ILogger4', ProviderBuilder.fromClass(Logger).withArgs('dev').asSingleton().build()); // singleton in every scope
 ```
 
 ## Decorators
@@ -84,18 +84,19 @@ class Engine {
 
 ```typescript
 import {
-  MethodsMetadataCollector,
+  MethodReflector,
   createMethodHookDecorator,
   Container,
   IInjector,
   ContainerHook,
+  ProviderBuilder,
 } from "ts-ioc-container";
 
-export const onConstructMetadataCollector = new MethodsMetadataCollector('OnConstructHook');
-export const onConstruct = createMethodHookDecorator(onConstructMetadataCollector);
+export const onConstructReflector = new MethodReflector('OnConstructHook');
+export const onConstruct = onConstructReflector.createMethodHookDecorator();
 
-export const onDisposeMetadataCollector = new MethodsMetadataCollector('OnDisposeHook');
-export const onDispose = createMethodHookDecorator(onDisposeMetadataCollector);
+export const onDisposeReflector = new MethodReflector('OnDisposeHook');
+export const onDispose = onDisposeReflector.createMethodHookDecorator();
 
 class Logger {
   @onConstruct
@@ -116,7 +117,7 @@ const injector: IInjector = {
 const container = new Container(injector).setHook(new ContainerHook((instance) => {
   onDisposeMetadataCollector.invokeHooksOf(instance);
 }));
-container.register('ILogger', fromClass(Logger).build());
+container.register('ILogger', ProviderBuilder.fromClass(Logger).build());
 const logger = container.resolve<ILogger>('ILogger');
 ```
 

package/cjm/core/provider/{IProvidersMetadataCollector.d.ts → IProviderReflector.d.ts}

@@ -1,7 +1,7 @@
 import { constructor } from '../utils/types';
 import { ProviderBuilder } from '../../providers/ProviderBuilder';
 export declare type ProviderReducer<T> = (builder: ProviderBuilder<T>) => ProviderBuilder<T>;
-export interface IProvidersMetadataCollector {
+export interface IProviderReflector {
     addReducer<T>(target: constructor<T>, reducer: ProviderReducer<T>): void;
     findReducerOrCreate<T>(target: constructor<T>): ProviderReducer<T>;
 }

package/cjm/core/provider/{IProvidersMetadataCollector.js → IProviderReflector.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=IProvidersMetadataCollector.js.map
+//# sourceMappingURL=IProviderReflector.js.map

package/cjm/core/provider/IProviderReflector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IProviderReflector.js","sourceRoot":"","sources":["../../../lib/core/provider/IProviderReflector.ts"],"names":[],"mappings":""}

package/cjm/core/provider/Provider.d.ts

@@ -1,7 +1,6 @@
 import { constructor } from '../utils/types';
 import { IProvider, ProviderKey, ResolveDependency } from './IProvider';
 import { Resolveable } from '../container/IContainer';
-import { IProvidersMetadataCollector } from './IProvidersMetadataCollector';
 export declare class Provider<T> implements IProvider<T> {
     private readonly resolveDependency;
     static fromClass<T>(value: constructor<T>): Provider<T>;
@@ -15,4 +14,4 @@ export declare class Provider<T> implements IProvider<T> {
     isValid(): boolean;
     getKeyOrFail(): ProviderKey;
 }
-export declare const createAddKeyDecorator: (metadataCollector: IProvidersMetadataCollector) => (key: ProviderKey) => ClassDecorator;
+export declare const forKey: (key: ProviderKey) => ClassDecorator;

package/cjm/core/provider/Provider.js

@@ -25,8 +25,9 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAddKeyDecorator = exports.Provider = void 0;
+exports.forKey = exports.Provider = void 0;
 var ProviderHasNoKeyError_1 = require("./ProviderHasNoKeyError");
+var ProviderReflector_1 = require("./ProviderReflector");
 var Provider = /** @class */ (function () {
     function Provider(resolveDependency) {
         this.resolveDependency = resolveDependency;
@@ -73,14 +74,12 @@ var Provider = /** @class */ (function () {
     return Provider;
 }());
 exports.Provider = Provider;
-var createAddKeyDecorator = function (metadataCollector) {
-    return function (key) {
-        return function (target) {
-            var targetClass = target;
-            var fn = metadataCollector.findReducerOrCreate(targetClass);
-            metadataCollector.addReducer(targetClass, function (builder) { return fn(builder).forKey(key); });
-        };
+var forKey = function (key) {
+    return function (target) {
+        var targetClass = target;
+        var fn = ProviderReflector_1.providerReflector.findReducerOrCreate(targetClass);
+        ProviderReflector_1.providerReflector.addReducer(targetClass, function (builder) { return fn(builder).forKey(key); });
     };
 };
-exports.createAddKeyDecorator = createAddKeyDecorator;
+exports.forKey = forKey;
 //# sourceMappingURL=Provider.js.map

package/cjm/core/provider/Provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../lib/core/provider/Provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,iEAAgE;AAGhE;IAWI,kBAA6B,iBAAuC;QAAvC,sBAAiB,GAAjB,iBAAiB,CAAsB;IAAG,CAAC;IAVjE,kBAAS,GAAhB,UAAoB,KAAqB;QACrC,OAAO,IAAI,QAAQ,CAAC,UAAC,CAAC;YAAE,cAAO;iBAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;gBAAP,6BAAO;;YAAK,OAAA,CAAC,CAAC,OAAO,OAAT,CAAC,iBAAS,KAAK,UAAK,IAAI;QAAxB,CAAyB,CAAC,CAAC;IACnE,CAAC;IAEM,kBAAS,GAAhB,UAAoB,KAAQ;QACxB,OAAO,IAAI,QAAQ,CAAC,cAAM,OAAA,KAAK,EAAL,CAAK,CAAC,CAAC;IACrC,CAAC;IAMD,yBAAM,GAAN,UAAO,GAAgB;QACnB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,wBAAK,GAAL;QACI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACX,MAAM,IAAI,6CAAqB,CAAC,oDAAoD,CAAC,CAAC;SACzF;QACD,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,0BAAO,GAAP,UAAQ,SAAsB;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QAC1C,OAAO,IAAI,CAAC,iBAAiB,OAAtB,IAAI,iBAAmB,SAAS,UAAK,IAAI,WAAE;IACtD,CAAC;IAED,0BAAO,GAAP,cAAiB,CAAC;IAElB,0BAAO,GAAP;QACI,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,+BAAY,GAAZ;QACI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACX,MAAM,IAAI,6CAAqB,CAAC,oDAAoD,CAAC,CAAC;SACzF;QACD,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IACL,eAAC;AAAD,CAAC,AAzCD,IAyCC;AAzCY,4BAAQ;AA2Cd,IAAM,qBAAqB,GAC9B,UAAC,iBAA8C;IAC/C,OAAA,UAAC,GAAgB;QACjB,OAAA,UAAC,MAAM;YACH,IAAM,WAAW,GAAG,MAAqC,CAAC;YAC1D,IAAM,EAAE,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;YAC9D,iBAAiB,CAAC,UAAU,CAAC,WAAW,EAAE,UAAC,OAAO,IAAK,OAAA,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAvB,CAAuB,CAAC,CAAC;QACpF,CAAC;IAJD,CAIC;AALD,CAKC,CAAC;AAPO,QAAA,qBAAqB,yBAO5B"}
+{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../lib/core/provider/Provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,iEAAgE;AAEhE,yDAAwD;AAExD;IAWI,kBAA6B,iBAAuC;QAAvC,sBAAiB,GAAjB,iBAAiB,CAAsB;IAAG,CAAC;IAVjE,kBAAS,GAAhB,UAAoB,KAAqB;QACrC,OAAO,IAAI,QAAQ,CAAC,UAAC,CAAC;YAAE,cAAO;iBAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;gBAAP,6BAAO;;YAAK,OAAA,CAAC,CAAC,OAAO,OAAT,CAAC,iBAAS,KAAK,UAAK,IAAI;QAAxB,CAAyB,CAAC,CAAC;IACnE,CAAC;IAEM,kBAAS,GAAhB,UAAoB,KAAQ;QACxB,OAAO,IAAI,QAAQ,CAAC,cAAM,OAAA,KAAK,EAAL,CAAK,CAAC,CAAC;IACrC,CAAC;IAMD,yBAAM,GAAN,UAAO,GAAgB;QACnB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,wBAAK,GAAL;QACI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACX,MAAM,IAAI,6CAAqB,CAAC,oDAAoD,CAAC,CAAC;SACzF;QACD,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,0BAAO,GAAP,UAAQ,SAAsB;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QAC1C,OAAO,IAAI,CAAC,iBAAiB,OAAtB,IAAI,iBAAmB,SAAS,UAAK,IAAI,WAAE;IACtD,CAAC;IAED,0BAAO,GAAP,cAAiB,CAAC;IAElB,0BAAO,GAAP;QACI,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,+BAAY,GAAZ;QACI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACX,MAAM,IAAI,6CAAqB,CAAC,oDAAoD,CAAC,CAAC;SACzF;QACD,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IACL,eAAC;AAAD,CAAC,AAzCD,IAyCC;AAzCY,4BAAQ;AA2Cd,IAAM,MAAM,GACf,UAAC,GAAgB;IACjB,OAAA,UAAC,MAAM;QACH,IAAM,WAAW,GAAG,MAAqC,CAAC;QAC1D,IAAM,EAAE,GAAG,qCAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAC9D,qCAAiB,CAAC,UAAU,CAAC,WAAW,EAAE,UAAC,OAAO,IAAK,OAAA,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAvB,CAAuB,CAAC,CAAC;IACpF,CAAC;AAJD,CAIC,CAAC;AANO,QAAA,MAAM,UAMb"}

package/{esm/core/provider/ProvidersMetadataCollector.d.ts → cjm/core/provider/ProviderReflector.d.ts}

@@ -1,10 +1,11 @@
-import { IProvidersMetadataCollector, ProviderReducer } from './IProvidersMetadataCollector';
+import { IProviderReflector, ProviderReducer } from './IProviderReflector';
 import { constructor } from '../utils/types';
-export declare class ProvidersMetadataCollector implements IProvidersMetadataCollector {
+export declare class ProviderReflector implements IProviderReflector {
     private metadataKey;
     private createReducer;
-    static create(): ProvidersMetadataCollector;
+    static create(): ProviderReflector;
     constructor(metadataKey: string | symbol, createReducer: () => ProviderReducer<unknown>);
     findReducerOrCreate<T>(target: constructor<T>): ProviderReducer<T>;
     addReducer<T>(target: constructor<T>, reducer: ProviderReducer<T>): void;
 }
+export declare const providerReflector: ProviderReflector;

package/cjm/core/provider/ProviderReflector.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.providerReflector = exports.ProviderReflector = void 0;
+var others_1 = require("../utils/others");
+var ProviderReflector = /** @class */ (function () {
+    function ProviderReflector(metadataKey, createReducer) {
+        this.metadataKey = metadataKey;
+        this.createReducer = createReducer;
+    }
+    ProviderReflector.create = function () {
+        return new ProviderReflector(Symbol('providerReducer'), function () { return others_1.id; });
+    };
+    ProviderReflector.prototype.findReducerOrCreate = function (target) {
+        if (!Reflect.hasMetadata(this.metadataKey, target)) {
+            Reflect.defineMetadata(this.metadataKey, this.createReducer(), target);
+        }
+        return Reflect.getMetadata(this.metadataKey, target);
+    };
+    ProviderReflector.prototype.addReducer = function (target, reducer) {
+        Reflect.defineMetadata(this.metadataKey, reducer, target);
+    };
+    return ProviderReflector;
+}());
+exports.ProviderReflector = ProviderReflector;
+exports.providerReflector = ProviderReflector.create();
+//# sourceMappingURL=ProviderReflector.js.map

package/cjm/core/provider/ProviderReflector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProviderReflector.js","sourceRoot":"","sources":["../../../lib/core/provider/ProviderReflector.ts"],"names":[],"mappings":";;;AAEA,0CAAqC;AAErC;IAKI,2BAAoB,WAA4B,EAAU,aAA6C;QAAnF,gBAAW,GAAX,WAAW,CAAiB;QAAU,kBAAa,GAAb,aAAa,CAAgC;IAAG,CAAC;IAJpG,wBAAM,GAAb;QACI,OAAO,IAAI,iBAAiB,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,cAAM,OAAA,WAAE,EAAF,CAAE,CAAC,CAAC;IACtE,CAAC;IAID,+CAAmB,GAAnB,UAAuB,MAAsB;QACzC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,EAAE;YAChD,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,aAAa,EAAE,EAAE,MAAM,CAAC,CAAC;SAC1E;QACD,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,sCAAU,GAAV,UAAc,MAAsB,EAAE,OAA2B;QAC7D,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;IACL,wBAAC;AAAD,CAAC,AAjBD,IAiBC;AAjBY,8CAAiB;AAmBjB,QAAA,iBAAiB,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC"}

package/cjm/hooks/IMethodReflector.d.ts

@@ -0,0 +1,3 @@
+export interface IMethodReflector {
+    invokeHooksOf<GInstance extends Object>(target: GInstance): void;
+}

package/cjm/hooks/IMethodReflector.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IMethodReflector.js.map

package/cjm/hooks/IMethodReflector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IMethodReflector.js","sourceRoot":"","sources":["../../lib/hooks/IMethodReflector.ts"],"names":[],"mappings":""}

package/cjm/hooks/MethodReflector.d.ts

@@ -0,0 +1,9 @@
+import { IMethodReflector } from './IMethodReflector';
+export declare class MethodReflector implements IMethodReflector {
+    readonly hookKey: string | symbol;
+    constructor(hookKey: string | symbol);
+    private addHook;
+    invokeHooksOf<GInstance extends Object>(target: GInstance): void;
+    private static getTargetId;
+    createMethodHookDecorator(): MethodDecorator;
+}

package/cjm/hooks/{MethodsMetadataCollector.js → MethodReflector.js}

@@ -36,21 +36,21 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MethodsMetadataCollector = void 0;
-var MethodsMetadataCollector = /** @class */ (function () {
-    function MethodsMetadataCollector(hookKey) {
+exports.MethodReflector = void 0;
+var MethodReflector = /** @class */ (function () {
+    function MethodReflector(hookKey) {
         this.hookKey = hookKey;
     }
     // eslint-disable-next-line @typescript-eslint/ban-types
-    MethodsMetadataCollector.prototype.addHook = function (target, propertyKey) {
-        var targetId = MethodsMetadataCollector.getTargetId(target);
+    MethodReflector.prototype.addHook = function (target, propertyKey) {
+        var targetId = MethodReflector.getTargetId(target);
         var hooks = Reflect.getMetadata(this.hookKey, targetId) || [];
         Reflect.defineMetadata(this.hookKey, __spreadArray(__spreadArray([], __read(hooks), false), [propertyKey], false), targetId);
     };
     // eslint-disable-next-line @typescript-eslint/ban-types
-    MethodsMetadataCollector.prototype.invokeHooksOf = function (target) {
+    MethodReflector.prototype.invokeHooksOf = function (target) {
         var e_1, _a;
-        var targetId = MethodsMetadataCollector.getTargetId(target);
+        var targetId = MethodReflector.getTargetId(target);
         var hooks = Reflect.hasMetadata(this.hookKey, targetId)
             ? Reflect.getMetadata(this.hookKey, targetId)
             : [];
@@ -69,10 +69,17 @@ var MethodsMetadataCollector = /** @class */ (function () {
         }
     };
     // eslint-disable-next-line @typescript-eslint/ban-types
-    MethodsMetadataCollector.getTargetId = function (target) {
+    MethodReflector.getTargetId = function (target) {
         return target.constructor;
     };
-    return MethodsMetadataCollector;
+    MethodReflector.prototype.createMethodHookDecorator = function () {
+        var _this = this;
+        return function (target, propertyKey) {
+            // eslint-disable-next-line @typescript-eslint/ban-types
+            _this.addHook(target, propertyKey);
+        };
+    };
+    return MethodReflector;
 }());
-exports.MethodsMetadataCollector = MethodsMetadataCollector;
-//# sourceMappingURL=MethodsMetadataCollector.js.map
+exports.MethodReflector = MethodReflector;
+//# sourceMappingURL=MethodReflector.js.map

package/cjm/hooks/MethodReflector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MethodReflector.js","sourceRoot":"","sources":["../../lib/hooks/MethodReflector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA;IACI,yBAAqB,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;IAAG,CAAC;IAEjD,wDAAwD;IAChD,iCAAO,GAAf,UAA0C,MAAiB,EAAE,WAA4B;QACrF,IAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACrD,IAAM,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QAChE,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,yCAAM,KAAK,YAAE,WAAW,WAAG,QAAQ,CAAC,CAAC;IAC5E,CAAC;IAED,wDAAwD;IACxD,uCAAa,GAAb,UAAwC,MAAiB;;QACrD,IAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACrD,IAAM,KAAK,GAAa,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC;YAC/D,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC;YAC7C,CAAC,CAAC,EAAE,CAAC;;YAET,KAAyB,IAAA,UAAA,SAAA,KAAK,CAAA,4BAAA,+CAAE;gBAA3B,IAAM,UAAU,kBAAA;gBAChB,MAAc,CAAC,UAAU,CAAC,EAAE,CAAC;aACjC;;;;;;;;;IACL,CAAC;IAED,wDAAwD;IACzC,2BAAW,GAA1B,UAA2D,MAAiB;QACxE,OAAO,MAAM,CAAC,WAAW,CAAC;IAC9B,CAAC;IAED,mDAAyB,GAAzB;QAAA,iBAKC;QAJG,OAAO,UAAC,MAAM,EAAE,WAAW;YACvB,wDAAwD;YACxD,KAAI,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACtC,CAAC,CAAC;IACN,CAAC;IACL,sBAAC;AAAD,CAAC,AAjCD,IAiCC;AAjCY,0CAAe"}

package/cjm/index.d.ts

@@ -1,17 +1,14 @@
-import { constructor } from './core/utils/types';
-import { ProviderBuilder } from './providers/ProviderBuilder';
-import { ResolveDependency } from './core/provider/IProvider';
 import { IContainer, InjectionToken } from './core/container/IContainer';
 export { ContainerHook } from './hooks/ContainerHook';
-export { ProviderReducer } from './core/provider/IProvidersMetadataCollector';
+export { ProviderReducer } from './core/provider/IProviderReflector';
 export { IContainer, Resolveable } from './core/container/IContainer';
 export { constructor } from './core/utils/types';
 export { Container } from './core/container/Container';
 export { ScopeOptions, ResolveDependency, Tag, IProvider } from './core/provider/IProvider';
 export { IInjector } from './core/IInjector';
 export { SimpleInjector } from './injectors/SimpleInjector';
-export { IMethodsMetadataCollector } from './hooks/IMethodsMetadataCollector';
-export { MethodsMetadataCollector } from './hooks/MethodsMetadataCollector';
+export { IMethodReflector } from './hooks/IMethodReflector';
+export { MethodReflector } from './hooks/MethodReflector';
 export { InjectionToken } from './core/container/IContainer';
 export { ProviderNotFoundError } from './core/provider/ProviderNotFoundError';
 export { MethodNotImplementedError } from './core/utils/MethodNotImplementedError';
@@ -21,24 +18,17 @@ export { ArgsProvider, ArgsFn, createArgsFnDecorator } from './providers/ArgsPro
 export { IContainerHook } from './core/container/IContainerHook';
 export { TaggedProvider } from './providers/TaggedProvider';
 export { ProxyInjector } from './injectors/ProxyInjector';
-export { LevelProvider, createLevelDecorator } from './providers/LevelProvider';
+export { LevelProvider, perLevel } from './providers/LevelProvider';
 export { IMockRepository } from './automock/IMockRepository';
 export { AutoMockedContainer } from './automock/AutoMockedContainer';
 export { SingletonProvider } from './providers/SingletonProvider';
 export { ProviderBuilder } from './providers/ProviderBuilder';
-export { IProvidersMetadataCollector } from './core/provider/IProvidersMetadataCollector';
-export { ProvidersMetadataCollector } from './core/provider/ProvidersMetadataCollector';
+export { IProviderReflector } from './core/provider/IProviderReflector';
+export { ProviderReflector } from './core/provider/ProviderReflector';
 export { IDisposable } from './core/utils/types';
 export { ProviderKey } from './core/provider/IProvider';
 export { isProviderKey } from './core/provider/IProvider';
-export { createTagsDecorator } from './providers/TaggedProvider';
-export { createSingletonDecorator } from './providers/SingletonProvider';
-export { createAddKeyDecorator } from './core/provider/Provider';
-export declare const forKey: (key: import("./core/provider/IProvider").ProviderKey) => ClassDecorator;
-export declare const asSingleton: ClassDecorator;
-export declare const perTags: (...tags: string[]) => ClassDecorator;
-export declare function fromClass<T>(value: constructor<T>): ProviderBuilder<T>;
-export declare function fromValue<T>(value: T): ProviderBuilder<T>;
-export declare function fromFn<T>(fn: ResolveDependency<T>): ProviderBuilder<T>;
-export { createMethodHookDecorator } from './hooks/IMethodsMetadataCollector';
+export { perTags } from './providers/TaggedProvider';
+export { asSingleton } from './providers/SingletonProvider';
+export { forKey } from './core/provider/Provider';
 export declare const by: <T>(key: InjectionToken<T>, ...args: unknown[]) => (l: IContainer) => T;

package/cjm/index.js

@@ -25,72 +25,49 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.by = exports.createMethodHookDecorator = exports.fromFn = exports.fromValue = exports.fromClass = exports.perTags = exports.asSingleton = exports.forKey = exports.createAddKeyDecorator = exports.createSingletonDecorator = exports.createTagsDecorator = exports.isProviderKey = exports.ProvidersMetadataCollector = exports.ProviderBuilder = exports.SingletonProvider = exports.AutoMockedContainer = exports.createLevelDecorator = exports.LevelProvider = exports.ProxyInjector = exports.TaggedProvider = exports.createArgsFnDecorator = exports.ArgsProvider = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.ProviderNotFoundError = exports.MethodsMetadataCollector = exports.SimpleInjector = exports.Container = exports.ContainerHook = void 0;
-var Provider_1 = require("./core/provider/Provider");
-var ProvidersMetadataCollector_1 = require("./core/provider/ProvidersMetadataCollector");
-var SingletonProvider_1 = require("./providers/SingletonProvider");
-var TaggedProvider_1 = require("./providers/TaggedProvider");
-var ProviderBuilder_1 = require("./providers/ProviderBuilder");
+exports.by = exports.forKey = exports.asSingleton = exports.perTags = exports.isProviderKey = exports.ProviderReflector = exports.ProviderBuilder = exports.SingletonProvider = exports.AutoMockedContainer = exports.perLevel = exports.LevelProvider = exports.ProxyInjector = exports.TaggedProvider = exports.createArgsFnDecorator = exports.ArgsProvider = exports.Provider = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.ProviderNotFoundError = exports.MethodReflector = exports.SimpleInjector = exports.Container = exports.ContainerHook = void 0;
 var ContainerHook_1 = require("./hooks/ContainerHook");
 Object.defineProperty(exports, "ContainerHook", { enumerable: true, get: function () { return ContainerHook_1.ContainerHook; } });
 var Container_1 = require("./core/container/Container");
 Object.defineProperty(exports, "Container", { enumerable: true, get: function () { return Container_1.Container; } });
 var SimpleInjector_1 = require("./injectors/SimpleInjector");
 Object.defineProperty(exports, "SimpleInjector", { enumerable: true, get: function () { return SimpleInjector_1.SimpleInjector; } });
-var MethodsMetadataCollector_1 = require("./hooks/MethodsMetadataCollector");
-Object.defineProperty(exports, "MethodsMetadataCollector", { enumerable: true, get: function () { return MethodsMetadataCollector_1.MethodsMetadataCollector; } });
+var MethodReflector_1 = require("./hooks/MethodReflector");
+Object.defineProperty(exports, "MethodReflector", { enumerable: true, get: function () { return MethodReflector_1.MethodReflector; } });
 var ProviderNotFoundError_1 = require("./core/provider/ProviderNotFoundError");
 Object.defineProperty(exports, "ProviderNotFoundError", { enumerable: true, get: function () { return ProviderNotFoundError_1.ProviderNotFoundError; } });
 var MethodNotImplementedError_1 = require("./core/utils/MethodNotImplementedError");
 Object.defineProperty(exports, "MethodNotImplementedError", { enumerable: true, get: function () { return MethodNotImplementedError_1.MethodNotImplementedError; } });
 var ContainerDisposedError_1 = require("./core/container/ContainerDisposedError");
 Object.defineProperty(exports, "ContainerDisposedError", { enumerable: true, get: function () { return ContainerDisposedError_1.ContainerDisposedError; } });
-var Provider_2 = require("./core/provider/Provider");
-Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return Provider_2.Provider; } });
+var Provider_1 = require("./core/provider/Provider");
+Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return Provider_1.Provider; } });
 var ArgsProvider_1 = require("./providers/ArgsProvider");
 Object.defineProperty(exports, "ArgsProvider", { enumerable: true, get: function () { return ArgsProvider_1.ArgsProvider; } });
 Object.defineProperty(exports, "createArgsFnDecorator", { enumerable: true, get: function () { return ArgsProvider_1.createArgsFnDecorator; } });
-var TaggedProvider_2 = require("./providers/TaggedProvider");
-Object.defineProperty(exports, "TaggedProvider", { enumerable: true, get: function () { return TaggedProvider_2.TaggedProvider; } });
+var TaggedProvider_1 = require("./providers/TaggedProvider");
+Object.defineProperty(exports, "TaggedProvider", { enumerable: true, get: function () { return TaggedProvider_1.TaggedProvider; } });
 var ProxyInjector_1 = require("./injectors/ProxyInjector");
 Object.defineProperty(exports, "ProxyInjector", { enumerable: true, get: function () { return ProxyInjector_1.ProxyInjector; } });
 var LevelProvider_1 = require("./providers/LevelProvider");
 Object.defineProperty(exports, "LevelProvider", { enumerable: true, get: function () { return LevelProvider_1.LevelProvider; } });
-Object.defineProperty(exports, "createLevelDecorator", { enumerable: true, get: function () { return LevelProvider_1.createLevelDecorator; } });
+Object.defineProperty(exports, "perLevel", { enumerable: true, get: function () { return LevelProvider_1.perLevel; } });
 var AutoMockedContainer_1 = require("./automock/AutoMockedContainer");
 Object.defineProperty(exports, "AutoMockedContainer", { enumerable: true, get: function () { return AutoMockedContainer_1.AutoMockedContainer; } });
-var SingletonProvider_2 = require("./providers/SingletonProvider");
-Object.defineProperty(exports, "SingletonProvider", { enumerable: true, get: function () { return SingletonProvider_2.SingletonProvider; } });
-var ProviderBuilder_2 = require("./providers/ProviderBuilder");
-Object.defineProperty(exports, "ProviderBuilder", { enumerable: true, get: function () { return ProviderBuilder_2.ProviderBuilder; } });
-var ProvidersMetadataCollector_2 = require("./core/provider/ProvidersMetadataCollector");
-Object.defineProperty(exports, "ProvidersMetadataCollector", { enumerable: true, get: function () { return ProvidersMetadataCollector_2.ProvidersMetadataCollector; } });
+var SingletonProvider_1 = require("./providers/SingletonProvider");
+Object.defineProperty(exports, "SingletonProvider", { enumerable: true, get: function () { return SingletonProvider_1.SingletonProvider; } });
+var ProviderBuilder_1 = require("./providers/ProviderBuilder");
+Object.defineProperty(exports, "ProviderBuilder", { enumerable: true, get: function () { return ProviderBuilder_1.ProviderBuilder; } });
+var ProviderReflector_1 = require("./core/provider/ProviderReflector");
+Object.defineProperty(exports, "ProviderReflector", { enumerable: true, get: function () { return ProviderReflector_1.ProviderReflector; } });
 var IProvider_1 = require("./core/provider/IProvider");
 Object.defineProperty(exports, "isProviderKey", { enumerable: true, get: function () { return IProvider_1.isProviderKey; } });
-var TaggedProvider_3 = require("./providers/TaggedProvider");
-Object.defineProperty(exports, "createTagsDecorator", { enumerable: true, get: function () { return TaggedProvider_3.createTagsDecorator; } });
-var SingletonProvider_3 = require("./providers/SingletonProvider");
-Object.defineProperty(exports, "createSingletonDecorator", { enumerable: true, get: function () { return SingletonProvider_3.createSingletonDecorator; } });
-var Provider_3 = require("./core/provider/Provider");
-Object.defineProperty(exports, "createAddKeyDecorator", { enumerable: true, get: function () { return Provider_3.createAddKeyDecorator; } });
-var providerMetadataCollector = ProvidersMetadataCollector_1.ProvidersMetadataCollector.create();
-exports.forKey = (0, Provider_1.createAddKeyDecorator)(providerMetadataCollector);
-exports.asSingleton = (0, SingletonProvider_1.createSingletonDecorator)(providerMetadataCollector);
-exports.perTags = (0, TaggedProvider_1.createTagsDecorator)(providerMetadataCollector);
-function fromClass(value) {
-    return new ProviderBuilder_1.ProviderBuilder(Provider_1.Provider.fromClass(value)).map(providerMetadataCollector.findReducerOrCreate(value));
-}
-exports.fromClass = fromClass;
-function fromValue(value) {
-    return new ProviderBuilder_1.ProviderBuilder(Provider_1.Provider.fromValue(value));
-}
-exports.fromValue = fromValue;
-function fromFn(fn) {
-    return new ProviderBuilder_1.ProviderBuilder(new Provider_1.Provider(fn));
-}
-exports.fromFn = fromFn;
-var IMethodsMetadataCollector_1 = require("./hooks/IMethodsMetadataCollector");
-Object.defineProperty(exports, "createMethodHookDecorator", { enumerable: true, get: function () { return IMethodsMetadataCollector_1.createMethodHookDecorator; } });
+var TaggedProvider_2 = require("./providers/TaggedProvider");
+Object.defineProperty(exports, "perTags", { enumerable: true, get: function () { return TaggedProvider_2.perTags; } });
+var SingletonProvider_2 = require("./providers/SingletonProvider");
+Object.defineProperty(exports, "asSingleton", { enumerable: true, get: function () { return SingletonProvider_2.asSingleton; } });
+var Provider_2 = require("./core/provider/Provider");
+Object.defineProperty(exports, "forKey", { enumerable: true, get: function () { return Provider_2.forKey; } });
 var by = function (key) {
     var args = [];
     for (var _i = 1; _i < arguments.length; _i++) {

package/cjm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAA2E;AAC3E,yFAAwF;AACxF,mEAAyE;AACzE,6DAAiE;AAEjE,+DAA8D;AAI9D,uDAAsD;AAA7C,8GAAA,aAAa,OAAA;AAItB,wDAAuD;AAA9C,sGAAA,SAAS,OAAA;AAGlB,6DAA4D;AAAnD,gHAAA,cAAc,OAAA;AAEvB,6EAA4E;AAAnE,oIAAA,wBAAwB,OAAA;AAEjC,+EAA8E;AAArE,8HAAA,qBAAqB,OAAA;AAC9B,oFAAmF;AAA1E,sIAAA,yBAAyB,OAAA;AAClC,kFAAiF;AAAxE,gIAAA,sBAAsB,OAAA;AAC/B,qDAAoD;AAA3C,oGAAA,QAAQ,OAAA;AACjB,yDAAuF;AAA9E,4GAAA,YAAY,OAAA;AAAU,qHAAA,qBAAqB,OAAA;AAEpD,6DAA4D;AAAnD,gHAAA,cAAc,OAAA;AACvB,2DAA0D;AAAjD,8GAAA,aAAa,OAAA;AACtB,2DAAgF;AAAvE,8GAAA,aAAa,OAAA;AAAE,qHAAA,oBAAoB,OAAA;AAE5C,sEAAqE;AAA5D,0HAAA,mBAAmB,OAAA;AAC5B,mEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,+DAA8D;AAArD,kHAAA,eAAe,OAAA;AAExB,yFAAwF;AAA/E,wIAAA,0BAA0B,OAAA;AAGnC,uDAA0D;AAAjD,0GAAA,aAAa,OAAA;AACtB,6DAAiE;AAAxD,qHAAA,mBAAmB,OAAA;AAC5B,mEAAyE;AAAhE,6HAAA,wBAAwB,OAAA;AACjC,qDAAiE;AAAxD,iHAAA,qBAAqB,OAAA;AAE9B,IAAM,yBAAyB,GAAG,uDAA0B,CAAC,MAAM,EAAE,CAAC;AACzD,QAAA,MAAM,GAAG,IAAA,gCAAqB,EAAC,yBAAyB,CAAC,CAAC;AAE1D,QAAA,WAAW,GAAG,IAAA,4CAAwB,EAAC,yBAAyB,CAAC,CAAC;AAClE,QAAA,OAAO,GAAG,IAAA,oCAAmB,EAAC,yBAAyB,CAAC,CAAC;AAEtE,SAAgB,SAAS,CAAI,KAAqB;IAC9C,OAAO,IAAI,iCAAe,CAAC,mBAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,yBAAyB,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;AACpH,CAAC;AAFD,8BAEC;AAED,SAAgB,SAAS,CAAI,KAAQ;IACjC,OAAO,IAAI,iCAAe,CAAC,mBAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1D,CAAC;AAFD,8BAEC;AAED,SAAgB,MAAM,CAAI,EAAwB;IAC9C,OAAO,IAAI,iCAAe,CAAC,IAAI,mBAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;AACjD,CAAC;AAFD,wBAEC;AAED,+EAA8E;AAArE,sIAAA,yBAAyB,OAAA;AAE3B,IAAM,EAAE,GACX,UAAI,GAAsB;IAAE,cAAkB;SAAlB,UAAkB,EAAlB,qBAAkB,EAAlB,IAAkB;QAAlB,6BAAkB;;IAC9C,OAAA,UAAC,CAAa;QACV,OAAA,CAAC,CAAC,OAAO,OAAT,CAAC,iBAAY,GAAG,UAAK,IAAI;IAAzB,CAA0B;AAD9B,CAC8B,CAAC;AAHtB,QAAA,EAAE,MAGoB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,uDAAsD;AAA7C,8GAAA,aAAa,OAAA;AAItB,wDAAuD;AAA9C,sGAAA,SAAS,OAAA;AAGlB,6DAA4D;AAAnD,gHAAA,cAAc,OAAA;AAEvB,2DAA0D;AAAjD,kHAAA,eAAe,OAAA;AAExB,+EAA8E;AAArE,8HAAA,qBAAqB,OAAA;AAC9B,oFAAmF;AAA1E,sIAAA,yBAAyB,OAAA;AAClC,kFAAiF;AAAxE,gIAAA,sBAAsB,OAAA;AAC/B,qDAAoD;AAA3C,oGAAA,QAAQ,OAAA;AACjB,yDAAuF;AAA9E,4GAAA,YAAY,OAAA;AAAU,qHAAA,qBAAqB,OAAA;AAEpD,6DAA4D;AAAnD,gHAAA,cAAc,OAAA;AACvB,2DAA0D;AAAjD,8GAAA,aAAa,OAAA;AACtB,2DAAoE;AAA3D,8GAAA,aAAa,OAAA;AAAE,yGAAA,QAAQ,OAAA;AAEhC,sEAAqE;AAA5D,0HAAA,mBAAmB,OAAA;AAC5B,mEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,+DAA8D;AAArD,kHAAA,eAAe,OAAA;AAExB,uEAAsE;AAA7D,sHAAA,iBAAiB,OAAA;AAG1B,uDAA0D;AAAjD,0GAAA,aAAa,OAAA;AACtB,6DAAqD;AAA5C,yGAAA,OAAO,OAAA;AAChB,mEAA4D;AAAnD,gHAAA,WAAW,OAAA;AACpB,qDAAkD;AAAzC,kGAAA,MAAM,OAAA;AAER,IAAM,EAAE,GACX,UAAI,GAAsB;IAAE,cAAkB;SAAlB,UAAkB,EAAlB,qBAAkB,EAAlB,IAAkB;QAAlB,6BAAkB;;IAC9C,OAAA,UAAC,CAAa;QACV,OAAA,CAAC,CAAC,OAAO,OAAT,CAAC,iBAAY,GAAG,UAAK,IAAI;IAAzB,CAA0B;AAD9B,CAC8B,CAAC;AAHtB,QAAA,EAAE,MAGoB"}

package/cjm/providers/ArgsProvider.d.ts

@@ -1,7 +1,7 @@
 import { ProviderDecorator } from '../core/provider/ProviderDecorator';
 import { Resolveable } from '../core/container/IContainer';
 import { IProvider } from '../core/provider/IProvider';
-import { IProvidersMetadataCollector } from '../core/provider/IProvidersMetadataCollector';
+import { IProviderReflector } from '../core/provider/IProviderReflector';
 export declare type ArgsFn = (l: Resolveable) => any[];
 export declare class ArgsProvider<T> extends ProviderDecorator<T> {
     private provider;
@@ -10,4 +10,4 @@ export declare class ArgsProvider<T> extends ProviderDecorator<T> {
     resolve(container: Resolveable, ...args: any[]): T;
     clone(): ProviderDecorator<T>;
 }
-export declare const createArgsFnDecorator: (metadataCollector: IProvidersMetadataCollector) => (argsFn: ArgsFn) => ClassDecorator;
+export declare const createArgsFnDecorator: (metadataCollector: IProviderReflector) => (argsFn: ArgsFn) => ClassDecorator;

package/cjm/providers/ArgsProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArgsProvider.js","sourceRoot":"","sources":["../../lib/providers/ArgsProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wEAAuE;AAQvE;IAAqC,gCAAoB;IACrD,sBAAoB,QAAsB,EAAU,MAAc;QAAlE,YACI,kBAAM,QAAQ,CAAC,SAClB;QAFmB,cAAQ,GAAR,QAAQ,CAAc;QAAU,YAAM,GAAN,MAAM,CAAQ;;IAElE,CAAC;IAED,8BAAO,GAAP,UAAQ,SAAsB;;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QAC1C,OAAO,CAAA,KAAA,IAAI,CAAC,QAAQ,CAAA,CAAC,OAAO,wCAAC,SAAS,UAAK,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAK,IAAI,WAAE;IAChF,CAAC;IAED,4BAAK,GAAL;QACI,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAChE,CAAC;IACL,mBAAC;AAAD,CAAC,AAZD,CAAqC,qCAAiB,GAYrD;AAZY,oCAAY;AAclB,IAAM,qBAAqB,GAC9B,UAAC,iBAA8C;IAC/C,OAAA,UAAC,MAAc;QACf,OAAA,UAAC,MAAM;YACH,IAAM,WAAW,GAAG,MAAqC,CAAC;YAC1D,IAAM,EAAE,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;YAC9D,iBAAiB,CAAC,UAAU,CAAC,WAAW,EAAE,UAAC,OAAO,IAAK,OAAA,EAAE,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAA9B,CAA8B,CAAC,CAAC;QAC3F,CAAC;IAJD,CAIC;AALD,CAKC,CAAC;AAPO,QAAA,qBAAqB,yBAO5B"}
+{"version":3,"file":"ArgsProvider.js","sourceRoot":"","sources":["../../lib/providers/ArgsProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wEAAuE;AAQvE;IAAqC,gCAAoB;IACrD,sBAAoB,QAAsB,EAAU,MAAc;QAAlE,YACI,kBAAM,QAAQ,CAAC,SAClB;QAFmB,cAAQ,GAAR,QAAQ,CAAc;QAAU,YAAM,GAAN,MAAM,CAAQ;;IAElE,CAAC;IAED,8BAAO,GAAP,UAAQ,SAAsB;;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QAC1C,OAAO,CAAA,KAAA,IAAI,CAAC,QAAQ,CAAA,CAAC,OAAO,wCAAC,SAAS,UAAK,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAK,IAAI,WAAE;IAChF,CAAC;IAED,4BAAK,GAAL;QACI,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAChE,CAAC;IACL,mBAAC;AAAD,CAAC,AAZD,CAAqC,qCAAiB,GAYrD;AAZY,oCAAY;AAclB,IAAM,qBAAqB,GAC9B,UAAC,iBAAqC;IACtC,OAAA,UAAC,MAAc;QACf,OAAA,UAAC,MAAM;YACH,IAAM,WAAW,GAAG,MAAqC,CAAC;YAC1D,IAAM,EAAE,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;YAC9D,iBAAiB,CAAC,UAAU,CAAC,WAAW,EAAE,UAAC,OAAO,IAAK,OAAA,EAAE,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAA9B,CAA8B,CAAC,CAAC;QAC3F,CAAC;IAJD,CAIC;AALD,CAKC,CAAC;AAPO,QAAA,qBAAqB,yBAO5B"}

package/cjm/providers/LevelProvider.d.ts

@@ -1,6 +1,5 @@
 import { IProvider, ScopeOptions } from '../core/provider/IProvider';
 import { ProviderDecorator } from '../core/provider/ProviderDecorator';
-import { IProvidersMetadataCollector } from '../core/provider/IProvidersMetadataCollector';
 export declare class LevelProvider<T> extends ProviderDecorator<T> {
     private provider;
     private readonly range;
@@ -8,4 +7,4 @@ export declare class LevelProvider<T> extends ProviderDecorator<T> {
     clone(): LevelProvider<T>;
     isValid(filters: ScopeOptions): boolean;
 }
-export declare const createLevelDecorator: (metadataCollector: IProvidersMetadataCollector) => (value: number) => ClassDecorator;
+export declare const perLevel: (value: number) => ClassDecorator;

package/cjm/providers/LevelProvider.js

@@ -31,8 +31,9 @@ var __read = (this && this.__read) || function (o, n) {
     return ar;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLevelDecorator = exports.LevelProvider = void 0;
+exports.perLevel = exports.LevelProvider = void 0;
 var ProviderDecorator_1 = require("../core/provider/ProviderDecorator");
+var ProviderReflector_1 = require("../core/provider/ProviderReflector");
 var LevelProvider = /** @class */ (function (_super) {
     __extends(LevelProvider, _super);
     function LevelProvider(provider, range) {
@@ -52,14 +53,12 @@ var LevelProvider = /** @class */ (function (_super) {
     return LevelProvider;
 }(ProviderDecorator_1.ProviderDecorator));
 exports.LevelProvider = LevelProvider;
-var createLevelDecorator = function (metadataCollector) {
-    return function (value) {
-        return function (target) {
-            var targetClass = target;
-            var fn = metadataCollector.findReducerOrCreate(targetClass);
-            metadataCollector.addReducer(targetClass, function (builder) { return fn(builder).forLevel(value); });
-        };
+var perLevel = function (value) {
+    return function (target) {
+        var targetClass = target;
+        var fn = ProviderReflector_1.providerReflector.findReducerOrCreate(targetClass);
+        ProviderReflector_1.providerReflector.addReducer(targetClass, function (builder) { return fn(builder).forLevel(value); });
     };
 };
-exports.createLevelDecorator = createLevelDecorator;
+exports.perLevel = perLevel;
 //# sourceMappingURL=LevelProvider.js.map

package/cjm/providers/LevelProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"LevelProvider.js","sourceRoot":"","sources":["../../lib/providers/LevelProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wEAAuE;AAIvE;IAAsC,iCAAoB;IACtD,uBAAoB,QAAsB,EAAmB,KAAuB;QAApF,YACI,kBAAM,QAAQ,CAAC,SAClB;QAFmB,cAAQ,GAAR,QAAQ,CAAc;QAAmB,WAAK,GAAL,KAAK,CAAkB;;IAEpF,CAAC;IAED,6BAAK,GAAL;QACI,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAChE,CAAC;IAED,+BAAO,GAAP,UAAQ,OAAqB;QACjB,IAAA,KAAK,GAAK,OAAO,MAAZ,CAAa;QACpB,IAAA,KAAA,OAAa,IAAI,CAAC,KAAK,IAAA,EAAtB,IAAI,QAAA,EAAE,EAAE,QAAc,CAAC;QAC9B,OAAO,IAAI,IAAI,KAAK,IAAI,KAAK,IAAI,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1E,CAAC;IACL,oBAAC;AAAD,CAAC,AAdD,CAAsC,qCAAiB,GActD;AAdY,sCAAa;AAgBnB,IAAM,oBAAoB,GAC7B,UAAC,iBAA8C;IAC/C,OAAA,UAAC,KAAa;QACd,OAAA,UAAC,MAAM;YACH,IAAM,WAAW,GAAG,MAAqC,CAAC;YAC1D,IAAM,EAAE,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;YAC9D,iBAAiB,CAAC,UAAU,CAAC,WAAW,EAAE,UAAC,OAAO,IAAK,OAAA,EAAE,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAA3B,CAA2B,CAAC,CAAC;QACxF,CAAC;IAJD,CAIC;AALD,CAKC,CAAC;AAPO,QAAA,oBAAoB,wBAO3B"}
+{"version":3,"file":"LevelProvider.js","sourceRoot":"","sources":["../../lib/providers/LevelProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wEAAuE;AAEvE,wEAAuE;AAEvE;IAAsC,iCAAoB;IACtD,uBAAoB,QAAsB,EAAmB,KAAuB;QAApF,YACI,kBAAM,QAAQ,CAAC,SAClB;QAFmB,cAAQ,GAAR,QAAQ,CAAc;QAAmB,WAAK,GAAL,KAAK,CAAkB;;IAEpF,CAAC;IAED,6BAAK,GAAL;QACI,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAChE,CAAC;IAED,+BAAO,GAAP,UAAQ,OAAqB;QACjB,IAAA,KAAK,GAAK,OAAO,MAAZ,CAAa;QACpB,IAAA,KAAA,OAAa,IAAI,CAAC,KAAK,IAAA,EAAtB,IAAI,QAAA,EAAE,EAAE,QAAc,CAAC;QAC9B,OAAO,IAAI,IAAI,KAAK,IAAI,KAAK,IAAI,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1E,CAAC;IACL,oBAAC;AAAD,CAAC,AAdD,CAAsC,qCAAiB,GActD;AAdY,sCAAa;AAgBnB,IAAM,QAAQ,GACjB,UAAC,KAAa;IACd,OAAA,UAAC,MAAM;QACH,IAAM,WAAW,GAAG,MAAqC,CAAC;QAC1D,IAAM,EAAE,GAAG,qCAAiB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC;QAC9D,qCAAiB,CAAC,UAAU,CAAC,WAAW,EAAE,UAAC,OAAO,IAAK,OAAA,EAAE,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAA3B,CAA2B,CAAC,CAAC;IACxF,CAAC;AAJD,CAIC,CAAC;AANO,QAAA,QAAQ,YAMf"}

package/cjm/providers/ProviderBuilder.d.ts

@@ -1,8 +1,12 @@
 import { IProvider, ProviderKey, Tag } from '../core/provider/IProvider';
-import { ProviderReducer } from '../core/provider/IProvidersMetadataCollector';
+import { ProviderReducer } from '../core/provider/IProviderReflector';
 import { ArgsFn } from './ArgsProvider';
+import { constructor } from '../core/utils/types';
 export declare class ProviderBuilder<T> {
     private provider;
+    static fromClass<T>(value: constructor<T>): ProviderBuilder<T>;
+    static fromValue<T>(value: T): ProviderBuilder<T>;
+    static fromFn<T>(fn: (...args: any[]) => T): ProviderBuilder<T>;
     constructor(provider: IProvider<T>);
     withArgs(...extraArgs: any[]): this;
     withArgsFn(argsFn: ArgsFn): this;

package/cjm/providers/ProviderBuilder.js

@@ -5,10 +5,21 @@ var SingletonProvider_1 = require("./SingletonProvider");
 var TaggedProvider_1 = require("./TaggedProvider");
 var LevelProvider_1 = require("./LevelProvider");
 var ArgsProvider_1 = require("./ArgsProvider");
+var Provider_1 = require("../core/provider/Provider");
+var ProviderReflector_1 = require("../core/provider/ProviderReflector");
 var ProviderBuilder = /** @class */ (function () {
     function ProviderBuilder(provider) {
         this.provider = provider;
     }
+    ProviderBuilder.fromClass = function (value) {
+        return new ProviderBuilder(Provider_1.Provider.fromClass(value)).map(ProviderReflector_1.providerReflector.findReducerOrCreate(value));
+    };
+    ProviderBuilder.fromValue = function (value) {
+        return new ProviderBuilder(Provider_1.Provider.fromValue(value));
+    };
+    ProviderBuilder.fromFn = function (fn) {
+        return new ProviderBuilder(new Provider_1.Provider(fn));
+    };
     ProviderBuilder.prototype.withArgs = function () {
         var extraArgs = [];
         for (var _i = 0; _i < arguments.length; _i++) {

package/cjm/providers/ProviderBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProviderBuilder.js","sourceRoot":"","sources":["../../lib/providers/ProviderBuilder.ts"],"names":[],"mappings":";;;AACA,yDAAwD;AACxD,mDAAkD;AAClD,iDAAgD;AAEhD,+CAAsD;AAEtD;IACI,yBAAoB,QAAsB;QAAtB,aAAQ,GAAR,QAAQ,CAAc;IAAG,CAAC;IAE9C,kCAAQ,GAAR;QAAS,mBAAmB;aAAnB,UAAmB,EAAnB,qBAAmB,EAAnB,IAAmB;YAAnB,8BAAmB;;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAM,OAAA,SAAS,EAAT,CAAS,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,oCAAU,GAAV,UAAW,MAAc;QACrB,IAAI,CAAC,QAAQ,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,6BAAG,GAAH,UAAI,OAA2B;QAC3B,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,iCAAO,GAAP;QAAQ,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,yBAAc;;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,kCAAQ,GAAR,UAAS,KAAa;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,6BAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,qCAAW,GAAX;QACI,IAAI,CAAC,QAAQ,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,gCAAM,GAAN,UAAO,GAAgB;QACnB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,+BAAK,GAAL;QACI,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACL,sBAAC;AAAD,CAAC,AAxCD,IAwCC;AAxCY,0CAAe"}
+{"version":3,"file":"ProviderBuilder.js","sourceRoot":"","sources":["../../lib/providers/ProviderBuilder.ts"],"names":[],"mappings":";;;AACA,yDAAwD;AACxD,mDAAkD;AAClD,iDAAgD;AAEhD,+CAAsD;AACtD,sDAAqD;AAErD,wEAAuE;AAEvE;IAaI,yBAAoB,QAAsB;QAAtB,aAAQ,GAAR,QAAQ,CAAc;IAAG,CAAC;IAZvC,yBAAS,GAAhB,UAAoB,KAAqB;QACrC,OAAO,IAAI,eAAe,CAAC,mBAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,qCAAiB,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5G,CAAC;IAEM,yBAAS,GAAhB,UAAoB,KAAQ;QACxB,OAAO,IAAI,eAAe,CAAC,mBAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1D,CAAC;IAEM,sBAAM,GAAb,UAAiB,EAAyB;QACtC,OAAO,IAAI,eAAe,CAAC,IAAI,mBAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IAID,kCAAQ,GAAR;QAAS,mBAAmB;aAAnB,UAAmB,EAAnB,qBAAmB,EAAnB,IAAmB;YAAnB,8BAAmB;;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAM,OAAA,SAAS,EAAT,CAAS,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,oCAAU,GAAV,UAAW,MAAc;QACrB,IAAI,CAAC,QAAQ,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,6BAAG,GAAH,UAAI,OAA2B;QAC3B,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,iCAAO,GAAP;QAAQ,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,yBAAc;;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,kCAAQ,GAAR,UAAS,KAAa;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,6BAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,qCAAW,GAAX;QACI,IAAI,CAAC,QAAQ,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,gCAAM,GAAN,UAAO,GAAgB;QACnB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,+BAAK,GAAL;QACI,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACL,sBAAC;AAAD,CAAC,AApDD,IAoDC;AApDY,0CAAe"}

package/cjm/providers/SingletonProvider.d.ts

@@ -1,7 +1,6 @@
 import { Resolveable } from '../core/container/IContainer';
 import { ProviderDecorator } from '../core/provider/ProviderDecorator';
 import { IProvider } from '../core/provider/IProvider';
-import { IProvidersMetadataCollector } from '../core/provider/IProvidersMetadataCollector';
 export declare class SingletonProvider<T> extends ProviderDecorator<T> {
     private readonly provider;
     private instance;
@@ -10,4 +9,4 @@ export declare class SingletonProvider<T> extends ProviderDecorator<T> {
     dispose(): void;
     resolve(container: Resolveable, ...args: any[]): T;
 }
-export declare const createSingletonDecorator: (metadataCollector: IProvidersMetadataCollector) => ClassDecorator;
+export declare const asSingleton: ClassDecorator;