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

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

@@ -1,6 +1,16 @@
 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
  */
@@ -25,5 +35,18 @@ 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]`).
+ *
+ * @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}.
+ *
+ * @since 0.3.16-canary.0
+ */
+declare const accessorMetadataByConstructorMap: WeakMap<object, AccessorInjectionEntryList>;
 //#endregion
-export { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, constructorMetadataMap, lifecycleByConstructorMetadataMap, lifecycleMetadataMap };
+export { AccessorInjectionEntryList, INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, accessorMetadataByConstructorMap, accessorMetadataByMetadataObjectMap, constructorMetadataMap, lifecycleByConstructorMetadataMap, lifecycleMetadataMap };

package/dist/metadata/metadata-keys.mjs

@@ -23,5 +23,18 @@ 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]`).
+*
+* @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}.
+*
+* @since 0.3.16-canary.0
+*/
+const accessorMetadataByConstructorMap = /* @__PURE__ */ new WeakMap();
 //#endregion
-export { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, constructorMetadataMap, lifecycleByConstructorMetadataMap, lifecycleMetadataMap };
+export { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, accessorMetadataByConstructorMap, accessorMetadataByMetadataObjectMap, constructorMetadataMap, lifecycleByConstructorMetadataMap, lifecycleMetadataMap };

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

@@ -17,14 +17,14 @@ interface ParamMetadata {
  * @since 0.3.16-canary.0
  */
 interface ConstructorMetadata {
-  readonly params: readonly ParamMetadata[];
+  readonly params: ReadonlyArray<ParamMetadata>;
 }
 /**
  * @since 0.3.16-canary.0
  */
 interface LifecycleMetadata {
-  readonly postConstruct: readonly string[];
-  readonly preDestroy: readonly string[];
+  readonly postConstruct: ReadonlyArray<string>;
+  readonly preDestroy: ReadonlyArray<string>;
 }
 /**
  * Mutable buckets used while aggregating decorator metadata (same keys as {@link LifecycleMetadata}).
@@ -32,8 +32,8 @@ interface LifecycleMetadata {
  * @since 0.3.16-canary.0
  */
 interface MutableLifecycleMetadata {
-  postConstruct: string[];
-  preDestroy: string[];
+  postConstruct: Array<string>;
+  preDestroy: Array<string>;
 }
 /**
  * @since 0.3.16-canary.0

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

@@ -1,39 +1,46 @@
-import { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, constructorMetadataMap, lifecycleByConstructorMetadataMap, lifecycleMetadataMap } from "./metadata-keys.mjs";
+import { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, accessorMetadataByConstructorMap, accessorMetadataByMetadataObjectMap, constructorMetadataMap, lifecycleByConstructorMetadataMap, lifecycleMetadataMap } from "./metadata-keys.mjs";
 //#region src/metadata/symbol-metadata-reader.ts
 /**
 * @since 0.3.16-canary.0
 */
 var SymbolMetadataReader = class {
 	getConstructorMetadata(target) {
-		const fromWeakMap = constructorMetadataMap.get(target);
-		if (fromWeakMap !== void 0) return fromWeakMap;
-		const own = Object.getOwnPropertyDescriptor(target, Symbol.metadata);
-		if (own === void 0) return;
-		const meta = own.value;
-		if (!meta || typeof meta !== "object" || !Object.hasOwn(meta, INJECTABLE_KEY)) return;
-		return meta[INJECTABLE_KEY];
+		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];
 	}
 	getLifecycleMetadata(target) {
-		const byConstructor = lifecycleByConstructorMetadataMap.get(target);
-		if (byConstructor !== void 0) return byConstructor;
-		const own = Object.getOwnPropertyDescriptor(target, Symbol.metadata);
-		if (own !== void 0) {
-			const meta = own.value;
-			if (meta && typeof meta === "object" && Object.hasOwn(meta, LIFECYCLE_KEY)) return meta[LIFECYCLE_KEY];
+		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 classMeta = target[Symbol.metadata];
-		if (classMeta !== void 0) {
-			const fromWeakMap = lifecycleMetadataMap.get(classMeta);
-			if (fromWeakMap !== void 0) return fromWeakMap;
+		const classMetadataObject = target[Symbol.metadata];
+		if (classMetadataObject !== void 0) {
+			const weakMapMetadata = lifecycleMetadataMap.get(classMetadataObject);
+			if (weakMapMetadata !== void 0) return weakMapMetadata;
 		}
 	}
 	getAccessorMetadata(target) {
-		const own = Object.getOwnPropertyDescriptor(target, Symbol.metadata);
-		if (own === void 0) return;
-		const meta = own.value;
-		if (!meta || typeof meta !== "object") return;
-		if (!Object.hasOwn(meta, INJECT_ACCESSOR_KEY)) return;
-		return meta[INJECT_ACCESSOR_KEY];
+		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];
 	}
 };
 /**

package/dist/module.d.mts

@@ -26,7 +26,7 @@ interface AsyncModule {
  */
 interface ModuleBuilder {
   bind<const Value>(token: Token<Value> | Constructor<Value>): BindToBuilder<Value>;
-  import(...modules: SyncModule[]): void;
+  import(...modules: Array<SyncModule>): void;
 }
 /**
  * @since 0.3.16-canary.0

package/dist/registry.d.mts

@@ -16,24 +16,24 @@ 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): Binding[];
+  removeByToken(t: 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): readonly Binding[];
+  getAll(t: 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;
   /** All bindings in the registry. */
-  allBindings(): readonly Binding[];
+  allBindings(): ReadonlyArray<Binding>;
   /** Remove all bindings. Returns all removed. */
-  clear(): readonly Binding[];
+  clear(): ReadonlyArray<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[];
+  availableSlotStrings(t: Token<unknown> | Constructor): Array<string>;
   private _indexSimpleTaggedBinding;
   private _deindexSimpleTaggedBinding;
   private _isPurePredicateBinding;

package/dist/registry.mjs

@@ -1,4 +1,4 @@
-import { slotKeyEquals } from "./binding.mjs";
+import { slotKeyEquals, slotKeyToString } from "./binding.mjs";
 //#region src/registry.ts
 /**
 * @since 0.3.16-canary.0
@@ -12,20 +12,20 @@ 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((b) => !this._isPurePredicateBinding(b) && slotKeyEquals(b.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);
@@ -34,13 +34,13 @@ var BindingRegistry = class {
 	/** Remove all bindings for a token. Returns removed bindings. */
 	removeByToken(t) {
 		const key = t;
-		const list = this._bindings.get(key) ?? [];
+		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);
@@ -79,9 +79,9 @@ var BindingRegistry = class {
 	}
 	/** 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() {
@@ -104,14 +104,7 @@ var BindingRegistry = class {
 	}
 	/** 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(",");
-		});
+		return (this._bindings.get(t) ?? []).map((binding) => slotKeyToString(binding.slot));
 	}
 	_indexSimpleTaggedBinding(tokenKeyValue, binding) {
 		const slot = binding.slot;
@@ -154,30 +147,30 @@ var BindingRegistry = class {
 	_indexSimpleNamedBinding(tokenKeyValue, 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(tokenKeyValue);
+		if (bindingsByName === void 0) {
+			bindingsByName = /* @__PURE__ */ new Map();
+			this._simpleNamed.set(tokenKeyValue, bindingsByName);
 		}
-		byName.set(slot.name, binding);
+		bindingsByName.set(slot.name, binding);
 	}
 	_deindexSimpleNamedBinding(tokenKeyValue, 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(tokenKeyValue);
+		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);
 		}
 	}
 	_refreshFastDefaultForToken(tokenKeyValue) {
-		const list = this._bindings.get(tokenKeyValue);
-		if (list === void 0 || list.length !== 1) {
+		const bindingsForToken = this._bindings.get(tokenKeyValue);
+		if (bindingsForToken === void 0 || bindingsForToken.length !== 1) {
 			this._fastDefault.delete(tokenKeyValue);
 			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);
 			return;

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 { 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>, materializationStack: Array<MaterializationFrame>): Value;
+  resolve<const Value>(token: Token<Value> | Constructor<Value>, hint: ResolveOptions | undefined, resolutionPath: Array<string>, materializationStack: Array<MaterializationFrame>): 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>, 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>;
   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>, 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>>;
   private _getAllBindingsFromChain;
   private _getSimpleNamedBindingsFromChain;
   private _getAvailableSlots;