ts-ioc-container 7.0.3 → 7.1.0

package/cjm/core/ProviderRepository.d.ts

@@ -1,9 +1,9 @@
 import { IProvider, ProviderKey, ScopeOptions, Tag } from './IProvider';
 import { IProviderRepository } from './IProviderRepository';
-export declare class ProviderRepository implements IProviderRepository {
+export declare class ProviderRepository implements IProviderRepository, ScopeOptions {
     private parent?;
     level: number;
-    private tags;
+    tags: Tag[];
     private readonly providers;
     constructor(parent?: ProviderRepository, level?: number, tags?: Tag[]);
     add<T>(key: ProviderKey, provider: IProvider<T>): void;
@@ -11,4 +11,5 @@ export declare class ProviderRepository implements IProviderRepository {
     entries(filters: ScopeOptions): Array<[ProviderKey, IProvider<any>]>;
     dispose(): void;
     find<T>(key: ProviderKey): IProvider<T>;
+    private findLocally;
 }

package/cjm/core/ProviderRepository.js

@@ -38,7 +38,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProviderRepository = void 0;
 var ProviderNotFoundError_1 = require("../errors/ProviderNotFoundError");
-var ProviderStorage_1 = require("./ProviderStorage");
 var ProviderRepository = /** @class */ (function () {
     function ProviderRepository(parent, level, tags) {
         if (level === void 0) { level = 0; }
@@ -46,19 +45,18 @@ var ProviderRepository = /** @class */ (function () {
         this.parent = parent;
         this.level = level;
         this.tags = tags;
-        this.providers = new ProviderStorage_1.ProviderStorage();
+        this.providers = new Map();
     }
     ProviderRepository.prototype.add = function (key, provider) {
-        this.providers.add(key, provider);
+        this.providers.set(key, provider);
     };
     ProviderRepository.prototype.clone = function (tags, parent) {
         var e_1, _a;
         if (tags === void 0) { tags = []; }
         if (parent === void 0) { parent = this; }
-        var options = { level: parent.level + 1, tags: tags };
-        var repo = new ProviderRepository(parent, options.level, options.tags);
+        var repo = new ProviderRepository(parent, parent.level + 1, tags);
         try {
-            for (var _b = __values(parent.entries(options)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = __values(parent.entries(repo)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var _d = __read(_c.value, 2), key = _d[0], provider = _d[1];
                 repo.add(key, provider.clone());
             }
@@ -73,8 +71,12 @@ var ProviderRepository = /** @class */ (function () {
         return repo;
     };
     ProviderRepository.prototype.entries = function (filters) {
-        var localProviders = this.providers.entries(filters);
-        var parentProviders = this.parent ? this.parent.entries(filters) : [];
+        var _a, _b;
+        var localProviders = Array.from(this.providers.entries()).filter(function (_a) {
+            var _b = __read(_a, 2), value = _b[1];
+            return value.isValid(filters);
+        });
+        var parentProviders = (_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.entries(filters)) !== null && _b !== void 0 ? _b : [];
         return Array.from(new Map(__spreadArray(__spreadArray([], __read(parentProviders), false), __read(localProviders), false)).entries());
     };
     ProviderRepository.prototype.dispose = function () {
@@ -97,13 +99,16 @@ var ProviderRepository = /** @class */ (function () {
     };
     ProviderRepository.prototype.find = function (key) {
         var _a, _b;
-        var options = { level: this.level, tags: this.tags };
-        var provider = (_a = this.providers.find(key, options)) !== null && _a !== void 0 ? _a : (_b = this.parent) === null || _b === void 0 ? void 0 : _b.find(key);
+        var provider = (_a = this.findLocally(key)) !== null && _a !== void 0 ? _a : (_b = this.parent) === null || _b === void 0 ? void 0 : _b.find(key);
         if (provider === undefined) {
             throw new ProviderNotFoundError_1.ProviderNotFoundError(key.toString());
         }
         return provider;
     };
+    ProviderRepository.prototype.findLocally = function (key) {
+        var provider = this.providers.get(key);
+        return !provider || !provider.isValid(this) ? undefined : provider;
+    };
     return ProviderRepository;
 }());
 exports.ProviderRepository = ProviderRepository;

package/cjm/core/ProviderRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProviderRepository.js","sourceRoot":"","sources":["../../lib/core/ProviderRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yEAAwE;AAExE,qDAAoD;AAEpD;IAGI,4BAAoB,MAA2B,EAAS,KAAS,EAAU,IAAgB;QAAnC,sBAAA,EAAA,SAAS;QAAU,qBAAA,EAAA,SAAgB;QAAvE,WAAM,GAAN,MAAM,CAAqB;QAAS,UAAK,GAAL,KAAK,CAAI;QAAU,SAAI,GAAJ,IAAI,CAAY;QAF1E,cAAS,GAAG,IAAI,iCAAe,EAAE,CAAC;IAE2C,CAAC;IAE/F,gCAAG,GAAH,UAAO,GAAgB,EAAE,QAAsB;QAC3C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,kCAAK,GAAL,UAAM,IAAgB,EAAE,MAAiC;;QAAnD,qBAAA,EAAA,SAAgB;QAAE,uBAAA,EAAA,aAAiC;QACrD,IAAM,OAAO,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE,IAAI,MAAA,EAAE,CAAC;QAClD,IAAM,IAAI,GAAG,IAAI,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;;YACzE,KAA8B,IAAA,KAAA,SAAA,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA,gBAAA,4BAAE;gBAA5C,IAAA,KAAA,mBAAe,EAAd,GAAG,QAAA,EAAE,QAAQ,QAAA;gBACrB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;aACnC;;;;;;;;;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,oCAAO,GAAP,UAAQ,OAAqB;QACzB,IAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACvD,IAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,wCAAK,eAAe,kBAAK,cAAc,UAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,oCAAO,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;QACvB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,iCAAI,GAAJ,UAAQ,GAAgB;;QACpB,IAAM,OAAO,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACvD,IAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,SAAS,CAAC,IAAI,CAAI,GAAG,EAAE,OAAO,CAAC,mCAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAI,GAAG,CAAC,CAAC;QACnF,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,MAAM,IAAI,6CAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;SACnD;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IACL,yBAAC;AAAD,CAAC,AAxCD,IAwCC;AAxCY,gDAAkB"}
+{"version":3,"file":"ProviderRepository.js","sourceRoot":"","sources":["../../lib/core/ProviderRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yEAAwE;AAGxE;IAGI,4BAAoB,MAA2B,EAAS,KAAS,EAAS,IAAgB;QAAlC,sBAAA,EAAA,SAAS;QAAS,qBAAA,EAAA,SAAgB;QAAtE,WAAM,GAAN,MAAM,CAAqB;QAAS,UAAK,GAAL,KAAK,CAAI;QAAS,SAAI,GAAJ,IAAI,CAAY;QAFzE,cAAS,GAAG,IAAI,GAAG,EAA+B,CAAC;IAEyB,CAAC;IAE9F,gCAAG,GAAH,UAAO,GAAgB,EAAE,QAAsB;QAC3C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,kCAAK,GAAL,UAAM,IAAgB,EAAE,MAAiC;;QAAnD,qBAAA,EAAA,SAAgB;QAAE,uBAAA,EAAA,aAAiC;QACrD,IAAM,IAAI,GAAG,IAAI,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;;YACpE,KAA8B,IAAA,KAAA,SAAA,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA,gBAAA,4BAAE;gBAAzC,IAAA,KAAA,mBAAe,EAAd,GAAG,QAAA,EAAE,QAAQ,QAAA;gBACrB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;aACnC;;;;;;;;;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,oCAAO,GAAP,UAAQ,OAAqB;;QACzB,IAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,UAAC,EAAS;gBAAT,KAAA,aAAS,EAAN,KAAK,QAAA;YAAM,OAAA,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAAtB,CAAsB,CAAC,CAAC;QAC1G,IAAM,eAAe,GAAG,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAC,OAAO,CAAC,mCAAI,EAAE,CAAC;QAC5D,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,wCAAK,eAAe,kBAAK,cAAc,UAAE,CAAC,OAAO,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,oCAAO,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;QACvB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,iCAAI,GAAJ,UAAQ,GAAgB;;QACpB,IAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,WAAW,CAAI,GAAG,CAAC,mCAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAI,GAAG,CAAC,CAAC;QACvE,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,MAAM,IAAI,6CAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;SACnD;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,wCAAW,GAAnB,UAAuB,GAAgB;QACnC,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAiB,CAAC;QACzD,OAAO,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IACvE,CAAC;IACL,yBAAC;AAAD,CAAC,AA3CD,IA2CC;AA3CY,gDAAkB"}

package/cjm/features/ProviderBuilder.d.ts

@@ -10,8 +10,8 @@ export declare class ProviderBuilder<T> {
     withArgs(...extraArgs: any[]): this;
     withHook(hook: IInstanceHook): this;
     withArgsFn(fn: (l: IServiceLocator) => any[]): this;
-    asSingleton(): this;
     forTags(tags: Tag[]): this;
     forLevel(level: number): this;
-    build(): IProvider<T>;
+    asSingleton(): IProvider<T>;
+    asRequested(): IProvider<T>;
 }

package/cjm/features/ProviderBuilder.js

@@ -52,7 +52,14 @@ var ProviderBuilder = /** @class */ (function () {
         for (var _i = 0; _i < arguments.length; _i++) {
             extraArgs[_i] = arguments[_i];
         }
-        this.withArgsFn(function () { return extraArgs; });
+        var oldProvider = this.provider;
+        this.provider = new Provider_1.Provider(function (l) {
+            var args = [];
+            for (var _i = 1; _i < arguments.length; _i++) {
+                args[_i - 1] = arguments[_i];
+            }
+            return oldProvider.resolve.apply(oldProvider, __spreadArray(__spreadArray([l], __read(args), false), __read(extraArgs), false));
+        });
         return this;
     };
     ProviderBuilder.prototype.withHook = function (hook) {
@@ -70,10 +77,6 @@ var ProviderBuilder = /** @class */ (function () {
         });
         return this;
     };
-    ProviderBuilder.prototype.asSingleton = function () {
-        this.provider = new SingletonProvider_1.SingletonProvider(this.provider);
-        return this;
-    };
     ProviderBuilder.prototype.forTags = function (tags) {
         this.provider = new TaggedProvider_1.TaggedProvider(this.provider, tags);
         return this;
@@ -82,7 +85,10 @@ var ProviderBuilder = /** @class */ (function () {
         this.provider = new LevelProvider_1.LevelProvider(this.provider, [level, level]);
         return this;
     };
-    ProviderBuilder.prototype.build = function () {
+    ProviderBuilder.prototype.asSingleton = function () {
+        return new SingletonProvider_1.SingletonProvider(this.provider);
+    };
+    ProviderBuilder.prototype.asRequested = function () {
         return this.provider;
     };
     return ProviderBuilder;

package/cjm/features/ProviderBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProviderBuilder.js","sourceRoot":"","sources":["../../lib/features/ProviderBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAA8D;AAC9D,6CAA4C;AAG5C,gEAA+D;AAE/D,yDAAwD;AACxD,uDAAsD;AAEtD;IAWI,yBAAY,EAAwB;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAQ,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAVM,+BAAe,GAAtB,UAA0B,KAAqB;QAC3C,OAAO,IAAI,eAAe,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;IAC1E,CAAC;IAEM,4BAAY,GAAnB,UAAuB,KAAQ;QAC3B,OAAO,IAAI,eAAe,CAAC,cAAM,OAAA,KAAK,EAAL,CAAK,CAAC,CAAC;IAC5C,CAAC;IAMD,kCAAQ,GAAR;QAAS,mBAAmB;aAAnB,UAAmB,EAAnB,qBAAmB,EAAnB,IAAmB;YAAnB,8BAAmB;;QACxB,IAAI,CAAC,UAAU,CAAC,cAAM,OAAA,SAAS,EAAT,CAAS,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,kCAAQ,GAAR,UAAS,IAAmB;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,oCAAU,GAAV,UAAW,EAAiC;QACxC,IAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAQ,CAAC,UAAC,CAAC;YAAE,cAAO;iBAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;gBAAP,6BAAO;;YAAK,OAAA,WAAW,CAAC,OAAO,OAAnB,WAAW,+BAAS,CAAC,UAAK,IAAI,kBAAK,EAAE,CAAC,CAAC,CAAC;QAAxC,CAAyC,CAAC,CAAC;QACxF,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,UAAQ,IAAW;QACf,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,+BAAK,GAAL;QACI,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACL,sBAAC;AAAD,CAAC,AAjDD,IAiDC;AAjDY,0CAAe"}
+{"version":3,"file":"ProviderBuilder.js","sourceRoot":"","sources":["../../lib/features/ProviderBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+DAA8D;AAC9D,6CAA4C;AAG5C,gEAA+D;AAE/D,yDAAwD;AACxD,uDAAsD;AAEtD;IAWI,yBAAY,EAAwB;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAQ,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAVM,+BAAe,GAAtB,UAA0B,KAAqB;QAC3C,OAAO,IAAI,eAAe,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;IAC1E,CAAC;IAEM,4BAAY,GAAnB,UAAuB,KAAQ;QAC3B,OAAO,IAAI,eAAe,CAAC,cAAM,OAAA,KAAK,EAAL,CAAK,CAAC,CAAC;IAC5C,CAAC;IAMD,kCAAQ,GAAR;QAAS,mBAAmB;aAAnB,UAAmB,EAAnB,qBAAmB,EAAnB,IAAmB;YAAnB,8BAAmB;;QACxB,IAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAQ,CAAC,UAAC,CAAC;YAAE,cAAO;iBAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;gBAAP,6BAAO;;YAAK,OAAA,WAAW,CAAC,OAAO,OAAnB,WAAW,+BAAS,CAAC,UAAK,IAAI,kBAAK,SAAS;QAA5C,CAA6C,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,kCAAQ,GAAR,UAAS,IAAmB;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,oCAAU,GAAV,UAAW,EAAiC;QACxC,IAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,mBAAQ,CAAC,UAAC,CAAC;YAAE,cAAO;iBAAP,UAAO,EAAP,qBAAO,EAAP,IAAO;gBAAP,6BAAO;;YAAK,OAAA,WAAW,CAAC,OAAO,OAAnB,WAAW,+BAAS,CAAC,UAAK,IAAI,kBAAK,EAAE,CAAC,CAAC,CAAC;QAAxC,CAAyC,CAAC,CAAC;QACxF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,iCAAO,GAAP,UAAQ,IAAW;QACf,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,OAAO,IAAI,qCAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,qCAAW,GAAX;QACI,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACL,sBAAC;AAAD,CAAC,AAjDD,IAiDC;AAjDY,0CAAe"}

package/cjm/index.d.ts

@@ -34,6 +34,5 @@ export { ProviderBuilder } from './features/ProviderBuilder';
 export { IocLocatorBuilder } from './features/ioc/IocLocatorBuilder';
 export { SimpleLocatorBuilder } from './features/simple/SimpleLocatorBuilder';
 export { emptyHook } from './features/instanceHook/emptyHook';
-export { IScopeContextKey } from './features/scope/IScopeContext';
 export { LocatorBuilder } from './features/LocatorBuilder';
 export { ILocatorBuilder } from './features/ILocatorBuilder';

package/cjm/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocatorBuilder = exports.IScopeContextKey = exports.emptyHook = exports.SimpleLocatorBuilder = exports.IocLocatorBuilder = exports.ProviderBuilder = exports.SingletonProvider = exports.LevelProvider = exports.MockedRepository = exports.HookedInjector = exports.TaggedProvider = exports.Provider = exports.ProviderRepository = exports.HookedProvider = exports.MethodNotImplementedError = exports.ProviderNotFoundError = exports.InjectMetadataCollector = exports.createInjectFnDecorator = exports.createInjectDecorator = exports.createHookDecorator = exports.MethodsMetadataCollector = exports.IocInjector = exports.SimpleInjector = exports.ServiceLocator = exports.VendorMockProviderStorage = exports.MockProviderStorage = exports.MockProvider = void 0;
+exports.LocatorBuilder = exports.emptyHook = exports.SimpleLocatorBuilder = exports.IocLocatorBuilder = exports.ProviderBuilder = exports.SingletonProvider = exports.LevelProvider = exports.MockedRepository = exports.HookedInjector = exports.TaggedProvider = exports.Provider = exports.ProviderRepository = exports.HookedProvider = exports.MethodNotImplementedError = exports.ProviderNotFoundError = exports.InjectMetadataCollector = exports.createInjectFnDecorator = exports.createInjectDecorator = exports.createHookDecorator = exports.MethodsMetadataCollector = exports.IocInjector = exports.SimpleInjector = exports.ServiceLocator = exports.VendorMockProviderStorage = exports.MockProviderStorage = exports.MockProvider = void 0;
 var MockProvider_1 = require("./features/mock/MockProvider");
 Object.defineProperty(exports, "MockProvider", { enumerable: true, get: function () { return MockProvider_1.MockProvider; } });
 var MockProviderStorage_1 = require("./features/mock/MockProviderStorage");
@@ -50,8 +50,6 @@ var SimpleLocatorBuilder_1 = require("./features/simple/SimpleLocatorBuilder");
 Object.defineProperty(exports, "SimpleLocatorBuilder", { enumerable: true, get: function () { return SimpleLocatorBuilder_1.SimpleLocatorBuilder; } });
 var emptyHook_1 = require("./features/instanceHook/emptyHook");
 Object.defineProperty(exports, "emptyHook", { enumerable: true, get: function () { return emptyHook_1.emptyHook; } });
-var IScopeContext_1 = require("./features/scope/IScopeContext");
-Object.defineProperty(exports, "IScopeContextKey", { enumerable: true, get: function () { return IScopeContext_1.IScopeContextKey; } });
 var LocatorBuilder_1 = require("./features/LocatorBuilder");
 Object.defineProperty(exports, "LocatorBuilder", { enumerable: true, get: function () { return LocatorBuilder_1.LocatorBuilder; } });
 //# sourceMappingURL=index.js.map

package/cjm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;AACA,6DAA4D;AAAnD,4GAAA,YAAY,OAAA;AACrB,2EAA0E;AAAjE,0HAAA,mBAAmB,OAAA;AAC5B,uFAAsF;AAA7E,sIAAA,yBAAyB,OAAA;AAGlC,wDAAuD;AAA9C,gHAAA,cAAc,OAAA;AAGvB,mEAAkE;AAAzD,gHAAA,cAAc,OAAA;AACvB,0DAAyD;AAAhD,0GAAA,WAAW,OAAA;AAGpB,wGAAuG;AAA9F,oIAAA,wBAAwB,OAAA;AACjC,4EAAoF;AAA3E,iHAAA,mBAAmB,OAAA;AAC5B,mEAAsG;AAA7F,mHAAA,qBAAqB,OAAA;AAAE,qHAAA,uBAAuB,OAAA;AACvD,6FAA4F;AAAnF,kIAAA,uBAAuB,OAAA;AAEhC,wEAAuE;AAA9D,8HAAA,qBAAqB,OAAA;AAC9B,gFAA+E;AAAtE,sIAAA,yBAAyB,OAAA;AAElC,yEAAwE;AAA/D,gHAAA,cAAc,OAAA;AAGvB,gEAA+D;AAAtD,wHAAA,kBAAkB,OAAA;AAC3B,4CAA2C;AAAlC,oGAAA,QAAQ,OAAA;AACjB,kEAAiE;AAAxD,gHAAA,cAAc,OAAA;AACvB,yEAAwE;AAA/D,gHAAA,cAAc,OAAA;AAEvB,qEAAoE;AAA3D,oHAAA,gBAAgB,OAAA;AACzB,gEAA+D;AAAtD,8GAAA,aAAa,OAAA;AACtB,wEAAuE;AAA9D,sHAAA,iBAAiB,OAAA;AAC1B,8DAA6D;AAApD,kHAAA,eAAe,OAAA;AACxB,sEAAqE;AAA5D,sHAAA,iBAAiB,OAAA;AAC1B,+EAA8E;AAArE,4HAAA,oBAAoB,OAAA;AAC7B,+DAA8D;AAArD,sGAAA,SAAS,OAAA;AAClB,gEAAkE;AAAzD,iHAAA,gBAAgB,OAAA;AACzB,4DAA2D;AAAlD,gHAAA,cAAc,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":";;;AACA,6DAA4D;AAAnD,4GAAA,YAAY,OAAA;AACrB,2EAA0E;AAAjE,0HAAA,mBAAmB,OAAA;AAC5B,uFAAsF;AAA7E,sIAAA,yBAAyB,OAAA;AAGlC,wDAAuD;AAA9C,gHAAA,cAAc,OAAA;AAGvB,mEAAkE;AAAzD,gHAAA,cAAc,OAAA;AACvB,0DAAyD;AAAhD,0GAAA,WAAW,OAAA;AAGpB,wGAAuG;AAA9F,oIAAA,wBAAwB,OAAA;AACjC,4EAAoF;AAA3E,iHAAA,mBAAmB,OAAA;AAC5B,mEAAsG;AAA7F,mHAAA,qBAAqB,OAAA;AAAE,qHAAA,uBAAuB,OAAA;AACvD,6FAA4F;AAAnF,kIAAA,uBAAuB,OAAA;AAEhC,wEAAuE;AAA9D,8HAAA,qBAAqB,OAAA;AAC9B,gFAA+E;AAAtE,sIAAA,yBAAyB,OAAA;AAElC,yEAAwE;AAA/D,gHAAA,cAAc,OAAA;AAGvB,gEAA+D;AAAtD,wHAAA,kBAAkB,OAAA;AAC3B,4CAA2C;AAAlC,oGAAA,QAAQ,OAAA;AACjB,kEAAiE;AAAxD,gHAAA,cAAc,OAAA;AACvB,yEAAwE;AAA/D,gHAAA,cAAc,OAAA;AAEvB,qEAAoE;AAA3D,oHAAA,gBAAgB,OAAA;AACzB,gEAA+D;AAAtD,8GAAA,aAAa,OAAA;AACtB,wEAAuE;AAA9D,sHAAA,iBAAiB,OAAA;AAC1B,8DAA6D;AAApD,kHAAA,eAAe,OAAA;AACxB,sEAAqE;AAA5D,sHAAA,iBAAiB,OAAA;AAC1B,+EAA8E;AAArE,4HAAA,oBAAoB,OAAA;AAC7B,+DAA8D;AAArD,sGAAA,SAAS,OAAA;AAClB,4DAA2D;AAAlD,gHAAA,cAAc,OAAA"}

package/esm/core/ProviderRepository.d.ts

@@ -1,9 +1,9 @@
 import { IProvider, ProviderKey, ScopeOptions, Tag } from './IProvider';
 import { IProviderRepository } from './IProviderRepository';
-export declare class ProviderRepository implements IProviderRepository {
+export declare class ProviderRepository implements IProviderRepository, ScopeOptions {
     private parent?;
     level: number;
-    private tags;
+    tags: Tag[];
     private readonly providers;
     constructor(parent?: ProviderRepository, level?: number, tags?: Tag[]);
     add<T>(key: ProviderKey, provider: IProvider<T>): void;
@@ -11,4 +11,5 @@ export declare class ProviderRepository implements IProviderRepository {
     entries(filters: ScopeOptions): Array<[ProviderKey, IProvider<any>]>;
     dispose(): void;
     find<T>(key: ProviderKey): IProvider<T>;
+    private findLocally;
 }

package/esm/core/ProviderRepository.js

@@ -1,26 +1,25 @@
 import { ProviderNotFoundError } from '../errors/ProviderNotFoundError';
-import { ProviderStorage } from './ProviderStorage';
 export class ProviderRepository {
     constructor(parent, level = 0, tags = []) {
         this.parent = parent;
         this.level = level;
         this.tags = tags;
-        this.providers = new ProviderStorage();
+        this.providers = new Map();
     }
     add(key, provider) {
-        this.providers.add(key, provider);
+        this.providers.set(key, provider);
     }
     clone(tags = [], parent = this) {
-        const options = { level: parent.level + 1, tags };
-        const repo = new ProviderRepository(parent, options.level, options.tags);
-        for (const [key, provider] of parent.entries(options)) {
+        const repo = new ProviderRepository(parent, parent.level + 1, tags);
+        for (const [key, provider] of parent.entries(repo)) {
             repo.add(key, provider.clone());
         }
         return repo;
     }
     entries(filters) {
-        const localProviders = this.providers.entries(filters);
-        const parentProviders = this.parent ? this.parent.entries(filters) : [];
+        var _a, _b;
+        const localProviders = Array.from(this.providers.entries()).filter(([, value]) => value.isValid(filters));
+        const parentProviders = (_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.entries(filters)) !== null && _b !== void 0 ? _b : [];
         return Array.from(new Map([...parentProviders, ...localProviders]).entries());
     }
     dispose() {
@@ -32,12 +31,15 @@ export class ProviderRepository {
     }
     find(key) {
         var _a, _b;
-        const options = { level: this.level, tags: this.tags };
-        const provider = (_a = this.providers.find(key, options)) !== null && _a !== void 0 ? _a : (_b = this.parent) === null || _b === void 0 ? void 0 : _b.find(key);
+        const provider = (_a = this.findLocally(key)) !== null && _a !== void 0 ? _a : (_b = this.parent) === null || _b === void 0 ? void 0 : _b.find(key);
         if (provider === undefined) {
             throw new ProviderNotFoundError(key.toString());
         }
         return provider;
     }
+    findLocally(key) {
+        const provider = this.providers.get(key);
+        return !provider || !provider.isValid(this) ? undefined : provider;
+    }
 }
 //# sourceMappingURL=ProviderRepository.js.map

package/esm/core/ProviderRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProviderRepository.js","sourceRoot":"","sources":["../../lib/core/ProviderRepository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAExE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,OAAO,kBAAkB;IAG3B,YAAoB,MAA2B,EAAS,QAAQ,CAAC,EAAU,OAAc,EAAE;QAAvE,WAAM,GAAN,MAAM,CAAqB;QAAS,UAAK,GAAL,KAAK,CAAI;QAAU,SAAI,GAAJ,IAAI,CAAY;QAF1E,cAAS,GAAG,IAAI,eAAe,EAAE,CAAC;IAE2C,CAAC;IAE/F,GAAG,CAAI,GAAgB,EAAE,QAAsB;QAC3C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAc,EAAE,EAAE,SAA6B,IAAI;QACrD,MAAM,OAAO,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC;QAClD,MAAM,IAAI,GAAG,IAAI,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACzE,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACnD,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;SACnC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,OAAqB;QACzB,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACvD,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACxE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,OAAO;QACH,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE;YACrC,CAAC,CAAC,OAAO,EAAE,CAAC;SACf;QACD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,IAAI,CAAI,GAAgB;;QACpB,MAAM,OAAO,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACvD,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,SAAS,CAAC,IAAI,CAAI,GAAG,EAAE,OAAO,CAAC,mCAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAI,GAAG,CAAC,CAAC;QACnF,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;SACnD;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ"}
+{"version":3,"file":"ProviderRepository.js","sourceRoot":"","sources":["../../lib/core/ProviderRepository.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,MAAM,OAAO,kBAAkB;IAG3B,YAAoB,MAA2B,EAAS,QAAQ,CAAC,EAAS,OAAc,EAAE;QAAtE,WAAM,GAAN,MAAM,CAAqB;QAAS,UAAK,GAAL,KAAK,CAAI;QAAS,SAAI,GAAJ,IAAI,CAAY;QAFzE,cAAS,GAAG,IAAI,GAAG,EAA+B,CAAC;IAEyB,CAAC;IAE9F,GAAG,CAAI,GAAgB,EAAE,QAAsB;QAC3C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAc,EAAE,EAAE,SAA6B,IAAI;QACrD,MAAM,IAAI,GAAG,IAAI,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;QACpE,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAChD,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;SACnC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,OAAqB;;QACzB,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1G,MAAM,eAAe,GAAG,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAC,OAAO,CAAC,mCAAI,EAAE,CAAC;QAC5D,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,eAAe,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,OAAO;QACH,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE;YACrC,CAAC,CAAC,OAAO,EAAE,CAAC;SACf;QACD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,IAAI,CAAI,GAAgB;;QACpB,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,WAAW,CAAI,GAAG,CAAC,mCAAI,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAI,GAAG,CAAC,CAAC;QACvE,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;SACnD;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAEO,WAAW,CAAI,GAAgB;QACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAiB,CAAC;QACzD,OAAO,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IACvE,CAAC;CACJ"}

package/esm/features/ProviderBuilder.d.ts

@@ -10,8 +10,8 @@ export declare class ProviderBuilder<T> {
     withArgs(...extraArgs: any[]): this;
     withHook(hook: IInstanceHook): this;
     withArgsFn(fn: (l: IServiceLocator) => any[]): this;
-    asSingleton(): this;
     forTags(tags: Tag[]): this;
     forLevel(level: number): this;
-    build(): IProvider<T>;
+    asSingleton(): IProvider<T>;
+    asRequested(): IProvider<T>;
 }

package/esm/features/ProviderBuilder.js

@@ -14,7 +14,8 @@ export class ProviderBuilder {
         return new ProviderBuilder(() => value);
     }
     withArgs(...extraArgs) {
-        this.withArgsFn(() => extraArgs);
+        const oldProvider = this.provider;
+        this.provider = new Provider((l, ...args) => oldProvider.resolve(l, ...args, ...extraArgs));
         return this;
     }
     withHook(hook) {
@@ -26,10 +27,6 @@ export class ProviderBuilder {
         this.provider = new Provider((l, ...args) => oldProvider.resolve(l, ...args, ...fn(l)));
         return this;
     }
-    asSingleton() {
-        this.provider = new SingletonProvider(this.provider);
-        return this;
-    }
     forTags(tags) {
         this.provider = new TaggedProvider(this.provider, tags);
         return this;
@@ -38,7 +35,10 @@ export class ProviderBuilder {
         this.provider = new LevelProvider(this.provider, [level, level]);
         return this;
     }
-    build() {
+    asSingleton() {
+        return new SingletonProvider(this.provider);
+    }
+    asRequested() {
         return this.provider;
     }
 }

package/esm/features/ProviderBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProviderBuilder.js","sourceRoot":"","sources":["../../lib/features/ProviderBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,OAAO,eAAe;IAWxB,YAAY,EAAwB;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAVD,MAAM,CAAC,eAAe,CAAI,KAAqB;QAC3C,OAAO,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,CAAC,YAAY,CAAI,KAAQ;QAC3B,OAAO,IAAI,eAAe,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;IAMD,QAAQ,CAAC,GAAG,SAAgB;QACxB,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,QAAQ,CAAC,IAAmB;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,EAAiC;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,WAAW;QACP,IAAI,CAAC,QAAQ,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,IAAW;QACf,IAAI,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,QAAQ,CAAC,KAAa;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ"}
+{"version":3,"file":"ProviderBuilder.js","sourceRoot":"","sources":["../../lib/features/ProviderBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,OAAO,eAAe;IAWxB,YAAY,EAAwB;QAChC,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAVD,MAAM,CAAC,eAAe,CAAI,KAAqB;QAC3C,OAAO,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,CAAC,YAAY,CAAI,KAAQ;QAC3B,OAAO,IAAI,eAAe,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;IAMD,QAAQ,CAAC,GAAG,SAAgB;QACxB,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,QAAQ,CAAC,IAAmB;QACxB,IAAI,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,EAAiC;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CAAC,IAAW;QACf,IAAI,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,QAAQ,CAAC,KAAa;QAClB,IAAI,CAAC,QAAQ,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,WAAW;QACP,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;CACJ"}

package/esm/index.d.ts

@@ -34,6 +34,5 @@ export { ProviderBuilder } from './features/ProviderBuilder';
 export { IocLocatorBuilder } from './features/ioc/IocLocatorBuilder';
 export { SimpleLocatorBuilder } from './features/simple/SimpleLocatorBuilder';
 export { emptyHook } from './features/instanceHook/emptyHook';
-export { IScopeContextKey } from './features/scope/IScopeContext';
 export { LocatorBuilder } from './features/LocatorBuilder';
 export { ILocatorBuilder } from './features/ILocatorBuilder';

package/esm/index.js

@@ -22,6 +22,5 @@ export { ProviderBuilder } from './features/ProviderBuilder';
 export { IocLocatorBuilder } from './features/ioc/IocLocatorBuilder';
 export { SimpleLocatorBuilder } from './features/simple/SimpleLocatorBuilder';
 export { emptyHook } from './features/instanceHook/emptyHook';
-export { IScopeContextKey } from './features/scope/IScopeContext';
 export { LocatorBuilder } from './features/LocatorBuilder';
 //# sourceMappingURL=index.js.map

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAGtF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,6DAA6D,CAAC;AACvG,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACtG,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAE5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAGxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAGtF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,OAAO,EAAE,wBAAwB,EAAE,MAAM,6DAA6D,CAAC;AACvG,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACtG,OAAO,EAAE,uBAAuB,EAAE,MAAM,mDAAmD,CAAC;AAE5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAGxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "7.0.3",
+  "version": "7.1.0",
   "description": "Typescript IoC container",
   "author": "ibabkin <ibabkin@goodgamestudios.com>",
   "homepage": "https://github.com/IgorBabkin/service-locator/tree/master/packages/ts-ioc-container",
@@ -48,7 +48,7 @@
     "ts-jest": "27.0.5",
     "typescript": "4.4.3"
   },
-  "gitHead": "62f304a90d4ac08c5a68af6e254818ca17daf8af",
+  "gitHead": "5c8793c581fc286ff759cda5324e248533075082",
   "peerDependencies": {
     "reflect-metadata": "^0.1.13"
   }

package/cjm/core/ProviderStorage.d.ts

@@ -1,9 +0,0 @@
-import { IProvider, ProviderKey, ScopeOptions } from './IProvider';
-export declare class ProviderStorage {
-    private readonly providers;
-    add<T>(key: ProviderKey, provider: IProvider<T>): void;
-    entries(filters: ScopeOptions): [ProviderKey, IProvider<any>][];
-    values(): IterableIterator<IProvider<any>>;
-    find<T>(key: ProviderKey, filters: ScopeOptions): IProvider<T> | undefined;
-    clear(): void;
-}

package/cjm/core/ProviderStorage.js

@@ -1,49 +0,0 @@
-"use strict";
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProviderStorage = void 0;
-var ProviderStorage = /** @class */ (function () {
-    function ProviderStorage() {
-        this.providers = new Map();
-    }
-    ProviderStorage.prototype.add = function (key, provider) {
-        this.providers.set(key, provider);
-    };
-    ProviderStorage.prototype.entries = function (filters) {
-        return Array.from(this.providers.entries()).filter(function (_a) {
-            var _b = __read(_a, 2), value = _b[1];
-            return value.isValid(filters);
-        });
-    };
-    ProviderStorage.prototype.values = function () {
-        return this.providers.values();
-    };
-    ProviderStorage.prototype.find = function (key, filters) {
-        var provider = this.providers.get(key);
-        if (!provider || !provider.isValid(filters)) {
-            return undefined;
-        }
-        return provider;
-    };
-    ProviderStorage.prototype.clear = function () {
-        this.providers.clear();
-    };
-    return ProviderStorage;
-}());
-exports.ProviderStorage = ProviderStorage;
-//# sourceMappingURL=ProviderStorage.js.map

package/cjm/core/ProviderStorage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ProviderStorage.js","sourceRoot":"","sources":["../../lib/core/ProviderStorage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAEA;IAAA;QACqB,cAAS,GAAG,IAAI,GAAG,EAA+B,CAAC;IAyBxE,CAAC;IAvBG,6BAAG,GAAH,UAAO,GAAgB,EAAE,QAAsB;QAC3C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,iCAAO,GAAP,UAAQ,OAAqB;QACzB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,UAAC,EAAS;gBAAT,KAAA,aAAS,EAAN,KAAK,QAAA;YAAM,OAAA,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAAtB,CAAsB,CAAC,CAAC;IAC9F,CAAC;IAED,gCAAM,GAAN;QACI,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IAED,8BAAI,GAAJ,UAAQ,GAAgB,EAAE,OAAqB;QAC3C,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAiB,CAAC;QACzD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACzC,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,+BAAK,GAAL;QACI,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IACL,sBAAC;AAAD,CAAC,AA1BD,IA0BC;AA1BY,0CAAe"}

package/cjm/features/scope/IScopeContext.d.ts

@@ -1 +0,0 @@
-export declare const IScopeContextKey: unique symbol;

package/cjm/features/scope/IScopeContext.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IScopeContextKey = void 0;
-exports.IScopeContextKey = Symbol.for('IScopeContext');
-//# sourceMappingURL=IScopeContext.js.map

package/cjm/features/scope/IScopeContext.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IScopeContext.js","sourceRoot":"","sources":["../../../lib/features/scope/IScopeContext.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC"}

package/esm/core/ProviderStorage.d.ts

@@ -1,9 +0,0 @@
-import { IProvider, ProviderKey, ScopeOptions } from './IProvider';
-export declare class ProviderStorage {
-    private readonly providers;
-    add<T>(key: ProviderKey, provider: IProvider<T>): void;
-    entries(filters: ScopeOptions): [ProviderKey, IProvider<any>][];
-    values(): IterableIterator<IProvider<any>>;
-    find<T>(key: ProviderKey, filters: ScopeOptions): IProvider<T> | undefined;
-    clear(): void;
-}

package/esm/core/ProviderStorage.js

@@ -1,25 +0,0 @@
-export class ProviderStorage {
-    constructor() {
-        this.providers = new Map();
-    }
-    add(key, provider) {
-        this.providers.set(key, provider);
-    }
-    entries(filters) {
-        return Array.from(this.providers.entries()).filter(([, value]) => value.isValid(filters));
-    }
-    values() {
-        return this.providers.values();
-    }
-    find(key, filters) {
-        const provider = this.providers.get(key);
-        if (!provider || !provider.isValid(filters)) {
-            return undefined;
-        }
-        return provider;
-    }
-    clear() {
-        this.providers.clear();
-    }
-}
-//# sourceMappingURL=ProviderStorage.js.map

package/esm/core/ProviderStorage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ProviderStorage.js","sourceRoot":"","sources":["../../lib/core/ProviderStorage.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,eAAe;IAA5B;QACqB,cAAS,GAAG,IAAI,GAAG,EAA+B,CAAC;IAyBxE,CAAC;IAvBG,GAAG,CAAI,GAAgB,EAAE,QAAsB;QAC3C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,CAAC,OAAqB;QACzB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9F,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IAED,IAAI,CAAI,GAAgB,EAAE,OAAqB;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAiB,CAAC;QACzD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACzC,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,KAAK;QACD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;CACJ"}

package/esm/features/scope/IScopeContext.d.ts

@@ -1 +0,0 @@
-export declare const IScopeContextKey: unique symbol;

package/esm/features/scope/IScopeContext.js

@@ -1,2 +0,0 @@
-export const IScopeContextKey = Symbol.for('IScopeContext');
-//# sourceMappingURL=IScopeContext.js.map

package/esm/features/scope/IScopeContext.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IScopeContext.js","sourceRoot":"","sources":["../../../lib/features/scope/IScopeContext.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC"}