@codefast/di 0.3.16-canary.0 → 0.3.16-canary.2

package/dist/registry.mjs

@@ -1,4 +1,4 @@
-import { slotKeyEquals } from "./binding.mjs";
+import { bindingSlotEquals, bindingSlotToString } from "./binding.mjs";
 //#region src/registry.ts
 /**
 * @since 0.3.16-canary.0
@@ -12,35 +12,35 @@ var BindingRegistry = class {
 	/** Add or replace binding using slot-aware last-wins. */
 	add(binding) {
 		const key = binding.token;
-		let list = this._bindings.get(key);
-		if (list === void 0) {
-			list = [];
-			this._bindings.set(key, list);
+		let bindingsForToken = this._bindings.get(key);
+		if (bindingsForToken === void 0) {
+			bindingsForToken = [];
+			this._bindings.set(key, bindingsForToken);
 		}
 		if (!this._isPurePredicateBinding(binding)) {
-			const existingIndex = list.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 old = list[existingIndex];
-				this._byId.delete(old.id);
-				list.splice(existingIndex, 1);
+				const replacedBinding = bindingsForToken[existingIndex];
+				this._byId.delete(replacedBinding.id);
+				bindingsForToken.splice(existingIndex, 1);
 			}
 		}
-		list.push(binding);
+		bindingsForToken.push(binding);
 		this._byId.set(binding.id, binding);
 		this._indexSimpleNamedBinding(key, binding);
 		this._indexSimpleTaggedBinding(key, binding);
 		this._refreshFastDefaultForToken(key);
 	}
 	/** Remove all bindings for a token. Returns removed bindings. */
-	removeByToken(t) {
-		const key = t;
-		const list = this._bindings.get(key) ?? [];
+	removeByToken(token) {
+		const key = token;
+		const bindingsForToken = this._bindings.get(key) ?? [];
 		this._bindings.delete(key);
 		this._simpleNamed.delete(key);
 		this._simpleTagged.delete(key);
 		this._fastDefault.delete(key);
-		for (const b of list) this._byId.delete(b.id);
-		return list;
+		for (const binding of bindingsForToken) this._byId.delete(binding.id);
+		return bindingsForToken;
 	}
 	/** Remove a specific binding by ID. Returns the removed binding or undefined. */
 	removeById(id) {
@@ -48,13 +48,13 @@ var BindingRegistry = class {
 		if (binding === void 0) return;
 		this._byId.delete(id);
 		const key = binding.token;
-		const list = this._bindings.get(key);
-		if (list !== void 0) {
-			const idx = list.findIndex((b) => b.id === id);
-			if (idx !== -1) list.splice(idx, 1);
+		const bindingsForToken = this._bindings.get(key);
+		if (bindingsForToken !== void 0) {
+			const bindingIndex = bindingsForToken.findIndex((candidate) => candidate.id === id);
+			if (bindingIndex !== -1) bindingsForToken.splice(bindingIndex, 1);
 			this._deindexSimpleNamedBinding(key, binding);
 			this._deindexSimpleTaggedBinding(key, binding);
-			if (list.length === 0) {
+			if (bindingsForToken.length === 0) {
 				this._bindings.delete(key);
 				this._simpleNamed.delete(key);
 				this._simpleTagged.delete(key);
@@ -64,24 +64,24 @@ 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;
 	}
 	/** All bindings in the registry. */
 	allBindings() {
-		const result = [];
-		for (const list of this._bindings.values()) result.push(...list);
-		return result;
+		const allBindings = [];
+		for (const bindingsForToken of this._bindings.values()) allBindings.push(...bindingsForToken);
+		return allBindings;
 	}
 	/** Remove all bindings. Returns all removed. */
 	clear() {
@@ -103,24 +103,17 @@ 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((b) => {
-			const s = b.slot;
-			if (s.name === void 0 && s.tags.length === 0) return "default";
-			const parts = [];
-			if (s.name !== void 0) parts.push(`name:${s.name}`);
-			for (const [k, v] of s.tags) parts.push(`tag:${k}=${String(v)}`);
-			return parts.join(",");
-		});
-	}
-	_indexSimpleTaggedBinding(tokenKeyValue, binding) {
+	availableSlotStrings(token) {
+		return (this._bindings.get(token) ?? []).map((binding) => bindingSlotToString(binding.slot));
+	}
+	_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);
+		let byTagKey = this._simpleTagged.get(tokenKey);
 		if (byTagKey === void 0) {
 			byTagKey = /* @__PURE__ */ new Map();
-			this._simpleTagged.set(tokenKeyValue, byTagKey);
+			this._simpleTagged.set(tokenKey, byTagKey);
 		}
 		let byTagValue = byTagKey.get(tagKey);
 		if (byTagValue === void 0) {
@@ -129,11 +122,11 @@ var BindingRegistry = class {
 		}
 		byTagValue.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;
@@ -141,7 +134,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);
 			}
 		}
 	}
@@ -151,38 +144,38 @@ 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 byName = this._simpleNamed.get(tokenKeyValue);
-		if (byName === void 0) {
-			byName = /* @__PURE__ */ new Map();
-			this._simpleNamed.set(tokenKeyValue, byName);
+		let bindingsByName = this._simpleNamed.get(tokenKey);
+		if (bindingsByName === void 0) {
+			bindingsByName = /* @__PURE__ */ new Map();
+			this._simpleNamed.set(tokenKey, bindingsByName);
 		}
-		byName.set(slot.name, binding);
+		bindingsByName.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 byName = this._simpleNamed.get(tokenKeyValue);
-		if (byName === void 0) return;
-		if (byName.get(slot.name)?.id === binding.id) {
-			byName.delete(slot.name);
-			if (byName.size === 0) this._simpleNamed.delete(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(tokenKey);
 		}
 	}
-	_refreshFastDefaultForToken(tokenKeyValue) {
-		const list = this._bindings.get(tokenKeyValue);
-		if (list === void 0 || list.length !== 1) {
-			this._fastDefault.delete(tokenKeyValue);
+	_refreshFastDefaultForToken(tokenKey) {
+		const bindingsForToken = this._bindings.get(tokenKey);
+		if (bindingsForToken === void 0 || bindingsForToken.length !== 1) {
+			this._fastDefault.delete(tokenKey);
 			return;
 		}
-		const onlyBinding = list[0];
+		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 { 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]>;
 }): 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

@@ -5,22 +5,22 @@
 *
 * @since 0.3.16-canary.0
 */
-function injectableSlotToResolveOptions(slot) {
+function injectionSlotToResolveOptions(injectionSlot) {
 	const options = {};
-	if (slot.name !== void 0) options.name = slot.name;
-	if (slot.tags !== void 0) options.tags = slot.tags;
+	if (injectionSlot.name !== void 0) options.name = injectionSlot.name;
+	if (injectionSlot.tags !== void 0) options.tags = injectionSlot.tags;
 	return options.name !== void 0 || options.tags !== void 0 ? options : void 0;
 }
 /**
-* 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) {
+function bindingSlotToResolveOptions(bindingSlot) {
 	const options = {};
-	if (slot.name !== void 0) options.name = slot.name;
-	if (slot.tags.length > 0) options.tags = slot.tags;
+	if (bindingSlot.name !== void 0) options.name = bindingSlot.name;
+	if (bindingSlot.tags.length > 0) options.tags = bindingSlot.tags;
 	return options.name !== void 0 || options.tags !== void 0 ? options : void 0;
 }
 //#endregion
-export { injectableSlotToResolveOptions, slotKeyToResolveOptions };
+export { bindingSlotToResolveOptions, injectionSlotToResolveOptions };

package/dist/resolver.d.mts

@@ -1,6 +1,7 @@
 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";
 import { MetadataReader } from "./metadata/metadata-types.mjs";
@@ -35,22 +36,33 @@ declare class DependencyResolver {
   private _activationCacheVersion;
   constructor(_registry: BindingRegistry, _scope: ScopeManager, _lifecycle: LifecycleManager, _metadataReader: MetadataReader, _container: Container, _parent: DependencyResolver | undefined);
   private _findBinding;
-  resolveFromContext<const Value>(token: Token<Value> | Constructor<Value>, resolutionPath: string[], materializationStack: MaterializationFrame[]): Value;
-  resolve<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: string[], materializationStack: MaterializationFrame[]): Value;
+  /**
+   * Binding lookup aligned with `resolve` — used by `Container.validate` without instantiating.
+   */
+  peekBindingForValidate(token: Token<unknown> | Constructor, hint: ResolveOptions | undefined): {
+    binding: Binding;
+    owner: DependencyResolver;
+  } | undefined;
+  /**
+   * 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>, 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: string[], materializationStack: MaterializationFrame[]): Value | undefined;
-  resolveAll<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: string[], materializationStack: MaterializationFrame[]): Value[];
-  resolveAsyncFromContext<const Value>(token: Token<Value> | Constructor<Value>, resolutionPath: string[], materializationStack: MaterializationFrame[]): Promise<Value>;
-  resolveAsync<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: string[], materializationStack: 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: string[], materializationStack: MaterializationFrame[]): Promise<Value | undefined>;
-  resolveAllAsync<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: string[], materializationStack: MaterializationFrame[]): Promise<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;
@@ -67,7 +79,7 @@ declare class DependencyResolver {
   private _resolveTransientDynamicAsyncSlow;
   private _resolveCandidateSync;
   private _resolveCandidateAsync;
-  private _getMaterializationFrame;
+  private _getResolutionFrame;
   private _needsActivation;
   private _refreshClassPostConstructCache;
   private _requiresResolutionContext;