ts-ioc-container 11.0.5 → 12.0.2

package/cjm/core/EmptyServiceLocator.d.ts

@@ -1,9 +1,12 @@
 import { InjectionToken, IServiceLocator, ProviderKey } from './IServiceLocator';
 import { IProvider } from './provider/IProvider';
+import { IInstanceHook } from "./IInstanceHook";
 export declare class EmptyServiceLocator implements IServiceLocator {
     createScope(): IServiceLocator;
     dispose(): void;
     register(): this;
     resolve<T>(key: InjectionToken<T>): T;
     entries(): Array<[ProviderKey, IProvider<any>]>;
+    has(key: ProviderKey): boolean;
+    setHook(hook: IInstanceHook): this;
 }

package/cjm/core/EmptyServiceLocator.js

@@ -21,6 +21,12 @@ var EmptyServiceLocator = /** @class */ (function () {
     EmptyServiceLocator.prototype.entries = function () {
         return [];
     };
+    EmptyServiceLocator.prototype.has = function (key) {
+        return false;
+    };
+    EmptyServiceLocator.prototype.setHook = function (hook) {
+        throw new MethodNotImplementedError_1.MethodNotImplementedError();
+    };
     return EmptyServiceLocator;
 }());
 exports.EmptyServiceLocator = EmptyServiceLocator;

package/cjm/core/EmptyServiceLocator.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmptyServiceLocator.js","sourceRoot":"","sources":["../../lib/core/EmptyServiceLocator.ts"],"names":[],"mappings":";;;AACA,iFAAgF;AAChF,yEAAwE;AAGxE;IAAA;IAoBA,CAAC;IAnBG,yCAAW,GAAX;QACI,MAAM,IAAI,qDAAyB,EAAE,CAAC;IAC1C,CAAC;IAED,qCAAO,GAAP;QACI,MAAM,IAAI,qDAAyB,EAAE,CAAC;IAC1C,CAAC;IAED,sCAAQ,GAAR;QACI,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,qCAAO,GAAP,UAAW,GAAsB;QAC7B,MAAM,IAAI,6CAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,qCAAO,GAAP;QACI,OAAO,EAAE,CAAC;IACd,CAAC;IACL,0BAAC;AAAD,CAAC,AApBD,IAoBC;AApBY,kDAAmB"}
+{"version":3,"file":"EmptyServiceLocator.js","sourceRoot":"","sources":["../../lib/core/EmptyServiceLocator.ts"],"names":[],"mappings":";;;AACA,iFAAgF;AAChF,yEAAwE;AAIxE;IAAA;IA4BA,CAAC;IA3BG,yCAAW,GAAX;QACI,MAAM,IAAI,qDAAyB,EAAE,CAAC;IAC1C,CAAC;IAED,qCAAO,GAAP;QACI,MAAM,IAAI,qDAAyB,EAAE,CAAC;IAC1C,CAAC;IAED,sCAAQ,GAAR;QACI,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,qCAAO,GAAP,UAAW,GAAsB;QAC7B,MAAM,IAAI,6CAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,qCAAO,GAAP;QACI,OAAO,EAAE,CAAC;IACd,CAAC;IAED,iCAAG,GAAH,UAAI,GAAgB;QAChB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,qCAAO,GAAP,UAAQ,IAAmB;QACvB,MAAM,IAAI,qDAAyB,EAAE,CAAC;IAC1C,CAAC;IACL,0BAAC;AAAD,CAAC,AA5BD,IA4BC;AA5BY,kDAAmB"}

package/cjm/core/IInstanceHook.d.ts

@@ -1,6 +1,7 @@
-export interface IInstanceHook {
-    onConstruct<T>(instance: T): T;
-    onResolve<T>(instance: T): T;
-    onDispose(instance: unknown): void;
+import { IDisposable } from '../helpers/types';
+export interface IInstanceHook extends IDisposable {
+    resolve<T>(instance: T): T;
+    dispose(): void;
+    clone(): IInstanceHook;
 }
 export declare const emptyHook: IInstanceHook;

package/cjm/core/IInstanceHook.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.emptyHook = void 0;
 var utils_1 = require("../helpers/utils");
 exports.emptyHook = {
-    onResolve: utils_1.id,
-    onConstruct: utils_1.id,
-    onDispose: function () { },
+    resolve: utils_1.id,
+    dispose: utils_1.noop,
+    clone: function () { return exports.emptyHook; },
 };
 //# sourceMappingURL=IInstanceHook.js.map

package/cjm/core/IInstanceHook.js.map

@@ -1 +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"}
+{"version":3,"file":"IInstanceHook.js","sourceRoot":"","sources":["../../lib/core/IInstanceHook.ts"],"names":[],"mappings":";;;AAAA,0CAA4C;AAW/B,QAAA,SAAS,GAAkB;IACpC,OAAO,EAAE,UAAE;IACX,OAAO,EAAE,YAAI;IACb,KAAK,EAAE,cAAM,OAAA,iBAAS,EAAT,CAAS;CACzB,CAAC"}

package/cjm/core/IServiceLocator.d.ts

@@ -1,7 +1,8 @@
 import { IProvider, Tag } from './provider/IProvider';
 import { constructor, IDisposable } from '../helpers/types';
+import { IInstanceHook } from './IInstanceHook';
 export declare type RegisterOptions = {
-    noOverride: boolean;
+    override: boolean;
 };
 export declare type ProviderKey = string | symbol;
 export declare function isProviderKey<T>(token: InjectionToken<T>): token is ProviderKey;
@@ -11,6 +12,7 @@ export interface Resolveable {
 }
 export interface IServiceLocator extends IDisposable, Resolveable {
     createScope(tags?: Tag[], parent?: IServiceLocator): IServiceLocator;
-    register(key: ProviderKey, provider: IProvider<unknown>, options?: Partial<RegisterOptions>): void;
+    register(key: ProviderKey, provider: IProvider<unknown>): void;
     entries(): Array<[ProviderKey, IProvider<any>]>;
+    setHook(hook: IInstanceHook): this;
 }

package/cjm/core/IServiceLocator.js.map

@@ -1 +1 @@
-{"version":3,"file":"IServiceLocator.js","sourceRoot":"","sources":["../../lib/core/IServiceLocator.ts"],"names":[],"mappings":";;;AAQA,SAAgB,aAAa,CAAI,KAAwB;IACrD,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAC;AACvD,CAAC;AAFD,sCAEC"}
+{"version":3,"file":"IServiceLocator.js","sourceRoot":"","sources":["../../lib/core/IServiceLocator.ts"],"names":[],"mappings":";;;AASA,SAAgB,aAAa,CAAI,KAAwB;IACrD,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAC;AACvD,CAAC;AAFD,sCAEC"}

package/cjm/core/ProviderRepo.d.ts

@@ -0,0 +1,9 @@
+import { ProviderKey } from './IServiceLocator';
+import { IProvider } from './provider/IProvider';
+export declare class ProviderRepo {
+    private readonly providers;
+    set(key: ProviderKey, provider: IProvider<unknown>): void;
+    get<T>(key: ProviderKey): IProvider<T> | undefined;
+    entries(): Array<[ProviderKey, IProvider<any>]>;
+    dispose(): void;
+}

package/cjm/core/ProviderRepo.js

@@ -0,0 +1,48 @@
+"use strict";
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProviderRepo = void 0;
+var ProviderRepo = /** @class */ (function () {
+    function ProviderRepo() {
+        this.providers = new Map();
+    }
+    ProviderRepo.prototype.set = function (key, provider) {
+        this.providers.set(key, provider);
+    };
+    ProviderRepo.prototype.get = function (key) {
+        return this.providers.get(key);
+    };
+    ProviderRepo.prototype.entries = function () {
+        return Array.from(this.providers.entries());
+    };
+    ProviderRepo.prototype.dispose = function () {
+        var e_1, _a;
+        try {
+            for (var _b = __values(this.providers.values()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var p = _c.value;
+                p.dispose();
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        this.providers.clear();
+    };
+    return ProviderRepo;
+}());
+exports.ProviderRepo = ProviderRepo;
+//# sourceMappingURL=ProviderRepo.js.map

package/cjm/core/ProviderRepo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ProviderRepo.js","sourceRoot":"","sources":["../../lib/core/ProviderRepo.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAGA;IAAA;QACqB,cAAS,GAAG,IAAI,GAAG,EAA+B,CAAC;IAoBxE,CAAC;IAlBG,0BAAG,GAAH,UAAI,GAAgB,EAAE,QAA4B;QAC9C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,0BAAG,GAAH,UAAO,GAAgB;QACnB,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,8BAAO,GAAP;QACI,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,8BAAO,GAAP;;;YACI,KAAgB,IAAA,KAAA,SAAA,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAA,gBAAA,4BAAE;gBAApC,IAAM,CAAC,WAAA;gBACR,CAAC,CAAC,OAAO,EAAE,CAAC;aACf;;;;;;;;;QACD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IACL,mBAAC;AAAD,CAAC,AArBD,IAqBC;AArBY,oCAAY"}

package/cjm/core/ServiceLocator.d.ts

@@ -1,22 +1,23 @@
-import { InjectionToken, IServiceLocator, ProviderKey, RegisterOptions } from './IServiceLocator';
+import { InjectionToken, IServiceLocator, ProviderKey } 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[], hook?: IInstanceHook);
-    register(key: ProviderKey, provider: IProvider<unknown>, options?: Partial<RegisterOptions>): void;
+    private parent;
+    level: number;
+    tags: Tag[];
+    private hook;
+    constructor(injector: IInjector);
+    setParent(parent: IServiceLocator): this;
+    setTags(tags: Tag[]): this;
+    setLevel(level?: number): this;
+    setHook(hook: IInstanceHook): this;
+    register(key: ProviderKey, provider: IProvider<unknown>): 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;
+    map<T extends IServiceLocator>(transform: (l: IServiceLocator) => T): T;
 }

package/cjm/core/ServiceLocator.js

@@ -38,30 +38,36 @@ var __values = (this && this.__values) || function(o) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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 ProviderRepo_1 = require("./ProviderRepo");
 var ServiceLocator = /** @class */ (function () {
-    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;
+    function ServiceLocator(injector) {
         this.injector = injector;
-        this.level = level;
+        this.providers = new ProviderRepo_1.ProviderRepo();
+        this.parent = new EmptyServiceLocator_1.EmptyServiceLocator();
+        this.level = 0;
+        this.tags = [];
+        this.hook = IInstanceHook_1.emptyHook;
+    }
+    ServiceLocator.prototype.setParent = function (parent) {
+        this.parent = parent;
+        return this;
+    };
+    ServiceLocator.prototype.setTags = function (tags) {
         this.tags = tags;
+        return this;
+    };
+    ServiceLocator.prototype.setLevel = function (level) {
+        if (level === void 0) { level = 0; }
+        this.level = level;
+        return this;
+    };
+    ServiceLocator.prototype.setHook = function (hook) {
         this.hook = hook;
-        this.instances = new Set();
-        this.providers = new Map();
-    }
-    ServiceLocator.fromInjector = function (injector) {
-        return new ServiceLocator(new EmptyServiceLocator_1.EmptyServiceLocator(), injector);
+        return this;
     };
-    ServiceLocator.prototype.register = function (key, provider, options) {
-        if (options === void 0) { options = {}; }
-        if (options.noOverride && this.providers.has(key)) {
-            throw new ProviderKeyIsBusy_1.ProviderKeyIsBusy(key);
-        }
+    ServiceLocator.prototype.register = function (key, provider) {
         this.providers.set(key, provider);
     };
     ServiceLocator.prototype.resolve = function (key) {
@@ -71,26 +77,22 @@ var ServiceLocator = /** @class */ (function () {
             args[_i - 1] = arguments[_i];
         }
         if ((0, IServiceLocator_1.isProviderKey)(key)) {
-            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 this.onResolve((_b = this.injector).resolve.apply(_b, __spreadArray([this, key], __read(args), false)));
-    };
-    ServiceLocator.prototype.findValidProvider = function (key) {
-        if (!this.providers.has(key)) {
-            return undefined;
+            var provider = this.providers.get(key);
+            return (provider === null || provider === void 0 ? void 0 : provider.isValid(this))
+                ? this.hook.resolve(provider.resolve.apply(provider, __spreadArray([this], __read(args), false)))
+                : (_a = this.parent).resolve.apply(_a, __spreadArray([key], __read(args), false));
         }
-        var provider = this.providers.get(key);
-        if (!provider.isValid(this)) {
-            return undefined;
-        }
-        return provider;
+        return this.hook.resolve((_b = this.injector).resolve.apply(_b, __spreadArray([this, key], __read(args), false)));
     };
     ServiceLocator.prototype.createScope = function (tags, parent) {
         var e_1, _a;
         if (tags === void 0) { tags = []; }
         if (parent === void 0) { parent = this; }
-        var scope = new ServiceLocator(parent, this.injector, this.level + 1, tags, this.hook);
+        var scope = new ServiceLocator(this.injector)
+            .setParent(parent)
+            .setLevel(this.level + 1)
+            .setTags(tags)
+            .setHook(this.hook.clone());
         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,47 +111,16 @@ var ServiceLocator = /** @class */ (function () {
         return scope;
     };
     ServiceLocator.prototype.entries = function () {
-        var localProviders = Array.from(this.providers.entries());
-        return Array.from(new Map(__spreadArray(__spreadArray([], __read(this.parent.entries()), false), __read(localProviders), false)).entries());
+        return Array.from(new Map(__spreadArray(__spreadArray([], __read(this.parent.entries()), false), __read(this.providers.entries()), false)).entries());
     };
     ServiceLocator.prototype.dispose = function () {
-        var e_2, _a, e_3, _b;
         this.parent = new EmptyServiceLocator_1.EmptyServiceLocator();
-        try {
-            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 (_d && !_d.done && (_a = _c.return)) _a.call(_c);
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
-        this.providers.clear();
-        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();
+        this.providers.dispose();
+        this.hook.dispose();
     };
-    ServiceLocator.prototype.onResolve = function (instance) {
-        if (!this.instances.has(instance)) {
-            this.instances.add(instance);
-            this.hook.onConstruct(instance);
-        }
-        return this.hook.onResolve(instance);
+    ServiceLocator.prototype.map = function (transform) {
+        this.parent = transform(this.parent);
+        return transform(this);
     };
     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/core/provider/ArgsProvider.d.ts

@@ -1,11 +1,11 @@
 import { ProviderDecorator } from './ProviderDecorator';
-import { IKeyedProvider } from './IProvider';
 import { Resolveable } from '../IServiceLocator';
+import { IProvider } from "./IProvider";
 export declare type ArgsFn = (l: Resolveable) => any[];
 export declare class ArgsProvider<T> extends ProviderDecorator<T> {
     private provider;
     private argsFn;
-    constructor(provider: IKeyedProvider<T>, argsFn: ArgsFn);
+    constructor(provider: IProvider<T>, argsFn: ArgsFn);
     resolve(locator: Resolveable, ...args: any[]): T;
     clone(): ProviderDecorator<T>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"ArgsProvider.js","sourceRoot":"","sources":["../../../lib/core/provider/ArgsProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAwD;AAMxD;IAAqC,gCAAoB;IACrD,sBAAoB,QAA2B,EAAU,MAAc;QAAvE,YACI,kBAAM,QAAQ,CAAC,SAClB;QAFmB,cAAQ,GAAR,QAAQ,CAAmB;QAAU,YAAM,GAAN,MAAM,CAAQ;;IAEvE,CAAC;IAED,8BAAO,GAAP,UAAQ,OAAoB;;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QACxC,OAAO,CAAA,KAAA,IAAI,CAAC,QAAQ,CAAA,CAAC,OAAO,wCAAC,OAAO,UAAK,IAAI,kBAAK,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAE;IAC5E,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"}
+{"version":3,"file":"ArgsProvider.js","sourceRoot":"","sources":["../../../lib/core/provider/ArgsProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAsD;AAMtD;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,OAAoB;;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QACxC,OAAO,CAAA,KAAA,IAAI,CAAC,QAAQ,CAAA,CAAC,OAAO,wCAAC,OAAO,UAAK,IAAI,kBAAK,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAE;IAC5E,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"}

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

@@ -1,4 +1,4 @@
-import { ProviderKey, Resolveable } from '../IServiceLocator';
+import { Resolveable } from '../IServiceLocator';
 import { IDisposable } from '../../helpers/types';
 export declare type ResolveDependency<T> = (locator: Resolveable, ...args: any[]) => T;
 export declare type Tag = string | symbol;
@@ -11,8 +11,3 @@ export interface IProvider<T> extends IDisposable {
     resolve(locator: Resolveable, ...args: any[]): T;
     isValid(filters: ScopeOptions): boolean;
 }
-export interface IKeyedProvider<T> extends IProvider<T> {
-    clone(): IKeyedProvider<T>;
-    getKeys(): ProviderKey[];
-    addKeys(...keys: ProviderKey[]): this;
-}

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

@@ -1,16 +1,13 @@
 import { constructor } from '../../helpers/types';
-import { IKeyedProvider, ResolveDependency, ScopeOptions } from './IProvider';
-import { ProviderKey, Resolveable } from '../IServiceLocator';
-export declare class Provider<T> implements IKeyedProvider<T> {
+import { IProvider, ResolveDependency, ScopeOptions } from './IProvider';
+import { Resolveable } from '../IServiceLocator';
+export declare class Provider<T> implements IProvider<T> {
     private readonly resolveDependency;
     static fromClass<T>(value: constructor<T>): Provider<T>;
     static fromValue<T>(value: T): Provider<T>;
-    private keys;
     constructor(resolveDependency: ResolveDependency<T>);
-    clone(): IKeyedProvider<T>;
+    clone(): Provider<T>;
     resolve(locator: Resolveable, ...args: any[]): T;
     dispose(): void;
     isValid(filters: ScopeOptions): boolean;
-    addKeys(...keys: ProviderKey[]): this;
-    getKeys(): ProviderKey[];
 }

package/cjm/core/provider/Provider.js

@@ -29,7 +29,6 @@ exports.Provider = void 0;
 var Provider = /** @class */ (function () {
     function Provider(resolveDependency) {
         this.resolveDependency = resolveDependency;
-        this.keys = [];
     }
     Provider.fromClass = function (value) {
         return new Provider(function (l) {
@@ -53,22 +52,11 @@ var Provider = /** @class */ (function () {
         }
         return this.resolveDependency.apply(this, __spreadArray([locator], __read(args), false));
     };
-    Provider.prototype.dispose = function () { };
+    Provider.prototype.dispose = function () {
+    };
     Provider.prototype.isValid = function (filters) {
         return true;
     };
-    Provider.prototype.addKeys = function () {
-        var _a;
-        var keys = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            keys[_i] = arguments[_i];
-        }
-        (_a = this.keys).push.apply(_a, __spreadArray([], __read(keys), false));
-        return this;
-    };
-    Provider.prototype.getKeys = function () {
-        return this.keys;
-    };
     return Provider;
 }());
 exports.Provider = Provider;

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

@@ -1 +1 @@
-{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../lib/core/provider/Provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA;IAWI,kBAA6B,iBAAuC;QAAvC,sBAAiB,GAAjB,iBAAiB,CAAsB;QAF5D,SAAI,GAAkB,EAAE,CAAC;IAEsC,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,wBAAK,GAAL;QACI,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAChD,CAAC;IAED,0BAAO,GAAP,UAAQ,OAAoB;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QACxC,OAAO,IAAI,CAAC,iBAAiB,OAAtB,IAAI,iBAAmB,OAAO,UAAK,IAAI,WAAE;IACpD,CAAC;IAED,0BAAO,GAAP,cAAiB,CAAC;IAElB,0BAAO,GAAP,UAAQ,OAAqB;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,0BAAO,GAAP;;QAAQ,cAAsB;aAAtB,UAAsB,EAAtB,qBAAsB,EAAtB,IAAsB;YAAtB,yBAAsB;;QAC1B,CAAA,KAAA,IAAI,CAAC,IAAI,CAAA,CAAC,IAAI,oCAAI,IAAI,WAAE;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,0BAAO,GAAP;QACI,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IACL,eAAC;AAAD,CAAC,AAnCD,IAmCC;AAnCY,4BAAQ"}
+{"version":3,"file":"Provider.js","sourceRoot":"","sources":["../../../lib/core/provider/Provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA;IASI,kBAA6B,iBAAuC;QAAvC,sBAAiB,GAAjB,iBAAiB,CAAsB;IACpE,CAAC;IATM,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;IAKD,wBAAK,GAAL;QACI,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAChD,CAAC;IAED,0BAAO,GAAP,UAAQ,OAAoB;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QACxC,OAAO,IAAI,CAAC,iBAAiB,OAAtB,IAAI,iBAAmB,OAAO,UAAK,IAAI,WAAE;IACpD,CAAC;IAED,0BAAO,GAAP;IACA,CAAC;IAED,0BAAO,GAAP,UAAQ,OAAqB;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IACL,eAAC;AAAD,CAAC,AA1BD,IA0BC;AA1BY,4BAAQ"}

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

@@ -1,12 +1,10 @@
-import { ProviderKey, Resolveable } from '../IServiceLocator';
-import { IKeyedProvider, ScopeOptions } from './IProvider';
-export declare abstract class ProviderDecorator<T> implements IKeyedProvider<T> {
+import { Resolveable } from '../IServiceLocator';
+import { IProvider, ScopeOptions } from './IProvider';
+export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     private decorated;
-    constructor(decorated: IKeyedProvider<T>);
-    abstract clone(): ProviderDecorator<T>;
+    constructor(decorated: IProvider<T>);
+    clone(): IProvider<T>;
     dispose(): void;
     isValid(filters: ScopeOptions): boolean;
     resolve(locator: Resolveable, ...args: any[]): T;
-    addKeys(...keys: ProviderKey[]): this;
-    getKeys(): ProviderKey[];
 }

package/cjm/core/provider/ProviderDecorator.js

@@ -30,6 +30,9 @@ var ProviderDecorator = /** @class */ (function () {
     function ProviderDecorator(decorated) {
         this.decorated = decorated;
     }
+    ProviderDecorator.prototype.clone = function () {
+        return this.decorated.clone();
+    };
     ProviderDecorator.prototype.dispose = function () {
         this.decorated.dispose();
     };
@@ -44,18 +47,6 @@ var ProviderDecorator = /** @class */ (function () {
         }
         return (_a = this.decorated).resolve.apply(_a, __spreadArray([locator], __read(args), false));
     };
-    ProviderDecorator.prototype.addKeys = function () {
-        var _a;
-        var keys = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            keys[_i] = arguments[_i];
-        }
-        (_a = this.decorated).addKeys.apply(_a, __spreadArray([], __read(keys), false));
-        return this;
-    };
-    ProviderDecorator.prototype.getKeys = function () {
-        return this.decorated.getKeys();
-    };
     return ProviderDecorator;
 }());
 exports.ProviderDecorator = ProviderDecorator;

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

@@ -1 +1 @@
-{"version":3,"file":"ProviderDecorator.js","sourceRoot":"","sources":["../../../lib/core/provider/ProviderDecorator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA;IACI,2BAAoB,SAA4B;QAA5B,cAAS,GAAT,SAAS,CAAmB;IAAG,CAAC;IAIpD,mCAAO,GAAP;QACI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,mCAAO,GAAP,UAAQ,OAAqB;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,mCAAO,GAAP,UAAQ,OAAoB;;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QACxC,OAAO,CAAA,KAAA,IAAI,CAAC,SAAS,CAAA,CAAC,OAAO,0BAAC,OAAO,UAAK,IAAI,WAAE;IACpD,CAAC;IAED,mCAAO,GAAP;;QAAQ,cAAsB;aAAtB,UAAsB,EAAtB,qBAAsB,EAAtB,IAAsB;YAAtB,yBAAsB;;QAC1B,CAAA,KAAA,IAAI,CAAC,SAAS,CAAA,CAAC,OAAO,oCAAI,IAAI,WAAE;QAChC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,mCAAO,GAAP;QACI,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IACpC,CAAC;IACL,wBAAC;AAAD,CAAC,AAzBD,IAyBC;AAzBqB,8CAAiB"}
+{"version":3,"file":"ProviderDecorator.js","sourceRoot":"","sources":["../../../lib/core/provider/ProviderDecorator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA;IACI,2BAAoB,SAAuB;QAAvB,cAAS,GAAT,SAAS,CAAc;IAAG,CAAC;IAE/C,iCAAK,GAAL;QACI,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAClC,CAAC;IAED,mCAAO,GAAP;QACI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,mCAAO,GAAP,UAAQ,OAAqB;QACzB,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,mCAAO,GAAP,UAAQ,OAAoB;;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QACxC,OAAO,CAAA,KAAA,IAAI,CAAC,SAAS,CAAA,CAAC,OAAO,0BAAC,OAAO,UAAK,IAAI,WAAE;IACpD,CAAC;IACL,wBAAC;AAAD,CAAC,AAlBD,IAkBC;AAlBqB,8CAAiB"}

package/cjm/features/container/Container.d.ts

@@ -0,0 +1,16 @@
+import { Tag } from '../../core/provider/IProvider';
+import { InjectionToken, IServiceLocator } from '../../core/IServiceLocator';
+import { IContainer } from './IContainer';
+import { IContainerProvider } from './IContainerProvider';
+import { IInjector } from '../../core/IInjector';
+import { IInstanceHook } from '../../core/IInstanceHook';
+export declare class Container implements IContainer {
+    private locator;
+    static fromInjector(injector: IInjector): Container;
+    constructor(locator: IServiceLocator);
+    setHook(hook: IInstanceHook): this;
+    createScope(tags?: Tag[]): IContainer;
+    register(provider: IContainerProvider<unknown>): this;
+    resolve<T>(key: InjectionToken<T>, ...args: any[]): T;
+    dispose(): void;
+}

package/cjm/{core → features/container}/Container.js

@@ -1,15 +1,4 @@
 "use strict";
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -37,33 +26,23 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Container = void 0;
-var NoRegistrationKeysProvided_1 = require("../errors/NoRegistrationKeysProvided");
+var ServiceLocator_1 = require("../../core/ServiceLocator");
 var Container = /** @class */ (function () {
     function Container(locator) {
         this.locator = locator;
     }
+    Container.fromInjector = function (injector) {
+        return new Container(new ServiceLocator_1.ServiceLocator(injector));
+    };
+    Container.prototype.setHook = function (hook) {
+        this.locator.setHook(hook);
+        return this;
+    };
     Container.prototype.createScope = function (tags) {
         return new Container(this.locator.createScope(tags));
     };
-    Container.prototype.register = function (provider, options) {
-        var e_1, _a;
-        var keys = provider.getKeys();
-        if (keys.length === 0) {
-            throw new NoRegistrationKeysProvided_1.NoRegistrationKeysProvided();
-        }
-        try {
-            for (var keys_1 = __values(keys), keys_1_1 = keys_1.next(); !keys_1_1.done; keys_1_1 = keys_1.next()) {
-                var key = keys_1_1.value;
-                this.locator.register(key, provider, options);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
+    Container.prototype.register = function (provider) {
+        provider.appendTo(this.locator);
         return this;
     };
     Container.prototype.resolve = function (key) {

package/cjm/features/container/Container.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Container.js","sourceRoot":"","sources":["../../../lib/features/container/Container.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,4DAA2D;AAG3D;IAKI,mBAAoB,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;IAAG,CAAC;IAJzC,sBAAY,GAAnB,UAAoB,QAAmB;QACnC,OAAO,IAAI,SAAS,CAAC,IAAI,+BAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvD,CAAC;IAID,2BAAO,GAAP,UAAQ,IAAmB;QACvB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,+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,QAAqC;QAC1C,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,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,AA5BD,IA4BC;AA5BY,8BAAS"}

package/cjm/features/container/ContainerProvider.d.ts

@@ -0,0 +1,9 @@
+import { IServiceLocator, ProviderKey } from '../../core/IServiceLocator';
+import { IProvider } from '../../core/provider/IProvider';
+import { IContainerProvider } from './IContainerProvider';
+export declare class ContainerProvider<T> implements IContainerProvider<T> {
+    private provider;
+    private keys;
+    constructor(provider: IProvider<T>, keys?: Set<ProviderKey>);
+    appendTo(locator: IServiceLocator): void;
+}