@codefast/di 0.5.0-canary.3 → 0.5.0-canary.4

package/dist/resolver.mjs

@@ -13,7 +13,7 @@ const ROOT_CONSTRAINT_CONTEXT = {
 	resolutionStack: EMPTY_FRAME_LIST,
 	parent: void 0,
 	ancestors: EMPTY_FRAME_LIST,
-	currentResolveHint: void 0
+	currentResolveOptions: void 0
 };
 /**
 * @since 0.3.16-canary.0
@@ -48,23 +48,23 @@ var DependencyResolver = class {
 		this._container = _container;
 		this._parent = _parent;
 	}
-	_findBinding(token, hint, resolutionPath, resolutionStack) {
-		if (hint === void 0) {
+	_findBinding(token, options, resolutionPath, resolutionStack) {
+		if (options === void 0) {
 			const fastDefaultBinding = this._registry.getFastDefault(token);
 			if (fastDefaultBinding !== void 0) return {
 				binding: fastDefaultBinding,
 				owner: this
 			};
 		}
-		if (hint?.name !== void 0 && hint.tag === void 0 && (hint.tags?.length ?? 0) === 0) {
-			const namedBinding = this._registry.getSimpleNamed(token, hint.name);
-			if (namedBinding !== void 0 && this._matchesBindingFast(namedBinding, hint, resolutionPath, resolutionStack)) return {
+		if (options?.name !== void 0 && options.tag === void 0 && (options.tags?.length ?? 0) === 0) {
+			const namedBinding = this._registry.getSimpleNamed(token, options.name);
+			if (namedBinding !== void 0 && this._matchesBindingFast(namedBinding, options, resolutionPath, resolutionStack)) return {
 				binding: namedBinding,
 				owner: this
 			};
 		}
-		if (hint !== void 0 && hint.name === void 0 && hint.tag === void 0 && (hint.tags?.length ?? 0) === 1) {
-			const [tagKey, tagValue] = hint.tags[0];
+		if (options !== void 0 && options.name === void 0 && options.tag === void 0 && (options.tags?.length ?? 0) === 1) {
+			const [tagKey, tagValue] = options.tags[0];
 			const tagged = this._registry.getSimpleTagged(token, tagKey, tagValue);
 			if (tagged !== void 0) return {
 				binding: tagged,
@@ -76,37 +76,37 @@ var DependencyResolver = class {
 			if (bindings.length === 1) {
 				const onlyBinding = bindings[0];
 				const isDefaultSlot = onlyBinding.slot.name === void 0 && onlyBinding.slot.tags.length === 0;
-				if (hint === void 0 && isDefaultSlot && onlyBinding.predicate === void 0) return {
+				if (options === void 0 && isDefaultSlot && onlyBinding.predicate === void 0) return {
 					binding: onlyBinding,
 					owner: this
 				};
-				if (this._matchesBindingFast(onlyBinding, hint, resolutionPath, resolutionStack)) return {
+				if (this._matchesBindingFast(onlyBinding, options, resolutionPath, resolutionStack)) return {
 					binding: onlyBinding,
 					owner: this
 				};
 			}
-			const binding = selectBinding(bindings, hint, this._makeConstraintContext(resolutionPath, resolutionStack, hint), this._getTokenName(token));
+			const binding = selectBinding(bindings, options, this._makeConstraintContext(resolutionPath, resolutionStack, options), this._getTokenName(token));
 			if (binding !== void 0) return {
 				binding,
 				owner: this
 			};
 		}
-		if (this._parent !== void 0) return this._parent._findBinding(token, hint, resolutionPath, resolutionStack);
+		if (this._parent !== void 0) return this._parent._findBinding(token, options, resolutionPath, resolutionStack);
 	}
 	/**
 	* Binding lookup aligned with `resolve` — used by `Container.validate` without instantiating.
 	*/
-	peekBindingForValidate(token, hint) {
-		return this._findBinding(token, hint, [], []);
+	peekBindingForValidate(token, options) {
+		return this._findBinding(token, options, [], []);
 	}
 	/**
 	* Mirrors {@link DependencyResolver.resolveAll} candidate selection only (no instantiation).
 	*/
-	peekCandidateBindingsForValidate(token, hint) {
-		if (hint?.name !== void 0 && hint.tag === void 0 && (hint.tags?.length ?? 0) === 0) return this._getSimpleNamedBindingsFromChain(token, hint.name);
+	peekCandidateBindingsForValidate(token, options) {
+		if (options?.name !== void 0 && options.tag === void 0 && (options.tags?.length ?? 0) === 0) return this._getSimpleNamedBindingsFromChain(token, options.name);
 		const allBindings = this._getAllBindingsFromChain(token);
 		if (allBindings.length === 0) return [];
-		return selectAllBindings(allBindings, hint, this._makeConstraintContext([], [], hint));
+		return selectAllBindings(allBindings, options, this._makeConstraintContext([], [], options));
 	}
 	resolveFromContext(token, resolutionPath, resolutionStack) {
 		const fastBinding = this._registry.getFastDefault(token);
@@ -123,18 +123,18 @@ var DependencyResolver = class {
 		}
 		return this.resolve(token, void 0, resolutionPath, resolutionStack);
 	}
-	resolve(token, hint, resolutionPath, resolutionStack) {
-		const found = this._findBinding(token, hint, resolutionPath, resolutionStack);
+	resolve(token, options, resolutionPath, resolutionStack) {
+		const found = this._findBinding(token, options, resolutionPath, resolutionStack);
 		if (found === void 0) {
-			if (this._registry.getAll(token).length > 0) throw new NoMatchingBindingError(this._getTokenName(token), hint ?? {}, this._getAvailableSlots(token));
+			if (this._registry.getAll(token).length > 0) throw new NoMatchingBindingError(this._getTokenName(token), options ?? {}, this._getAvailableSlots(token));
 			throw new TokenNotBoundError(this._getTokenName(token));
 		}
 		const { binding, owner } = found;
-		if (binding.kind === "alias") return this.resolve(binding.target, hint, resolutionPath, resolutionStack);
-		if ((binding.scope ?? "transient") === "singleton" && owner !== this) return owner._resolveBinding(binding, hint, resolutionPath, resolutionStack);
-		return this._resolveBinding(binding, hint, resolutionPath, resolutionStack);
+		if (binding.kind === "alias") return this.resolve(binding.target, options, resolutionPath, resolutionStack);
+		if ((binding.scope ?? "transient") === "singleton" && owner !== this) return owner._resolveBinding(binding, options, resolutionPath, resolutionStack);
+		return this._resolveBinding(binding, options, resolutionPath, resolutionStack);
 	}
-	_resolveBinding(binding, hint, resolutionPath, resolutionStack) {
+	_resolveBinding(binding, options, resolutionPath, resolutionStack) {
 		if (binding.kind === "constant" && binding.onActivation === void 0 && !this._lifecycle.hasActivationHandlers(binding.token)) return binding.value;
 		const scope = binding.scope ?? "transient";
 		if (scope === "singleton") {
@@ -158,7 +158,7 @@ var DependencyResolver = class {
 		resolutionStack.push(frame);
 		const needsActivation = this._needsActivation(binding);
 		if (!needsActivation && scope === "transient" && binding.kind === "dynamic") {
-			const resolutionCtx = this._acquireSyncResolutionContext(resolutionPath, resolutionStack, hint);
+			const resolutionCtx = this._acquireSyncResolutionContext(resolutionPath, resolutionStack, options);
 			try {
 				const dynamicResult = binding.factory(resolutionCtx);
 				if (dynamicResult instanceof Promise) throw new AsyncResolutionError(tokenName(binding.token), tokenName(binding.token));
@@ -174,7 +174,7 @@ var DependencyResolver = class {
 			}
 		}
 		try {
-			const resolutionCtx = needsActivation || this._requiresResolutionContext(binding) ? this._acquireSyncResolutionContext(resolutionPath, resolutionStack, hint) : void 0;
+			const resolutionCtx = needsActivation || this._requiresResolutionContext(binding) ? this._acquireSyncResolutionContext(resolutionPath, resolutionStack, options) : void 0;
 			const instance = this._instantiateSync(binding, resolutionCtx, resolutionPath, resolutionStack);
 			const activated = this._refreshActivationCacheIfNeeded(binding, needsActivation) ? this._lifecycle.runActivationSync(resolutionCtx, binding, instance, this._metadataReader) : instance;
 			if (scope === "singleton") this._scope.setSingleton(binding.id, activated);
@@ -219,25 +219,25 @@ var DependencyResolver = class {
 		if (meta.params.length === 0) return [];
 		if (meta.params.length === 1) {
 			const param = meta.params[0];
-			const paramHint = injectionSlotToResolveOptions(param);
-			if (param.multi) return [this.resolveAll(param.token, paramHint, resolutionPath, resolutionStack)];
-			if (param.optional) return [this.resolveOptional(param.token, paramHint, resolutionPath, resolutionStack)];
-			if (paramHint === void 0) return [this.resolveFromContext(param.token, resolutionPath, resolutionStack)];
-			return [this.resolve(param.token, paramHint, resolutionPath, resolutionStack)];
+			const paramOptions = injectionSlotToResolveOptions(param);
+			if (param.multi) return [this.resolveAll(param.token, paramOptions, resolutionPath, resolutionStack)];
+			if (param.optional) return [this.resolveOptional(param.token, paramOptions, resolutionPath, resolutionStack)];
+			if (paramOptions === void 0) return [this.resolveFromContext(param.token, resolutionPath, resolutionStack)];
+			return [this.resolve(param.token, paramOptions, resolutionPath, resolutionStack)];
 		}
 		const deps = new Array(meta.params.length);
 		for (let index = 0; index < meta.params.length; index += 1) {
 			const param = meta.params[index];
-			const paramHint = injectionSlotToResolveOptions(param);
+			const paramOptions = injectionSlotToResolveOptions(param);
 			if (param.multi) {
-				deps[index] = this.resolveAll(param.token, paramHint, resolutionPath, resolutionStack);
+				deps[index] = this.resolveAll(param.token, paramOptions, resolutionPath, resolutionStack);
 				continue;
 			}
 			if (param.optional) {
-				deps[index] = this.resolveOptional(param.token, paramHint, resolutionPath, resolutionStack);
+				deps[index] = this.resolveOptional(param.token, paramOptions, resolutionPath, resolutionStack);
 				continue;
 			}
-			deps[index] = paramHint === void 0 ? this.resolveFromContext(param.token, resolutionPath, resolutionStack) : this.resolve(param.token, paramHint, resolutionPath, resolutionStack);
+			deps[index] = paramOptions === void 0 ? this.resolveFromContext(param.token, resolutionPath, resolutionStack) : this.resolve(param.token, paramOptions, resolutionPath, resolutionStack);
 		}
 		return deps;
 	}
@@ -245,36 +245,36 @@ var DependencyResolver = class {
 		const resolved = new Array(deps.length);
 		for (let index = 0; index < deps.length; index += 1) {
 			const dep = deps[index];
-			const depHint = injectionSlotToResolveOptions(dep);
+			const depOptions = injectionSlotToResolveOptions(dep);
 			if (dep.multi) {
-				resolved[index] = this.resolveAll(dep.token, depHint, resolutionPath, resolutionStack);
+				resolved[index] = this.resolveAll(dep.token, depOptions, resolutionPath, resolutionStack);
 				continue;
 			}
 			if (dep.optional) {
-				resolved[index] = this.resolveOptional(dep.token, depHint, resolutionPath, resolutionStack);
+				resolved[index] = this.resolveOptional(dep.token, depOptions, resolutionPath, resolutionStack);
 				continue;
 			}
-			resolved[index] = depHint === void 0 ? this.resolveFromContext(dep.token, resolutionPath, resolutionStack) : this.resolve(dep.token, depHint, resolutionPath, resolutionStack);
+			resolved[index] = depOptions === void 0 ? this.resolveFromContext(dep.token, resolutionPath, resolutionStack) : this.resolve(dep.token, depOptions, resolutionPath, resolutionStack);
 		}
 		return resolved;
 	}
-	resolveOptional(token, hint, resolutionPath, resolutionStack) {
-		if (this._findBinding(token, hint, resolutionPath, resolutionStack) === void 0) return;
-		return this.resolve(token, hint, resolutionPath, resolutionStack);
+	resolveOptional(token, options, resolutionPath, resolutionStack) {
+		if (this._findBinding(token, options, resolutionPath, resolutionStack) === void 0) return;
+		return this.resolve(token, options, resolutionPath, resolutionStack);
 	}
-	resolveAll(token, hint, resolutionPath, resolutionStack) {
-		if (hint?.name !== void 0 && hint.tag === void 0 && (hint.tags?.length ?? 0) === 0) {
-			const namedCandidates = this._getSimpleNamedBindingsFromChain(token, hint.name);
+	resolveAll(token, options, resolutionPath, resolutionStack) {
+		if (options?.name !== void 0 && options.tag === void 0 && (options.tags?.length ?? 0) === 0) {
+			const namedCandidates = this._getSimpleNamedBindingsFromChain(token, options.name);
 			if (namedCandidates.length === 0) return [];
 			const resolved = new Array(namedCandidates.length);
-			for (let index = 0; index < namedCandidates.length; index += 1) resolved[index] = this._resolveCandidateSync(namedCandidates[index], hint, resolutionPath, resolutionStack);
+			for (let index = 0; index < namedCandidates.length; index += 1) resolved[index] = this._resolveCandidateSync(namedCandidates[index], options, resolutionPath, resolutionStack);
 			return resolved;
 		}
 		const allBindings = this._getAllBindingsFromChain(token);
 		if (allBindings.length === 0) return [];
-		const candidates = selectAllBindings(allBindings, hint, this._makeConstraintContext(resolutionPath, resolutionStack, hint));
+		const candidates = selectAllBindings(allBindings, options, this._makeConstraintContext(resolutionPath, resolutionStack, options));
 		const resolved = new Array(candidates.length);
-		for (let index = 0; index < candidates.length; index += 1) resolved[index] = this._resolveCandidateSync(candidates[index], hint, resolutionPath, resolutionStack);
+		for (let index = 0; index < candidates.length; index += 1) resolved[index] = this._resolveCandidateSync(candidates[index], options, resolutionPath, resolutionStack);
 		return resolved;
 	}
 	resolveAsyncFromContext(token, resolutionPath, resolutionStack) {
@@ -292,18 +292,18 @@ var DependencyResolver = class {
 		}
 		return this.resolveAsync(token, void 0, resolutionPath, resolutionStack);
 	}
-	async resolveAsync(token, hint, resolutionPath, resolutionStack) {
-		const found = this._findBinding(token, hint, resolutionPath, resolutionStack);
+	async resolveAsync(token, options, resolutionPath, resolutionStack) {
+		const found = this._findBinding(token, options, resolutionPath, resolutionStack);
 		if (found === void 0) {
-			if (this._registry.getAll(token).length > 0) throw new NoMatchingBindingError(this._getTokenName(token), hint ?? {}, this._getAvailableSlots(token));
+			if (this._registry.getAll(token).length > 0) throw new NoMatchingBindingError(this._getTokenName(token), options ?? {}, this._getAvailableSlots(token));
 			throw new TokenNotBoundError(this._getTokenName(token));
 		}
 		const { binding, owner } = found;
-		if (binding.kind === "alias") return this.resolveAsync(binding.target, hint, resolutionPath, resolutionStack);
-		if ((binding.scope ?? "transient") === "singleton" && owner !== this) return owner._resolveBindingAsync(binding, hint, resolutionPath, resolutionStack);
-		return this._resolveBindingAsync(binding, hint, resolutionPath, resolutionStack);
+		if (binding.kind === "alias") return this.resolveAsync(binding.target, options, resolutionPath, resolutionStack);
+		if ((binding.scope ?? "transient") === "singleton" && owner !== this) return owner._resolveBindingAsync(binding, options, resolutionPath, resolutionStack);
+		return this._resolveBindingAsync(binding, options, resolutionPath, resolutionStack);
 	}
-	async _resolveBindingAsync(binding, hint, resolutionPath, resolutionStack) {
+	async _resolveBindingAsync(binding, options, resolutionPath, resolutionStack) {
 		if (binding.kind === "constant" && binding.onActivation === void 0 && !this._lifecycle.hasActivationHandlers(binding.token)) return binding.value;
 		const scope = binding.scope ?? "transient";
 		if (scope === "singleton") {
@@ -329,7 +329,7 @@ var DependencyResolver = class {
 		resolutionStack.push(frame);
 		const needsActivation = this._needsActivation(binding);
 		if (!needsActivation && scope === "transient" && (binding.kind === "dynamic" || binding.kind === "dynamic-async")) {
-			const resolutionCtx = new DefaultResolutionContext(this, resolutionPath, resolutionStack, hint);
+			const resolutionCtx = new DefaultResolutionContext(this, resolutionPath, resolutionStack, options);
 			try {
 				if (binding.kind === "dynamic-async") return await binding.factory(resolutionCtx);
 				const dynamicResult = binding.factory(resolutionCtx);
@@ -340,7 +340,7 @@ var DependencyResolver = class {
 				resolutionSet?.delete(frameName);
 			}
 		}
-		const resolutionCtx = needsActivation || this._requiresResolutionContext(binding) ? new DefaultResolutionContext(this, resolutionPath, resolutionStack, hint) : void 0;
+		const resolutionCtx = needsActivation || this._requiresResolutionContext(binding) ? new DefaultResolutionContext(this, resolutionPath, resolutionStack, options) : void 0;
 		try {
 			if (scope === "singleton") {
 				const createSingletonPromise = async () => {
@@ -404,20 +404,20 @@ var DependencyResolver = class {
 		if (meta.params.length === 0) return [];
 		if (meta.params.length === 1) {
 			const param = meta.params[0];
-			const paramHint = injectionSlotToResolveOptions(param);
-			if (param.multi) return [await this.resolveAllAsync(param.token, paramHint, resolutionPath, resolutionStack)];
-			if (param.optional) return [await this.resolveOptionalAsync(param.token, paramHint, resolutionPath, resolutionStack)];
-			if (paramHint === void 0) return [await this.resolveAsyncFromContext(param.token, resolutionPath, resolutionStack)];
-			return [await this.resolveAsync(param.token, paramHint, resolutionPath, resolutionStack)];
+			const paramOptions = injectionSlotToResolveOptions(param);
+			if (param.multi) return [await this.resolveAllAsync(param.token, paramOptions, resolutionPath, resolutionStack)];
+			if (param.optional) return [await this.resolveOptionalAsync(param.token, paramOptions, resolutionPath, resolutionStack)];
+			if (paramOptions === void 0) return [await this.resolveAsyncFromContext(param.token, resolutionPath, resolutionStack)];
+			return [await this.resolveAsync(param.token, paramOptions, resolutionPath, resolutionStack)];
 		}
 		const pending = new Array(meta.params.length);
 		const shouldCloneContext = meta.params.length > 1;
 		for (let index = 0; index < meta.params.length; index += 1) {
 			const param = meta.params[index];
-			const paramHint = injectionSlotToResolveOptions(param);
-			if (param.multi) pending[index] = this.resolveAllAsync(param.token, paramHint, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
-			else if (param.optional) pending[index] = this.resolveOptionalAsync(param.token, paramHint, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
-			else pending[index] = paramHint === void 0 ? this.resolveAsyncFromContext(param.token, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack) : this.resolveAsync(param.token, paramHint, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
+			const paramOptions = injectionSlotToResolveOptions(param);
+			if (param.multi) pending[index] = this.resolveAllAsync(param.token, paramOptions, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
+			else if (param.optional) pending[index] = this.resolveOptionalAsync(param.token, paramOptions, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
+			else pending[index] = paramOptions === void 0 ? this.resolveAsyncFromContext(param.token, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack) : this.resolveAsync(param.token, paramOptions, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
 		}
 		return Promise.all(pending);
 	}
@@ -426,30 +426,30 @@ var DependencyResolver = class {
 		const shouldCloneContext = deps.length > 1;
 		for (let index = 0; index < deps.length; index += 1) {
 			const dep = deps[index];
-			const depHint = injectionSlotToResolveOptions(dep);
-			if (dep.multi) pending[index] = this.resolveAllAsync(dep.token, depHint, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
-			else if (dep.optional) pending[index] = this.resolveOptionalAsync(dep.token, depHint, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
-			else pending[index] = depHint === void 0 ? this.resolveAsyncFromContext(dep.token, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack) : this.resolveAsync(dep.token, depHint, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
+			const depOptions = injectionSlotToResolveOptions(dep);
+			if (dep.multi) pending[index] = this.resolveAllAsync(dep.token, depOptions, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
+			else if (dep.optional) pending[index] = this.resolveOptionalAsync(dep.token, depOptions, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
+			else pending[index] = depOptions === void 0 ? this.resolveAsyncFromContext(dep.token, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack) : this.resolveAsync(dep.token, depOptions, shouldCloneContext ? [...resolutionPath] : resolutionPath, shouldCloneContext ? [...resolutionStack] : resolutionStack);
 		}
 		return Promise.all(pending);
 	}
-	async resolveOptionalAsync(token, hint, resolutionPath, resolutionStack) {
-		if (this._findBinding(token, hint, resolutionPath, resolutionStack) === void 0) return;
-		return this.resolveAsync(token, hint, resolutionPath, resolutionStack);
+	async resolveOptionalAsync(token, options, resolutionPath, resolutionStack) {
+		if (this._findBinding(token, options, resolutionPath, resolutionStack) === void 0) return;
+		return this.resolveAsync(token, options, resolutionPath, resolutionStack);
 	}
-	async resolveAllAsync(token, hint, resolutionPath, resolutionStack) {
-		if (hint?.name !== void 0 && hint.tag === void 0 && (hint.tags?.length ?? 0) === 0) {
-			const namedCandidates = this._getSimpleNamedBindingsFromChain(token, hint.name);
+	async resolveAllAsync(token, options, resolutionPath, resolutionStack) {
+		if (options?.name !== void 0 && options.tag === void 0 && (options.tags?.length ?? 0) === 0) {
+			const namedCandidates = this._getSimpleNamedBindingsFromChain(token, options.name);
 			if (namedCandidates.length === 0) return [];
 			const pending = new Array(namedCandidates.length);
-			for (let index = 0; index < namedCandidates.length; index += 1) pending[index] = this._resolveCandidateAsync(namedCandidates[index], hint, resolutionPath, resolutionStack);
+			for (let index = 0; index < namedCandidates.length; index += 1) pending[index] = this._resolveCandidateAsync(namedCandidates[index], options, resolutionPath, resolutionStack);
 			return Promise.all(pending);
 		}
 		const allBindings = this._getAllBindingsFromChain(token);
 		if (allBindings.length === 0) return [];
-		const candidates = selectAllBindings(allBindings, hint, this._makeConstraintContext(resolutionPath, resolutionStack, hint));
+		const candidates = selectAllBindings(allBindings, options, this._makeConstraintContext(resolutionPath, resolutionStack, options));
 		const pending = new Array(candidates.length);
-		for (let index = 0; index < candidates.length; index += 1) pending[index] = this._resolveCandidateAsync(candidates[index], hint, resolutionPath, resolutionStack);
+		for (let index = 0; index < candidates.length; index += 1) pending[index] = this._resolveCandidateAsync(candidates[index], options, resolutionPath, resolutionStack);
 		return Promise.all(pending);
 	}
 	_getAllBindingsFromChain(token) {
@@ -480,34 +480,34 @@ var DependencyResolver = class {
 	_getAvailableSlots(token) {
 		return this._registry.availableSlotStrings(token);
 	}
-	_makeConstraintContext(resolutionPath, resolutionStack, hint) {
-		if (hint === void 0 && resolutionPath.length === 0 && resolutionStack.length === 0) return ROOT_CONSTRAINT_CONTEXT;
+	_makeConstraintContext(resolutionPath, resolutionStack, options) {
+		if (options === void 0 && resolutionPath.length === 0 && resolutionStack.length === 0) return ROOT_CONSTRAINT_CONTEXT;
 		return {
 			resolutionPath,
 			resolutionStack,
 			parent: resolutionStack.at(-1),
 			ancestors: resolutionStack.length > 1 ? resolutionStack.slice(0, -1) : [],
-			currentResolveHint: hint
+			currentResolveOptions: options
 		};
 	}
-	_matchesBindingFast(binding, hint, resolutionPath, resolutionStack) {
-		if (!this._matchesSlotFast(binding.slot, hint)) return false;
+	_matchesBindingFast(binding, options, resolutionPath, resolutionStack) {
+		if (!this._matchesSlotFast(binding.slot, options)) return false;
 		if (binding.predicate === void 0) return true;
-		const ctx = this._makeConstraintContext(resolutionPath, resolutionStack, hint);
+		const ctx = this._makeConstraintContext(resolutionPath, resolutionStack, options);
 		return binding.predicate(ctx);
 	}
-	_matchesSlotFast(slot, hint) {
-		const hintName = hint?.name;
-		const hintTags = hint?.tags;
-		const singleHintTag = hint?.tag;
-		const hasHintTags = (hintTags?.length ?? 0) > 0 || singleHintTag !== void 0;
+	_matchesSlotFast(slot, options) {
+		const requestedName = options?.name;
+		const requestedTags = options?.tags;
+		const singleRequestedTag = options?.tag;
+		const hasRequestedTags = (requestedTags?.length ?? 0) > 0 || singleRequestedTag !== void 0;
 		if (slot.name !== void 0) {
-			if (hintName === void 0 || slot.name !== hintName) return false;
-		} else if (hintName !== void 0) return false;
+			if (requestedName === void 0 || slot.name !== requestedName) return false;
+		} else if (requestedName !== void 0) return false;
 		if (slot.tags.length > 0) {
-			if (!hasHintTags) return false;
-			for (const [tagKey, tagValue] of slot.tags) if (!this._matchesHintTag(tagKey, tagValue, hintTags, singleHintTag)) return false;
-		} else if (hasHintTags) return false;
+			if (!hasRequestedTags) return false;
+			for (const [tagKey, tagValue] of slot.tags) if (!this._matchesRequestedTag(tagKey, tagValue, requestedTags, singleRequestedTag)) return false;
+		} else if (hasRequestedTags) return false;
 		return true;
 	}
 	_getTokenName(token) {
@@ -530,12 +530,12 @@ var DependencyResolver = class {
 		if (!needsActiveContainer) return new invokable(...deps);
 		return runWithContainer(this._container, () => new invokable(...deps));
 	}
-	_matchesHintTag(tagKey, tagValue, hintTags, singleHintTag) {
-		if (singleHintTag !== void 0 && singleHintTag[0] === tagKey && Object.is(singleHintTag[1], tagValue)) return true;
-		if (hintTags === void 0 || hintTags.length === 0) return false;
-		for (let index = 0; index < hintTags.length; index += 1) {
-			const hintTag = hintTags[index];
-			if (hintTag[0] === tagKey && Object.is(hintTag[1], tagValue)) return true;
+	_matchesRequestedTag(tagKey, tagValue, requestedTags, singleRequestedTag) {
+		if (singleRequestedTag !== void 0 && singleRequestedTag[0] === tagKey && Object.is(singleRequestedTag[1], tagValue)) return true;
+		if (requestedTags === void 0 || requestedTags.length === 0) return false;
+		for (let index = 0; index < requestedTags.length; index += 1) {
+			const requestedTag = requestedTags[index];
+			if (requestedTag[0] === tagKey && Object.is(requestedTag[1], tagValue)) return true;
 		}
 		return false;
 	}
@@ -676,29 +676,29 @@ var DependencyResolver = class {
 			resolutionSet.delete(tokenDisplayName);
 		}
 	}
-	_resolveCandidateSync(binding, hint, resolutionPath, resolutionStack) {
+	_resolveCandidateSync(binding, options, resolutionPath, resolutionStack) {
 		if (binding.kind === "constant" && binding.onActivation === void 0 && !this._lifecycle.hasActivationHandlers(binding.token)) return binding.value;
-		if (binding.kind === "alias") return this.resolve(binding.target, hint, resolutionPath, resolutionStack);
+		if (binding.kind === "alias") return this.resolve(binding.target, options, resolutionPath, resolutionStack);
 		const scope = binding.scope ?? "transient";
 		if (scope === "singleton" && this._scope.hasSingleton(binding.id)) return this._scope.getSingleton(binding.id);
 		if (scope === "scoped") {
 			if (!this._scope.isChild) throw new MissingScopeContextError(this._getTokenName(binding.token));
 			if (this._scope.hasScoped(binding.id)) return this._scope.getScoped(binding.id);
 		}
-		return this._resolveBinding(binding, hint, resolutionPath, resolutionStack);
+		return this._resolveBinding(binding, options, resolutionPath, resolutionStack);
 	}
-	_resolveCandidateAsync(binding, hint, resolutionPath, resolutionStack) {
+	_resolveCandidateAsync(binding, options, resolutionPath, resolutionStack) {
 		if (binding.kind === "constant" && binding.onActivation === void 0 && !this._lifecycle.hasActivationHandlers(binding.token)) return Promise.resolve(binding.value);
 		const isolatedPath = [...resolutionPath];
 		const isolatedStack = [...resolutionStack];
-		if (binding.kind === "alias") return this.resolveAsync(binding.target, hint, isolatedPath, isolatedStack);
+		if (binding.kind === "alias") return this.resolveAsync(binding.target, options, isolatedPath, isolatedStack);
 		const scope = binding.scope ?? "transient";
 		if (scope === "singleton" && this._scope.hasSingleton(binding.id)) return Promise.resolve(this._scope.getSingleton(binding.id));
 		if (scope === "scoped") {
 			if (!this._scope.isChild) return Promise.reject(new MissingScopeContextError(this._getTokenName(binding.token)));
 			if (this._scope.hasScoped(binding.id)) return Promise.resolve(this._scope.getScoped(binding.id));
 		}
-		return this._resolveBindingAsync(binding, hint, isolatedPath, isolatedStack);
+		return this._resolveBindingAsync(binding, options, isolatedPath, isolatedStack);
 	}
 	_getResolutionFrame(binding) {
 		const existing = this._frameByBindingId.get(binding.id);
@@ -751,14 +751,14 @@ var DependencyResolver = class {
 	_requiresResolutionContext(binding) {
 		return binding.kind === "dynamic" || binding.kind === "dynamic-async";
 	}
-	_acquireSyncResolutionContext(resolutionPath, resolutionStack, hint) {
+	_acquireSyncResolutionContext(resolutionPath, resolutionStack, options) {
 		const depth = resolutionStack.length;
 		const existing = this._syncResolutionContextPool[depth];
 		if (existing !== void 0) {
-			existing.reset(this, resolutionPath, resolutionStack, hint);
+			existing.reset(this, resolutionPath, resolutionStack, options);
 			return existing;
 		}
-		const created = new DefaultResolutionContext(this, resolutionPath, resolutionStack, hint);
+		const created = new DefaultResolutionContext(this, resolutionPath, resolutionStack, options);
 		this._syncResolutionContextPool[depth] = created;
 		return created;
 	}

package/dist/types.d.mts

@@ -3,7 +3,7 @@ import { Token } from "./token.mjs";
 
 //#region src/types.d.ts
 /**
- * A single [tag, value] pair used in slot constraints and resolve hints.
+ * A single [tag, value] pair used in slot constraints and resolve options.
  *
  * @since 0.3.16-canary.0
  */
@@ -70,18 +70,18 @@ interface ConstraintContext {
   readonly resolutionStack: ReadonlyArray<ResolutionFrame>;
   readonly parent: ResolutionFrame | undefined;
   readonly ancestors: ReadonlyArray<ResolutionFrame>;
-  readonly currentResolveHint: ResolveOptions | undefined;
+  readonly currentResolveOptions: ResolveOptions | undefined;
 }
 /**
  * @since 0.3.16-canary.0
  */
 interface ResolutionContext {
-  resolve<const Value>(token: Token<Value> | Constructor<Value>, hint?: ResolveOptions): Value;
-  resolveAsync<const Value>(token: Token<Value> | Constructor<Value>, hint?: ResolveOptions): Promise<Value>;
-  resolveOptional<const Value>(token: Token<Value> | Constructor<Value>, hint?: ResolveOptions): Value | undefined;
-  resolveOptionalAsync<const Value>(token: Token<Value> | Constructor<Value>, hint?: ResolveOptions): Promise<Value | undefined>;
-  resolveAll<const Value>(token: Token<Value> | Constructor<Value>, hint?: ResolveOptions): Array<Value>;
-  resolveAllAsync<const Value>(token: Token<Value> | Constructor<Value>, hint?: ResolveOptions): Promise<Array<Value>>;
+  resolve<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Value;
+  resolveAsync<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Promise<Value>;
+  resolveOptional<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Value | undefined;
+  resolveOptionalAsync<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Promise<Value | undefined>;
+  resolveAll<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Array<Value>;
+  resolveAllAsync<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Promise<Array<Value>>;
   readonly graph: ConstraintContext;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefast/di",
-  "version": "0.5.0-canary.3",
+  "version": "0.5.0-canary.4",
   "description": "Lightweight dependency injection primitives for Codefast",
   "keywords": [
     "codefast",
@@ -200,14 +200,14 @@
     "@babel/plugin-proposal-decorators": "8.0.2",
     "@rolldown/plugin-babel": "^0.2.3",
     "@types/node": "^26.1.0",
-    "@typescript/native-preview": "7.0.0-dev.20260703.1",
+    "@typescript/native-preview": "7.0.0-dev.20260704.1",
     "@vitest/coverage-v8": "^4.1.9",
     "expect-type": "^1.4.0",
     "tsdown": "^0.22.3",
     "tsx": "^4.23.0",
     "typescript": "^6.0.3",
     "vitest": "^4.1.9",
-    "@codefast/typescript-config": "0.5.0-canary.3"
+    "@codefast/typescript-config": "0.5.0-canary.4"
   },
   "engines": {
     "node": ">=26.0.0"