ts-ioc-container 72.1.0 → 72.3.0

package/cjm/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHookExecutionContext = exports.createHookContextFactory = exports.HookContext = exports.toHookFn = exports.hasHooks = exports.hook = exports.getHooks = exports.ArgumentNotFoundError = exports.TypedEventDisposedError = exports.UnsupportedTokenTypeError = exports.CannonSingletonApplyTwiceError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.ContainerError = exports.Registration = exports.onResolve = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.by = exports.argsFn = exports.args = exports.arg = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.AutoResolveModule = exports.Container = exports.isDependencyKey = void 0;
-exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.runAtOnce = exports.runInOrder = exports.handleAsyncError = exports.handleError = exports.createComposeMethodDecorator = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.createComposeParameterDecorator = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.createComposeClassDecorator = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.resolveConstructor = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.argToToken = exports.toToken = exports.forwardArgs = exports.isInjectionToken = exports.InjectionToken = exports.toTask = exports.HookCollector = exports.oncePerInstance = exports.parallel = exports.sequential = exports.injectProp = void 0;
-exports.isSerializable = exports.Is = exports.unwrapProxy = exports.ProxyRegistry = exports.findOrFail = exports.pipe = exports.select = exports.TypedEvent = exports.getConstructorChain = exports.memoize = void 0;
+exports.createHookContextFactory = exports.HookContext = exports.toHookFn = exports.hasHooks = exports.hook = exports.getHooks = exports.ArgumentNotFoundError = exports.TypedEventDisposedError = exports.UnsupportedTokenTypeError = exports.CannonSingletonApplyTwiceError = exports.CannotApplySingletonTwiceError = exports.ProviderDisposedError = exports.ContainerDisposedError = exports.MethodNotImplementedError = exports.DependencyMissingKeyError = exports.ContainerNotFoundError = exports.DependencyNotFoundError = exports.ContainerError = exports.Registration = exports.onResolve = exports.appendArgsFn = exports.appendArgs = exports.decorate = exports.singleton = exports.autoResolve = exports.lazy = exports.scopeAccess = exports.scope = exports.bindTo = exports.register = exports.toRegistrationFn = exports.toProviderFn = exports.toBindToken = exports.registerPipe = exports.isProviderPipe = exports.Provider = exports.ProxyInjector = exports.SimpleInjector = exports.resolveArgs = exports.by = exports.argsFn = exports.args = exports.arg = exports.inject = exports.MetadataInjector = exports.Injector = exports.EmptyContainer = exports.AutoResolveModule = exports.Container = exports.isDependencyKey = void 0;
+exports.handleAsyncError = exports.handleError = exports.createComposeMethodDecorator = exports.getMethodTags = exports.addMethodTag = exports.getMethodLabels = exports.addMethodLabel = exports.getMethodMeta = exports.addMethodMeta = exports.createComposeParameterDecorator = exports.getParamTags = exports.addParamTag = exports.getParamLabels = exports.addParamLabel = exports.getParamMeta = exports.addParamMeta = exports.createComposeClassDecorator = exports.getClassTags = exports.addClassTag = exports.getClassLabels = exports.addClassLabel = exports.getClassMeta = exports.addClassMeta = exports.resolveConstructor = exports.IFeatureContextToken = exports.IFeatureFlagsToken = exports.ToggleFeatureToken = exports.MultiVariantFeatureToken = exports.GroupInstanceToken = exports.ConstantToken = exports.FunctionToken = exports.SingleToken = exports.BindableToken = exports.ClassToken = exports.toSingleAlias = exports.SingleAliasToken = exports.toGroupAlias = exports.GroupAliasToken = exports.argToToken = exports.toToken = exports.forwardArgs = exports.isInjectionToken = exports.InjectionToken = exports.toTask = exports.HookCollector = exports.oncePerInstance = exports.parallel = exports.sequential = exports.injectProp = exports.createHookExecutionContext = void 0;
+exports.isSerializable = exports.Is = exports.unwrapProxy = exports.ProxyRegistry = exports.findOrFail = exports.pipe = exports.select = exports.TypedEvent = exports.getConstructorChain = exports.memoize = exports.once = exports.shallowCache = exports.debounce = exports.throttle = exports.runAtOnce = exports.runInOrder = void 0;
 var IContainer_1 = require("./container/IContainer");
 Object.defineProperty(exports, "isDependencyKey", { enumerable: true, get: function () { return IContainer_1.isDependencyKey; } });
 var Container_1 = require("./container/Container");
@@ -60,6 +60,8 @@ var ContainerDisposedError_1 = require("./errors/ContainerDisposedError");
 Object.defineProperty(exports, "ContainerDisposedError", { enumerable: true, get: function () { return ContainerDisposedError_1.ContainerDisposedError; } });
 var ProviderDisposedError_1 = require("./errors/ProviderDisposedError");
 Object.defineProperty(exports, "ProviderDisposedError", { enumerable: true, get: function () { return ProviderDisposedError_1.ProviderDisposedError; } });
+var CannotApplySingletonTwiceError_1 = require("./errors/CannotApplySingletonTwiceError");
+Object.defineProperty(exports, "CannotApplySingletonTwiceError", { enumerable: true, get: function () { return CannotApplySingletonTwiceError_1.CannotApplySingletonTwiceError; } });
 var CannonSingletonApplyTwiceError_1 = require("./errors/CannonSingletonApplyTwiceError");
 Object.defineProperty(exports, "CannonSingletonApplyTwiceError", { enumerable: true, get: function () { return CannonSingletonApplyTwiceError_1.CannonSingletonApplyTwiceError; } });
 var UnsupportedTokenTypeError_1 = require("./errors/UnsupportedTokenTypeError");
@@ -101,6 +103,8 @@ Object.defineProperty(exports, "SingleAliasToken", { enumerable: true, get: func
 Object.defineProperty(exports, "toSingleAlias", { enumerable: true, get: function () { return SingleAliasToken_1.toSingleAlias; } });
 var ClassToken_1 = require("./token/ClassToken");
 Object.defineProperty(exports, "ClassToken", { enumerable: true, get: function () { return ClassToken_1.ClassToken; } });
+var BindableToken_1 = require("./token/BindableToken");
+Object.defineProperty(exports, "BindableToken", { enumerable: true, get: function () { return BindableToken_1.BindableToken; } });
 var SingleToken_1 = require("./token/SingleToken");
 Object.defineProperty(exports, "SingleToken", { enumerable: true, get: function () { return SingleToken_1.SingleToken; } });
 var FunctionToken_1 = require("./token/FunctionToken");
@@ -109,6 +113,13 @@ var ConstantToken_1 = require("./token/ConstantToken");
 Object.defineProperty(exports, "ConstantToken", { enumerable: true, get: function () { return ConstantToken_1.ConstantToken; } });
 var GroupInstanceToken_1 = require("./token/GroupInstanceToken");
 Object.defineProperty(exports, "GroupInstanceToken", { enumerable: true, get: function () { return GroupInstanceToken_1.GroupInstanceToken; } });
+var MultiVariantFeatureToken_1 = require("./token/MultiVariantFeatureToken");
+Object.defineProperty(exports, "MultiVariantFeatureToken", { enumerable: true, get: function () { return MultiVariantFeatureToken_1.MultiVariantFeatureToken; } });
+var ToggleFeatureToken_1 = require("./token/ToggleFeatureToken");
+Object.defineProperty(exports, "ToggleFeatureToken", { enumerable: true, get: function () { return ToggleFeatureToken_1.ToggleFeatureToken; } });
+var IFeatureFlags_1 = require("./feature/IFeatureFlags");
+Object.defineProperty(exports, "IFeatureFlagsToken", { enumerable: true, get: function () { return IFeatureFlags_1.IFeatureFlagsToken; } });
+Object.defineProperty(exports, "IFeatureContextToken", { enumerable: true, get: function () { return IFeatureFlags_1.IFeatureContextToken; } });
 var target_1 = require("./metadata/target");
 Object.defineProperty(exports, "resolveConstructor", { enumerable: true, get: function () { return target_1.resolveConstructor; } });
 var class_1 = require("./metadata/class");

package/cjm/provider/Provider.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Provider = void 0;
 const basic_1 = require("../utils/basic");
-const CannonSingletonApplyTwiceError_1 = require("../errors/CannonSingletonApplyTwiceError");
+const CannotApplySingletonTwiceError_1 = require("../errors/CannotApplySingletonTwiceError");
 const ProviderDisposedError_1 = require("../errors/ProviderDisposedError");
 class Provider {
     resolveDependency;
@@ -28,7 +28,7 @@ class Provider {
         this.resolveDependency = resolveDependency;
     }
     resolve(options) {
-        ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
+        ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed: its scope was disposed. Resolve from a live scope.');
         if (!this.getKey) {
             return this.resolveDep(options);
         }
@@ -67,7 +67,7 @@ class Provider {
         return this;
     }
     isAutoResolvable() {
-        ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
+        ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed: its scope was disposed. Resolve from a live scope.');
         return this.isAutoResolve;
     }
     addArgsFn(...fns) {
@@ -75,11 +75,11 @@ class Provider {
         return this;
     }
     hasAccess(options) {
-        ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
+        ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed: its scope was disposed. Resolve from a live scope.');
         return this.accessRules.reduce((acc, rule) => rule(options, acc), true);
     }
     singleton(getCacheKey = () => '1') {
-        CannonSingletonApplyTwiceError_1.CannonSingletonApplyTwiceError.assert(!this.getKey, 'Provider is already singleton');
+        CannotApplySingletonTwiceError_1.CannotApplySingletonTwiceError.assert(!this.getKey, 'Provider is already singleton: singleton() was applied twice to the same provider. Remove the duplicate singleton().');
         this.getKey = getCacheKey;
         return this;
     }
@@ -88,7 +88,7 @@ class Provider {
         return this;
     }
     dispose() {
-        ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed');
+        ProviderDisposedError_1.ProviderDisposedError.assert(!this.isDisposed, 'Provider is already disposed: its scope was disposed. Resolve from a live scope.');
         this.isDisposed = true;
         this.isAutoResolve = false;
         this.getKey = undefined;

package/cjm/registration/Registration.js

@@ -62,14 +62,14 @@ class Registration {
             return;
         }
         if (!this.key) {
-            throw new DependencyMissingKeyError_1.DependencyMissingKeyError('No key provided for registration');
+            throw new DependencyMissingKeyError_1.DependencyMissingKeyError('No key provided for registration: bind it with @register(bindTo(...)) or .bindTo(...).');
         }
         const provider = this.mappers.reduce((p, m) => m(p), this.createProvider());
         container.register(this.key, provider, { aliases: [...this.aliases] });
     }
     getKeyOrFail() {
         if (!this.key) {
-            throw new DependencyMissingKeyError_1.DependencyMissingKeyError('No key provided for registration');
+            throw new DependencyMissingKeyError_1.DependencyMissingKeyError('No key provided for registration: bind it with @register(bindTo(...)) or .bindTo(...).');
         }
         return this.key;
     }

package/cjm/token/BindableToken.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BindableToken = void 0;
+const InjectionToken_1 = require("./InjectionToken");
+class BindableToken extends InjectionToken_1.InjectionToken {
+    token;
+    getArgsFn;
+    isLazyByDefault;
+    memberships;
+    constructor(token, { getArgsFn = InjectionToken_1.forwardArgs, isLazy = false, tags = [], memberships = [] } = {}) {
+        super(tags);
+        this.token = token;
+        this.getArgsFn = getArgsFn;
+        this.isLazyByDefault = isLazy;
+        this.memberships = memberships;
+    }
+    bindTo(r) {
+        this.bindKey(r);
+        for (const alias of this.memberships) {
+            r.bindToAlias(alias);
+        }
+    }
+    variantOf(feature, name) {
+        return this.copy({ memberships: [...this.memberships, feature.variantAlias(name)] });
+    }
+    primaryVariantOf(feature) {
+        return this.copy({ memberships: [...this.memberships, feature.primaryAlias()] });
+    }
+    fallbackOf(feature) {
+        return this.copy({ memberships: [...this.memberships, feature.fallbackAlias()] });
+    }
+    args(...newArgs) {
+        const parentFn = this.getArgsFn;
+        return this.copy({ getArgsFn: (options) => [...parentFn(options), ...newArgs] });
+    }
+    argsFn(fn) {
+        const parentFn = this.getArgsFn;
+        return this.copy({ getArgsFn: (options) => [...parentFn(options), ...fn(options.scope)] });
+    }
+    lazy() {
+        return this.copy({ isLazy: true });
+    }
+    addTags(...tags) {
+        return this.copy({ tags: [...this.getTags(), ...tags] });
+    }
+    toString() {
+        return this.token.toString();
+    }
+    toResolveOptions(s, { args = [], lazy } = {}) {
+        return { args: this.getArgsFn({ scope: s, args }), lazy: this.isLazyByDefault || lazy };
+    }
+    copy(overrides) {
+        const Self = this.constructor;
+        return new Self(this.token, {
+            getArgsFn: this.getArgsFn,
+            isLazy: this.isLazyByDefault,
+            tags: this.getTags(),
+            memberships: this.memberships,
+            ...overrides,
+        });
+    }
+}
+exports.BindableToken = BindableToken;

package/cjm/token/ConstantToken.js

@@ -13,19 +13,19 @@ class ConstantToken extends InjectionToken_1.InjectionToken {
         return this.token;
     }
     args(...deps) {
-        throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
+        throw new MethodNotImplementedError_1.MethodNotImplementedError('ConstantToken.args is not implemented');
     }
     argsFn(getArgsFn) {
-        throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
+        throw new MethodNotImplementedError_1.MethodNotImplementedError('ConstantToken.argsFn is not implemented');
     }
     lazy() {
-        throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
+        throw new MethodNotImplementedError_1.MethodNotImplementedError('ConstantToken.lazy is not implemented');
     }
     addTags(...tags) {
         return new ConstantToken(this.token, { tags: [...this.getTags(), ...tags] });
     }
     toString() {
-        throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
+        throw new MethodNotImplementedError_1.MethodNotImplementedError('ConstantToken.toString is not implemented');
     }
 }
 exports.ConstantToken = ConstantToken;

package/cjm/token/FunctionToken.js

@@ -51,7 +51,7 @@ class FunctionToken extends InjectionToken_1.InjectionToken {
         });
     }
     toString() {
-        throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
+        throw new MethodNotImplementedError_1.MethodNotImplementedError('FunctionToken.toString is not implemented');
     }
 }
 exports.FunctionToken = FunctionToken;

package/cjm/token/GroupAliasToken.js

@@ -1,62 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toGroupAlias = exports.GroupAliasToken = void 0;
-const InjectionToken_1 = require("./InjectionToken");
-class GroupAliasToken extends InjectionToken_1.InjectionToken {
-    token;
-    _getArgsFn;
-    _isLazy;
-    constructor(token, { getArgsFn = InjectionToken_1.forwardArgs, isLazy = false, tags = [], } = {}) {
-        super(tags);
-        this.token = token;
-        this._getArgsFn = getArgsFn;
-        this._isLazy = isLazy;
-    }
+const BindableToken_1 = require("./BindableToken");
+class GroupAliasToken extends BindableToken_1.BindableToken {
     select(fn) {
         return (s) => fn(this.resolve(s));
     }
-    resolve(s, { args = [], lazy } = {}) {
-        return s.resolveByAlias(this.token, {
-            args: this._getArgsFn({ scope: s, args }),
-            lazy: this._isLazy || lazy,
-        });
+    resolve(s, options) {
+        return s.resolveByAlias(this.token, this.toResolveOptions(s, options));
     }
-    bindTo(r) {
+    bindKey(r) {
         r.bindToAlias(this.token);
     }
-    args(...newArgs) {
-        const parentFn = this._getArgsFn;
-        return new GroupAliasToken(this.token, {
-            getArgsFn: (options) => [...parentFn(options), ...newArgs],
-            isLazy: this._isLazy,
-            tags: this.getTags(),
-        });
-    }
-    argsFn(fn) {
-        const parentFn = this._getArgsFn;
-        return new GroupAliasToken(this.token, {
-            getArgsFn: (options) => [...parentFn(options), ...fn(options.scope)],
-            isLazy: this._isLazy,
-            tags: this.getTags(),
-        });
-    }
-    lazy() {
-        return new GroupAliasToken(this.token, {
-            getArgsFn: this._getArgsFn,
-            isLazy: true,
-            tags: this.getTags(),
-        });
-    }
-    addTags(...tags) {
-        return new GroupAliasToken(this.token, {
-            getArgsFn: this._getArgsFn,
-            isLazy: this._isLazy,
-            tags: [...this.getTags(), ...tags],
-        });
-    }
-    toString() {
-        return this.token.toString();
-    }
 }
 exports.GroupAliasToken = GroupAliasToken;
 const toGroupAlias = (token) => new GroupAliasToken(token);

package/cjm/token/GroupInstanceToken.js

@@ -15,13 +15,13 @@ class GroupInstanceToken extends InjectionToken_1.InjectionToken {
         return (s) => this.resolve(s).map(fn);
     }
     args(...deps) {
-        throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
+        throw new MethodNotImplementedError_1.MethodNotImplementedError('GroupInstanceToken.args is not implemented');
     }
     argsFn(getArgsFn) {
-        throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
+        throw new MethodNotImplementedError_1.MethodNotImplementedError('GroupInstanceToken.argsFn is not implemented');
     }
     lazy() {
-        throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
+        throw new MethodNotImplementedError_1.MethodNotImplementedError('GroupInstanceToken.lazy is not implemented');
     }
     cascade(isTrue) {
         this.isCascade = isTrue;
@@ -34,7 +34,7 @@ class GroupInstanceToken extends InjectionToken_1.InjectionToken {
         return new GroupInstanceToken(this.predicate, { tags: [...this.getTags(), ...tags], isCascade: this.isCascade });
     }
     toString() {
-        throw new MethodNotImplementedError_1.MethodNotImplementedError('not implemented');
+        throw new MethodNotImplementedError_1.MethodNotImplementedError('GroupInstanceToken.toString is not implemented');
     }
 }
 exports.GroupInstanceToken = GroupInstanceToken;

package/cjm/token/MultiVariantFeatureToken.js

@@ -0,0 +1,84 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MultiVariantFeatureToken = void 0;
+const InjectionToken_1 = require("./InjectionToken");
+const ProxyRegistry_1 = require("../utils/ProxyRegistry");
+const DependencyNotFoundError_1 = require("../errors/DependencyNotFoundError");
+const IFeatureFlags_1 = require("../feature/IFeatureFlags");
+class MultiVariantFeatureToken extends InjectionToken_1.InjectionToken {
+    flag;
+    _getArgsFn;
+    _isLazy;
+    constructor(flag, { getArgsFn = InjectionToken_1.forwardArgs, isLazy = false, tags = [] } = {}) {
+        super(tags);
+        this.flag = flag;
+        this._getArgsFn = getArgsFn;
+        this._isLazy = isLazy;
+    }
+    variantAlias(name) {
+        return `feature:${this.flag}:variant:${name}`;
+    }
+    primaryAlias() {
+        return `feature:${this.flag}:primary`;
+    }
+    fallbackAlias() {
+        return `feature:${this.flag}:fallback`;
+    }
+    resolve(s, { args = [], lazy } = {}) {
+        const resolveSelected = () => s.resolveOneByAlias(this.selectAlias(s), { args: this._getArgsFn({ scope: s, args }) });
+        return ProxyRegistry_1.ProxyRegistry.getInstance().toLazyIf(resolveSelected, this._isLazy || lazy);
+    }
+    args(...newArgs) {
+        const parentFn = this._getArgsFn;
+        return this.copy({ getArgsFn: (options) => [...parentFn(options), ...newArgs] });
+    }
+    argsFn(fn) {
+        const parentFn = this._getArgsFn;
+        return this.copy({ getArgsFn: (options) => [...parentFn(options), ...fn(options.scope)] });
+    }
+    lazy() {
+        return this.copy({ isLazy: true });
+    }
+    addTags(...tags) {
+        return this.copy({ tags: [...this.getTags(), ...tags] });
+    }
+    toString() {
+        return this.flag;
+    }
+    evaluate(flags, context) {
+        const served = flags.getVariant(this.flag, context);
+        return served.enabled
+            ? { enabled: true, variant: served.name }
+            : { enabled: flags.isEnabled(this.flag, context) };
+    }
+    copy(overrides) {
+        const Self = this.constructor;
+        return new Self(this.flag, {
+            getArgsFn: this._getArgsFn,
+            isLazy: this._isLazy,
+            tags: this.getTags(),
+            ...overrides,
+        });
+    }
+    selectAlias(s) {
+        const fallback = this.fallbackAlias();
+        if (!s.hasAlias(fallback)) {
+            throw new DependencyNotFoundError_1.DependencyNotFoundError(`Feature flag "${this.flag}" has no fallback: a flag always has one. ` +
+                `Register it with @register(token.fallbackOf(feature)) in this scope or a parent.`);
+        }
+        const flags = IFeatureFlags_1.IFeatureFlagsToken.resolve(s);
+        const context = IFeatureFlags_1.IFeatureContextToken.resolve(s);
+        let served = { enabled: false };
+        try {
+            served = this.evaluate(flags, context);
+        }
+        catch {
+        }
+        const candidates = [
+            served.variant === undefined ? undefined : this.variantAlias(served.variant),
+            served.enabled ? this.primaryAlias() : undefined,
+        ];
+        return candidates.find((alias) => alias !== undefined && s.hasAlias(alias)) ?? fallback;
+    }
+}
+exports.MultiVariantFeatureToken = MultiVariantFeatureToken;

package/cjm/token/SingleAliasToken.js

@@ -1,62 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toSingleAlias = exports.SingleAliasToken = void 0;
-const InjectionToken_1 = require("./InjectionToken");
-class SingleAliasToken extends InjectionToken_1.InjectionToken {
-    token;
-    _getArgsFn;
-    _isLazy;
-    constructor(token, { getArgsFn = InjectionToken_1.forwardArgs, isLazy = false, tags = [], } = {}) {
-        super(tags);
-        this.token = token;
-        this._getArgsFn = getArgsFn;
-        this._isLazy = isLazy;
-    }
+const BindableToken_1 = require("./BindableToken");
+class SingleAliasToken extends BindableToken_1.BindableToken {
     select(fn) {
         return (s) => fn(this.resolve(s));
     }
-    resolve(s, { args = [], lazy } = {}) {
-        return s.resolveOneByAlias(this.token, {
-            args: this._getArgsFn({ scope: s, args }),
-            lazy: this._isLazy || lazy,
-        });
+    resolve(s, options) {
+        return s.resolveOneByAlias(this.token, this.toResolveOptions(s, options));
     }
-    bindTo(r) {
+    bindKey(r) {
         r.bindToAlias(this.token);
     }
-    args(...newArgs) {
-        const parentFn = this._getArgsFn;
-        return new SingleAliasToken(this.token, {
-            getArgsFn: (options) => [...parentFn(options), ...newArgs],
-            isLazy: this._isLazy,
-            tags: this.getTags(),
-        });
-    }
-    argsFn(fn) {
-        const parentFn = this._getArgsFn;
-        return new SingleAliasToken(this.token, {
-            getArgsFn: (options) => [...parentFn(options), ...fn(options.scope)],
-            isLazy: this._isLazy,
-            tags: this.getTags(),
-        });
-    }
-    lazy() {
-        return new SingleAliasToken(this.token, {
-            getArgsFn: this._getArgsFn,
-            isLazy: true,
-            tags: this.getTags(),
-        });
-    }
-    addTags(...tags) {
-        return new SingleAliasToken(this.token, {
-            getArgsFn: this._getArgsFn,
-            isLazy: this._isLazy,
-            tags: [...this.getTags(), ...tags],
-        });
-    }
-    toString() {
-        return this.token.toString();
-    }
 }
 exports.SingleAliasToken = SingleAliasToken;
 const toSingleAlias = (token) => new SingleAliasToken(token);

package/cjm/token/SingleToken.js

@@ -1,61 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingleToken = void 0;
-const InjectionToken_1 = require("./InjectionToken");
-class SingleToken extends InjectionToken_1.InjectionToken {
-    token;
-    _getArgsFn;
-    _isLazy;
-    constructor(token, { getArgsFn = InjectionToken_1.forwardArgs, isLazy = false, tags = [], } = {}) {
-        super(tags);
-        this.token = token;
-        this._getArgsFn = getArgsFn;
-        this._isLazy = isLazy;
-    }
+const BindableToken_1 = require("./BindableToken");
+class SingleToken extends BindableToken_1.BindableToken {
     select(fn) {
         return (s) => fn(this.resolve(s));
     }
-    resolve(s, { args = [], lazy } = {}) {
-        return s.resolve(this.token, {
-            args: this._getArgsFn({ scope: s, args }),
-            lazy: this._isLazy || lazy,
-        });
+    resolve(s, options) {
+        return s.resolve(this.token, this.toResolveOptions(s, options));
     }
-    bindTo(r) {
+    bindKey(r) {
         r.bindToKey(this.token);
     }
-    args(...newArgs) {
-        const parentFn = this._getArgsFn;
-        return new SingleToken(this.token, {
-            getArgsFn: (options) => [...parentFn(options), ...newArgs],
-            isLazy: this._isLazy,
-            tags: this.getTags(),
-        });
-    }
-    argsFn(fn) {
-        const parentFn = this._getArgsFn;
-        return new SingleToken(this.token, {
-            getArgsFn: (options) => [...parentFn(options), ...fn(options.scope)],
-            isLazy: this._isLazy,
-            tags: this.getTags(),
-        });
-    }
-    lazy() {
-        return new SingleToken(this.token, {
-            getArgsFn: this._getArgsFn,
-            isLazy: true,
-            tags: this.getTags(),
-        });
-    }
-    addTags(...tags) {
-        return new SingleToken(this.token, {
-            getArgsFn: this._getArgsFn,
-            isLazy: this._isLazy,
-            tags: [...this.getTags(), ...tags],
-        });
-    }
-    toString() {
-        return this.token.toString();
-    }
 }
 exports.SingleToken = SingleToken;

package/cjm/token/ToggleFeatureToken.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ToggleFeatureToken = void 0;
+const MultiVariantFeatureToken_1 = require("./MultiVariantFeatureToken");
+class ToggleFeatureToken extends MultiVariantFeatureToken_1.MultiVariantFeatureToken {
+    evaluate(flags, context) {
+        return { enabled: flags.isEnabled(this.flag, context) };
+    }
+}
+exports.ToggleFeatureToken = ToggleFeatureToken;

package/cjm/token/toToken.js

@@ -22,7 +22,7 @@ const toToken = (token) => {
     if (typeof token === 'function') {
         return new FunctionToken_1.FunctionToken(token);
     }
-    throw new UnsupportedTokenTypeError_1.UnsupportedTokenTypeError(`Unknown token ${token}`);
+    throw new UnsupportedTokenTypeError_1.UnsupportedTokenTypeError(`Unknown token ${token}: expected an InjectionToken, a DependencyKey (string | symbol), a class or a function.`);
 };
 exports.toToken = toToken;
 const argToToken = (v) => ((0, InjectionToken_1.isInjectionToken)(v) ? v : new ConstantToken_1.ConstantToken(v));

package/cjm/utils/TypedEvent.js

@@ -29,7 +29,7 @@ class TypedEvent {
         this.isDisposed = true;
     }
     validate() {
-        TypedEventDisposedError_1.TypedEventDisposedError.assert(!this.isDisposed, 'TypedEvent is already disposed');
+        TypedEventDisposedError_1.TypedEventDisposedError.assert(!this.isDisposed, 'TypedEvent is already disposed: its scope was disposed, so it accepts no new listeners.');
     }
 }
 exports.TypedEvent = TypedEvent;

package/cjm/utils/array.js

@@ -11,7 +11,7 @@ exports.Filter = {
 const findOrFail = (predicate) => (args = []) => {
     const index = args.findIndex((arg) => predicate(arg));
     if (index === -1) {
-        throw new ArgumentNotFoundError_1.ArgumentNotFoundError();
+        throw new ArgumentNotFoundError_1.ArgumentNotFoundError(`No argument matches the predicate (received ${args.length} args).`);
     }
     return args[index];
 };

package/esm/container/Container.js

@@ -126,6 +126,9 @@ export class Container {
     hasRegistration(key) {
         return this.registrations.some((r) => r.getKeyOrFail() === key) || this.parent.hasRegistration(key);
     }
+    hasAlias(alias) {
+        return this.aliases.getKeysByAlias(alias).length > 0 || this.parent.hasAlias(alias);
+    }
     addInstance(instance) {
         this.instances.add(instance);
     }
@@ -161,12 +164,12 @@ export class Container {
     }
     validateContainer() {
         if (this.isDisposed) {
-            throw new ContainerDisposedError('Container is already disposed');
+            throw new ContainerDisposedError('Container is already disposed: a scope cannot be used after dispose(). Create a new scope.');
         }
     }
     findProviderByKeyOrFail(key) {
         if (!this.providers.has(key)) {
-            throw new DependencyNotFoundError(`Provider ${key.toString()} does not exist`);
+            throw new DependencyNotFoundError(`Provider ${key.toString()} does not exist: an alias points at a key with no provider in this scope.`);
         }
         return this.providers.get(key);
     }