ts-ioc-container 37.0.2 → 37.0.3

package/cjm/by.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.depKey = exports.isDepKey = exports.by = exports.byAlias = exports.byAliases = exports.IMemoKey = exports.all = void 0;
-const Registration_1 = require("./registration/Registration");
-const Provider_1 = require("./provider/Provider");
+exports.by = exports.byAlias = exports.byAliases = exports.IMemoKey = exports.all = void 0;
 const all = () => true;
 exports.all = all;
 exports.IMemoKey = Symbol('IMemo');
@@ -26,12 +24,14 @@ const byAlias = (predicate, { memoize, lazy } = {}) => (c) => {
     const predicateFn = (aliases) => predicate(aliases, c);
     const memoKey = memoize?.(c);
     if (memoKey === undefined) {
-        return c.resolveOneByAlias(predicateFn, { lazy })[1];
+        const [, result] = c.resolveOneByAlias(predicateFn, { lazy });
+        return result;
     }
     const memo = c.resolve(exports.IMemoKey);
     const memoized = memo.get(memoKey);
     if (memoized) {
-        return c.resolve(memoized[0], { lazy });
+        const [key] = memoized;
+        return c.resolve(key, { lazy });
     }
     const [key, result] = c.resolveOneByAlias(predicateFn, { lazy });
     memo.set(memoKey, [key]);
@@ -39,7 +39,7 @@ const byAlias = (predicate, { memoize, lazy } = {}) => (c) => {
 };
 exports.byAlias = byAlias;
 exports.by = {
-    keys: (keys, { lazy } = {}) => (с, ...args) => keys.map((t) => с.resolve(t, { args, lazy })),
+    keys: (keys, { lazy } = {}) => (c, ...args) => keys.map((t) => c.resolve(t, { args, lazy })),
     key: (key, { args: deps = [], lazy } = {}) => (c, ...args) => c.resolve(key, { args: [...deps, ...args], lazy }),
     instances: (predicate = exports.all) => (c) => {
         const result = new Set(c.getInstances());
@@ -55,43 +55,3 @@ exports.by = {
         create: (options) => (l) => l.createScope(options),
     },
 };
-const isDepKey = (key) => {
-    return typeof key === 'object' && key !== null && 'key' in key;
-};
-exports.isDepKey = isDepKey;
-const depKey = (key) => {
-    let isValidWhen;
-    const mappers = [];
-    return {
-        key,
-        assignTo: (registration) => {
-            let reg = registration.pipe(...mappers).fromKey(key);
-            if (isValidWhen) {
-                reg = registration.when(isValidWhen);
-            }
-            return reg;
-        },
-        register: (fn) => {
-            let registration = new Registration_1.Registration(() => new Provider_1.Provider(fn), key).pipe(...mappers);
-            if (isValidWhen) {
-                registration = registration.when(isValidWhen);
-            }
-            return registration;
-        },
-        resolve: (s, ...args) => exports.by.key(key)(s, ...args),
-        pipe(...values) {
-            mappers.push(...values);
-            return this;
-        },
-        to(target) {
-            key = target;
-            return this;
-        },
-        when(value) {
-            isValidWhen = value;
-            return this;
-        },
-        redirectFrom: (registration) => registration.redirectFrom(key),
-    };
-};
-exports.depKey = depKey;

package/cjm/container/AutoMockedContainer.js

@@ -7,7 +7,6 @@ class AutoMockedContainer {
     constructor() {
         this.isDisposed = false;
     }
-    detach() { }
     hasProvider(key) {
         return false;
     }

package/cjm/container/Container.js

@@ -13,12 +13,9 @@ class Container {
         this.providers = new Map();
         this.registrations = new Set();
         this.parent = options.parent ?? new EmptyContainer_1.EmptyContainer();
-        this.tags = new Set(options.tags);
+        this.tags = new Set(options.tags ?? []);
+        this.onConstruct = options.onConstruct ?? (() => { });
         this.onDispose = options.onDispose ?? (() => { });
-        // apply registrations from parent
-        for (const registration of this.parent.getRegistrations()) {
-            registration.applyTo(this);
-        }
     }
     add(registration) {
         this.registrations.add(registration);
@@ -35,6 +32,7 @@ class Container {
         if ((0, IContainer_1.isConstructor)(token)) {
             const instance = this.injector.resolve(this, token, { args });
             this.instances.add(instance);
+            this.onConstruct(instance);
             return instance;
         }
         const provider = this.providers.get(token);
@@ -45,34 +43,25 @@ class Container {
     createScope({ tags = [] } = {}) {
         this.validateContainer();
         const scope = new Container(this.injector, { parent: this, tags, onDispose: this.onDispose });
+        scope.applyRegistrationsFrom(this);
         this.scopes.add(scope);
         return scope;
     }
-    dispose(options = {}) {
-        const { cascade = true } = options;
+    dispose() {
         this.validateContainer();
         this.isDisposed = true;
-        // Dispose all scopes
-        for (const scope of this.scopes) {
-            if (cascade) {
-                scope.dispose(options);
-            }
-            else {
-                scope.detach();
-            }
-        }
-        // Unbind from parent
+        // Detach from parent
         this.parent.removeScope(this);
         this.parent = new EmptyContainer_1.EmptyContainer();
-        // Drop internal state to prevent memory leaks
-        this.registrations.clear();
+        // Reset the state
         this.providers.clear();
-        this.instances.forEach((instance) => this.onDispose(instance));
         this.instances.clear();
-    }
-    detach() {
-        this.parent.removeScope(this);
-        this.parent = new EmptyContainer_1.EmptyContainer();
+        this.registrations.clear();
+        this.onDispose(this);
+        // Dispose all scopes
+        for (const scope of this.scopes) {
+            scope.dispose();
+        }
     }
     use(module) {
         module.applyTo(this);
@@ -109,6 +98,14 @@ class Container {
     hasTag(tag) {
         return this.tags.has(tag);
     }
+    /**
+     * @private
+     */
+    applyRegistrationsFrom(source) {
+        for (const registration of source.getRegistrations()) {
+            registration.applyTo(this);
+        }
+    }
     /**
      * @private
      */

package/cjm/container/EmptyContainer.js

@@ -4,7 +4,6 @@ exports.EmptyContainer = void 0;
 const MethodNotImplementedError_1 = require("../errors/MethodNotImplementedError");
 const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
 class EmptyContainer {
-    detach() { }
     get isDisposed() {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
@@ -33,7 +32,7 @@ class EmptyContainer {
         throw new DependencyNotFoundError_1.DependencyNotFoundError(`Cannot find ${key.toString()}`);
     }
     hasTag(tag) {
-        return false;
+        throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
     getRegistrations() {
         return [];
@@ -43,7 +42,7 @@ class EmptyContainer {
         throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
     add(registration) {
-        return this;
+        throw new MethodNotImplementedError_1.MethodNotImplementedError();
     }
     resolveManyByAlias(predicate, options = {}, result = new Map()) {
         return result;

package/cjm/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.depKey = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.HookContext = exports.runOnDisposeHooks = exports.runOnConstructHooks = exports.onConstruct = exports.onDispose = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.redirectFrom = exports.register = exports.scope = exports.key = exports.decorate = exports.multiCache = exports.MultiCache = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.alias = exports.visible = exports.provider = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
-exports.getParameterMetadata = exports.getMethodMetadata = void 0;
+exports.depKey = exports.getParameterMetadata = exports.getMethodMetadata = exports.setMethodMetadata = exports.setParameterMetadata = exports.getMetadata = exports.setMetadata = exports.byAliases = exports.byAlias = exports.IMemoKey = exports.by = exports.HookContext = exports.runOnDisposeHooks = exports.runOnConstructHooks = exports.onConstruct = exports.onDispose = exports.injectProp = exports.runHooksAsync = exports.runHooks = exports.hasHooks = exports.hook = exports.getHooks = exports.UnexpectedHookResultError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyNotFoundError = exports.Registration = exports.redirectFrom = exports.register = exports.scope = exports.key = exports.decorate = exports.SingletonProvider = exports.singleton = exports.Provider = exports.ProviderDecorator = exports.args = exports.argsFn = exports.alias = exports.visible = exports.provider = exports.ProxyInjector = exports.SimpleInjector = exports.MetadataInjector = exports.resolveArgs = exports.inject = exports.AutoMockedContainer = exports.EmptyContainer = exports.Container = exports.isDependencyKey = void 0;
+exports.MultiCache = exports.multiCache = void 0;
 // Containers
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
@@ -31,12 +31,9 @@ Object.defineProperty(exports, "args", { enumerable: true, get: function () { re
 Object.defineProperty(exports, "ProviderDecorator", { enumerable: true, get: function () { return IProvider_1.ProviderDecorator; } });
 var Provider_1 = require("./provider/Provider");
 Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return Provider_1.Provider; } });
-var SingletonProvider_1 = require("./provider/singleton/SingletonProvider");
+var SingletonProvider_1 = require("./provider/SingletonProvider");
 Object.defineProperty(exports, "singleton", { enumerable: true, get: function () { return SingletonProvider_1.singleton; } });
 Object.defineProperty(exports, "SingletonProvider", { enumerable: true, get: function () { return SingletonProvider_1.SingletonProvider; } });
-var MultiCache_1 = require("./provider/singleton/MultiCache");
-Object.defineProperty(exports, "MultiCache", { enumerable: true, get: function () { return MultiCache_1.MultiCache; } });
-Object.defineProperty(exports, "multiCache", { enumerable: true, get: function () { return MultiCache_1.multiCache; } });
 var DecoratorProvider_1 = require("./provider/DecoratorProvider");
 Object.defineProperty(exports, "decorate", { enumerable: true, get: function () { return DecoratorProvider_1.decorate; } });
 // Registrations
@@ -76,7 +73,6 @@ Object.defineProperty(exports, "by", { enumerable: true, get: function () { retu
 Object.defineProperty(exports, "IMemoKey", { enumerable: true, get: function () { return by_1.IMemoKey; } });
 Object.defineProperty(exports, "byAlias", { enumerable: true, get: function () { return by_1.byAlias; } });
 Object.defineProperty(exports, "byAliases", { enumerable: true, get: function () { return by_1.byAliases; } });
-Object.defineProperty(exports, "depKey", { enumerable: true, get: function () { return by_1.depKey; } });
 var metadata_1 = require("./metadata");
 Object.defineProperty(exports, "setMetadata", { enumerable: true, get: function () { return metadata_1.setMetadata; } });
 Object.defineProperty(exports, "getMetadata", { enumerable: true, get: function () { return metadata_1.getMetadata; } });
@@ -84,3 +80,9 @@ Object.defineProperty(exports, "setParameterMetadata", { enumerable: true, get:
 Object.defineProperty(exports, "setMethodMetadata", { enumerable: true, get: function () { return metadata_1.setMethodMetadata; } });
 Object.defineProperty(exports, "getMethodMetadata", { enumerable: true, get: function () { return metadata_1.getMethodMetadata; } });
 Object.defineProperty(exports, "getParameterMetadata", { enumerable: true, get: function () { return metadata_1.getParameterMetadata; } });
+var isDepKey_1 = require("./isDepKey");
+Object.defineProperty(exports, "depKey", { enumerable: true, get: function () { return isDepKey_1.depKey; } });
+var Cache_1 = require("./provider/Cache");
+Object.defineProperty(exports, "multiCache", { enumerable: true, get: function () { return Cache_1.multiCache; } });
+var Cache_2 = require("./provider/Cache");
+Object.defineProperty(exports, "MultiCache", { enumerable: true, get: function () { return Cache_2.MultiCache; } });

package/cjm/injector/inject.js

@@ -4,9 +4,9 @@ exports.resolveArgs = exports.inject = void 0;
 const metadata_1 = require("../metadata");
 const utils_1 = require("../utils");
 const HookContext_1 = require("../hooks/HookContext");
-const by_1 = require("../by");
+const isDepKey_1 = require("../isDepKey");
 const inject = (fn) => (target, propertyKey, parameterIndex) => {
-    (0, metadata_1.setParameterMetadata)((0, HookContext_1.hookMetaKey)(propertyKey), (0, by_1.isDepKey)(fn) ? fn.resolve : fn)((0, utils_1.isInstance)(target) ? target.constructor : target, propertyKey, parameterIndex);
+    (0, metadata_1.setParameterMetadata)((0, HookContext_1.hookMetaKey)(propertyKey), (0, isDepKey_1.isDepKey)(fn) ? fn.resolve : fn)((0, utils_1.isInstance)(target) ? target.constructor : target, propertyKey, parameterIndex);
 };
 exports.inject = inject;
 const resolveArgs = (Target, methodName) => {

package/cjm/isDepKey.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.depKey = exports.isDepKey = void 0;
+const Registration_1 = require("./registration/Registration");
+const Provider_1 = require("./provider/Provider");
+const by_1 = require("./by");
+const isDepKey = (key) => {
+    return typeof key === 'object' && key !== null && 'key' in key;
+};
+exports.isDepKey = isDepKey;
+const depKey = (key) => {
+    let isValidWhen;
+    const mappers = [];
+    return {
+        key,
+        assignTo: (registration) => {
+            let reg = registration.pipe(...mappers).fromKey(key);
+            if (isValidWhen) {
+                reg = registration.when(isValidWhen);
+            }
+            return reg;
+        },
+        register: (fn) => {
+            let registration = new Registration_1.Registration(() => new Provider_1.Provider(fn), key).pipe(...mappers);
+            if (isValidWhen) {
+                registration = registration.when(isValidWhen);
+            }
+            return registration;
+        },
+        resolve: (s, ...args) => by_1.by.key(key)(s, ...args),
+        pipe(...values) {
+            mappers.push(...values);
+            return this;
+        },
+        to(target) {
+            key = target;
+            return this;
+        },
+        when(value) {
+            isValidWhen = value;
+            return this;
+        },
+        redirectFrom: (registration) => registration.redirectFrom(key),
+    };
+};
+exports.depKey = depKey;

package/cjm/provider/{singleton/MultiCache.js → Cache.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.multiCache = exports.MultiCache = void 0;
+exports.SingleCache = exports.multiCache = exports.MultiCache = void 0;
 class MultiCache {
     constructor(getKey = () => '1') {
         this.getKey = getKey;
@@ -19,3 +19,18 @@ class MultiCache {
 exports.MultiCache = MultiCache;
 const multiCache = (getKey) => new MultiCache(getKey);
 exports.multiCache = multiCache;
+class SingleCache {
+    getKey(...args) {
+        return '1';
+    }
+    getValue(key) {
+        return this.instance.value;
+    }
+    hasValue(key) {
+        return this.instance !== undefined;
+    }
+    setValue(key, value) {
+        this.instance = { value };
+    }
+}
+exports.SingleCache = SingleCache;

package/cjm/provider/IProvider.js

@@ -24,6 +24,12 @@ class ProviderDecorator {
     constructor(decorated) {
         this.decorated = decorated;
     }
+    get key() {
+        return this.decorated.key;
+    }
+    set key(value) {
+        this.decorated.key = value;
+    }
     setVisibility(predicate) {
         this.decorated.setVisibility(predicate);
         return this;

package/cjm/provider/{singleton/SingletonProvider.js → SingletonProvider.js}

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingletonProvider = void 0;
 exports.singleton = singleton;
-const IProvider_1 = require("../IProvider");
-const SingleCache_1 = require("./SingleCache");
+const IProvider_1 = require("./IProvider");
+const Cache_1 = require("./Cache");
 function singleton(cacheProvider) {
-    return (provider) => new SingletonProvider(provider, cacheProvider ? cacheProvider() : new SingleCache_1.SingleCache());
+    return (provider) => new SingletonProvider(provider, cacheProvider ? cacheProvider() : new Cache_1.SingleCache());
 }
 class SingletonProvider extends IProvider_1.ProviderDecorator {
     constructor(provider, cache) {

package/cjm/registration/IRegistration.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = exports.getTransformers = exports.scope = exports.redirectFrom = exports.key = void 0;
 const IContainer_1 = require("../container/IContainer");
 const metadata_1 = require("../metadata");
-const by_1 = require("../by");
+const isDepKey_1 = require("../isDepKey");
 const key = (...keys) => (r) => {
     const [originalKey, ...redirectKeys] = keys;
     return r.fromKey(originalKey).redirectFrom(...redirectKeys);
@@ -17,7 +17,7 @@ const METADATA_KEY = 'registration';
 const getTransformers = (Target) => (0, metadata_1.getMetadata)(Target, METADATA_KEY) ?? [];
 exports.getTransformers = getTransformers;
 const register = (...mappers) => (0, metadata_1.setMetadata)(METADATA_KEY, mappers.map((m, index) => {
-    if ((0, by_1.isDepKey)(m)) {
+    if ((0, isDepKey_1.isDepKey)(m)) {
         return index === 0 ? m.assignTo.bind(m) : m.redirectFrom.bind(m);
     }
     if ((0, IContainer_1.isDependencyKey)(m)) {

package/cjm/registration/Registration.js

@@ -63,8 +63,7 @@ class Registration {
             throw new DependencyMissingKeyError_1.DependencyMissingKeyError('No key provided for registration');
         }
         const key = this.key;
-        const provider = this.createProvider(key).pipe(...this.mappers);
-        container.register(key, provider);
+        container.register(key, this.createProvider(key).pipe(...this.mappers));
         for (const redirectKey of this.redirectKeys) {
             container.register(redirectKey, new Provider_1.Provider((s) => s.resolve(key)));
         }

package/esm/by.js

@@ -1,5 +1,3 @@
-import { Registration } from './registration/Registration';
-import { Provider } from './provider/Provider';
 export const all = () => true;
 export const IMemoKey = Symbol('IMemo');
 export const byAliases = (predicate, { memoize, lazy } = {}) => (c) => {
@@ -21,19 +19,21 @@ export const byAlias = (predicate, { memoize, lazy } = {}) => (c) => {
     const predicateFn = (aliases) => predicate(aliases, c);
     const memoKey = memoize?.(c);
     if (memoKey === undefined) {
-        return c.resolveOneByAlias(predicateFn, { lazy })[1];
+        const [, result] = c.resolveOneByAlias(predicateFn, { lazy });
+        return result;
     }
     const memo = c.resolve(IMemoKey);
     const memoized = memo.get(memoKey);
     if (memoized) {
-        return c.resolve(memoized[0], { lazy });
+        const [key] = memoized;
+        return c.resolve(key, { lazy });
     }
     const [key, result] = c.resolveOneByAlias(predicateFn, { lazy });
     memo.set(memoKey, [key]);
     return result;
 };
 export const by = {
-    keys: (keys, { lazy } = {}) => (с, ...args) => keys.map((t) => с.resolve(t, { args, lazy })),
+    keys: (keys, { lazy } = {}) => (c, ...args) => keys.map((t) => c.resolve(t, { args, lazy })),
     key: (key, { args: deps = [], lazy } = {}) => (c, ...args) => c.resolve(key, { args: [...deps, ...args], lazy }),
     instances: (predicate = all) => (c) => {
         const result = new Set(c.getInstances());
@@ -49,41 +49,3 @@ export const by = {
         create: (options) => (l) => l.createScope(options),
     },
 };
-export const isDepKey = (key) => {
-    return typeof key === 'object' && key !== null && 'key' in key;
-};
-export const depKey = (key) => {
-    let isValidWhen;
-    const mappers = [];
-    return {
-        key,
-        assignTo: (registration) => {
-            let reg = registration.pipe(...mappers).fromKey(key);
-            if (isValidWhen) {
-                reg = registration.when(isValidWhen);
-            }
-            return reg;
-        },
-        register: (fn) => {
-            let registration = new Registration(() => new Provider(fn), key).pipe(...mappers);
-            if (isValidWhen) {
-                registration = registration.when(isValidWhen);
-            }
-            return registration;
-        },
-        resolve: (s, ...args) => by.key(key)(s, ...args),
-        pipe(...values) {
-            mappers.push(...values);
-            return this;
-        },
-        to(target) {
-            key = target;
-            return this;
-        },
-        when(value) {
-            isValidWhen = value;
-            return this;
-        },
-        redirectFrom: (registration) => registration.redirectFrom(key),
-    };
-};

package/esm/container/AutoMockedContainer.js

@@ -4,7 +4,6 @@ export class AutoMockedContainer {
     constructor() {
         this.isDisposed = false;
     }
-    detach() { }
     hasProvider(key) {
         return false;
     }

package/esm/container/Container.js

@@ -10,12 +10,9 @@ export class Container {
         this.providers = new Map();
         this.registrations = new Set();
         this.parent = options.parent ?? new EmptyContainer();
-        this.tags = new Set(options.tags);
+        this.tags = new Set(options.tags ?? []);
+        this.onConstruct = options.onConstruct ?? (() => { });
         this.onDispose = options.onDispose ?? (() => { });
-        // apply registrations from parent
-        for (const registration of this.parent.getRegistrations()) {
-            registration.applyTo(this);
-        }
     }
     add(registration) {
         this.registrations.add(registration);
@@ -32,6 +29,7 @@ export class Container {
         if (isConstructor(token)) {
             const instance = this.injector.resolve(this, token, { args });
             this.instances.add(instance);
+            this.onConstruct(instance);
             return instance;
         }
         const provider = this.providers.get(token);
@@ -42,34 +40,25 @@ export class Container {
     createScope({ tags = [] } = {}) {
         this.validateContainer();
         const scope = new Container(this.injector, { parent: this, tags, onDispose: this.onDispose });
+        scope.applyRegistrationsFrom(this);
         this.scopes.add(scope);
         return scope;
     }
-    dispose(options = {}) {
-        const { cascade = true } = options;
+    dispose() {
         this.validateContainer();
         this.isDisposed = true;
-        // Dispose all scopes
-        for (const scope of this.scopes) {
-            if (cascade) {
-                scope.dispose(options);
-            }
-            else {
-                scope.detach();
-            }
-        }
-        // Unbind from parent
+        // Detach from parent
         this.parent.removeScope(this);
         this.parent = new EmptyContainer();
-        // Drop internal state to prevent memory leaks
-        this.registrations.clear();
+        // Reset the state
         this.providers.clear();
-        this.instances.forEach((instance) => this.onDispose(instance));
         this.instances.clear();
-    }
-    detach() {
-        this.parent.removeScope(this);
-        this.parent = new EmptyContainer();
+        this.registrations.clear();
+        this.onDispose(this);
+        // Dispose all scopes
+        for (const scope of this.scopes) {
+            scope.dispose();
+        }
     }
     use(module) {
         module.applyTo(this);
@@ -106,6 +95,14 @@ export class Container {
     hasTag(tag) {
         return this.tags.has(tag);
     }
+    /**
+     * @private
+     */
+    applyRegistrationsFrom(source) {
+        for (const registration of source.getRegistrations()) {
+            registration.applyTo(this);
+        }
+    }
     /**
      * @private
      */

package/esm/container/EmptyContainer.js

@@ -1,7 +1,6 @@
 import { MethodNotImplementedError } from '../errors/MethodNotImplementedError';
 import { DependencyNotFoundError } from '../errors/DependencyNotFoundError';
 export class EmptyContainer {
-    detach() { }
     get isDisposed() {
         throw new MethodNotImplementedError();
     }
@@ -30,7 +29,7 @@ export class EmptyContainer {
         throw new DependencyNotFoundError(`Cannot find ${key.toString()}`);
     }
     hasTag(tag) {
-        return false;
+        throw new MethodNotImplementedError();
     }
     getRegistrations() {
         return [];
@@ -40,7 +39,7 @@ export class EmptyContainer {
         throw new MethodNotImplementedError();
     }
     add(registration) {
-        return this;
+        throw new MethodNotImplementedError();
     }
     resolveManyByAlias(predicate, options = {}, result = new Map()) {
         return result;

package/esm/index.js

@@ -11,8 +11,7 @@ export { ProxyInjector } from './injector/ProxyInjector';
 // Providers
 export { provider, visible, alias, argsFn, args, ProviderDecorator, } from './provider/IProvider';
 export { Provider } from './provider/Provider';
-export { singleton, SingletonProvider } from './provider/singleton/SingletonProvider';
-export { MultiCache, multiCache } from './provider/singleton/MultiCache';
+export { singleton, SingletonProvider } from './provider/SingletonProvider';
 export { decorate } from './provider/DecoratorProvider';
 // Registrations
 export { key, scope, register, redirectFrom, } from './registration/IRegistration';
@@ -26,5 +25,8 @@ export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
 export { getHooks, hook, hasHooks, runHooks, runHooksAsync, injectProp, onDispose, onConstruct, runOnConstructHooks, runOnDisposeHooks, } from './hooks/hook';
 export { HookContext } from './hooks/HookContext';
 // Others
-export { by, IMemoKey, byAlias, byAliases, depKey } from './by';
+export { by, IMemoKey, byAlias, byAliases } from './by';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
+export { depKey } from './isDepKey';
+export { multiCache } from './provider/Cache';
+export { MultiCache } from './provider/Cache';

package/esm/injector/inject.js

@@ -1,7 +1,7 @@
 import { getParameterMetadata, setParameterMetadata } from '../metadata';
 import { constant, fillEmptyIndexes, isInstance } from '../utils';
 import { hookMetaKey } from '../hooks/HookContext';
-import { isDepKey } from '../by';
+import { isDepKey } from '../isDepKey';
 export const inject = (fn) => (target, propertyKey, parameterIndex) => {
     setParameterMetadata(hookMetaKey(propertyKey), isDepKey(fn) ? fn.resolve : fn)(isInstance(target) ? target.constructor : target, propertyKey, parameterIndex);
 };

package/esm/isDepKey.js

@@ -0,0 +1,41 @@
+import { Registration } from './registration/Registration';
+import { Provider } from './provider/Provider';
+import { by } from './by';
+export const isDepKey = (key) => {
+    return typeof key === 'object' && key !== null && 'key' in key;
+};
+export const depKey = (key) => {
+    let isValidWhen;
+    const mappers = [];
+    return {
+        key,
+        assignTo: (registration) => {
+            let reg = registration.pipe(...mappers).fromKey(key);
+            if (isValidWhen) {
+                reg = registration.when(isValidWhen);
+            }
+            return reg;
+        },
+        register: (fn) => {
+            let registration = new Registration(() => new Provider(fn), key).pipe(...mappers);
+            if (isValidWhen) {
+                registration = registration.when(isValidWhen);
+            }
+            return registration;
+        },
+        resolve: (s, ...args) => by.key(key)(s, ...args),
+        pipe(...values) {
+            mappers.push(...values);
+            return this;
+        },
+        to(target) {
+            key = target;
+            return this;
+        },
+        when(value) {
+            isValidWhen = value;
+            return this;
+        },
+        redirectFrom: (registration) => registration.redirectFrom(key),
+    };
+};

package/esm/provider/{singleton/MultiCache.js → Cache.js}

@@ -14,3 +14,17 @@ export class MultiCache {
     }
 }
 export const multiCache = (getKey) => new MultiCache(getKey);
+export class SingleCache {
+    getKey(...args) {
+        return '1';
+    }
+    getValue(key) {
+        return this.instance.value;
+    }
+    hasValue(key) {
+        return this.instance !== undefined;
+    }
+    setValue(key, value) {
+        this.instance = { value };
+    }
+}

package/esm/provider/IProvider.js

@@ -15,6 +15,12 @@ export class ProviderDecorator {
     constructor(decorated) {
         this.decorated = decorated;
     }
+    get key() {
+        return this.decorated.key;
+    }
+    set key(value) {
+        this.decorated.key = value;
+    }
     setVisibility(predicate) {
         this.decorated.setVisibility(predicate);
         return this;

package/esm/provider/{singleton/SingletonProvider.js → SingletonProvider.js}

@@ -1,5 +1,5 @@
-import { ProviderDecorator } from '../IProvider';
-import { SingleCache } from './SingleCache';
+import { ProviderDecorator } from './IProvider';
+import { SingleCache } from './Cache';
 export function singleton(cacheProvider) {
     return (provider) => new SingletonProvider(provider, cacheProvider ? cacheProvider() : new SingleCache());
 }

package/esm/registration/IRegistration.js

@@ -1,6 +1,6 @@
 import { isDependencyKey } from '../container/IContainer';
 import { getMetadata, setMetadata } from '../metadata';
-import { isDepKey } from '../by';
+import { isDepKey } from '../isDepKey';
 export const key = (...keys) => (r) => {
     const [originalKey, ...redirectKeys] = keys;
     return r.fromKey(originalKey).redirectFrom(...redirectKeys);

package/esm/registration/Registration.js

@@ -60,8 +60,7 @@ export class Registration {
             throw new DependencyMissingKeyError('No key provided for registration');
         }
         const key = this.key;
-        const provider = this.createProvider(key).pipe(...this.mappers);
-        container.register(key, provider);
+        container.register(key, this.createProvider(key).pipe(...this.mappers));
         for (const redirectKey of this.redirectKeys) {
             container.register(redirectKey, new Provider((s) => s.resolve(key)));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ioc-container",
-  "version": "37.0.2",
+  "version": "37.0.3",
   "description": "Typescript IoC container",
   "publishConfig": {
     "access": "public",

package/typings/by.d.ts

@@ -1,8 +1,6 @@
 import { CreateScopeOptions, DependencyKey, IContainer, InjectionToken, Instance } from './container/IContainer';
-import { IProvider, ProviderResolveOptions } from './provider/IProvider';
+import { ProviderResolveOptions } from './provider/IProvider';
 import { InjectFn } from './hooks/HookContext';
-import { IRegistration, ScopePredicate } from './registration/IRegistration';
-import { MapFn } from './utils';
 export type InstancePredicate = (dep: unknown) => boolean;
 export declare const all: InstancePredicate;
 export type IMemo = Map<string, DependencyKey[]>;
@@ -15,7 +13,7 @@ type AliasPredicate = (aliases: Set<string>, container: IContainer) => boolean;
 export declare const byAliases: (predicate: AliasPredicate, { memoize, lazy }?: AliasOptions) => InjectFn<unknown[]>;
 export declare const byAlias: (predicate: AliasPredicate, { memoize, lazy }?: AliasOptions) => InjectFn;
 export declare const by: {
-    keys: (keys: InjectionToken[], { lazy }?: Pick<ProviderResolveOptions, "lazy">) => (с: IContainer, ...args: unknown[]) => unknown[];
+    keys: (keys: InjectionToken[], { lazy }?: Pick<ProviderResolveOptions, "lazy">) => (c: IContainer, ...args: unknown[]) => unknown[];
     key: <T>(key: InjectionToken<T>, { args: deps, lazy }?: {
         args?: unknown[];
         lazy?: boolean;
@@ -26,16 +24,4 @@ export declare const by: {
         create: (options: CreateScopeOptions) => (l: IContainer) => IContainer;
     };
 };
-export type DepKey<T> = {
-    key: DependencyKey;
-    assignTo: (registration: IRegistration<T>) => IRegistration<T>;
-    register: (fn: (s: IContainer, ...args: unknown[]) => T) => IRegistration<T>;
-    resolve: (s: IContainer, ...args: unknown[]) => T;
-    pipe(...values: MapFn<IProvider<T>>[]): DepKey<T>;
-    to(target: DependencyKey): DepKey<T>;
-    when(value: ScopePredicate): DepKey<T>;
-    redirectFrom: (registration: IRegistration<T>) => IRegistration<T>;
-};
-export declare const isDepKey: <T>(key: unknown) => key is DepKey<T>;
-export declare const depKey: <T>(key: DependencyKey) => DepKey<T>;
 export {};

package/typings/container/AutoMockedContainer.d.ts

@@ -1,7 +1,6 @@
 import { AliasPredicate, DependencyKey, IContainer, InjectionToken, Instance, ResolveOptions, Tag } from './IContainer';
 import { IRegistration } from '../registration/IRegistration';
 export declare abstract class AutoMockedContainer implements IContainer {
-    detach(): void;
     isDisposed: boolean;
     hasProvider(key: string): boolean;
     createScope(): IContainer;

package/typings/container/Container.d.ts

@@ -11,20 +11,19 @@ export declare class Container implements IContainer {
     private readonly tags;
     private readonly providers;
     private readonly registrations;
+    private readonly onConstruct;
     private readonly onDispose;
     constructor(injector: IInjector, options?: {
         parent?: IContainer;
         tags?: Tag[];
-        onDispose?: (instance: Instance) => void;
+        onConstruct?: (instance: Instance) => void;
+        onDispose?: (scope: IContainer) => void;
     });
     add(registration: IRegistration): this;
     register(key: DependencyKey, provider: IProvider): this;
     resolve<T>(token: InjectionToken<T>, { args, child, lazy }?: ResolveOptions): T;
     createScope({ tags }?: CreateScopeOptions): IContainer;
-    dispose(options?: {
-        cascade?: boolean;
-    }): void;
-    detach(): void;
+    dispose(): void;
     use(module: IContainerModule): this;
     hasProvider(key: DependencyKey): boolean;
     resolveManyByAlias(predicate: AliasPredicate, { args, child, lazy }?: ResolveOptions, result?: Map<DependencyKey, unknown>): Map<DependencyKey, unknown>;
@@ -33,6 +32,10 @@ export declare class Container implements IContainer {
     getScopes(): IContainer[];
     getInstances(): Instance[];
     hasTag(tag: Tag): boolean;
+    /**
+     * @private
+     */
+    applyRegistrationsFrom(source: Container): void;
     /**
      * @private
      */

package/typings/container/EmptyContainer.d.ts

@@ -2,7 +2,6 @@ import { AliasPredicate, DependencyKey, IContainer, IContainerModule, InjectionT
 import { IProvider } from '../provider/IProvider';
 import { IRegistration } from '../registration/IRegistration';
 export declare class EmptyContainer implements IContainer {
-    detach(): void;
     get isDisposed(): boolean;
     hasProvider(key: string): boolean;
     getParent(): undefined;

package/typings/container/IContainer.d.ts

@@ -35,22 +35,13 @@ export interface IContainer extends Resolvable, Tagged {
     register(key: DependencyKey, value: IProvider): this;
     add(registration: IRegistration): this;
     removeScope(child: IContainer): void;
-    /**
-     * @param options - cascade must be true by default
-     */
-    dispose(options?: {
-        cascade?: boolean;
-    }): void;
+    dispose(): void;
     use(module: IContainerModule): this;
     getRegistrations(): IRegistration[];
     hasProvider(key: DependencyKey): boolean;
     getParent(): IContainer | undefined;
     getScopes(): IContainer[];
     getInstances(): Instance[];
-    /**
-     * Detaches container from parent
-     */
-    detach(): void;
     resolveManyByAlias(predicate: AliasPredicate, options?: ResolveOptions, result?: Map<DependencyKey, unknown>): Map<DependencyKey, unknown>;
     resolveOneByAlias<T>(predicate: AliasPredicate, options?: ResolveOptions): [DependencyKey, T];
 }

package/typings/index.d.ts

@@ -9,9 +9,8 @@ export { SimpleInjector } from './injector/SimpleInjector';
 export { ProxyInjector } from './injector/ProxyInjector';
 export { ResolveDependency, IProvider, provider, visible, alias, argsFn, args, ArgsFn, ProviderDecorator, ProviderResolveOptions, } from './provider/IProvider';
 export { Provider } from './provider/Provider';
-export { singleton, SingletonProvider } from './provider/singleton/SingletonProvider';
-export { MultiCache, multiCache } from './provider/singleton/MultiCache';
-export { Cache } from './provider/singleton/Cache';
+export { singleton, SingletonProvider } from './provider/SingletonProvider';
+export { Cache } from './provider/Cache';
 export { decorate, DecorateFn } from './provider/DecoratorProvider';
 export { key, IRegistration, ReturnTypeOfRegistration, scope, register, redirectFrom, ScopePredicate, } from './registration/IRegistration';
 export { Registration } from './registration/Registration';
@@ -21,6 +20,10 @@ export { ContainerDisposedError } from './errors/ContainerDisposedError';
 export { UnexpectedHookResultError } from './errors/UnexpectedHookResultError';
 export { getHooks, hook, hasHooks, HookFn, HookClass, runHooks, runHooksAsync, injectProp, onDispose, onConstruct, runOnConstructHooks, runOnDisposeHooks, } from './hooks/hook';
 export { HookContext, InjectFn, IHookContext } from './hooks/HookContext';
-export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases, depKey, DepKey } from './by';
+export { by, InstancePredicate, IMemo, IMemoKey, byAlias, byAliases } from './by';
 export { constructor, Branded } from './utils';
 export { setMetadata, getMetadata, setParameterMetadata, setMethodMetadata, getMethodMetadata, getParameterMetadata, } from './metadata';
+export { depKey } from './isDepKey';
+export { DepKey } from './isDepKey';
+export { multiCache } from './provider/Cache';
+export { MultiCache } from './provider/Cache';

package/typings/injector/inject.d.ts

@@ -1,6 +1,6 @@
 import { constructor } from '../utils';
 import { IContainer } from '../container/IContainer';
 import { InjectFn } from '../hooks/HookContext';
-import { DepKey } from '../by';
+import { DepKey } from '../isDepKey';
 export declare const inject: <T>(fn: InjectFn | DepKey<T>) => ParameterDecorator;
 export declare const resolveArgs: (Target: constructor<unknown>, methodName?: string) => (scope: IContainer, ...deps: unknown[]) => unknown[];

package/typings/isDepKey.d.ts

@@ -0,0 +1,16 @@
+import { DependencyKey, IContainer } from './container/IContainer';
+import { MapFn } from './utils';
+import { IRegistration, ScopePredicate } from './registration/IRegistration';
+import { IProvider } from './provider/IProvider';
+export type DepKey<T> = {
+    key: DependencyKey;
+    assignTo: (registration: IRegistration<T>) => IRegistration<T>;
+    register: (fn: (s: IContainer, ...args: unknown[]) => T) => IRegistration<T>;
+    resolve: (s: IContainer, ...args: unknown[]) => T;
+    pipe(...values: MapFn<IProvider<T>>[]): DepKey<T>;
+    to(target: DependencyKey): DepKey<T>;
+    when(value: ScopePredicate): DepKey<T>;
+    redirectFrom: (registration: IRegistration<T>) => IRegistration<T>;
+};
+export declare const isDepKey: <T>(key: unknown) => key is DepKey<T>;
+export declare const depKey: <T>(key: DependencyKey) => DepKey<T>;

package/typings/provider/Cache.d.ts

@@ -0,0 +1,22 @@
+export interface Cache<K, V> {
+    getKey(...args: unknown[]): K;
+    hasValue(key: K): boolean;
+    getValue(key: K): V;
+    setValue(key: K, value: V): void;
+}
+export declare class MultiCache<K, V> implements Cache<K, V> {
+    readonly getKey: (...args: unknown[]) => K;
+    private instances;
+    constructor(getKey?: (...args: unknown[]) => K);
+    hasValue(token: K): boolean;
+    getValue(token: K): V;
+    setValue(token: K, value: V): void;
+}
+export declare const multiCache: <K, V>(getKey: (...args: unknown[]) => K) => MultiCache<K, V>;
+export declare class SingleCache<V> implements Cache<string, V> {
+    private instance?;
+    getKey(...args: unknown[]): string;
+    getValue(key: string): V;
+    hasValue(key: string): boolean;
+    setValue(key: string, value: V): void;
+}

package/typings/provider/IProvider.d.ts

@@ -1,4 +1,4 @@
-import { Alias, AliasPredicate, IContainer, Tagged } from '../container/IContainer';
+import { Alias, AliasPredicate, DependencyKey, IContainer, Tagged } from '../container/IContainer';
 import { constructor, MapFn } from '../utils';
 export type ProviderResolveOptions = {
     args: unknown[];
@@ -13,6 +13,7 @@ export type ArgsFn = (l: IContainer, ...args: unknown[]) => unknown[];
 export declare function args<T = unknown>(...extraArgs: unknown[]): MapFn<IProvider<T>>;
 export declare function argsFn<T = unknown>(fn: ArgsFn): MapFn<IProvider<T>>;
 export interface IProvider<T = any> {
+    key?: DependencyKey;
     resolve(container: IContainer, options: ProviderResolveOptions): T;
     isVisible(parent: Tagged, child: Tagged): boolean;
     pipe(...mappers: MapFn<IProvider<T>>[]): IProvider<T>;
@@ -28,6 +29,8 @@ export declare const visible: (isVisibleWhen: ChildrenVisibilityPredicate) => Ma
 export declare abstract class ProviderDecorator<T> implements IProvider<T> {
     private decorated;
     protected constructor(decorated: IProvider<T>);
+    get key(): DependencyKey | undefined;
+    set key(value: DependencyKey | undefined);
     setVisibility(predicate: ChildrenVisibilityPredicate): this;
     isVisible(parent: IContainer, child: Tagged): boolean;
     resolve(container: IContainer, options: ProviderResolveOptions): T;

package/typings/provider/Provider.d.ts

@@ -6,6 +6,7 @@ export declare class Provider<T = any> implements IProvider<T> {
     static fromClass<T>(Target: constructor<T>): IProvider<T>;
     static fromValue<T>(value: T): IProvider<T>;
     static fromKey<T>(key: DependencyKey): Provider<T>;
+    key?: DependencyKey;
     private readonly aliases;
     private argsFn;
     private isVisibleWhen;

package/typings/provider/{singleton/SingletonProvider.d.ts → SingletonProvider.d.ts}

@@ -1,6 +1,6 @@
-import { IContainer } from '../../container/IContainer';
-import { IProvider, ProviderDecorator, ProviderResolveOptions } from '../IProvider';
-import { MapFn } from '../../utils';
+import { IContainer } from '../container/IContainer';
+import { IProvider, ProviderDecorator, ProviderResolveOptions } from './IProvider';
+import { MapFn } from '../utils';
 import { Cache } from './Cache';
 export declare function singleton<T = unknown>(cacheProvider?: () => Cache<unknown, T>): MapFn<IProvider<T>>;
 export declare class SingletonProvider<T> extends ProviderDecorator<T> {

package/typings/registration/IRegistration.d.ts

@@ -1,7 +1,7 @@
 import { DependencyKey, IContainer, IContainerModule } from '../container/IContainer';
 import { constructor, MapFn } from '../utils';
 import { IProvider } from '../provider/IProvider';
-import { DepKey } from '../by';
+import { DepKey } from '../isDepKey';
 export type ScopePredicate = (s: IContainer, prev?: boolean) => boolean;
 export interface IRegistration<T = any> extends IContainerModule {
     when(...predicates: ScopePredicate[]): this;

package/cjm/provider/singleton/Cache.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/cjm/provider/singleton/SingleCache.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SingleCache = void 0;
-class SingleCache {
-    getKey(...args) {
-        return '1';
-    }
-    getValue(key) {
-        return this.instance.value;
-    }
-    hasValue(key) {
-        return this.instance !== undefined;
-    }
-    setValue(key, value) {
-        this.instance = { value };
-    }
-}
-exports.SingleCache = SingleCache;

package/esm/provider/singleton/Cache.js

@@ -1 +0,0 @@
-export {};

package/esm/provider/singleton/SingleCache.js

@@ -1,14 +0,0 @@
-export class SingleCache {
-    getKey(...args) {
-        return '1';
-    }
-    getValue(key) {
-        return this.instance.value;
-    }
-    hasValue(key) {
-        return this.instance !== undefined;
-    }
-    setValue(key, value) {
-        this.instance = { value };
-    }
-}

package/typings/provider/singleton/Cache.d.ts

@@ -1,6 +0,0 @@
-export interface Cache<K, V> {
-    getKey(...args: unknown[]): K;
-    hasValue(key: K): boolean;
-    getValue(key: K): V;
-    setValue(key: K, value: V): void;
-}

package/typings/provider/singleton/MultiCache.d.ts

@@ -1,10 +0,0 @@
-import { Cache } from './Cache';
-export declare class MultiCache<K, V> implements Cache<K, V> {
-    readonly getKey: (...args: unknown[]) => K;
-    private instances;
-    constructor(getKey?: (...args: unknown[]) => K);
-    hasValue(token: K): boolean;
-    getValue(token: K): V;
-    setValue(token: K, value: V): void;
-}
-export declare const multiCache: <K, V>(getKey: (...args: unknown[]) => K) => MultiCache<K, V>;

package/typings/provider/singleton/SingleCache.d.ts

@@ -1,8 +0,0 @@
-import { Cache } from './Cache';
-export declare class SingleCache<V> implements Cache<string, V> {
-    private instance?;
-    getKey(...args: unknown[]): string;
-    getValue(key: string): V;
-    hasValue(key: string): boolean;
-    setValue(key: string, value: V): void;
-}