@codefast/di 0.3.16-canary.1 → 0.3.16-canary.3

package/dist/index.mjs

@@ -2,11 +2,11 @@ import { effectiveBindingScope } from "./binding-scope.mjs";
 import { AmbiguousBindingError, AsyncActivationError, AsyncDeactivationError, AsyncModuleLoadError, AsyncResolutionError, CircularDependencyError, DiError, DisposedContainerError, InternalError, MissingContainerContextError, MissingMetadataError, MissingScopeContextError, NoMatchingBindingError, RebindUnboundTokenError, ScopeViolationError, SyncDisposalNotSupportedError, TokenNotBoundError } from "./errors.mjs";
 import { isToken, token, tokenName } from "./token.mjs";
 import { whenAnyAncestorIs, whenAnyAncestorNamed, whenAnyAncestorTagged, whenAnyAncestorTaggedAll, whenNoAncestorIs, whenNoParentIs, whenParentIs, whenParentNamed, whenParentTagged, whenParentTaggedAll } from "./constraints.mjs";
-import { injectableSlotToResolveOptions, slotKeyToResolveOptions } from "./resolve-options.mjs";
+import { bindingSlotToResolveOptions, injectionSlotToResolveOptions } from "./resolve-options.mjs";
 import { MetadataReaderToken } from "./metadata/metadata-reader-token.mjs";
 import { inject, injectAll, isInjectionDescriptor, optional } from "./decorators/inject.mjs";
 import { AsyncModule, Module, SyncModule, isSyncModule } from "./module.mjs";
 import { Container } from "./container.mjs";
 import { createAutoRegisterRegistry, injectable } from "./decorators/injectable.mjs";
 import { postConstruct, preDestroy } from "./decorators/lifecycle-decorators.mjs";
-export { AmbiguousBindingError, AsyncActivationError, AsyncDeactivationError, AsyncModule, AsyncModuleLoadError, AsyncResolutionError, CircularDependencyError, Container, DiError, DisposedContainerError, InternalError, MetadataReaderToken, MissingContainerContextError, MissingMetadataError, MissingScopeContextError, Module, NoMatchingBindingError, RebindUnboundTokenError, ScopeViolationError, SyncDisposalNotSupportedError, SyncModule, TokenNotBoundError, createAutoRegisterRegistry, effectiveBindingScope, inject, injectAll, injectable, injectableSlotToResolveOptions, isInjectionDescriptor, isSyncModule, isToken, optional, postConstruct, preDestroy, slotKeyToResolveOptions, token, tokenName, whenAnyAncestorIs, whenAnyAncestorNamed, whenAnyAncestorTagged, whenAnyAncestorTaggedAll, whenNoAncestorIs, whenNoParentIs, whenParentIs, whenParentNamed, whenParentTagged, whenParentTaggedAll };
+export { AmbiguousBindingError, AsyncActivationError, AsyncDeactivationError, AsyncModule, AsyncModuleLoadError, AsyncResolutionError, CircularDependencyError, Container, DiError, DisposedContainerError, InternalError, MetadataReaderToken, MissingContainerContextError, MissingMetadataError, MissingScopeContextError, Module, NoMatchingBindingError, RebindUnboundTokenError, ScopeViolationError, SyncDisposalNotSupportedError, SyncModule, TokenNotBoundError, bindingSlotToResolveOptions, createAutoRegisterRegistry, effectiveBindingScope, inject, injectAll, injectable, injectionSlotToResolveOptions, isInjectionDescriptor, isSyncModule, isToken, optional, postConstruct, preDestroy, token, tokenName, whenAnyAncestorIs, whenAnyAncestorNamed, whenAnyAncestorTagged, whenAnyAncestorTaggedAll, whenNoAncestorIs, whenNoParentIs, whenParentIs, whenParentNamed, whenParentTagged, whenParentTaggedAll };

package/dist/inspector.d.mts

@@ -1,6 +1,6 @@
 import { Constructor } from "./constructor-type.mjs";
 import { Token } from "./token.mjs";
-import { BindingIdentifier, BindingKind, BindingScope, ResolveOptions } from "./types.mjs";
+import { BindingIdentifier, BindingKind, BindingScope, BindingTag, ResolveOptions } from "./types.mjs";
 import { BindingRegistry } from "./registry.mjs";
 import { ScopeManager } from "./scope.mjs";
 
@@ -14,7 +14,7 @@ interface BindingSnapshot {
   readonly scope: BindingScope;
   readonly slot: {
     readonly name?: string;
-    readonly tags: ReadonlyArray<readonly [string, unknown]>;
+    readonly tags: ReadonlyArray<BindingTag>;
   };
   readonly id: BindingIdentifier;
 }
@@ -40,6 +40,7 @@ declare class Inspector {
   lookupBindings<Value>(token: Token<Value> | Constructor<Value>): ReadonlyArray<BindingSnapshot>;
   has(token: Token<unknown> | Constructor, hint?: ResolveOptions, parentHas?: () => boolean): boolean;
   hasOwn(token: Token<unknown> | Constructor, hint?: ResolveOptions): boolean;
+  private _makeHintContext;
   private allBindingSnapshots;
   private _toSnapshot;
 }

package/dist/inspector.mjs

@@ -25,48 +25,45 @@ var Inspector = class {
 		};
 	}
 	lookupBindings(token) {
-		return this._registry.getAll(token).map((b) => this._toSnapshot(b));
+		return this._registry.getAll(token).map((binding) => this._toSnapshot(binding));
 	}
 	has(token, hint, parentHas) {
 		const bindings = this._registry.getAll(token);
 		if (bindings.length > 0) if (hint !== void 0) {
-			if (selectBinding(bindings, hint, {
-				resolutionPath: [],
-				materializationStack: [],
-				parent: void 0,
-				ancestors: [],
-				currentResolveHint: hint
-			}, tokenName(token)) !== void 0) return true;
+			if (selectBinding(bindings, hint, this._makeHintContext(hint), tokenName(token)) !== void 0) return true;
 		} else return true;
 		return parentHas?.() ?? false;
 	}
 	hasOwn(token, hint) {
 		const bindings = this._registry.getAll(token);
 		if (bindings.length === 0) return false;
-		if (hint !== void 0) return selectBinding(bindings, hint, {
+		if (hint !== void 0) return selectBinding(bindings, hint, this._makeHintContext(hint), tokenName(token)) !== void 0;
+		return true;
+	}
+	_makeHintContext(hint) {
+		return {
 			resolutionPath: [],
-			materializationStack: [],
+			resolutionStack: [],
 			parent: void 0,
 			ancestors: [],
 			currentResolveHint: hint
-		}, tokenName(token)) !== void 0;
-		return true;
+		};
 	}
 	allBindingSnapshots() {
-		return this._registry.allBindings().map((b) => this._toSnapshot(b));
+		return this._registry.allBindings().map((binding) => this._toSnapshot(binding));
 	}
-	_toSnapshot(b) {
-		const scope = effectiveBindingScope(b);
-		const slot = b.slot.name !== void 0 ? {
-			name: b.slot.name,
-			tags: b.slot.tags
-		} : { tags: b.slot.tags };
+	_toSnapshot(binding) {
+		const scope = effectiveBindingScope(binding);
+		const slot = binding.slot.name !== void 0 ? {
+			name: binding.slot.name,
+			tags: binding.slot.tags
+		} : { tags: binding.slot.tags };
 		return {
-			tokenName: tokenName(b.token),
-			kind: b.kind,
+			tokenName: tokenName(binding.token),
+			kind: binding.kind,
 			scope,
 			slot,
-			id: b.id
+			id: binding.id
 		};
 	}
 };

package/dist/lifecycle.mjs

@@ -10,12 +10,7 @@ var LifecycleManager = class {
 	_activationVersion = 0;
 	registerActivation(token, handler) {
 		this._activationVersion += 1;
-		let list = this._activationHooks.get(token);
-		if (list === void 0) {
-			list = [];
-			this._activationHooks.set(token, list);
-		}
-		list.push(handler);
+		this._activationHooks.getOrInsert(token, []).push(handler);
 	}
 	hasActivationHandlers(token) {
 		if (this._activationHooks.size === 0) return false;
@@ -26,12 +21,7 @@ var LifecycleManager = class {
 		return this._activationVersion;
 	}
 	registerDeactivation(token, handler) {
-		let list = this._deactivationHooks.get(token);
-		if (list === void 0) {
-			list = [];
-			this._deactivationHooks.set(token, list);
-		}
-		list.push(handler);
+		this._deactivationHooks.getOrInsert(token, []).push(handler);
 	}
 	async runActivation(resolutionContext, binding, instance, metadataReader) {
 		let activatedInstance = instance;

package/dist/metadata/metadata-keys.d.mts

@@ -1,16 +1,4 @@
-import { ConstructorMetadata, MutableLifecycleMetadata } from "./metadata-types.mjs";
-
 //#region src/metadata/metadata-keys.d.ts
-/**
- * Accessor injection entries mirrored from `Symbol.metadata` for toolchains where
- * resolver reads stable metadata via the same object identity as `context.metadata`.
- *
- * @since 0.3.16-canary.0
- */
-type AccessorInjectionEntryList = Array<{
-  key: string | symbol;
-  descriptor: unknown;
-}>;
 /**
  * @since 0.3.16-canary.0
  */
@@ -24,29 +12,16 @@ declare const LIFECYCLE_KEY: unique symbol;
  */
 declare const INJECT_ACCESSOR_KEY: unique symbol;
 /**
- * @since 0.3.16-canary.0
- */
-declare const constructorMetadataMap: WeakMap<object, ConstructorMetadata>;
-/**
- * @since 0.3.16-canary.0
- */
-declare const lifecycleMetadataMap: WeakMap<object, MutableLifecycleMetadata>;
-/**
- * @since 0.3.16-canary.0
- */
-declare const lifecycleByConstructorMetadataMap: WeakMap<object, MutableLifecycleMetadata>;
-/**
- * Fallback keyed by the class metadata object (`context.metadata` / `ctor[Symbol.metadata]`).
+ * The well-known symbol used by TC39 Stage 3 decorator transforms to store class metadata.
  *
- * @since 0.3.16-canary.0
- */
-declare const accessorMetadataByMetadataObjectMap: WeakMap<object, AccessorInjectionEntryList>;
-/**
- * Populated from `@injectable()` after field decorators have written `INJECT_ACCESSOR_KEY`
- * onto `context.metadata` — same timing as {@link constructorMetadataMap}.
+ * `Symbol.metadata` is defined natively once the runtime ships the full TC39 decorator
+ * proposal.  Until then (current Node.js / browsers), Babel and esbuild both fall back to
+ * `Symbol.for("Symbol.metadata")` — a global-registry symbol with the same string key.
+ * Resolving it here once keeps the reader and the decorator transforms in sync regardless
+ * of which path is taken.
  *
  * @since 0.3.16-canary.0
  */
-declare const accessorMetadataByConstructorMap: WeakMap<object, AccessorInjectionEntryList>;
+declare const METADATA_SYMBOL: symbol;
 //#endregion
-export { AccessorInjectionEntryList, INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, accessorMetadataByConstructorMap, accessorMetadataByMetadataObjectMap, constructorMetadataMap, lifecycleByConstructorMetadataMap, lifecycleMetadataMap };
+export { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, METADATA_SYMBOL };

package/dist/metadata/metadata-keys.mjs

@@ -12,29 +12,16 @@ const LIFECYCLE_KEY = Symbol("di:lifecycle");
 */
 const INJECT_ACCESSOR_KEY = Symbol("di:inject-accessor");
 /**
-* @since 0.3.16-canary.0
-*/
-const constructorMetadataMap = /* @__PURE__ */ new WeakMap();
-/**
-* @since 0.3.16-canary.0
-*/
-const lifecycleMetadataMap = /* @__PURE__ */ new WeakMap();
-/**
-* @since 0.3.16-canary.0
-*/
-const lifecycleByConstructorMetadataMap = /* @__PURE__ */ new WeakMap();
-/**
-* Fallback keyed by the class metadata object (`context.metadata` / `ctor[Symbol.metadata]`).
+* The well-known symbol used by TC39 Stage 3 decorator transforms to store class metadata.
 *
-* @since 0.3.16-canary.0
-*/
-const accessorMetadataByMetadataObjectMap = /* @__PURE__ */ new WeakMap();
-/**
-* Populated from `@injectable()` after field decorators have written `INJECT_ACCESSOR_KEY`
-* onto `context.metadata` — same timing as {@link constructorMetadataMap}.
+* `Symbol.metadata` is defined natively once the runtime ships the full TC39 decorator
+* proposal.  Until then (current Node.js / browsers), Babel and esbuild both fall back to
+* `Symbol.for("Symbol.metadata")` — a global-registry symbol with the same string key.
+* Resolving it here once keeps the reader and the decorator transforms in sync regardless
+* of which path is taken.
 *
 * @since 0.3.16-canary.0
 */
-const accessorMetadataByConstructorMap = /* @__PURE__ */ new WeakMap();
+const METADATA_SYMBOL = Symbol.metadata ?? Symbol.for("Symbol.metadata");
 //#endregion
-export { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, accessorMetadataByConstructorMap, accessorMetadataByMetadataObjectMap, constructorMetadataMap, lifecycleByConstructorMetadataMap, lifecycleMetadataMap };
+export { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, METADATA_SYMBOL };

package/dist/metadata/metadata-types.d.mts

@@ -1,5 +1,6 @@
 import { Constructor } from "../constructor-type.mjs";
 import { Token } from "../token.mjs";
+import { InjectionDescriptor } from "../decorators/inject.mjs";
 
 //#region src/metadata/metadata-types.d.ts
 /**
@@ -41,6 +42,10 @@ interface MutableLifecycleMetadata {
 interface MetadataReader {
   getConstructorMetadata(target: Constructor): ConstructorMetadata | undefined;
   getLifecycleMetadata(target: Constructor): LifecycleMetadata | undefined;
+  getAccessorMetadata?(target: Constructor): ReadonlyArray<{
+    readonly key: string | symbol;
+    readonly descriptor: InjectionDescriptor;
+  }> | undefined;
 }
 //#endregion
 export { ConstructorMetadata, LifecycleMetadata, MetadataReader, MutableLifecycleMetadata, ParamMetadata };

package/dist/metadata/symbol-metadata-reader.d.mts

@@ -7,6 +7,7 @@ import { ConstructorMetadata, LifecycleMetadata, MetadataReader } from "./metada
  * @since 0.3.16-canary.0
  */
 declare class SymbolMetadataReader implements MetadataReader {
+  private _getMetadataRecord;
   getConstructorMetadata(target: Constructor): ConstructorMetadata | undefined;
   getLifecycleMetadata(target: Constructor): LifecycleMetadata | undefined;
   getAccessorMetadata(target: Constructor): Array<{

package/dist/metadata/symbol-metadata-reader.mjs

@@ -1,46 +1,24 @@
-import { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, accessorMetadataByConstructorMap, accessorMetadataByMetadataObjectMap, constructorMetadataMap, lifecycleByConstructorMetadataMap, lifecycleMetadataMap } from "./metadata-keys.mjs";
+import { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, METADATA_SYMBOL } from "./metadata-keys.mjs";
 //#region src/metadata/symbol-metadata-reader.ts
 /**
 * @since 0.3.16-canary.0
 */
 var SymbolMetadataReader = class {
+	_getMetadataRecord(target, key) {
+		const descriptor = Object.getOwnPropertyDescriptor(target, METADATA_SYMBOL);
+		if (descriptor === void 0) return;
+		const record = descriptor.value;
+		if (!record || typeof record !== "object" || !Object.hasOwn(record, key)) return;
+		return record;
+	}
 	getConstructorMetadata(target) {
-		const weakMapMetadata = constructorMetadataMap.get(target);
-		if (weakMapMetadata !== void 0) return weakMapMetadata;
-		const metadataDescriptor = Object.getOwnPropertyDescriptor(target, Symbol.metadata);
-		if (metadataDescriptor === void 0) return;
-		const metadataRecord = metadataDescriptor.value;
-		if (!metadataRecord || typeof metadataRecord !== "object" || !Object.hasOwn(metadataRecord, INJECTABLE_KEY)) return;
-		return metadataRecord[INJECTABLE_KEY];
+		return this._getMetadataRecord(target, INJECTABLE_KEY)?.[INJECTABLE_KEY];
 	}
 	getLifecycleMetadata(target) {
-		const lifecycleMetadataByConstructor = lifecycleByConstructorMetadataMap.get(target);
-		if (lifecycleMetadataByConstructor !== void 0) return lifecycleMetadataByConstructor;
-		const metadataDescriptor = Object.getOwnPropertyDescriptor(target, Symbol.metadata);
-		if (metadataDescriptor !== void 0) {
-			const metadataRecord = metadataDescriptor.value;
-			if (metadataRecord && typeof metadataRecord === "object" && Object.hasOwn(metadataRecord, LIFECYCLE_KEY)) return metadataRecord[LIFECYCLE_KEY];
-		}
-		const classMetadataObject = target[Symbol.metadata];
-		if (classMetadataObject !== void 0) {
-			const weakMapMetadata = lifecycleMetadataMap.get(classMetadataObject);
-			if (weakMapMetadata !== void 0) return weakMapMetadata;
-		}
+		return this._getMetadataRecord(target, LIFECYCLE_KEY)?.[LIFECYCLE_KEY];
 	}
 	getAccessorMetadata(target) {
-		const byConstructor = accessorMetadataByConstructorMap.get(target);
-		if (byConstructor !== void 0) return byConstructor;
-		const metadataObject = target[Symbol.metadata];
-		if (metadataObject !== void 0) {
-			const fromWeakMap = accessorMetadataByMetadataObjectMap.get(metadataObject);
-			if (fromWeakMap !== void 0) return fromWeakMap;
-		}
-		const metadataDescriptor = Object.getOwnPropertyDescriptor(target, Symbol.metadata);
-		if (metadataDescriptor === void 0) return;
-		const metadataRecord = metadataDescriptor.value;
-		if (!metadataRecord || typeof metadataRecord !== "object") return;
-		if (!Object.hasOwn(metadataRecord, INJECT_ACCESSOR_KEY)) return;
-		return metadataRecord[INJECT_ACCESSOR_KEY];
+		return this._getMetadataRecord(target, INJECT_ACCESSOR_KEY)?.[INJECT_ACCESSOR_KEY];
 	}
 };
 /**

package/dist/module.d.mts

@@ -57,6 +57,6 @@ declare const Module: {
 /**
  * @since 0.3.16-canary.0
  */
-declare function isSyncModule(m: SyncModule | AsyncModule): m is SyncModule;
+declare function isSyncModule(module: SyncModule | AsyncModule): module is SyncModule;
 //#endregion
 export { AsyncModule, AsyncModuleBuilder, Module, ModuleBuilder, SyncModule, isSyncModule };

package/dist/module.mjs

@@ -35,8 +35,8 @@ const Module = {
 /**
 * @since 0.3.16-canary.0
 */
-function isSyncModule(m) {
-	return m[SYNC_MODULE_BRAND] === true;
+function isSyncModule(module) {
+	return module[SYNC_MODULE_BRAND] === true;
 }
 //#endregion
 export { AsyncModule, Module, SyncModule, isSyncModule };

package/dist/registry.d.mts

@@ -16,15 +16,15 @@ declare class BindingRegistry {
   /** Add or replace binding using slot-aware last-wins. */
   add(binding: Binding): void;
   /** Remove all bindings for a token. Returns removed bindings. */
-  removeByToken(t: Token<unknown> | Constructor): Array<Binding>;
+  removeByToken(token: Token<unknown> | Constructor): Array<Binding>;
   /** Remove a specific binding by ID. Returns the removed binding or undefined. */
   removeById(id: BindingIdentifier): Binding | undefined;
   /** Get all bindings for a token. */
-  getAll(t: Token<unknown> | Constructor): ReadonlyArray<Binding>;
+  getAll(token: Token<unknown> | Constructor): ReadonlyArray<Binding>;
   /** Get binding by ID. */
   getById(id: BindingIdentifier): Binding | undefined;
   /** Check if any binding exists for token. */
-  has(t: Token<unknown> | Constructor): boolean;
+  has(token: Token<unknown> | Constructor): boolean;
   /** All bindings in the registry. */
   allBindings(): ReadonlyArray<Binding>;
   /** Remove all bindings. Returns all removed. */
@@ -33,7 +33,7 @@ declare class BindingRegistry {
   getSimpleTagged(token: Token<unknown> | Constructor, tagKey: string, tagValue: unknown): Binding | undefined;
   getFastDefault(token: Token<unknown> | Constructor): Binding | undefined;
   /** Summarize available slot strings for a token (for error messages). */
-  availableSlotStrings(t: Token<unknown> | Constructor): Array<string>;
+  availableSlotStrings(token: Token<unknown> | Constructor): Array<string>;
   private _indexSimpleTaggedBinding;
   private _deindexSimpleTaggedBinding;
   private _isPurePredicateBinding;

package/dist/registry.mjs

@@ -1,4 +1,4 @@
-import { slotKeyEquals, slotKeyToString } from "./binding.mjs";
+import { bindingSlotEquals, bindingSlotToString } from "./binding.mjs";
 //#region src/registry.ts
 /**
 * @since 0.3.16-canary.0
@@ -12,13 +12,9 @@ var BindingRegistry = class {
 	/** Add or replace binding using slot-aware last-wins. */
 	add(binding) {
 		const key = binding.token;
-		let bindingsForToken = this._bindings.get(key);
-		if (bindingsForToken === void 0) {
-			bindingsForToken = [];
-			this._bindings.set(key, bindingsForToken);
-		}
+		const bindingsForToken = this._bindings.getOrInsert(key, []);
 		if (!this._isPurePredicateBinding(binding)) {
-			const existingIndex = bindingsForToken.findIndex((b) => !this._isPurePredicateBinding(b) && slotKeyEquals(b.slot, binding.slot));
+			const existingIndex = bindingsForToken.findIndex((candidate) => !this._isPurePredicateBinding(candidate) && bindingSlotEquals(candidate.slot, binding.slot));
 			if (existingIndex !== -1) {
 				const replacedBinding = bindingsForToken[existingIndex];
 				this._byId.delete(replacedBinding.id);
@@ -32,8 +28,8 @@ var BindingRegistry = class {
 		this._refreshFastDefaultForToken(key);
 	}
 	/** Remove all bindings for a token. Returns removed bindings. */
-	removeByToken(t) {
-		const key = t;
+	removeByToken(token) {
+		const key = token;
 		const bindingsForToken = this._bindings.get(key) ?? [];
 		this._bindings.delete(key);
 		this._simpleNamed.delete(key);
@@ -64,16 +60,16 @@ var BindingRegistry = class {
 		return binding;
 	}
 	/** Get all bindings for a token. */
-	getAll(t) {
-		return this._bindings.get(t) ?? [];
+	getAll(token) {
+		return this._bindings.get(token) ?? [];
 	}
 	/** Get binding by ID. */
 	getById(id) {
 		return this._byId.get(id);
 	}
 	/** Check if any binding exists for token. */
-	has(t) {
-		const key = t;
+	has(token) {
+		const key = token;
 		const list = this._bindings.get(key);
 		return list !== void 0 && list.length > 0;
 	}
@@ -103,30 +99,20 @@ var BindingRegistry = class {
 		return this._fastDefault.get(token);
 	}
 	/** Summarize available slot strings for a token (for error messages). */
-	availableSlotStrings(t) {
-		return (this._bindings.get(t) ?? []).map((binding) => slotKeyToString(binding.slot));
+	availableSlotStrings(token) {
+		return (this._bindings.get(token) ?? []).map((binding) => bindingSlotToString(binding.slot));
 	}
-	_indexSimpleTaggedBinding(tokenKeyValue, binding) {
+	_indexSimpleTaggedBinding(tokenKey, binding) {
 		const slot = binding.slot;
 		if (slot.name !== void 0 || slot.tags.length !== 1 || binding.predicate !== void 0) return;
 		const [tagKey, tagValue] = slot.tags[0];
-		let byTagKey = this._simpleTagged.get(tokenKeyValue);
-		if (byTagKey === void 0) {
-			byTagKey = /* @__PURE__ */ new Map();
-			this._simpleTagged.set(tokenKeyValue, byTagKey);
-		}
-		let byTagValue = byTagKey.get(tagKey);
-		if (byTagValue === void 0) {
-			byTagValue = /* @__PURE__ */ new Map();
-			byTagKey.set(tagKey, byTagValue);
-		}
-		byTagValue.set(tagValue, binding);
+		this._simpleTagged.getOrInsert(tokenKey, /* @__PURE__ */ new Map()).getOrInsert(tagKey, /* @__PURE__ */ new Map()).set(tagValue, binding);
 	}
-	_deindexSimpleTaggedBinding(tokenKeyValue, binding) {
+	_deindexSimpleTaggedBinding(tokenKey, binding) {
 		const slot = binding.slot;
 		if (slot.name !== void 0 || slot.tags.length !== 1 || binding.predicate !== void 0) return;
 		const [tagKey, tagValue] = slot.tags[0];
-		const byTagKey = this._simpleTagged.get(tokenKeyValue);
+		const byTagKey = this._simpleTagged.get(tokenKey);
 		if (byTagKey === void 0) return;
 		const byTagValue = byTagKey.get(tagKey);
 		if (byTagValue === void 0) return;
@@ -134,7 +120,7 @@ var BindingRegistry = class {
 			byTagValue.delete(tagValue);
 			if (byTagValue.size === 0) {
 				byTagKey.delete(tagKey);
-				if (byTagKey.size === 0) this._simpleTagged.delete(tokenKeyValue);
+				if (byTagKey.size === 0) this._simpleTagged.delete(tokenKey);
 			}
 		}
 	}
@@ -144,38 +130,33 @@ var BindingRegistry = class {
 		const hasConstraint = slot.name !== void 0 || slot.tags.length > 0;
 		return hasPredicate && !hasConstraint;
 	}
-	_indexSimpleNamedBinding(tokenKeyValue, binding) {
+	_indexSimpleNamedBinding(tokenKey, binding) {
 		const slot = binding.slot;
 		if (slot.name === void 0 || slot.tags.length > 0) return;
-		let bindingsByName = this._simpleNamed.get(tokenKeyValue);
-		if (bindingsByName === void 0) {
-			bindingsByName = /* @__PURE__ */ new Map();
-			this._simpleNamed.set(tokenKeyValue, bindingsByName);
-		}
-		bindingsByName.set(slot.name, binding);
+		this._simpleNamed.getOrInsert(tokenKey, /* @__PURE__ */ new Map()).set(slot.name, binding);
 	}
-	_deindexSimpleNamedBinding(tokenKeyValue, binding) {
+	_deindexSimpleNamedBinding(tokenKey, binding) {
 		const slot = binding.slot;
 		if (slot.name === void 0 || slot.tags.length > 0) return;
-		const bindingsByName = this._simpleNamed.get(tokenKeyValue);
+		const bindingsByName = this._simpleNamed.get(tokenKey);
 		if (bindingsByName === void 0) return;
 		if (bindingsByName.get(slot.name)?.id === binding.id) {
 			bindingsByName.delete(slot.name);
-			if (bindingsByName.size === 0) this._simpleNamed.delete(tokenKeyValue);
+			if (bindingsByName.size === 0) this._simpleNamed.delete(tokenKey);
 		}
 	}
-	_refreshFastDefaultForToken(tokenKeyValue) {
-		const bindingsForToken = this._bindings.get(tokenKeyValue);
+	_refreshFastDefaultForToken(tokenKey) {
+		const bindingsForToken = this._bindings.get(tokenKey);
 		if (bindingsForToken === void 0 || bindingsForToken.length !== 1) {
-			this._fastDefault.delete(tokenKeyValue);
+			this._fastDefault.delete(tokenKey);
 			return;
 		}
 		const onlyBinding = bindingsForToken[0];
 		if (!(onlyBinding.slot.name === void 0 && onlyBinding.slot.tags.length === 0) || onlyBinding.predicate !== void 0) {
-			this._fastDefault.delete(tokenKeyValue);
+			this._fastDefault.delete(tokenKey);
 			return;
 		}
-		this._fastDefault.set(tokenKeyValue, onlyBinding);
+		this._fastDefault.set(tokenKey, onlyBinding);
 	}
 };
 //#endregion

package/dist/resolve-options.d.mts

@@ -1,5 +1,5 @@
-import { ResolveOptions } from "./types.mjs";
-import { SlotKey } from "./binding.mjs";
+import { BindingTag, ResolveOptions } from "./types.mjs";
+import { BindingSlot } from "./binding.mjs";
 
 //#region src/resolve-options.d.ts
 /**
@@ -8,15 +8,15 @@ import { SlotKey } from "./binding.mjs";
  *
  * @since 0.3.16-canary.0
  */
-declare function injectableSlotToResolveOptions(slot: {
+declare function injectionSlotToResolveOptions(injectionSlot: {
   readonly name?: string;
-  readonly tags?: ReadonlyArray<readonly [string, unknown]>;
+  readonly tags?: ReadonlyArray<BindingTag>;
 }): ResolveOptions | undefined;
 /**
- * Hint from a binding {@link SlotKey} (tags may be empty; omits when nothing to match).
+ * Hint from a binding {@link BindingSlot} (tags may be empty; omits when nothing to match).
  *
  * @since 0.3.16-canary.0
  */
-declare function slotKeyToResolveOptions(slot: SlotKey): ResolveOptions | undefined;
+declare function bindingSlotToResolveOptions(bindingSlot: BindingSlot): ResolveOptions | undefined;
 //#endregion
-export { injectableSlotToResolveOptions, slotKeyToResolveOptions };
+export { bindingSlotToResolveOptions, injectionSlotToResolveOptions };

package/dist/resolve-options.mjs

@@ -1,26 +1,28 @@
 //#region src/resolve-options.ts
+/** Shared core: build a ResolveOptions from already-normalised name + tags. */
+function buildOptions(name, tags) {
+	if (name === void 0 && tags === void 0) return;
+	const options = {};
+	if (name !== void 0) options.name = name;
+	if (tags !== void 0) options.tags = tags;
+	return options;
+}
 /**
 * Builds a {@link ResolveOptions} safe for `exactOptionalPropertyTypes`:
 * omits keys instead of assigning `undefined`.
 *
 * @since 0.3.16-canary.0
 */
-function injectableSlotToResolveOptions(slot) {
-	const options = {};
-	if (slot.name !== void 0) options.name = slot.name;
-	if (slot.tags !== void 0) options.tags = slot.tags;
-	return options.name !== void 0 || options.tags !== void 0 ? options : void 0;
+function injectionSlotToResolveOptions(injectionSlot) {
+	return buildOptions(injectionSlot.name, injectionSlot.tags);
 }
 /**
-* Hint from a binding {@link SlotKey} (tags may be empty; omits when nothing to match).
+* Hint from a binding {@link BindingSlot} (tags may be empty; omits when nothing to match).
 *
 * @since 0.3.16-canary.0
 */
-function slotKeyToResolveOptions(slot) {
-	const options = {};
-	if (slot.name !== void 0) options.name = slot.name;
-	if (slot.tags.length > 0) options.tags = slot.tags;
-	return options.name !== void 0 || options.tags !== void 0 ? options : void 0;
+function bindingSlotToResolveOptions(bindingSlot) {
+	return buildOptions(bindingSlot.name, bindingSlot.tags.length > 0 ? bindingSlot.tags : void 0);
 }
 //#endregion
-export { injectableSlotToResolveOptions, slotKeyToResolveOptions };
+export { bindingSlotToResolveOptions, injectionSlotToResolveOptions };

package/dist/resolver.d.mts

@@ -1,6 +1,6 @@
 import { Constructor } from "./constructor-type.mjs";
 import { Token } from "./token.mjs";
-import { MaterializationFrame, ResolveOptions } from "./types.mjs";
+import { ResolutionFrame, ResolveOptions } from "./types.mjs";
 import { Binding } from "./binding.mjs";
 import { BindingRegistry } from "./registry.mjs";
 import { ScopeManager } from "./scope.mjs";
@@ -47,22 +47,22 @@ declare class DependencyResolver {
    * Mirrors {@link DependencyResolver.resolveAll} candidate selection only (no instantiation).
    */
   peekCandidateBindingsForValidate(token: Token<unknown> | Constructor, hint: ResolveOptions | undefined): Array<Binding>;
-  resolveFromContext<const Value>(token: Token<Value> | Constructor<Value>, resolutionPath: Array<string>, materializationStack: Array<MaterializationFrame>): Value;
-  resolve<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, materializationStack: Array<MaterializationFrame>): Value;
+  resolveFromContext<const Value>(token: Token<Value> | Constructor<Value>, resolutionPath: Array<string>, resolutionStack: Array<ResolutionFrame>): Value;
+  resolve<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, resolutionStack: Array<ResolutionFrame>): Value;
   private _resolveBinding;
   private _instantiateSync;
   private _resolveClassDeps;
   private _resolveDescriptorDeps;
-  resolveOptional<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, materializationStack: Array<MaterializationFrame>): Value | undefined;
-  resolveAll<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, materializationStack: Array<MaterializationFrame>): Array<Value>;
-  resolveAsyncFromContext<const Value>(token: Token<Value> | Constructor<Value>, resolutionPath: Array<string>, materializationStack: Array<MaterializationFrame>): Promise<Value>;
-  resolveAsync<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, materializationStack: Array<MaterializationFrame>): Promise<Value>;
+  resolveOptional<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, resolutionStack: Array<ResolutionFrame>): Value | undefined;
+  resolveAll<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, resolutionStack: Array<ResolutionFrame>): Array<Value>;
+  resolveAsyncFromContext<const Value>(token: Token<Value> | Constructor<Value>, resolutionPath: Array<string>, resolutionStack: Array<ResolutionFrame>): Promise<Value>;
+  resolveAsync<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, resolutionStack: Array<ResolutionFrame>): Promise<Value>;
   private _resolveBindingAsync;
   private _instantiateAsync;
   private _resolveClassDepsAsync;
   private _resolveDescriptorDepsAsync;
-  resolveOptionalAsync<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, materializationStack: Array<MaterializationFrame>): Promise<Value | undefined>;
-  resolveAllAsync<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, materializationStack: Array<MaterializationFrame>): Promise<Array<Value>>;
+  resolveOptionalAsync<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, resolutionStack: Array<ResolutionFrame>): Promise<Value | undefined>;
+  resolveAllAsync<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, resolutionStack: Array<ResolutionFrame>): Promise<Array<Value>>;
   private _getAllBindingsFromChain;
   private _getSimpleNamedBindingsFromChain;
   private _getAvailableSlots;
@@ -79,9 +79,14 @@ declare class DependencyResolver {
   private _resolveTransientDynamicAsyncSlow;
   private _resolveCandidateSync;
   private _resolveCandidateAsync;
-  private _getMaterializationFrame;
+  private _getResolutionFrame;
   private _needsActivation;
   private _refreshClassPostConstructCache;
+  /**
+   * Refreshes the post-construct cache for class bindings on first instantiation and
+   * returns the (possibly updated) shouldActivate flag.
+   */
+  private _refreshActivationCacheIfNeeded;
   private _requiresResolutionContext;
   private _acquireSyncResolutionContext;
 }