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

package/dist/resolver.mjs

@@ -19,6 +19,12 @@ const ROOT_CONSTRAINT_CONTEXT = {
 * @since 0.3.16-canary.0
 */
 var DependencyResolver = class {
+	_registry;
+	_scope;
+	_lifecycle;
+	_metadataReader;
+	_container;
+	_parent;
 	_frameByBindingId = /* @__PURE__ */ new Map();
 	_syncResolutionContextPool = [];
 	_deepCycleMarks = /* @__PURE__ */ new Map();
@@ -87,6 +93,21 @@ var DependencyResolver = class {
 		}
 		if (this._parent !== void 0) return this._parent._findBinding(token, hint, resolutionPath, materializationStack);
 	}
+	/**
+	* Binding lookup aligned with `resolve` — used by `Container.validate` without instantiating.
+	*/
+	peekBindingForValidate(token, hint) {
+		return this._findBinding(token, hint, [], []);
+	}
+	/**
+	* 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);
+		const allBindings = this._getAllBindingsFromChain(token);
+		if (allBindings.length === 0) return [];
+		return selectAllBindings(allBindings, hint, this._makeConstraintContext([], [], hint));
+	}
 	resolveFromContext(token, resolutionPath, materializationStack) {
 		const fastBinding = this._registry.getFastDefault(token);
 		if (fastBinding !== void 0) {
@@ -124,16 +145,16 @@ var DependencyResolver = class {
 			if (this._scope.hasScoped(binding.id)) return this._scope.getScoped(binding.id);
 		}
 		const frame = this._getMaterializationFrame(binding);
-		const tName = frame.tokenName;
+		const tokenDisplayName = frame.tokenName;
 		const pathWithSet = resolutionPath;
 		let resolutionSet = pathWithSet[RESOLUTION_SET_KEY];
 		if (resolutionSet === void 0 && resolutionPath.length >= RESOLUTION_SET_THRESHOLD) {
 			resolutionSet = new Set(resolutionPath);
 			pathWithSet[RESOLUTION_SET_KEY] = resolutionSet;
 		}
-		if (resolutionSet !== void 0 ? resolutionSet.has(tName) : resolutionPath.includes(tName)) throw new CircularDependencyError([...resolutionPath, tName]);
-		resolutionPath.push(tName);
-		resolutionSet?.add(tName);
+		if (resolutionSet !== void 0 ? resolutionSet.has(tokenDisplayName) : resolutionPath.includes(tokenDisplayName)) throw new CircularDependencyError([...resolutionPath, tokenDisplayName]);
+		resolutionPath.push(tokenDisplayName);
+		resolutionSet?.add(tokenDisplayName);
 		materializationStack.push(frame);
 		const needsActivation = this._needsActivation(binding);
 		if (!needsActivation && scope === "transient" && binding.kind === "dynamic") {
@@ -143,18 +164,18 @@ var DependencyResolver = class {
 				if (dynamicResult instanceof Promise) throw new AsyncResolutionError(tokenName(binding.token), tokenName(binding.token));
 				materializationStack.pop();
 				resolutionPath.pop();
-				resolutionSet?.delete(tName);
+				resolutionSet?.delete(tokenDisplayName);
 				return dynamicResult;
 			} catch (error) {
 				materializationStack.pop();
 				resolutionPath.pop();
-				resolutionSet?.delete(tName);
+				resolutionSet?.delete(tokenDisplayName);
 				throw error;
 			}
 		}
 		try {
 			const resolutionCtx = needsActivation || this._requiresResolutionContext(binding) ? this._acquireSyncResolutionContext(resolutionPath, materializationStack, hint) : void 0;
-			const instance = this._instantiateSync(binding, resolutionCtx, resolutionPath, materializationStack, hint);
+			const instance = this._instantiateSync(binding, resolutionCtx, resolutionPath, materializationStack);
 			let shouldActivate = needsActivation;
 			if (binding.kind === "class" && this._classHasPostConstruct.get(binding.target) === void 0) {
 				this._refreshClassPostConstructCache(binding.target);
@@ -168,17 +189,17 @@ var DependencyResolver = class {
 		} finally {
 			materializationStack.pop();
 			resolutionPath.pop();
-			resolutionSet?.delete(tName);
+			resolutionSet?.delete(tokenDisplayName);
 		}
 	}
-	_instantiateSync(binding, ctx, resolutionPath, materializationStack, hint) {
+	_instantiateSync(binding, ctx, resolutionPath, materializationStack) {
 		switch (binding.kind) {
 			case "constant": return binding.value;
 			case "dynamic": {
 				if (ctx === void 0) throw new InternalError("dynamic binding requires resolution context");
-				const r = binding.factory(ctx);
-				if (r instanceof Promise) throw new AsyncResolutionError(tokenName(binding.token), tokenName(binding.token));
-				return r;
+				const factoryResult = binding.factory(ctx);
+				if (factoryResult instanceof Promise) throw new AsyncResolutionError(tokenName(binding.token), tokenName(binding.token));
+				return factoryResult;
 			}
 			case "dynamic-async": throw new AsyncResolutionError(tokenName(binding.token), tokenName(binding.token));
 			case "class": {
@@ -186,7 +207,7 @@ var DependencyResolver = class {
 				return this._instantiateClass(binding.target, deps);
 			}
 			case "resolved": {
-				const deps = this._resolveDescriptorDeps(binding.deps, resolutionPath, materializationStack, hint);
+				const deps = this._resolveDescriptorDeps(binding.deps, resolutionPath, materializationStack);
 				const r = binding.factory(...deps);
 				if (r instanceof Promise) throw new AsyncResolutionError(tokenName(binding.token), tokenName(binding.token));
 				return r;
@@ -226,7 +247,7 @@ var DependencyResolver = class {
 		}
 		return deps;
 	}
-	_resolveDescriptorDeps(deps, resolutionPath, materializationStack, _hint) {
+	_resolveDescriptorDeps(deps, resolutionPath, materializationStack) {
 		const resolved = new Array(deps.length);
 		for (let index = 0; index < deps.length; index += 1) {
 			const dep = deps[index];
@@ -329,7 +350,7 @@ var DependencyResolver = class {
 		try {
 			if (scope === "singleton") {
 				const createSingletonPromise = async () => {
-					const instance = await this._instantiateAsync(binding, resolutionCtx, resolutionPath, materializationStack, hint);
+					const instance = await this._instantiateAsync(binding, resolutionCtx, resolutionPath, materializationStack);
 					let shouldActivate = needsActivation;
 					if (binding.kind === "class" && this._classHasPostConstruct.get(binding.target) === void 0) {
 						this._refreshClassPostConstructCache(binding.target);
@@ -341,14 +362,14 @@ var DependencyResolver = class {
 					this._scope.clearInflight(binding.id);
 					return activated;
 				};
-				const p = createSingletonPromise().catch((err) => {
+				const singletonPromise = createSingletonPromise().catch((err) => {
 					this._scope.clearInflight(binding.id);
 					throw err;
 				});
-				this._scope.setInflight(binding.id, p);
-				return await p;
+				this._scope.setInflight(binding.id, singletonPromise);
+				return await singletonPromise;
 			}
-			const instance = await this._instantiateAsync(binding, resolutionCtx, resolutionPath, materializationStack, hint);
+			const instance = await this._instantiateAsync(binding, resolutionCtx, resolutionPath, materializationStack);
 			let shouldActivate = needsActivation;
 			if (binding.kind === "class" && this._classHasPostConstruct.get(binding.target) === void 0) {
 				this._refreshClassPostConstructCache(binding.target);
@@ -364,7 +385,7 @@ var DependencyResolver = class {
 			resolutionSet?.delete(tName);
 		}
 	}
-	async _instantiateAsync(binding, ctx, resolutionPath, materializationStack, hint) {
+	async _instantiateAsync(binding, ctx, resolutionPath, materializationStack) {
 		switch (binding.kind) {
 			case "constant": return binding.value;
 			case "dynamic": {
@@ -381,12 +402,12 @@ var DependencyResolver = class {
 			}
 			case "resolved": {
 				if (ctx === void 0) throw new InternalError("resolved binding requires resolution context");
-				const deps = await this._resolveDescriptorDepsAsync(binding.deps, resolutionPath, materializationStack, hint);
+				const deps = await this._resolveDescriptorDepsAsync(binding.deps, resolutionPath, materializationStack);
 				const r = binding.factory(...deps);
 				return r instanceof Promise ? r : Promise.resolve(r);
 			}
 			case "resolved-async": {
-				const deps = await this._resolveDescriptorDepsAsync(binding.deps, resolutionPath, materializationStack, hint);
+				const deps = await this._resolveDescriptorDepsAsync(binding.deps, resolutionPath, materializationStack);
 				return binding.factory(...deps);
 			}
 			case "alias": throw new InternalError("alias should have been followed before instantiation");
@@ -418,7 +439,7 @@ var DependencyResolver = class {
 		}
 		return Promise.all(pending);
 	}
-	async _resolveDescriptorDepsAsync(deps, resolutionPath, materializationStack, _hint) {
+	async _resolveDescriptorDepsAsync(deps, resolutionPath, materializationStack) {
 		const pending = new Array(deps.length);
 		const shouldCloneContext = deps.length > 1;
 		for (let index = 0; index < deps.length; index += 1) {
@@ -539,14 +560,14 @@ var DependencyResolver = class {
 	_resolveTransientDynamicSyncFromContext(binding, resolutionPath, materializationStack) {
 		if (resolutionPath.length < RESOLUTION_SET_THRESHOLD) {
 			const frame = this._getMaterializationFrame(binding);
-			const tName = frame.tokenName;
-			if (resolutionPath.includes(tName)) throw new CircularDependencyError([...resolutionPath, tName]);
-			resolutionPath.push(tName);
+			const tokenDisplayName = frame.tokenName;
+			if (resolutionPath.includes(tokenDisplayName)) throw new CircularDependencyError([...resolutionPath, tokenDisplayName]);
+			resolutionPath.push(tokenDisplayName);
 			materializationStack.push(frame);
 			const resolutionCtx = this._acquireSyncResolutionContext(resolutionPath, materializationStack, void 0);
 			try {
 				const dynamicResult = binding.factory(resolutionCtx);
-				if (dynamicResult instanceof Promise) throw new AsyncResolutionError(tName, tName);
+				if (dynamicResult instanceof Promise) throw new AsyncResolutionError(tokenDisplayName, tokenDisplayName);
 				return dynamicResult;
 			} finally {
 				materializationStack.pop();
@@ -577,33 +598,33 @@ var DependencyResolver = class {
 	}
 	_resolveTransientDynamicSyncSlow(binding, resolutionPath, materializationStack) {
 		const frame = this._getMaterializationFrame(binding);
-		const tName = frame.tokenName;
+		const tokenDisplayName = frame.tokenName;
 		const pathWithSet = resolutionPath;
 		let resolutionSet = pathWithSet[RESOLUTION_SET_KEY];
 		if (resolutionSet === void 0) {
 			resolutionSet = new Set(resolutionPath);
 			pathWithSet[RESOLUTION_SET_KEY] = resolutionSet;
 		}
-		if (resolutionSet.has(tName)) throw new CircularDependencyError([...resolutionPath, tName]);
-		resolutionPath.push(tName);
-		resolutionSet.add(tName);
+		if (resolutionSet.has(tokenDisplayName)) throw new CircularDependencyError([...resolutionPath, tokenDisplayName]);
+		resolutionPath.push(tokenDisplayName);
+		resolutionSet.add(tokenDisplayName);
 		materializationStack.push(frame);
 		const resolutionCtx = this._acquireSyncResolutionContext(resolutionPath, materializationStack, void 0);
 		try {
 			const dynamicResult = binding.factory(resolutionCtx);
-			if (dynamicResult instanceof Promise) throw new AsyncResolutionError(tName, tName);
+			if (dynamicResult instanceof Promise) throw new AsyncResolutionError(tokenDisplayName, tokenDisplayName);
 			return dynamicResult;
 		} finally {
 			materializationStack.pop();
 			resolutionPath.pop();
-			resolutionSet.delete(tName);
+			resolutionSet.delete(tokenDisplayName);
 		}
 	}
 	_resolveTransientDynamicAsyncFromContext(binding, resolutionPath, materializationStack) {
 		if (resolutionPath.length < RESOLUTION_SET_THRESHOLD) {
-			const tName = tokenName(binding.token);
-			if (resolutionPath.includes(tName)) return Promise.reject(new CircularDependencyError([...resolutionPath, tName]));
-			resolutionPath.push(tName);
+			const tokenDisplayName = tokenName(binding.token);
+			if (resolutionPath.includes(tokenDisplayName)) return Promise.reject(new CircularDependencyError([...resolutionPath, tokenDisplayName]));
+			resolutionPath.push(tokenDisplayName);
 			let ctx;
 			let isOwnerLevel;
 			if (this._deepAsyncCtxPath === resolutionPath) {
@@ -629,8 +650,8 @@ var DependencyResolver = class {
 			try {
 				if (binding.kind === "dynamic-async") factoryPromise = binding.factory(ctx);
 				else {
-					const r = binding.factory(ctx);
-					factoryPromise = r instanceof Promise ? r : Promise.resolve(r);
+					const factoryResult = binding.factory(ctx);
+					factoryPromise = factoryResult instanceof Promise ? factoryResult : Promise.resolve(factoryResult);
 				}
 			} catch (err) {
 				resolutionPath.pop();
@@ -651,16 +672,16 @@ var DependencyResolver = class {
 	}
 	async _resolveTransientDynamicAsyncSlow(binding, resolutionPath, materializationStack) {
 		const frame = this._getMaterializationFrame(binding);
-		const tName = frame.tokenName;
+		const tokenDisplayName = frame.tokenName;
 		const pathWithSet = resolutionPath;
 		let resolutionSet = pathWithSet[RESOLUTION_SET_KEY];
 		if (resolutionSet === void 0) {
 			resolutionSet = new Set(resolutionPath);
 			pathWithSet[RESOLUTION_SET_KEY] = resolutionSet;
 		}
-		if (resolutionSet.has(tName)) throw new CircularDependencyError([...resolutionPath, tName]);
-		resolutionPath.push(tName);
-		resolutionSet.add(tName);
+		if (resolutionSet.has(tokenDisplayName)) throw new CircularDependencyError([...resolutionPath, tokenDisplayName]);
+		resolutionPath.push(tokenDisplayName);
+		resolutionSet.add(tokenDisplayName);
 		materializationStack.push(frame);
 		const resolutionCtx = new DefaultResolutionContext(this, resolutionPath, materializationStack, void 0);
 		try {
@@ -670,7 +691,7 @@ var DependencyResolver = class {
 		} finally {
 			materializationStack.pop();
 			resolutionPath.pop();
-			resolutionSet.delete(tName);
+			resolutionSet.delete(tokenDisplayName);
 		}
 	}
 	_resolveCandidateSync(binding, hint, resolutionPath, materializationStack) {

package/dist/types.d.mts

@@ -36,6 +36,10 @@ type DeactivationHandler<Value> = (instance: Value) => void | Promise<void>;
  */
 interface ResolveOptions {
   name?: string;
+  /**
+   * Single-tag shorthand — semantics match including one pair in `tags`.
+   * Enables fast-path lookup alongside `tags`.
+   */
   tag?: readonly [tag: string, value: unknown];
   tags?: ReadonlyArray<readonly [tag: string, value: unknown]>;
 }
@@ -56,10 +60,10 @@ interface MaterializationFrame {
  * @since 0.3.16-canary.0
  */
 interface ConstraintContext {
-  readonly resolutionPath: readonly string[];
-  readonly materializationStack: readonly MaterializationFrame[];
+  readonly resolutionPath: ReadonlyArray<string>;
+  readonly materializationStack: ReadonlyArray<MaterializationFrame>;
   readonly parent: MaterializationFrame | undefined;
-  readonly ancestors: readonly MaterializationFrame[];
+  readonly ancestors: ReadonlyArray<MaterializationFrame>;
   readonly currentResolveHint: ResolveOptions | undefined;
 }
 /**
@@ -70,8 +74,8 @@ interface ResolutionContext {
   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): Value[];
-  resolveAllAsync<const Value>(token: Token<Value> | Constructor<Value>, hint?: ResolveOptions): Promise<Value[]>;
+  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>>;
   readonly graph: ConstraintContext;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefast/di",
-  "version": "0.3.16-canary.0",
+  "version": "0.3.16-canary.1",
   "description": "Lightweight dependency injection primitives for Codefast",
   "keywords": [
     "codefast",
@@ -170,14 +170,16 @@
     "access": "public"
   },
   "devDependencies": {
-    "@types/node": "^25.6.0",
-    "@typescript/native-preview": "7.0.0-dev.20260504.1",
+    "@types/node": "^25.6.2",
+    "@typescript/native-preview": "7.0.0-dev.20260509.2",
     "@vitest/coverage-v8": "^4.1.5",
     "expect-type": "^1.3.0",
+    "tsdown": "^0.22.0",
+    "tsx": "^4.21.0",
     "typescript": "^6.0.3",
     "unplugin-swc": "^1.5.9",
     "vitest": "^4.1.5",
-    "@codefast/typescript-config": "0.3.16-canary.0"
+    "@codefast/typescript-config": "0.3.16-canary.1"
   },
   "engines": {
     "node": ">=22.0.0"
@@ -186,9 +188,13 @@
     "build": "tsdown",
     "check-types": "tsgo --noEmit",
     "clean": "rm -rf dist",
-    "examples": "for file in examples/*/*.ts; do echo \"=== Running $file ===\"; tsx \"$file\"; echo \"\n\" || exit 1; done",
+    "examples": "for file in examples/*/*.ts; do echo \"=== Running $file ===\"; node --import tsx/esm \"$file\"; echo \"\n\" || exit 1; done",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
+    "test:e2e": "vitest run tests/e2e",
+    "test:integration": "vitest run tests/integration",
+    "test:type": "vitest run tests/types",
+    "test:unit": "vitest run tests/unit",
     "test:watch": "vitest"
   }
 }