@codefast/di 0.3.14 → 0.3.16-canary.0

package/dist/module.d.mts

@@ -5,34 +5,58 @@ import { BindToBuilder } from "./binding.mjs";
 //#region src/module.d.ts
 declare const SYNC_MODULE_BRAND: unique symbol;
 declare const ASYNC_MODULE_BRAND: unique symbol;
+/**
+ * @since 0.3.16-canary.0
+ */
 interface SyncModule {
   readonly name: string;
   readonly [SYNC_MODULE_BRAND]: true;
   readonly _setup: (builder: ModuleBuilder) => void;
 }
+/**
+ * @since 0.3.16-canary.0
+ */
 interface AsyncModule {
   readonly name: string;
   readonly [ASYNC_MODULE_BRAND]: true;
   readonly _setup: (builder: AsyncModuleBuilder) => Promise<void>;
 }
+/**
+ * @since 0.3.16-canary.0
+ */
 interface ModuleBuilder {
   bind<const Value>(token: Token<Value> | Constructor<Value>): BindToBuilder<Value>;
   import(...modules: SyncModule[]): void;
 }
+/**
+ * @since 0.3.16-canary.0
+ */
 interface AsyncModuleBuilder {
   bind<const Value>(token: Token<Value> | Constructor<Value>): BindToBuilder<Value>;
   import(...modules: Array<SyncModule | AsyncModule>): void;
 }
+/**
+ * @since 0.3.16-canary.0
+ */
 declare const SyncModule: {
   create(name: string, setup: (builder: ModuleBuilder) => void): SyncModule;
 };
+/**
+ * @since 0.3.16-canary.0
+ */
 declare const AsyncModule: {
   create(name: string, setup: (builder: AsyncModuleBuilder) => Promise<void>): AsyncModule;
 };
+/**
+ * @since 0.3.16-canary.0
+ */
 declare const Module: {
   create(name: string, setup: (builder: ModuleBuilder) => void): SyncModule;
   createAsync(name: string, setup: (builder: AsyncModuleBuilder) => Promise<void>): AsyncModule;
 };
+/**
+ * @since 0.3.16-canary.0
+ */
 declare function isSyncModule(m: SyncModule | AsyncModule): m is SyncModule;
 //#endregion
 export { AsyncModule, AsyncModuleBuilder, Module, ModuleBuilder, SyncModule, isSyncModule };

package/dist/module.mjs

@@ -1,6 +1,9 @@
 //#region src/module.ts
 const SYNC_MODULE_BRAND = Symbol("di:sync-module");
 const ASYNC_MODULE_BRAND = Symbol("di:async-module");
+/**
+* @since 0.3.16-canary.0
+*/
 const SyncModule = { create(name, setup) {
 	return {
 		name,
@@ -8,6 +11,9 @@ const SyncModule = { create(name, setup) {
 		_setup: setup
 	};
 } };
+/**
+* @since 0.3.16-canary.0
+*/
 const AsyncModule = { create(name, setup) {
 	return {
 		name,
@@ -15,6 +21,9 @@ const AsyncModule = { create(name, setup) {
 		_setup: setup
 	};
 } };
+/**
+* @since 0.3.16-canary.0
+*/
 const Module = {
 	create(name, setup) {
 		return SyncModule.create(name, setup);
@@ -23,6 +32,9 @@ const Module = {
 		return AsyncModule.create(name, setup);
 	}
 };
+/**
+* @since 0.3.16-canary.0
+*/
 function isSyncModule(m) {
 	return m[SYNC_MODULE_BRAND] === true;
 }

package/dist/registry.d.mts

@@ -4,11 +4,15 @@ import { BindingIdentifier } from "./types.mjs";
 import { Binding } from "./binding.mjs";
 
 //#region src/registry.d.ts
+/**
+ * @since 0.3.16-canary.0
+ */
 declare class BindingRegistry {
   private readonly _bindings;
   private readonly _byId;
   private readonly _simpleNamed;
   private readonly _fastDefault;
+  private readonly _simpleTagged;
   /** Add or replace binding using slot-aware last-wins. */
   add(binding: Binding): void;
   /** Remove all bindings for a token. Returns removed bindings. */
@@ -26,9 +30,12 @@ declare class BindingRegistry {
   /** Remove all bindings. Returns all removed. */
   clear(): readonly Binding[];
   getSimpleNamed(token: Token<unknown> | Constructor, name: string): Binding | undefined;
+  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): string[];
+  private _indexSimpleTaggedBinding;
+  private _deindexSimpleTaggedBinding;
   private _isPurePredicateBinding;
   private _indexSimpleNamedBinding;
   private _deindexSimpleNamedBinding;

package/dist/registry.mjs

@@ -1,10 +1,14 @@
 import { slotKeyEquals } from "./binding.mjs";
 //#region src/registry.ts
+/**
+* @since 0.3.16-canary.0
+*/
 var BindingRegistry = class {
 	_bindings = /* @__PURE__ */ new Map();
 	_byId = /* @__PURE__ */ new Map();
 	_simpleNamed = /* @__PURE__ */ new Map();
 	_fastDefault = /* @__PURE__ */ new Map();
+	_simpleTagged = /* @__PURE__ */ new Map();
 	/** Add or replace binding using slot-aware last-wins. */
 	add(binding) {
 		const key = binding.token;
@@ -24,6 +28,7 @@ var BindingRegistry = class {
 		list.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. */
@@ -32,6 +37,7 @@ var BindingRegistry = class {
 		const list = 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;
@@ -47,9 +53,11 @@ var BindingRegistry = class {
 			const idx = list.findIndex((b) => b.id === id);
 			if (idx !== -1) list.splice(idx, 1);
 			this._deindexSimpleNamedBinding(key, binding);
+			this._deindexSimpleTaggedBinding(key, binding);
 			if (list.length === 0) {
 				this._bindings.delete(key);
 				this._simpleNamed.delete(key);
+				this._simpleTagged.delete(key);
 				this._fastDefault.delete(key);
 			} else this._refreshFastDefaultForToken(key);
 		}
@@ -81,12 +89,16 @@ var BindingRegistry = class {
 		this._bindings.clear();
 		this._byId.clear();
 		this._simpleNamed.clear();
+		this._simpleTagged.clear();
 		this._fastDefault.clear();
 		return all;
 	}
 	getSimpleNamed(token, name) {
 		return this._simpleNamed.get(token)?.get(name);
 	}
+	getSimpleTagged(token, tagKey, tagValue) {
+		return this._simpleTagged.get(token)?.get(tagKey)?.get(tagValue);
+	}
 	getFastDefault(token) {
 		return this._fastDefault.get(token);
 	}
@@ -101,6 +113,38 @@ var BindingRegistry = class {
 			return parts.join(",");
 		});
 	}
+	_indexSimpleTaggedBinding(tokenKeyValue, 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);
+	}
+	_deindexSimpleTaggedBinding(tokenKeyValue, 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);
+		if (byTagKey === void 0) return;
+		const byTagValue = byTagKey.get(tagKey);
+		if (byTagValue === void 0) return;
+		if (byTagValue.get(tagValue)?.id === binding.id) {
+			byTagValue.delete(tagValue);
+			if (byTagValue.size === 0) {
+				byTagKey.delete(tagKey);
+				if (byTagKey.size === 0) this._simpleTagged.delete(tokenKeyValue);
+			}
+		}
+	}
 	_isPurePredicateBinding(binding) {
 		const slot = binding.slot;
 		const hasPredicate = binding.predicate !== void 0;

package/dist/resolve-options.d.mts

@@ -5,6 +5,8 @@ import { SlotKey } from "./binding.mjs";
 /**
  * Builds a {@link ResolveOptions} safe for `exactOptionalPropertyTypes`:
  * omits keys instead of assigning `undefined`.
+ *
+ * @since 0.3.16-canary.0
  */
 declare function injectableSlotToResolveOptions(slot: {
   readonly name?: string;
@@ -12,6 +14,8 @@ declare function injectableSlotToResolveOptions(slot: {
 }): ResolveOptions | undefined;
 /**
  * Hint from a binding {@link SlotKey} (tags may be empty; omits when nothing to match).
+ *
+ * @since 0.3.16-canary.0
  */
 declare function slotKeyToResolveOptions(slot: SlotKey): ResolveOptions | undefined;
 //#endregion

package/dist/resolve-options.mjs

@@ -2,6 +2,8 @@
 /**
 * Builds a {@link ResolveOptions} safe for `exactOptionalPropertyTypes`:
 * omits keys instead of assigning `undefined`.
+*
+* @since 0.3.16-canary.0
 */
 function injectableSlotToResolveOptions(slot) {
 	const options = {};
@@ -11,6 +13,8 @@ function injectableSlotToResolveOptions(slot) {
 }
 /**
 * Hint from a binding {@link SlotKey} (tags may be empty; omits when nothing to match).
+*
+* @since 0.3.16-canary.0
 */
 function slotKeyToResolveOptions(slot) {
 	const options = {};

package/dist/resolver.d.mts

@@ -8,6 +8,9 @@ import { Container } from "./container.mjs";
 import { LifecycleManager } from "./lifecycle.mjs";
 
 //#region src/resolver.d.ts
+/**
+ * @since 0.3.16-canary.0
+ */
 declare class DependencyResolver {
   private readonly _registry;
   private readonly _scope;

package/dist/resolver.mjs

@@ -15,6 +15,9 @@ const ROOT_CONSTRAINT_CONTEXT = {
 	ancestors: EMPTY_FRAME_LIST,
 	currentResolveHint: void 0
 };
+/**
+* @since 0.3.16-canary.0
+*/
 var DependencyResolver = class {
 	_frameByBindingId = /* @__PURE__ */ new Map();
 	_syncResolutionContextPool = [];
@@ -54,6 +57,14 @@ var DependencyResolver = class {
 				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];
+			const tagged = this._registry.getSimpleTagged(token, tagKey, tagValue);
+			if (tagged !== void 0) return {
+				binding: tagged,
+				owner: this
+			};
+		}
 		const bindings = this._registry.getAll(token);
 		if (bindings.length > 0) {
 			if (bindings.length === 1) {
@@ -233,12 +244,8 @@ var DependencyResolver = class {
 		return resolved;
 	}
 	resolveOptional(token, hint, resolutionPath, materializationStack) {
-		try {
-			return this.resolve(token, hint, resolutionPath, materializationStack);
-		} catch (e) {
-			if (e instanceof TokenNotBoundError || e instanceof NoMatchingBindingError) return;
-			throw e;
-		}
+		if (this._findBinding(token, hint, resolutionPath, materializationStack) === void 0) return;
+		return this.resolve(token, hint, resolutionPath, materializationStack);
 	}
 	resolveAll(token, hint, resolutionPath, materializationStack) {
 		if (hint?.name !== void 0 && hint.tag === void 0 && (hint.tags?.length ?? 0) === 0) {
@@ -424,12 +431,8 @@ var DependencyResolver = class {
 		return Promise.all(pending);
 	}
 	async resolveOptionalAsync(token, hint, resolutionPath, materializationStack) {
-		try {
-			return await this.resolveAsync(token, hint, resolutionPath, materializationStack);
-		} catch (e) {
-			if (e instanceof TokenNotBoundError || e instanceof NoMatchingBindingError) return;
-			throw e;
-		}
+		if (this._findBinding(token, hint, resolutionPath, materializationStack) === void 0) return;
+		return this.resolveAsync(token, hint, resolutionPath, materializationStack);
 	}
 	async resolveAllAsync(token, hint, resolutionPath, materializationStack) {
 		if (hint?.name !== void 0 && hint.tag === void 0 && (hint.tags?.length ?? 0) === 0) {

package/dist/scope.d.mts

@@ -1,6 +1,9 @@
 import { BindingIdentifier } from "./types.mjs";
 
 //#region src/scope.d.ts
+/**
+ * @since 0.3.16-canary.0
+ */
 declare class ScopeManager {
   private readonly _singletons;
   private readonly _inflight;

package/dist/scope.mjs

@@ -1,5 +1,8 @@
 import { MissingScopeContextError } from "./errors.mjs";
 //#region src/scope.ts
+/**
+* @since 0.3.16-canary.0
+*/
 var ScopeManager = class {
 	_singletons = /* @__PURE__ */ new Map();
 	_inflight = /* @__PURE__ */ new Map();

package/dist/token.d.mts

@@ -2,12 +2,24 @@ import { Constructor } from "./constructor-type.mjs";
 
 //#region src/token.d.ts
 declare const TOKEN_BRAND: unique symbol;
+/**
+ * @since 0.3.16-canary.0
+ */
 interface Token<Value> {
   readonly name: string;
   readonly [TOKEN_BRAND]: Value;
 }
+/**
+ * @since 0.3.16-canary.0
+ */
 declare function token<Value>(name: string): Token<Value>;
+/**
+ * @since 0.3.16-canary.0
+ */
 declare function tokenName(t: Token<unknown> | Constructor): string;
+/**
+ * @since 0.3.16-canary.0
+ */
 declare function isToken(value: unknown): value is Token<unknown>;
 //#endregion
 export { Token, isToken, token, tokenName };

package/dist/token.mjs

@@ -1,11 +1,20 @@
 //#region src/token.ts
+/**
+* @since 0.3.16-canary.0
+*/
 function token(name) {
 	return { name };
 }
+/**
+* @since 0.3.16-canary.0
+*/
 function tokenName(t) {
 	if (typeof t === "function") return t.name;
 	return t.name;
 }
+/**
+* @since 0.3.16-canary.0
+*/
 function isToken(value) {
 	return typeof value === "object" && value !== null && "name" in value && typeof value["name"] === "string" && typeof value !== "function";
 }

package/dist/types.d.mts

@@ -2,21 +2,46 @@ import { Constructor } from "./constructor-type.mjs";
 import { Token } from "./token.mjs";
 
 //#region src/types.d.ts
-/** Token or class constructor used as a binding / injection / resolve key. */
+/**
+ * Token or class constructor used as a binding / injection / resolve key.
+ *
+ * @since 0.3.16-canary.0
+ */
 type DependencyKey = Token<unknown> | Constructor;
+/**
+ * @since 0.3.16-canary.0
+ */
 type BindingScope = "singleton" | "transient" | "scoped";
 declare const BINDING_ID_BRAND: unique symbol;
+/**
+ * @since 0.3.16-canary.0
+ */
 type BindingIdentifier = string & {
   readonly [BINDING_ID_BRAND]: true;
 };
+/**
+ * @since 0.3.16-canary.0
+ */
 type BindingKind = "class" | "dynamic" | "dynamic-async" | "resolved" | "resolved-async" | "constant" | "alias";
+/**
+ * @since 0.3.16-canary.0
+ */
 type ActivationHandler<Value> = (ctx: ResolutionContext, instance: Value) => Value | Promise<Value>;
+/**
+ * @since 0.3.16-canary.0
+ */
 type DeactivationHandler<Value> = (instance: Value) => void | Promise<void>;
+/**
+ * @since 0.3.16-canary.0
+ */
 interface ResolveOptions {
   name?: string;
   tag?: readonly [tag: string, value: unknown];
   tags?: ReadonlyArray<readonly [tag: string, value: unknown]>;
 }
+/**
+ * @since 0.3.16-canary.0
+ */
 interface MaterializationFrame {
   readonly tokenName: string;
   readonly scope: BindingScope;
@@ -27,6 +52,9 @@ interface MaterializationFrame {
     readonly tags: ReadonlyArray<readonly [tag: string, value: unknown]>;
   };
 }
+/**
+ * @since 0.3.16-canary.0
+ */
 interface ConstraintContext {
   readonly resolutionPath: readonly string[];
   readonly materializationStack: readonly MaterializationFrame[];
@@ -34,6 +62,9 @@ interface ConstraintContext {
   readonly ancestors: readonly MaterializationFrame[];
   readonly currentResolveHint: 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>;
@@ -43,6 +74,9 @@ interface ResolutionContext {
   resolveAllAsync<const Value>(token: Token<Value> | Constructor<Value>, hint?: ResolveOptions): Promise<Value[]>;
   readonly graph: ConstraintContext;
 }
+/**
+ * @since 0.3.16-canary.0
+ */
 type TokenValue<Type> = Type extends Token<infer Value> ? Value : Type extends Constructor<infer Value> ? Value : never;
 //#endregion
 export { ActivationHandler, BindingIdentifier, BindingKind, BindingScope, ConstraintContext, type Constructor, DeactivationHandler, DependencyKey, MaterializationFrame, ResolutionContext, ResolveOptions, TokenValue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefast/di",
-  "version": "0.3.14",
+  "version": "0.3.16-canary.0",
   "description": "Lightweight dependency injection primitives for Codefast",
   "keywords": [
     "codefast",
@@ -171,13 +171,13 @@
   },
   "devDependencies": {
     "@types/node": "^25.6.0",
-    "@typescript/native-preview": "7.0.0-dev.20260422.1",
+    "@typescript/native-preview": "7.0.0-dev.20260504.1",
     "@vitest/coverage-v8": "^4.1.5",
     "expect-type": "^1.3.0",
     "typescript": "^6.0.3",
     "unplugin-swc": "^1.5.9",
     "vitest": "^4.1.5",
-    "@codefast/typescript-config": "0.3.14"
+    "@codefast/typescript-config": "0.3.16-canary.0"
   },
   "engines": {
     "node": ">=22.0.0"
@@ -187,7 +187,6 @@
     "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",
-    "bench": "vitest bench --run",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
     "test:watch": "vitest"