ts-ioc-container 10.1.0 → 10.3.2

package/README.md

@@ -287,6 +287,7 @@ export class MoqProvider<T> extends MockProvider<T> {
 }
 ```
 
+
 ## Errors
 
 - ProviderNotFoundError

package/cjm/core/Container.d.ts

@@ -0,0 +1,11 @@
+import { IKeyedProvider, Tag } from './provider/IProvider';
+import { InjectionToken, IServiceLocator, RegisterOptions } from './IServiceLocator';
+import { IContainer } from './IContainer';
+export declare class Container implements IContainer {
+    private locator;
+    constructor(locator: IServiceLocator);
+    createScope(tags?: Tag[]): IContainer;
+    register(provider: IKeyedProvider<unknown>, options?: Partial<RegisterOptions>): this;
+    resolve<T>(key: InjectionToken<T>, ...args: any[]): T;
+    dispose(): void;
+}

package/cjm/core/{DIContainer.js → Container.js}

@@ -36,21 +36,17 @@ 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.DIContainer = void 0;
+exports.Container = void 0;
 var NoRegistrationKeysProvided_1 = require("../errors/NoRegistrationKeysProvided");
-var DIProviderBuilder_1 = require("./DIProviderBuilder");
-var DIContainer = /** @class */ (function () {
-    function DIContainer(locator, providerBuilder) {
-        if (providerBuilder === void 0) { providerBuilder = new DIProviderBuilder_1.DIProviderBuilder(); }
+var Container = /** @class */ (function () {
+    function Container(locator) {
         this.locator = locator;
-        this.providerBuilder = providerBuilder;
     }
-    DIContainer.prototype.createScope = function (tags) {
-        return new DIContainer(this.locator.createScope(tags), this.providerBuilder);
+    Container.prototype.createScope = function (tags) {
+        return new Container(this.locator.createScope(tags));
     };
-    DIContainer.prototype.register = function (fn, options) {
+    Container.prototype.register = function (provider, options) {
         var e_1, _a;
-        var provider = fn(this.providerBuilder);
         var keys = provider.getKeys();
         if (keys.length === 0) {
             throw new NoRegistrationKeysProvided_1.NoRegistrationKeysProvided();
@@ -70,7 +66,7 @@ var DIContainer = /** @class */ (function () {
         }
         return this;
     };
-    DIContainer.prototype.resolve = function (key) {
+    Container.prototype.resolve = function (key) {
         var _a;
         var args = [];
         for (var _i = 1; _i < arguments.length; _i++) {
@@ -78,10 +74,10 @@ var DIContainer = /** @class */ (function () {
         }
         return (_a = this.locator).resolve.apply(_a, __spreadArray([key], __read(args), false));
     };
-    DIContainer.prototype.dispose = function () {
+    Container.prototype.dispose = function () {
         this.locator.dispose();
     };
-    return DIContainer;
+    return Container;
 }());
-exports.DIContainer = DIContainer;
-//# sourceMappingURL=DIContainer.js.map
+exports.Container = Container;
+//# sourceMappingURL=Container.js.map

package/cjm/core/Container.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Container.js","sourceRoot":"","sources":["../../lib/core/Container.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,mFAAkF;AAGlF;IACI,mBAAoB,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;IAAG,CAAC;IAEhD,+BAAW,GAAX,UAAY,IAAY;QACpB,OAAO,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,4BAAQ,GAAR,UAAS,QAAiC,EAAE,OAAkC;;QAC1E,IAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;QAChC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACnB,MAAM,IAAI,uDAA0B,EAAE,CAAC;SAC1C;;YACD,KAAkB,IAAA,SAAA,SAAA,IAAI,CAAA,0BAAA,4CAAE;gBAAnB,IAAM,GAAG,iBAAA;gBACV,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;aACjD;;;;;;;;;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,2BAAO,GAAP,UAAW,GAAsB;;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QAC7C,OAAO,CAAA,KAAA,IAAI,CAAC,OAAO,CAAA,CAAC,OAAO,0BAAC,GAAG,UAAK,IAAI,WAAE;IAC9C,CAAC;IAED,2BAAO,GAAP;QACI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IACL,gBAAC;AAAD,CAAC,AAzBD,IAyBC;AAzBY,8BAAS"}

package/cjm/core/ContainerBuilder.d.ts

@@ -1,21 +1,18 @@
 import { IInjector } from './IInjector';
 import { IServiceLocator } from './IServiceLocator';
 import { ScopeOptions } from './provider/IProvider';
-import { DIContainer } from './DIContainer';
-import { MapFn } from './ServiceLocator';
-import { IDIProviderBuilder } from './IDIContainer';
-import { IResolvableHook } from '../features/instanceHook/IResolvableHook';
+import { Container } from './Container';
+import { IInstanceHook } from './IInstanceHook';
+export declare type MapFn<T> = (value: T) => T;
 export declare class ContainerBuilder {
     private injector;
     private parent;
-    private providerBuilder;
     private mapFn;
     private options;
-    constructor(injector: IInjector, parent?: IServiceLocator, providerBuilder?: IDIProviderBuilder, mapFn?: MapFn<IServiceLocator>, options?: Partial<ScopeOptions>);
+    private hook;
+    constructor(injector: IInjector, parent?: IServiceLocator, mapFn?: MapFn<IServiceLocator>, options?: Partial<ScopeOptions>, hook?: IInstanceHook);
     mapLocator(fn: MapFn<IServiceLocator>): this;
-    withHook(hook: IResolvableHook): this;
-    mapInjector(fn: MapFn<IInjector>): this;
-    mapProviderBuilder(fn: MapFn<IDIProviderBuilder>): this;
+    setHook(hook: IInstanceHook): this;
     withOptions(options: Partial<ScopeOptions>): this;
-    build(): DIContainer;
+    build(): Container;
 }

package/cjm/core/ContainerBuilder.js

@@ -3,39 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContainerBuilder = void 0;
 var EmptyServiceLocator_1 = require("./EmptyServiceLocator");
 var utils_1 = require("../helpers/utils");
-var DIContainer_1 = require("./DIContainer");
+var Container_1 = require("./Container");
 var ServiceLocator_1 = require("./ServiceLocator");
-var DIProviderBuilder_1 = require("./DIProviderBuilder");
-var HookedProviderBuilder_1 = require("./HookedProviderBuilder");
-var HookedInjector_1 = require("../features/instanceHook/HookedInjector");
+var IInstanceHook_1 = require("./IInstanceHook");
 var ContainerBuilder = /** @class */ (function () {
-    function ContainerBuilder(injector, parent, providerBuilder, mapFn, options) {
+    function ContainerBuilder(injector, parent, mapFn, options, hook) {
         if (parent === void 0) { parent = new EmptyServiceLocator_1.EmptyServiceLocator(); }
-        if (providerBuilder === void 0) { providerBuilder = new DIProviderBuilder_1.DIProviderBuilder(); }
         if (mapFn === void 0) { mapFn = utils_1.id; }
         if (options === void 0) { options = {}; }
+        if (hook === void 0) { hook = IInstanceHook_1.emptyHook; }
         this.injector = injector;
         this.parent = parent;
-        this.providerBuilder = providerBuilder;
         this.mapFn = mapFn;
         this.options = options;
+        this.hook = hook;
     }
     ContainerBuilder.prototype.mapLocator = function (fn) {
         var oldFn = this.mapFn;
         this.mapFn = function (value) { return fn(oldFn(value)); };
         return this;
     };
-    ContainerBuilder.prototype.withHook = function (hook) {
-        this.injector = new HookedInjector_1.HookedInjector(this.injector, hook);
-        this.providerBuilder = new HookedProviderBuilder_1.HookedProviderBuilder(this.providerBuilder, hook);
-        return this;
-    };
-    ContainerBuilder.prototype.mapInjector = function (fn) {
-        this.injector = fn(this.injector);
-        return this;
-    };
-    ContainerBuilder.prototype.mapProviderBuilder = function (fn) {
-        this.providerBuilder = fn(this.providerBuilder);
+    ContainerBuilder.prototype.setHook = function (hook) {
+        this.hook = hook;
         return this;
     };
     ContainerBuilder.prototype.withOptions = function (options) {
@@ -44,8 +33,8 @@ var ContainerBuilder = /** @class */ (function () {
     };
     ContainerBuilder.prototype.build = function () {
         var parent = this.mapFn(this.parent);
-        var locator = new ServiceLocator_1.ServiceLocator(parent, this.injector, this.options.level, this.options.tags);
-        return new DIContainer_1.DIContainer(this.mapFn(locator), this.providerBuilder);
+        var locator = new ServiceLocator_1.ServiceLocator(parent, this.injector, this.options.level, this.options.tags, this.hook);
+        return new Container_1.Container(this.mapFn(locator));
     };
     return ContainerBuilder;
 }());

package/cjm/core/ContainerBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContainerBuilder.js","sourceRoot":"","sources":["../../lib/core/ContainerBuilder.ts"],"names":[],"mappings":";;;AAEA,6DAA4D;AAC5D,0CAAsC;AAEtC,6CAA4C;AAC5C,mDAAyD;AAEzD,yDAAwD;AAExD,iEAAgE;AAChE,0EAAyE;AAEzE;IACI,0BACY,QAAmB,EACnB,MAAmD,EACnD,eAA6D,EAC7D,KAAkC,EAClC,OAAmC;QAHnC,uBAAA,EAAA,aAA8B,yCAAmB,EAAE;QACnD,gCAAA,EAAA,sBAA0C,qCAAiB,EAAE;QAC7D,sBAAA,EAAA,QAAgC,UAAE;QAClC,wBAAA,EAAA,YAAmC;QAJnC,aAAQ,GAAR,QAAQ,CAAW;QACnB,WAAM,GAAN,MAAM,CAA6C;QACnD,oBAAe,GAAf,eAAe,CAA8C;QAC7D,UAAK,GAAL,KAAK,CAA6B;QAClC,YAAO,GAAP,OAAO,CAA4B;IAC5C,CAAC;IAEJ,qCAAU,GAAV,UAAW,EAA0B;QACjC,IAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,UAAC,KAAK,IAAK,OAAA,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAhB,CAAgB,CAAC;QACzC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,mCAAQ,GAAR,UAAS,IAAqB;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,eAAe,GAAG,IAAI,6CAAqB,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC7E,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,sCAAW,GAAX,UAAY,EAAoB;QAC5B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,6CAAkB,GAAlB,UAAmB,EAA6B;QAC5C,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,sCAAW,GAAX,UAAY,OAA8B;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,gCAAK,GAAL;QACI,IAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,IAAM,OAAO,GAAG,IAAI,+BAAc,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACjG,OAAO,IAAI,yBAAW,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACtE,CAAC;IACL,uBAAC;AAAD,CAAC,AAzCD,IAyCC;AAzCY,4CAAgB"}
+{"version":3,"file":"ContainerBuilder.js","sourceRoot":"","sources":["../../lib/core/ContainerBuilder.ts"],"names":[],"mappings":";;;AAEA,6DAA4D;AAC5D,0CAAsC;AAEtC,yCAAwC;AACxC,mDAAkD;AAClD,iDAA2D;AAI3D;IACI,0BACY,QAAmB,EACnB,MAAmD,EACnD,KAAkC,EAClC,OAAmC,EACnC,IAA+B;QAH/B,uBAAA,EAAA,aAA8B,yCAAmB,EAAE;QACnD,sBAAA,EAAA,QAAgC,UAAE;QAClC,wBAAA,EAAA,YAAmC;QACnC,qBAAA,EAAA,OAAsB,yBAAS;QAJ/B,aAAQ,GAAR,QAAQ,CAAW;QACnB,WAAM,GAAN,MAAM,CAA6C;QACnD,UAAK,GAAL,KAAK,CAA6B;QAClC,YAAO,GAAP,OAAO,CAA4B;QACnC,SAAI,GAAJ,IAAI,CAA2B;IACxC,CAAC;IAEJ,qCAAU,GAAV,UAAW,EAA0B;QACjC,IAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,UAAC,KAAK,IAAK,OAAA,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAhB,CAAgB,CAAC;QACzC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,kCAAO,GAAP,UAAQ,IAAmB;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,sCAAW,GAAX,UAAY,OAA8B;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,gCAAK,GAAL;QACI,IAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,IAAM,OAAO,GAAG,IAAI,+BAAc,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5G,OAAO,IAAI,qBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9C,CAAC;IACL,uBAAC;AAAD,CAAC,AA9BD,IA8BC;AA9BY,4CAAgB"}

package/cjm/core/IContainer.d.ts

@@ -0,0 +1,7 @@
+import { RegisterOptions, Resolveable } from './IServiceLocator';
+import { IKeyedProvider, Tag } from './provider/IProvider';
+import { IDisposable } from '../helpers/types';
+export interface IContainer extends Resolveable, IDisposable {
+    createScope(tags?: Tag[]): IContainer;
+    register(fn: IKeyedProvider<unknown>, options?: Partial<RegisterOptions>): this;
+}

package/cjm/core/{IDIContainer.js → IContainer.js}

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

package/cjm/core/IContainer.js.map

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

package/cjm/core/IInjector.d.ts

@@ -1,6 +1,5 @@
-import { constructor, IDisposable } from '../helpers/types';
+import { constructor } from '../helpers/types';
 import { IServiceLocator } from './IServiceLocator';
-export interface IInjector extends IDisposable {
+export interface IInjector {
     resolve<T>(locator: IServiceLocator, value: constructor<T>, ...deps: any[]): T;
-    clone(): IInjector;
 }

package/cjm/core/IInstanceHook.d.ts

@@ -0,0 +1,6 @@
+export interface IInstanceHook {
+    onConstruct<T>(instance: T): T;
+    onResolve<T>(instance: T): T;
+    onDispose(instance: unknown): void;
+}
+export declare const emptyHook: IInstanceHook;

package/cjm/{features/instanceHook/emptyHook.js → core/IInstanceHook.js}

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.emptyHook = void 0;
+var utils_1 = require("../helpers/utils");
 exports.emptyHook = {
-    onResolve: function (instance) { },
+    onResolve: utils_1.id,
+    onConstruct: utils_1.id,
     onDispose: function () { },
 };
-//# sourceMappingURL=emptyHook.js.map
+//# sourceMappingURL=IInstanceHook.js.map

package/cjm/core/IInstanceHook.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IInstanceHook.js","sourceRoot":"","sources":["../../lib/core/IInstanceHook.ts"],"names":[],"mappings":";;;AAAA,0CAAsC;AAUzB,QAAA,SAAS,GAAkB;IACpC,SAAS,EAAE,UAAE;IACb,WAAW,EAAE,UAAE;IACf,SAAS,EAAT,cAAmB,CAAC;CACvB,CAAC"}

package/cjm/core/ServiceLocator.d.ts

@@ -1,19 +1,22 @@
 import { InjectionToken, IServiceLocator, ProviderKey, RegisterOptions } from './IServiceLocator';
 import { IInjector } from './IInjector';
 import { IProvider, Tag } from './provider/IProvider';
+import { IInstanceHook } from './IInstanceHook';
 export declare class ServiceLocator implements IServiceLocator {
     private parent;
     private readonly injector;
     readonly level: number;
     readonly tags: Tag[];
+    private hook;
     static fromInjector(injector: IInjector): ServiceLocator;
+    private instances;
     private readonly providers;
-    constructor(parent: IServiceLocator, injector: IInjector, level?: number, tags?: Tag[]);
+    constructor(parent: IServiceLocator, injector: IInjector, level?: number, tags?: Tag[], hook?: IInstanceHook);
     register(key: ProviderKey, provider: IProvider<unknown>, options?: Partial<RegisterOptions>): void;
     resolve<T>(key: InjectionToken<T>, ...args: any[]): T;
     private findValidProvider;
     createScope(tags?: Tag[], parent?: IServiceLocator): ServiceLocator;
     entries(): Array<[ProviderKey, IProvider<any>]>;
     dispose(): void;
+    private onResolve;
 }
-export declare type MapFn<T> = (value: T) => T;

package/cjm/core/ServiceLocator.js

@@ -40,14 +40,18 @@ exports.ServiceLocator = void 0;
 var IServiceLocator_1 = require("./IServiceLocator");
 var ProviderKeyIsBusy_1 = require("../errors/ProviderKeyIsBusy");
 var EmptyServiceLocator_1 = require("./EmptyServiceLocator");
+var IInstanceHook_1 = require("./IInstanceHook");
 var ServiceLocator = /** @class */ (function () {
-    function ServiceLocator(parent, injector, level, tags) {
+    function ServiceLocator(parent, injector, level, tags, hook) {
         if (level === void 0) { level = 0; }
         if (tags === void 0) { tags = []; }
+        if (hook === void 0) { hook = IInstanceHook_1.emptyHook; }
         this.parent = parent;
         this.injector = injector;
         this.level = level;
         this.tags = tags;
+        this.hook = hook;
+        this.instances = new Set();
         this.providers = new Map();
     }
     ServiceLocator.fromInjector = function (injector) {
@@ -62,15 +66,15 @@ var ServiceLocator = /** @class */ (function () {
     };
     ServiceLocator.prototype.resolve = function (key) {
         var _a, _b;
-        var _c, _d;
         var args = [];
         for (var _i = 1; _i < arguments.length; _i++) {
             args[_i - 1] = arguments[_i];
         }
         if ((0, IServiceLocator_1.isProviderKey)(key)) {
-            return (_d = (_c = this.findValidProvider(key)) === null || _c === void 0 ? void 0 : _c.resolve.apply(_c, __spreadArray([this], __read(args), false))) !== null && _d !== void 0 ? _d : (_a = this.parent).resolve.apply(_a, __spreadArray([key], __read(args), false));
+            var provider = this.findValidProvider(key);
+            return provider ? this.onResolve(provider.resolve.apply(provider, __spreadArray([this], __read(args), false))) : (_a = this.parent).resolve.apply(_a, __spreadArray([key], __read(args), false));
         }
-        return (_b = this.injector).resolve.apply(_b, __spreadArray([this, key], __read(args), false));
+        return this.onResolve((_b = this.injector).resolve.apply(_b, __spreadArray([this, key], __read(args), false)));
     };
     ServiceLocator.prototype.findValidProvider = function (key) {
         if (!this.providers.has(key)) {
@@ -86,7 +90,7 @@ var ServiceLocator = /** @class */ (function () {
         var e_1, _a;
         if (tags === void 0) { tags = []; }
         if (parent === void 0) { parent = this; }
-        var scope = new ServiceLocator(parent, this.injector.clone(), this.level + 1, tags);
+        var scope = new ServiceLocator(parent, this.injector, this.level + 1, tags, this.hook);
         try {
             for (var _b = __values(parent.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var _d = __read(_c.value, 2), key = _d[0], provider = _d[1];
@@ -109,23 +113,43 @@ var ServiceLocator = /** @class */ (function () {
         return Array.from(new Map(__spreadArray(__spreadArray([], __read(this.parent.entries()), false), __read(localProviders), false)).entries());
     };
     ServiceLocator.prototype.dispose = function () {
-        var e_2, _a;
+        var e_2, _a, e_3, _b;
+        this.parent = new EmptyServiceLocator_1.EmptyServiceLocator();
         try {
-            for (var _b = __values(this.providers.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var p = _c.value;
+            for (var _c = __values(this.providers.values()), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var p = _d.value;
                 p.dispose();
             }
         }
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
             finally { if (e_2) throw e_2.error; }
         }
         this.providers.clear();
-        this.injector.dispose();
-        this.parent = new EmptyServiceLocator_1.EmptyServiceLocator();
+        try {
+            for (var _e = __values(this.instances), _f = _e.next(); !_f.done; _f = _e.next()) {
+                var it_1 = _f.value;
+                this.hook.onDispose(it_1);
+            }
+        }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
+            }
+            finally { if (e_3) throw e_3.error; }
+        }
+        this.instances.clear();
+    };
+    ServiceLocator.prototype.onResolve = function (instance) {
+        if (!this.instances.has(instance)) {
+            this.instances.add(instance);
+            this.hook.onConstruct(instance);
+        }
+        return this.hook.onResolve(instance);
     };
     return ServiceLocator;
 }());

package/cjm/core/ServiceLocator.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceLocator.js","sourceRoot":"","sources":["../../lib/core/ServiceLocator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ServiceLocator.js","sourceRoot":"","sources":["../../lib/core/ServiceLocator.ts"],"names":[],"mappings":"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"}

package/cjm/features/ProviderBuilder.d.ts

@@ -3,17 +3,15 @@ import { constructor } from '../helpers/types';
 import { ProviderReducer } from './scope/IProvidersMetadataCollector';
 import { ArgsFn } from '../core/provider/ArgsProvider';
 import { ProviderKey } from '../core/IServiceLocator';
-import { IResolvableHook } from './instanceHook/IResolvableHook';
+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 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: ResolveDependency<T>): ProviderBuilder<T>;
     constructor(provider: IKeyedProvider<T>);
     withArgs(...extraArgs: any[]): this;
     withArgsFn(argsFn: ArgsFn): this;
     withReducer(reducer: ProviderReducer<T>): this;
-    withHook(hook: IResolvableHook): this;
     forTags(...tags: Tag[]): this;
     forLevel(level: number): this;
     asSingleton(): this;

package/cjm/features/ProviderBuilder.js

@@ -25,26 +25,28 @@ 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.ProviderBuilder = void 0;
+exports.ProviderBuilder = exports.fromFn = exports.fromValue = exports.fromClass = void 0;
 var SingletonProvider_1 = require("./scope/SingletonProvider");
 var Provider_1 = require("../core/provider/Provider");
 var TaggedProvider_1 = require("./scope/TaggedProvider");
 var LevelProvider_1 = require("./scope/LevelProvider");
 var ArgsProvider_1 = require("../core/provider/ArgsProvider");
-var HookedProvider_1 = require("./instanceHook/HookedProvider");
+function fromClass(value) {
+    return new ProviderBuilder(Provider_1.Provider.fromClass(value));
+}
+exports.fromClass = fromClass;
+function fromValue(value) {
+    return new ProviderBuilder(Provider_1.Provider.fromValue(value));
+}
+exports.fromValue = fromValue;
+function fromFn(fn) {
+    return new ProviderBuilder(new Provider_1.Provider(fn));
+}
+exports.fromFn = fromFn;
 var ProviderBuilder = /** @class */ (function () {
     function ProviderBuilder(provider) {
         this.provider = provider;
     }
-    ProviderBuilder.fromClass = function (value) {
-        return new ProviderBuilder(Provider_1.Provider.fromClass(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++) {
@@ -61,10 +63,6 @@ var ProviderBuilder = /** @class */ (function () {
         this.provider = reducer(this.provider);
         return this;
     };
-    ProviderBuilder.prototype.withHook = function (hook) {
-        this.provider = new HookedProvider_1.HookedProvider(this.provider, hook);
-        return this;
-    };
     ProviderBuilder.prototype.forTags = function () {
         var tags = [];
         for (var _i = 0; _i < arguments.length; _i++) {

package/cjm/features/ProviderBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProviderBuilder.js","sourceRoot":"","sources":["../../lib/features/ProviderBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAA8D;AAC9D,sDAAqD;AAErD,yDAAwD;AACxD,uDAAsD;AAEtD,8DAAqE;AAGrE,gEAA+D;AAE/D;IAaI,yBAAoB,QAA2B;QAA3B,aAAQ,GAAR,QAAQ,CAAmB;IAAG,CAAC;IAZ5C,yBAAS,GAAhB,UAAoB,KAAqB;QACrC,OAAO,IAAI,eAAe,CAAC,mBAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1D,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,EAAwB;QACrC,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,qCAAW,GAAX,UAAY,OAA2B;QACnC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,kCAAQ,GAAR,UAAS,IAAqB;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,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,iCAAO,GAAP;;QAAQ,cAAsB;aAAtB,UAAsB,EAAtB,qBAAsB,EAAtB,IAAsB;YAAtB,yBAAsB;;QAC1B,IAAI,CAAC,QAAQ,GAAG,CAAA,KAAA,IAAI,CAAC,QAAQ,CAAA,CAAC,OAAO,oCAAI,IAAI,UAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,+BAAK,GAAL;QACI,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACL,sBAAC;AAAD,CAAC,AA1DD,IA0DC;AA1DY,0CAAe"}
+{"version":3,"file":"ProviderBuilder.js","sourceRoot":"","sources":["../../lib/features/ProviderBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAA8D;AAC9D,sDAAqD;AAErD,yDAAwD;AACxD,uDAAsD;AAEtD,8DAAqE;AAGrE,SAAgB,SAAS,CAAI,KAAqB;IAC9C,OAAO,IAAI,eAAe,CAAC,mBAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1D,CAAC;AAFD,8BAEC;AAED,SAAgB,SAAS,CAAI,KAAQ;IACjC,OAAO,IAAI,eAAe,CAAC,mBAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1D,CAAC;AAFD,8BAEC;AAED,SAAgB,MAAM,CAAI,EAAwB;IAC9C,OAAO,IAAI,eAAe,CAAC,IAAI,mBAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;AACjD,CAAC;AAFD,wBAEC;AAED;IACI,yBAAoB,QAA2B;QAA3B,aAAQ,GAAR,QAAQ,CAAmB;IAAG,CAAC;IAEnD,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,qCAAW,GAAX,UAAY,OAA2B;QACnC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC;IAChB,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,iCAAO,GAAP;;QAAQ,cAAsB;aAAtB,UAAsB,EAAtB,qBAAsB,EAAtB,IAAsB;YAAtB,yBAAsB;;QAC1B,IAAI,CAAC,QAAQ,GAAG,CAAA,KAAA,IAAI,CAAC,QAAQ,CAAA,CAAC,OAAO,oCAAI,IAAI,UAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,+BAAK,GAAL;QACI,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACL,sBAAC;AAAD,CAAC,AAzCD,IAyCC;AAzCY,0CAAe"}

package/cjm/features/instanceHook/IMethodsMetadataCollector.js.map

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

package/cjm/features/instanceHook/MethodsMetadataCollector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MethodsMetadataCollector.js","sourceRoot":"","sources":["../../../lib/features/instanceHook/MethodsMetadataCollector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA;IACI,kCAAqB,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;IAAG,CAAC;IAEjD,wDAAwD;IACxD,0CAAO,GAAP,UAAkC,MAAiB,EAAE,WAA4B;QAC7E,IAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC9D,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,gDAAa,GAAb,UAAwC,MAAiB;;QACrD,IAAM,QAAQ,GAAG,wBAAwB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC9D,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,oCAAW,GAA1B,UAA2D,MAAiB;QACxE,OAAO,MAAM,CAAC,WAAW,CAAC;IAC9B,CAAC;IACL,+BAAC;AAAD,CAAC,AA1BD,IA0BC;AA1BY,4DAAwB"}

package/cjm/features/instanceHook/decorators.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../../lib/features/instanceHook/decorators.ts"],"names":[],"mappings":";;;AAEA,SAAgB,yBAAyB,CAAC,QAAmC;IACzE,OAAO,UAAC,MAAM,EAAE,WAAW;QACvB,wDAAwD;QACxD,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC1C,CAAC,CAAC;AACN,CAAC;AALD,8DAKC"}

package/cjm/features/ioc/IocInjector.d.ts

@@ -1,11 +1,9 @@
 import { constructor } from '../../helpers/types';
-import { IServiceLocator } from '../../core/IServiceLocator';
+import { InjectionToken, IServiceLocator } from '../../core/IServiceLocator';
 import { IInjector } from '../../core/IInjector';
-import { IInjectMetadataCollector } from './IInjectMetadataCollector';
+import { InjectFn } from './InjectFn';
 export declare class IocInjector implements IInjector {
-    private readonly metadataCollector;
-    constructor(metadataCollector: IInjectMetadataCollector);
-    resolve<T>(locator: IServiceLocator, value: constructor<T>, ...deps: any[]): T;
-    clone(): IInjector;
-    dispose(): void;
+    resolve<T>(locator: IServiceLocator, value: constructor<T>, ...deps: unknown[]): T;
 }
+export declare const injectFn: <T>(injectionFn: InjectFn<T>) => ParameterDecorator;
+export declare const inject: <T>(token: InjectionToken<T>, ...args: unknown[]) => ParameterDecorator;

package/cjm/features/ioc/IocInjector.js

@@ -25,26 +25,46 @@ 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.IocInjector = void 0;
+exports.inject = exports.injectFn = exports.IocInjector = void 0;
 var utils_1 = require("../../helpers/utils");
+var METADATA_KEY = Symbol.for('IocInjector');
+function getInjectionFns(target) {
+    var _a;
+    return (_a = Reflect.getOwnMetadata(METADATA_KEY, target)) !== null && _a !== void 0 ? _a : [];
+}
+// eslint-disable-next-line @typescript-eslint/ban-types
+function addMetadata(target, parameterIndex, injectionFn) {
+    var metadata = getInjectionFns(target);
+    metadata[parameterIndex] = injectionFn;
+    Reflect.defineMetadata(METADATA_KEY, metadata, target);
+}
 var IocInjector = /** @class */ (function () {
-    function IocInjector(metadataCollector) {
-        this.metadataCollector = metadataCollector;
+    function IocInjector() {
     }
     IocInjector.prototype.resolve = function (locator, value) {
         var deps = [];
         for (var _i = 2; _i < arguments.length; _i++) {
             deps[_i - 2] = arguments[_i];
         }
-        var injectionFns = this.metadataCollector.getInjectionFns(value);
+        var injectionFns = getInjectionFns(value);
         var args = (0, utils_1.merge)(injectionFns, deps.map(utils_1.constant)).map(function (fn) { return fn(locator); });
         return new (value.bind.apply(value, __spreadArray([void 0], __read(args), false)))();
     };
-    IocInjector.prototype.clone = function () {
-        return new IocInjector(this.metadataCollector);
-    };
-    IocInjector.prototype.dispose = function () { };
     return IocInjector;
 }());
 exports.IocInjector = IocInjector;
+var injectFn = function (injectionFn) {
+    return function (target, propertyKey, parameterIndex) {
+        addMetadata(target, parameterIndex, injectionFn);
+    };
+};
+exports.injectFn = injectFn;
+var inject = function (token) {
+    var args = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args[_i - 1] = arguments[_i];
+    }
+    return (0, exports.injectFn)(function (l) { return l.resolve.apply(l, __spreadArray([token], __read(args), false)); });
+};
+exports.inject = inject;
 //# sourceMappingURL=IocInjector.js.map

package/cjm/features/ioc/IocInjector.js.map

@@ -1 +1 @@
-{"version":3,"file":"IocInjector.js","sourceRoot":"","sources":["../../../lib/features/ioc/IocInjector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,6CAAsD;AAGtD;IACI,qBAA6B,iBAA2C;QAA3C,sBAAiB,GAAjB,iBAAiB,CAA0B;IAAG,CAAC;IAE5E,6BAAO,GAAP,UAAW,OAAwB,EAAE,KAAqB;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QACtE,IAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACnE,IAAM,IAAI,GAAG,IAAA,aAAK,EAAC,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,gBAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,OAAO,CAAC,EAAX,CAAW,CAAC,CAAC;QAC9E,YAAW,KAAK,YAAL,KAAK,iCAAI,IAAI,cAAE;IAC9B,CAAC;IAED,2BAAK,GAAL;QACI,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACnD,CAAC;IAED,6BAAO,GAAP,cAAiB,CAAC;IACtB,kBAAC;AAAD,CAAC,AAdD,IAcC;AAdY,kCAAW"}
+{"version":3,"file":"IocInjector.js","sourceRoot":"","sources":["../../../lib/features/ioc/IocInjector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,6CAAsD;AAGtD,IAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAE/C,SAAS,eAAe,CAAI,MAAS;;IACjC,OAAO,MAAA,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,CAAC,mCAAI,EAAE,CAAC;AAC9D,CAAC;AAED,wDAAwD;AACxD,SAAS,WAAW,CAAI,MAAS,EAAE,cAAsB,EAAE,WAA8B;IACrF,IAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACzC,QAAQ,CAAC,cAAc,CAAC,GAAG,WAAW,CAAC;IACvC,OAAO,CAAC,cAAc,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAC3D,CAAC;AAED;IAAA;IAMA,CAAC;IALG,6BAAO,GAAP,UAAW,OAAwB,EAAE,KAAqB;QAAE,cAAkB;aAAlB,UAAkB,EAAlB,qBAAkB,EAAlB,IAAkB;YAAlB,6BAAkB;;QAC1E,IAAM,YAAY,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAM,IAAI,GAAG,IAAA,aAAK,EAAC,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,gBAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,OAAO,CAAC,EAAX,CAAW,CAAC,CAAC;QAC9E,YAAW,KAAK,YAAL,KAAK,iCAAI,IAAI,cAAE;IAC9B,CAAC;IACL,kBAAC;AAAD,CAAC,AAND,IAMC;AANY,kCAAW;AAQjB,IAAM,QAAQ,GACjB,UAAI,WAAwB;IAC5B,OAAA,UAAC,MAAM,EAAE,WAAW,EAAE,cAAc;QAChC,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,CAAC,CAAC;IACrD,CAAC;AAFD,CAEC,CAAC;AAJO,QAAA,QAAQ,YAIf;AAEC,IAAM,MAAM,GAAG,UAAI,KAAwB;IAAE,cAAkB;SAAlB,UAAkB,EAAlB,qBAAkB,EAAlB,IAAkB;QAAlB,6BAAkB;;IAClE,OAAA,IAAA,gBAAQ,EAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,OAAO,OAAT,CAAC,iBAAS,KAAK,UAAK,IAAI,YAAxB,CAAyB,CAAC;AAA1C,CAA0C,CAAC;AADlC,QAAA,MAAM,UAC4B"}

package/cjm/features/mock/IMockRepository.d.ts

@@ -0,0 +1,4 @@
+import { IDisposable, InjectionToken } from '../../index';
+export interface IMockRepository extends IDisposable {
+    resolve<T>(key: InjectionToken<T>): T;
+}

package/cjm/features/{ioc/IInjectMetadataCollector.js → mock/IMockRepository.js}

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

package/cjm/features/mock/IMockRepository.js.map

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

package/cjm/features/mock/MockedServiceLocator.d.ts

@@ -0,0 +1,12 @@
+import { InjectionToken, IProvider, IServiceLocator, ProviderKey } from '../../index';
+import { IMockRepository } from './IMockRepository';
+export declare class MockedServiceLocator implements IServiceLocator {
+    private decorated;
+    private mockRepository;
+    constructor(decorated: IServiceLocator, mockRepository: IMockRepository);
+    createScope(): IServiceLocator;
+    resolve<T>(key: InjectionToken<T>, ...args: any[]): T;
+    dispose(): void;
+    entries(): Array<[ProviderKey, IProvider<any>]>;
+    register(key: ProviderKey, provider: IProvider<unknown>): void;
+}