@codefast/di 0.5.0 → 0.6.1

package/dist/{module.d.ts → core/module.d.ts}

@@ -1,6 +1,6 @@
-import type { BindToBuilder } from "#/binding";
-import type { Token } from "#/token";
-import type { Constructor } from "#/types";
+import type { BindToBuilder } from "#/core/binding";
+import type { Token } from "#/core/token";
+import type { Constructor } from "#/core/types";
 declare const SYNC_MODULE_BRAND: unique symbol;
 declare const ASYNC_MODULE_BRAND: unique symbol;
 /**
@@ -30,14 +30,14 @@ export interface AsyncModule {
  * @since 0.3.16-canary.0
  */
 export interface ModuleBuilder {
-    bind<const Value>(token: Token<Value> | Constructor<Value>): BindToBuilder<Value>;
+    bind<Value>(token: Token<Value> | Constructor<Value>): BindToBuilder<Value>;
     import(...modules: Array<SyncModule>): void;
 }
 /**
  * @since 0.3.16-canary.0
  */
 export interface AsyncModuleBuilder {
-    bind<const Value>(token: Token<Value> | Constructor<Value>): BindToBuilder<Value>;
+    bind<Value>(token: Token<Value> | Constructor<Value>): BindToBuilder<Value>;
     import(...modules: Array<SyncModule | AsyncModule>): void;
 }
 /**

package/dist/core/module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/core/module.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIhD,QAAA,MAAM,iBAAiB,EAAE,OAAO,MAAiC,CAAC;AAClE,QAAA,MAAM,kBAAkB,EAAE,OAAO,MAAkC,CAAC;AAEpE;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,OAAO,MAAkC,CAAC;AAErE;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC;IACnC,QAAQ,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3D;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,CAAC,kBAAkB,CAAC,EAAE,IAAI,CAAC;IACpC,QAAQ,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE;AAID;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IAC5E,MAAM,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;CAC7C;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IAC5E,MAAM,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,UAAU,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC;CAC3D;AAID;;GAEG;AACH,eAAO,MAAM,UAAU;IACrB,MAAM,OAAO,MAAM,SAAS,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,GAAG,UAAU;CAO1E,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,WAAW;IACtB,MAAM,OAAO,MAAM,SAAS,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW;CAOzF,CAAC;AAIF;;GAEG;AACH,eAAO,MAAM,MAAM;IACjB,MAAM,OAAO,MAAM,SAAS,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,GAAG,UAAU;IAGzE,WAAW,OAAO,MAAM,SAAS,CAAC,OAAO,EAAE,kBAAkB,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW;CAG9F,CAAC;AAEF;;GAEG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,WAAW,GAAG,MAAM,IAAI,UAAU,CAEnF"}

package/dist/{module.js → core/module.js}

@@ -1,4 +1,4 @@
-// ── Branded types (runtime symbols for branding) ─────────────────────────────
+// ── Branded types (runtime symbols for branding) ─────────────────────────────────────────────────────────────────────
 const SYNC_MODULE_BRAND = Symbol("di:sync-module");
 const ASYNC_MODULE_BRAND = Symbol("di:async-module");
 /**
@@ -8,7 +8,7 @@ const ASYNC_MODULE_BRAND = Symbol("di:async-module");
  * @since 0.5.0-canary.7
  */
 export const MODULE_SETUP = Symbol("di:module-setup");
-// ── Static factories ──────────────────────────────────────────────────────────
+// ── Static factories ─────────────────────────────────────────────────────────────────────────────────────────────────
 /**
  * @since 0.3.16-canary.0
  */
@@ -33,7 +33,7 @@ export const AsyncModule = {
         };
     },
 };
-// ── Module — unified API ──────────────────────────────────────────────────────
+// ── Module — unified API ─────────────────────────────────────────────────────────────────────────────────────────────
 /**
  * @since 0.3.16-canary.0
  */
@@ -49,6 +49,6 @@ export const Module = {
  * @since 0.3.16-canary.0
  */
 export function isSyncModule(module) {
-    return module[SYNC_MODULE_BRAND];
+    return module[SYNC_MODULE_BRAND] === true;
 }
 //# sourceMappingURL=module.js.map

package/dist/core/module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/core/module.ts"],"names":[],"mappings":"AAIA,wHAAwH;AAExH,MAAM,iBAAiB,GAAkB,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAClE,MAAM,kBAAkB,GAAkB,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAEpE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,YAAY,GAAkB,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAsCrE,wHAAwH;AAExH;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,MAAM,CAAC,IAAY,EAAE,KAAuC;QAC1D,OAAO;YACL,IAAI;YACJ,CAAC,iBAAiB,CAAC,EAAE,IAAa;YAClC,CAAC,YAAY,CAAC,EAAE,KAAK;SACtB,CAAC;IACJ,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,MAAM,CAAC,IAAY,EAAE,KAAqD;QACxE,OAAO;YACL,IAAI;YACJ,CAAC,kBAAkB,CAAC,EAAE,IAAa;YACnC,CAAC,YAAY,CAAC,EAAE,KAAK;SACtB,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,wHAAwH;AAExH;;GAEG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,CAAC,IAAY,EAAE,KAAuC;QAC1D,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACxC,CAAC;IACD,WAAW,CAAC,IAAY,EAAE,KAAqD;QAC7E,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzC,CAAC;CACF,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,MAAgC;IAC3D,OAAQ,MAA8B,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;AACrE,CAAC"}

package/dist/{registry.d.ts → core/registry.d.ts}

@@ -1,6 +1,7 @@
-import type { Binding } from "#/binding";
-import type { Token } from "#/token";
-import type { BindingIdentifier, Constructor } from "#/types";
+import type { Binding } from "#/core/binding";
+import type { BindingTag } from "#/core/tag";
+import type { Token } from "#/core/token";
+import type { BindingIdentifier, Constructor } from "#/core/types";
 /**
  * @since 0.3.16-canary.0
  */
@@ -8,13 +9,15 @@ export declare class BindingRegistry {
     #private;
     /** Monotonic version — increments on every mutation. */
     get version(): number;
+    /** Whether a constant has ever been registered here, and so whether teardown has anything to sweep. */
+    get hasHeldConstantBinding(): boolean;
     /**
      * Registers a mutation the indexes don't care about (a fluent chain refining scope or an
      * activation hook in place), so version-stamped resolver caches still invalidate.
      */
     touch(): void;
     /**
-     * Add or replace binding using slot-aware last-wins. Returns the displaced binding, if any.
+     * Adds or replaces a binding using slot-aware last-wins. Returns the displaced binding, if any.
      *
      * @remarks The binding is stored by reference — it must come from `createBinding`, which is
      * what guarantees the single hidden class the resolver's hot reads depend on.
@@ -34,12 +37,29 @@ export declare class BindingRegistry {
     allBindings(): ReadonlyArray<Binding>;
     /** Remove all bindings. Returns all removed. */
     clear(): ReadonlyArray<Binding>;
+    /** Whether a slot-based binding currently occupies `binding`'s slot, so adding it would displace. */
+    hasSlotOccupant(binding: Binding): boolean;
     getSimpleNamed(token: Token<unknown> | Constructor, name: string): Binding | undefined;
-    getSimpleTagged(token: Token<unknown> | Constructor, tagKey: string, tagValue: unknown): Binding | undefined;
+    /**
+     * The binding indexed under one criterion.
+     *
+     * @remarks Exact, with no re-check: criteria are interned, so a `Map` keyed by the pair answers by
+     * identity — where a value-keyed map answered by SameValueZero and parted from `Object.is` on ±0.
+     */
+    getSimpleTagged(token: Token<unknown> | Constructor, criterion: BindingTag): Binding | undefined;
+    /**
+     * The multi-tag bindings whose slot's first criterion is `criterion`.
+     *
+     * @remarks A prefilter, not an answer: a bucket member's remaining tags still have to be matched
+     * against the request — first-criterion bucketing only guarantees each candidate appears once.
+     */
+    getMultiTagged(token: Token<unknown> | Constructor, criterion: BindingTag): ReadonlyArray<Binding> | undefined;
     getFastDefault(token: Token<unknown> | Constructor): Binding | undefined;
     /** Summarize available slot strings for a token (for error messages). */
     availableSlotStrings(token: Token<unknown> | Constructor): Array<string>;
-    /** Whether the deferred table behind `#simpleNamed` has had to be built. */
-    get isBuilt(): boolean;
+    /** Whether the deferred named-slot index has had to be built. */
+    get isNamedIndexBuilt(): boolean;
+    /** Whether the deferred tagged-slot index has had to be built. */
+    get isTaggedIndexBuilt(): boolean;
 }
 //# sourceMappingURL=registry.d.ts.map

package/dist/core/registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/core/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,WAAW,EAAiB,MAAM,cAAc,CAAC;AAElF;;GAEG;AACH,qBAAa,eAAe;;IAsB1B,wDAAwD;IACxD,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,uGAAuG;IACvG,IAAI,sBAAsB,IAAI,OAAO,CAEpC;IAED;;;OAGG;IACH,KAAK,IAAI,IAAI,CAEZ;IAED;;;;;OAKG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAyCzC;IAED,iEAAiE;IACjE,aAAa,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,CAajE;IAED,iFAAiF;IACjF,UAAU,CAAC,EAAE,EAAE,iBAAiB,GAAG,OAAO,GAAG,SAAS,CA4BrD;IAED,oCAAoC;IACpC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,aAAa,CAAC,OAAO,CAAC,CAElE;IAED,yBAAyB;IACzB,OAAO,CAAC,EAAE,EAAE,iBAAiB,GAAG,OAAO,GAAG,SAAS,CAElD;IAED,6CAA6C;IAC7C,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,OAAO,CAIhD;IAED,oCAAoC;IACpC,WAAW,IAAI,aAAa,CAAC,OAAO,CAAC,CAMpC;IAED,gDAAgD;IAChD,KAAK,IAAI,aAAa,CAAC,OAAO,CAAC,CAU9B;IAED,qGAAqG;IACrG,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAWzC;IAED,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAErF;IAED;;;;;OAKG;IACH,eAAe,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,GAAG,SAAS,CAE/F;IAED;;;;;OAKG;IACH,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,EAAE,SAAS,EAAE,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,SAAS,CAE7G;IAED,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,CAEvE;IAED,yEAAyE;IACzE,oBAAoB,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAGvE;IA0FD,iEAAiE;IACjE,IAAI,iBAAiB,IAAI,OAAO,CAE/B;IAED,kEAAkE;IAClE,IAAI,kBAAkB,IAAI,OAAO,CAEhC;CACF"}

package/dist/{registry.js → core/registry.js}

@@ -1,4 +1,4 @@
-import { bindingSlotEquals, bindingSlotToString } from "#/binding";
+import { bindingSlotEquals, bindingSlotToString } from "#/core/binding";
 /**
  * @since 0.3.16-canary.0
  */
@@ -13,13 +13,23 @@ export class BindingRegistry {
     #simpleNamed;
     // Fast path for one default slot binding with no predicate
     #fastDefault = new Map();
-    // Fast lookup for slot { name: undefined, tags: [[key, value]] } with no predicate — likewise
-    // unallocated until a tagged binding is registered.
+    // Fast lookup for a slot carrying exactly one tag — keyed by the interned criterion itself, so
+    // the (key, value) pair is one hash rather than two. Unallocated until a tagged binding lands.
     #simpleTagged;
+    // Name-less slots with two or more tags, bucketed by their FIRST criterion. A matching slot's
+    // every tag is in the request, so walking the request's buckets finds each candidate exactly once.
+    #multiTagged;
+    // Set on the first constant registered and never cleared. Teardown only needs the negative answer
+    // to be exact, and that is what lets a container holding no constant skip its sweep entirely.
+    #heldConstantBinding = false;
     /** Monotonic version — increments on every mutation. */
     get version() {
         return this.#version;
     }
+    /** Whether a constant has ever been registered here, and so whether teardown has anything to sweep. */
+    get hasHeldConstantBinding() {
+        return this.#heldConstantBinding;
+    }
     /**
      * Registers a mutation the indexes don't care about (a fluent chain refining scope or an
      * activation hook in place), so version-stamped resolver caches still invalidate.
@@ -28,33 +38,47 @@ export class BindingRegistry {
         this.#version += 1;
     }
     /**
-     * Add or replace binding using slot-aware last-wins. Returns the displaced binding, if any.
+     * Adds or replaces a binding using slot-aware last-wins. Returns the displaced binding, if any.
      *
      * @remarks The binding is stored by reference — it must come from `createBinding`, which is
      * what guarantees the single hidden class the resolver's hot reads depend on.
      */
     add(binding) {
         this.#version += 1;
+        if (binding.kind === "constant") {
+            this.#heldConstantBinding = true;
+        }
         const key = binding.token;
-        // Eager, not computed: a bind is usually the token's first, so the fallback is usually the
-        // one that gets stored — and the computed form would add a call to allocating it anyway.
-        const bindingsForToken = this.#bindings.getOrInsert(key, []);
+        // Copy-on-write: a selection may be walking the current list inside a `when()` predicate, so
+        // mutation replaces the array and never splices one that has been handed out.
+        const bindingsForToken = this.#bindings.get(key);
         // Only apply last-wins for slot-based bindings (not predicate-only)
         let displacedBinding;
-        if (!isPurePredicateBinding(binding)) {
-            const existingIndex = bindingsForToken.findIndex((candidate) => !isPurePredicateBinding(candidate) && bindingSlotEquals(candidate.slot, binding.slot));
-            if (existingIndex !== -1) {
-                displacedBinding = bindingsForToken[existingIndex];
-                this.#byId.delete(displacedBinding.id);
-                bindingsForToken.splice(existingIndex, 1);
-                this.#deindexSimpleNamedBinding(key, displacedBinding);
-                this.#deindexSimpleTaggedBinding(key, displacedBinding);
+        let nextBindings;
+        if (bindingsForToken === undefined) {
+            nextBindings = [binding];
+        }
+        else {
+            if (!isPurePredicateBinding(binding)) {
+                const existingIndex = bindingsForToken.findIndex((candidate) => !isPurePredicateBinding(candidate) && bindingSlotEquals(candidate.slot, binding.slot));
+                if (existingIndex !== -1) {
+                    displacedBinding = bindingsForToken[existingIndex];
+                    this.#byId.delete(displacedBinding.id);
+                    this.#deindexSimpleNamedBinding(key, displacedBinding);
+                    this.#deindexSimpleTaggedBinding(key, displacedBinding);
+                    this.#deindexMultiTaggedBinding(key, displacedBinding);
+                }
             }
+            nextBindings =
+                displacedBinding === undefined
+                    ? [...bindingsForToken, binding]
+                    : [...bindingsForToken.filter((candidate) => candidate !== displacedBinding), binding];
         }
-        bindingsForToken.push(binding);
+        this.#bindings.set(key, nextBindings);
         this.#byId.set(binding.id, binding);
         this.#indexSimpleNamedBinding(key, binding);
         this.#indexSimpleTaggedBinding(key, binding);
+        this.#indexMultiTaggedBinding(key, binding);
         this.#refreshFastDefaultForToken(key);
         return displacedBinding;
     }
@@ -66,6 +90,7 @@ export class BindingRegistry {
         this.#bindings.delete(key);
         this.#simpleNamed?.delete(key);
         this.#simpleTagged?.delete(key);
+        this.#multiTagged?.delete(key);
         this.#fastDefault.delete(key);
         for (const binding of bindingsForToken) {
             this.#byId.delete(binding.id);
@@ -84,18 +109,20 @@ export class BindingRegistry {
         const bindingsForToken = this.#bindings.get(key);
         if (bindingsForToken !== undefined) {
             const bindingIndex = bindingsForToken.findIndex((candidate) => candidate.id === id);
-            if (bindingIndex !== -1) {
-                bindingsForToken.splice(bindingIndex, 1);
-            }
+            // Copy-on-write, like `add`: a walk holding the current array must not lose its place.
+            const remaining = bindingIndex === -1 ? bindingsForToken : bindingsForToken.toSpliced(bindingIndex, 1);
             this.#deindexSimpleNamedBinding(key, binding);
             this.#deindexSimpleTaggedBinding(key, binding);
-            if (bindingsForToken.length === 0) {
+            this.#deindexMultiTaggedBinding(key, binding);
+            if (remaining.length === 0) {
                 this.#bindings.delete(key);
                 this.#simpleNamed?.delete(key);
                 this.#simpleTagged?.delete(key);
+                this.#multiTagged?.delete(key);
                 this.#fastDefault.delete(key);
             }
             else {
+                this.#bindings.set(key, remaining);
                 this.#refreshFastDefaultForToken(key);
             }
         }
@@ -131,17 +158,41 @@ export class BindingRegistry {
         this.#byId.clear();
         this.#simpleNamed?.clear();
         this.#simpleTagged?.clear();
+        this.#multiTagged?.clear();
         this.#fastDefault.clear();
         return all;
     }
+    /** Whether a slot-based binding currently occupies `binding`'s slot, so adding it would displace. */
+    hasSlotOccupant(binding) {
+        if (isPurePredicateBinding(binding)) {
+            return false;
+        }
+        const candidates = this.#bindings.get(binding.token);
+        if (candidates === undefined) {
+            return false;
+        }
+        return candidates.some((candidate) => !isPurePredicateBinding(candidate) && bindingSlotEquals(candidate.slot, binding.slot));
+    }
     getSimpleNamed(token, name) {
         return this.#simpleNamed?.get(token)?.get(name);
     }
-    getSimpleTagged(token, tagKey, tagValue) {
-        return this.#simpleTagged
-            ?.get(token)
-            ?.get(tagKey)
-            ?.get(tagValue);
+    /**
+     * The binding indexed under one criterion.
+     *
+     * @remarks Exact, with no re-check: criteria are interned, so a `Map` keyed by the pair answers by
+     * identity — where a value-keyed map answered by SameValueZero and parted from `Object.is` on ±0.
+     */
+    getSimpleTagged(token, criterion) {
+        return this.#simpleTagged?.get(token)?.get(criterion);
+    }
+    /**
+     * The multi-tag bindings whose slot's first criterion is `criterion`.
+     *
+     * @remarks A prefilter, not an answer: a bucket member's remaining tags still have to be matched
+     * against the request — first-criterion bucketing only guarantees each candidate appears once.
+     */
+    getMultiTagged(token, criterion) {
+        return this.#multiTagged?.get(token)?.get(criterion);
     }
     getFastDefault(token) {
         return this.#fastDefault.get(token);
@@ -152,38 +203,51 @@ export class BindingRegistry {
         return bindingsForToken.map((binding) => bindingSlotToString(binding.slot));
     }
     #indexSimpleTaggedBinding(tokenKey, binding) {
-        const tag = simpleTagOf(binding);
-        if (tag === undefined) {
+        const criterion = simpleTagOf(binding);
+        if (criterion === undefined) {
             return;
         }
-        const [tagKey, tagValue] = tag;
-        const byTagKey = (this.#simpleTagged ??= new Map()).getOrInsert(tokenKey, new Map());
-        const byTagValue = byTagKey.getOrInsert(tagKey, new Map());
-        byTagValue.set(tagValue, binding);
+        const byCriterion = (this.#simpleTagged ??= new Map()).getOrInsert(tokenKey, new Map());
+        byCriterion.set(criterion, binding);
     }
     #deindexSimpleTaggedBinding(tokenKey, binding) {
-        const tag = simpleTagOf(binding);
-        if (tag === undefined) {
+        const criterion = simpleTagOf(binding);
+        if (criterion === undefined) {
             return;
         }
-        const [tagKey, tagValue] = tag;
-        const byTagKey = this.#simpleTagged?.get(tokenKey);
-        if (byTagKey === undefined) {
+        const byCriterion = this.#simpleTagged?.get(tokenKey);
+        if (byCriterion === undefined) {
             return;
         }
-        const byTagValue = byTagKey.get(tagKey);
-        if (byTagValue === undefined) {
+        if (byCriterion.get(criterion)?.id === binding.id) {
+            byCriterion.delete(criterion);
+            if (byCriterion.size === 0) {
+                this.#simpleTagged.delete(tokenKey);
+            }
+        }
+    }
+    #indexMultiTaggedBinding(tokenKey, binding) {
+        const firstCriterion = multiTagFirstOf(binding);
+        if (firstCriterion === undefined) {
             return;
         }
-        const current = byTagValue.get(tagValue);
-        if (current?.id === binding.id) {
-            byTagValue.delete(tagValue);
-            if (byTagValue.size === 0) {
-                byTagKey.delete(tagKey);
-                if (byTagKey.size === 0) {
-                    this.#simpleTagged.delete(tokenKey);
-                }
-            }
+        const buckets = (this.#multiTagged ??= new Map()).getOrInsert(tokenKey, new Map());
+        buckets.getOrInsert(firstCriterion, []).push(binding);
+    }
+    #deindexMultiTaggedBinding(tokenKey, binding) {
+        const firstCriterion = multiTagFirstOf(binding);
+        if (firstCriterion === undefined) {
+            return;
+        }
+        const bucket = this.#multiTagged?.get(tokenKey)?.get(firstCriterion);
+        if (bucket === undefined) {
+            return;
+        }
+        const bindingIndex = bucket.findIndex((candidate) => candidate.id === binding.id);
+        // Spliced in place: nothing walks a bucket while user code runs — candidates are gathered
+        // into their own array before any predicate is evaluated.
+        if (bindingIndex !== -1) {
+            bucket.splice(bindingIndex, 1);
         }
     }
     #indexSimpleNamedBinding(tokenKey, binding) {
@@ -219,10 +283,14 @@ export class BindingRegistry {
         }
         this.#fastDefault.delete(tokenKey);
     }
-    /** Whether the deferred table behind `#simpleNamed` has had to be built. */
-    get isBuilt() {
+    /** Whether the deferred named-slot index has had to be built. */
+    get isNamedIndexBuilt() {
         return this.#simpleNamed !== undefined;
     }
+    /** Whether the deferred tagged-slot index has had to be built. */
+    get isTaggedIndexBuilt() {
+        return this.#simpleTagged !== undefined;
+    }
 }
 /** The name a binding is indexed under, or `undefined` when its slot is more than a plain name. */
 function simpleNameOf(binding) {
@@ -232,12 +300,17 @@ function simpleNameOf(binding) {
 /**
  * The tag a binding is indexed under, or `undefined` when its slot is more than one plain tag.
  *
- * @remarks A predicate is excluded here — unlike the name index — because the tag index is read
- * without a re-check, so an indexed hit must be unconditional.
+ * @remarks Carries predicate-bearing bindings too, exactly as the name index does: every lane that
+ * reads this index already re-checks what it finds, so an indexed hit was never unconditional.
  */
 function simpleTagOf(binding) {
     const { name, tags } = binding.slot;
-    return name === undefined && tags.length === 1 && binding.predicate === undefined ? tags[0] : undefined;
+    return name === undefined && tags.length === 1 ? tags[0] : undefined;
+}
+/** The first criterion a multi-tag slot is bucketed under, or `undefined` for any other shape. */
+function multiTagFirstOf(binding) {
+    const { name, tags } = binding.slot;
+    return name === undefined && tags.length >= 2 ? tags[0] : undefined;
 }
 /** A binding nothing has to be matched against: the default slot, no predicate. */
 function isDefaultSlotBinding(binding) {

package/dist/core/registry.js.map

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

package/dist/core/tag.d.ts

@@ -0,0 +1,80 @@
+/** Tag keys and the interned pairs they mint — the one way a slot criterion is built. */
+declare const TAG_KEY_BRAND: unique symbol;
+declare const BINDING_TAG_BRAND: unique symbol;
+/**
+ * A slot's or a request's tag key set, as one word.
+ *
+ * @remarks A slot matches only if the request carries every key the slot declares, which is
+ * `(requestMask & slotMask) === slotMask` — the whole subset test, before any value is read. Keys
+ * are prefiltered rather than values indexed because a key set fits in a word and a value set does not.
+ *
+ * @since 0.6.0
+ */
+export type TagKeyMask = number & {
+    readonly [TAG_KEY_BRAND]: "mask";
+};
+/**
+ * The empty key set: what an untagged slot and an untagged request both carry.
+ *
+ * @since 0.6.0
+ */
+export declare const NO_TAG_KEYS: TagKeyMask;
+/**
+ * One `[key, value]` criterion, interned so equal criteria are the same object.
+ *
+ * @remarks Only {@link TagKey.of} mints one, which is what makes identity a sound stand-in for the
+ * `Object.is` comparison the slot contract requires. Never build one by hand — the matcher and the
+ * registry index both read identity, so a hand-built criterion matches nothing.
+ *
+ * @since 0.6.0
+ */
+export interface BindingTag<Value = unknown> {
+    readonly key: TagKey<Value>;
+    readonly value: Value;
+    /** This pair's key mask, copied off the key so the matcher reads one field. */
+    readonly mask: TagKeyMask;
+    readonly [BINDING_TAG_BRAND]: true;
+}
+/**
+ * A named tag key, and the factory for its criteria.
+ *
+ * @since 0.6.0
+ */
+export interface TagKey<Value = unknown> {
+    readonly name: string;
+    /** Process-monotonic, so a key set is a mask and the registry can index on a number. */
+    readonly id: number;
+    readonly mask: TagKeyMask;
+    /** The criterion for one value, interned: the same value always yields the same object. */
+    of(value: Value): BindingTag<Value>;
+}
+/**
+ * Declares a tag key, whose `of()` builds the criteria a `whenTagged` and a resolve both take.
+ *
+ * @remarks The value type is checked at both ends: a key declared `tag<Region>("region")` refuses a
+ * value that is not a `Region`, so a bind site and a resolve site cannot drift apart silently.
+ *
+ * @example
+ * ```ts
+ * const Region = tag<"eu" | "us">("region");
+ * container.bind(Storage).to(S3).whenTagged(Region.of("eu"));
+ * container.resolve(Storage, { tag: Region.of("eu") });
+ * ```
+ *
+ * @since 0.6.0
+ */
+export declare function tag<Value = unknown>(name: string): TagKey<Value>;
+/**
+ * The key set a list of criteria covers.
+ *
+ * @since 0.6.0
+ */
+export declare function tagKeyMaskOf(tags: ReadonlyArray<BindingTag>): TagKeyMask;
+/**
+ * Whether a request carrying `requestMask` covers every key in `slotMask`.
+ *
+ * @since 0.6.0
+ */
+export declare function coversTagKeys(requestMask: TagKeyMask, slotMask: TagKeyMask): boolean;
+export {};
+//# sourceMappingURL=tag.d.ts.map

package/dist/core/tag.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tag.d.ts","sourceRoot":"","sources":["../../src/core/tag.ts"],"names":[],"mappings":"AAAA,yFAAyF;AAEzF,OAAO,CAAC,MAAM,aAAa,EAAE,OAAO,MAAM,CAAC;AAC3C,OAAO,CAAC,MAAM,iBAAiB,EAAE,OAAO,MAAM,CAAC;AAU/C;;;;;;;;GAQG;AACH,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvE;;;;GAIG;AACH,eAAO,MAAM,WAAW,EAAQ,UAAU,CAAC;AAE3C;;;;;;;;GAQG;AACH,MAAM,WAAW,UAAU,CAAC,KAAK,GAAG,OAAO;IACzC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,+EAA+E;IAC/E,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,QAAQ,CAAC,CAAC,iBAAiB,CAAC,EAAE,IAAI,CAAC;CACpC;AAED;;;;GAIG;AACH,MAAM,WAAW,MAAM,CAAC,KAAK,GAAG,OAAO;IACrC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,wFAAwF;IACxF,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B,2FAA2F;IAC3F,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;CACrC;AAiBD;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,GAAG,CAAC,KAAK,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAyChE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,UAAU,CAQxE;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,GAAG,OAAO,CAEpF"}

package/dist/core/tag.js

@@ -0,0 +1,96 @@
+/** Tag keys and the interned pairs they mint — the one way a slot criterion is built. */
+/**
+ * How many distinct tag keys one mask bit is shared by.
+ *
+ * @remarks Ids past this wrap, so two keys can share a bit. The mask is a prefilter only — a shared
+ * bit costs a false positive that the identity comparison then rejects, never a false negative.
+ */
+const MASK_WIDTH = 32;
+/**
+ * The empty key set: what an untagged slot and an untagged request both carry.
+ *
+ * @since 0.6.0
+ */
+export const NO_TAG_KEYS = 0;
+let tagKeyCounter = -1;
+/**
+ * Distinguishes `-0` from `+0` in the intern cache.
+ *
+ * @remarks A `Map` key compares by SameValueZero, which holds `+0` and `-0` equal, while tag values
+ * compare by `Object.is`, which does not. Interning them to one object would make the
+ * two indistinguishable everywhere downstream, so the negative one is cached under this instead.
+ */
+const NEGATIVE_ZERO_KEY = Symbol("di:tag-negative-zero");
+function internKeyFor(value) {
+    return value === 0 && Object.is(value, -0) ? NEGATIVE_ZERO_KEY : value;
+}
+/**
+ * Declares a tag key, whose `of()` builds the criteria a `whenTagged` and a resolve both take.
+ *
+ * @remarks The value type is checked at both ends: a key declared `tag<Region>("region")` refuses a
+ * value that is not a `Region`, so a bind site and a resolve site cannot drift apart silently.
+ *
+ * @example
+ * ```ts
+ * const Region = tag<"eu" | "us">("region");
+ * container.bind(Storage).to(S3).whenTagged(Region.of("eu"));
+ * container.resolve(Storage, { tag: Region.of("eu") });
+ * ```
+ *
+ * @since 0.6.0
+ */
+export function tag(name) {
+    tagKeyCounter += 1;
+    const id = tagKeyCounter;
+    const mask = (1 << (id % MASK_WIDTH));
+    const interned = new Map();
+    // One-entry cache in front of the intern map: an inline `.of()` at a call site usually repeats
+    // one value, and `Object.is` is the slot contract's own comparison, so a hit is exact — ±0 stay
+    // split and `NaN` hits itself, with no `internKeyFor` detour.
+    let lastValue;
+    let lastPair;
+    const key = {
+        name,
+        id,
+        mask,
+        of(value) {
+            if (lastPair !== undefined && Object.is(value, lastValue)) {
+                return lastPair;
+            }
+            const cacheKey = internKeyFor(value);
+            const existing = interned.get(cacheKey);
+            if (existing !== undefined) {
+                lastValue = value;
+                lastPair = existing;
+                return existing;
+            }
+            const pair = { key, value, mask };
+            interned.set(cacheKey, pair);
+            lastValue = value;
+            lastPair = pair;
+            return pair;
+        },
+    };
+    return key;
+}
+/**
+ * The key set a list of criteria covers.
+ *
+ * @since 0.6.0
+ */
+export function tagKeyMaskOf(tags) {
+    let mask = NO_TAG_KEYS;
+    for (let index = 0; index < tags.length; index += 1) {
+        mask = (mask | tags[index].mask);
+    }
+    return mask;
+}
+/**
+ * Whether a request carrying `requestMask` covers every key in `slotMask`.
+ *
+ * @since 0.6.0
+ */
+export function coversTagKeys(requestMask, slotMask) {
+    return (requestMask & slotMask) === slotMask;
+}
+//# sourceMappingURL=tag.js.map

package/dist/core/tag.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tag.js","sourceRoot":"","sources":["../../src/core/tag.ts"],"names":[],"mappings":"AAAA,yFAAyF;AAKzF;;;;;GAKG;AACH,MAAM,UAAU,GAAG,EAAE,CAAC;AAatB;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAe,CAAC;AAiC3C,IAAI,aAAa,GAAG,CAAC,CAAC,CAAC;AAEvB;;;;;;GAMG;AACH,MAAM,iBAAiB,GAAkB,MAAM,CAAC,sBAAsB,CAAC,CAAC;AAExE,SAAS,YAAY,CAAC,KAAc;IAClC,OAAO,KAAK,KAAK,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC;AACzE,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,GAAG,CAAkB,IAAY;IAC/C,aAAa,IAAI,CAAC,CAAC;IACnB,MAAM,EAAE,GAAG,aAAa,CAAC;IACzB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,UAAU,CAAC,CAAe,CAAC;IACpD,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAC;IACvD,+FAA+F;IAC/F,gGAAgG;IAChG,8DAA8D;IAC9D,IAAI,SAA4B,CAAC;IACjC,IAAI,QAAuC,CAAC;IAE5C,MAAM,GAAG,GAAkB;QACzB,IAAI;QACJ,EAAE;QACF,IAAI;QACJ,EAAE,CAAC,KAAY;YACb,IAAI,QAAQ,KAAK,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,CAAC;gBAC1D,OAAO,QAAQ,CAAC;YAClB,CAAC;YAED,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;YACrC,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAExC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC3B,SAAS,GAAG,KAAK,CAAC;gBAClB,QAAQ,GAAG,QAAQ,CAAC;gBAEpB,OAAO,QAAQ,CAAC;YAClB,CAAC;YAED,MAAM,IAAI,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAuB,CAAC;YAEvD,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC7B,SAAS,GAAG,KAAK,CAAC;YAClB,QAAQ,GAAG,IAAI,CAAC;YAEhB,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC;IAEF,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,IAA+B;IAC1D,IAAI,IAAI,GAAG,WAAW,CAAC;IAEvB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACpD,IAAI,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAE,CAAC,IAAI,CAAe,CAAC;IAClD,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,WAAuB,EAAE,QAAoB;IACzE,OAAO,CAAC,WAAW,GAAG,QAAQ,CAAC,KAAK,QAAQ,CAAC;AAC/C,CAAC"}