@codefast/di 0.3.16-canary.2 → 0.4.0-canary.4

package/dist/decorators/inject.mjs

@@ -1,7 +1,7 @@
 import { InternalError, MissingContainerContextError } from "../errors.mjs";
 import { getActiveContainer } from "../environment.mjs";
+import { INJECT_ACCESSOR_KEY } from "../metadata/metadata-keys.mjs";
 import { injectionSlotToResolveOptions } from "../resolve-options.mjs";
-import { INJECT_ACCESSOR_KEY, accessorMetadataByMetadataObjectMap } from "../metadata/metadata-keys.mjs";
 //#region src/decorators/inject.ts
 /**
 * @since 0.3.16-canary.0
@@ -54,12 +54,7 @@ function materializeInjectionDescriptor(dependency) {
 	};
 	return base;
 }
-function buildInjectionDescriptor(token, options) {
-	const base = {
-		token,
-		optional: false,
-		multi: false
-	};
+function withOptions(base, options) {
 	if (options?.name !== void 0 && options.tags !== void 0) return {
 		...base,
 		name: options.name,
@@ -75,20 +70,26 @@ function buildInjectionDescriptor(token, options) {
 	};
 	return base;
 }
+function buildInjectionDescriptor(token, options) {
+	return withOptions({
+		token,
+		optional: false,
+		multi: false
+	}, options);
+}
 /**
 * @since 0.3.16-canary.0
 */
 function inject(token, options) {
 	const descriptor = buildInjectionDescriptor(token, options);
 	const decoratorFn = (_target, context) => {
-		if (context.static === true) throw new InternalError("@inject() on static accessors is not supported; only instance accessors participate in runWithContainer-based property injection.");
+		if (context.static) throw new InternalError("@inject() on static accessors is not supported; only instance accessors participate in runWithContainer-based property injection.");
 		const meta = context.metadata;
 		if (!Array.isArray(meta[INJECT_ACCESSOR_KEY])) meta[INJECT_ACCESSOR_KEY] = [];
 		meta[INJECT_ACCESSOR_KEY].push({
 			key: context.name,
 			descriptor
 		});
-		accessorMetadataByMetadataObjectMap.set(context.metadata, meta[INJECT_ACCESSOR_KEY]);
 		context.addInitializer(function() {
 			const container = getActiveContainer();
 			if (container === void 0) throw new MissingContainerContextError(String(context.name));
@@ -115,49 +116,21 @@ function inject(token, options) {
 * @since 0.3.16-canary.0
 */
 function optional(token, options) {
-	const base = {
+	return withOptions({
 		token,
 		optional: true,
 		multi: false
-	};
-	if (options?.name !== void 0 && options.tags !== void 0) return {
-		...base,
-		name: options.name,
-		tags: options.tags
-	};
-	if (options?.name !== void 0) return {
-		...base,
-		name: options.name
-	};
-	if (options?.tags !== void 0) return {
-		...base,
-		tags: options.tags
-	};
-	return base;
+	}, options);
 }
 /**
 * @since 0.3.16-canary.0
 */
 function injectAll(token, options) {
-	const base = {
+	return withOptions({
 		token,
 		optional: false,
 		multi: true
-	};
-	if (options?.name !== void 0 && options.tags !== void 0) return {
-		...base,
-		name: options.name,
-		tags: options.tags
-	};
-	if (options?.name !== void 0) return {
-		...base,
-		name: options.name
-	};
-	if (options?.tags !== void 0) return {
-		...base,
-		tags: options.tags
-	};
-	return base;
+	}, options);
 }
 //#endregion
 export { inject, injectAll, isInjectionDescriptor, normalizeToDescriptor, optional };

package/dist/decorators/injectable.mjs

@@ -1,4 +1,4 @@
-import { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, accessorMetadataByConstructorMap, constructorMetadataMap } from "../metadata/metadata-keys.mjs";
+import { INJECTABLE_KEY } from "../metadata/metadata-keys.mjs";
 import { normalizeToDescriptor } from "./inject.mjs";
 //#region src/decorators/injectable.ts
 /**
@@ -23,7 +23,7 @@ function createAutoRegisterRegistry() {
 */
 function injectable(deps, options) {
 	return function(target, context) {
-		const constructorMetadata = { params: (deps ?? []).map((dependency, index) => {
+		const parameterMetadataList = (deps ?? []).map((dependency, index) => {
 			const descriptor = normalizeToDescriptor(dependency);
 			const baseParameterMetadata = {
 				index,
@@ -45,16 +45,8 @@ function injectable(deps, options) {
 				tags: descriptor.tags
 			};
 			return baseParameterMetadata;
-		}) };
-		constructorMetadataMap.set(target, constructorMetadata);
-		try {
-			const metadata = context.metadata;
-			if (metadata !== null && typeof metadata === "object") {
-				const accessorList = metadata[INJECT_ACCESSOR_KEY];
-				if (Array.isArray(accessorList) && accessorList.length > 0) accessorMetadataByConstructorMap.set(target, accessorList);
-				metadata[INJECTABLE_KEY] = constructorMetadata;
-			}
-		} catch {}
+		});
+		context.metadata[INJECTABLE_KEY] = { params: parameterMetadataList };
 		if (options?.autoRegister !== void 0) {
 			const scope = options.scope ?? "transient";
 			options.autoRegister.register(target, scope);

package/dist/decorators/lifecycle-decorators.mjs

@@ -1,61 +1,22 @@
 import { InternalError } from "../errors.mjs";
-import { LIFECYCLE_KEY, lifecycleByConstructorMetadataMap, lifecycleMetadataMap } from "../metadata/metadata-keys.mjs";
+import { LIFECYCLE_KEY } from "../metadata/metadata-keys.mjs";
 //#region src/decorators/lifecycle-decorators.ts
 function appendUniqueMethod(metadata, phase, methodName) {
 	if (!metadata[phase].includes(methodName)) metadata[phase].push(methodName);
 }
-function resolveConstructorFromDecoratorTarget(target) {
-	if (typeof target === "function") return target;
-	if (typeof target === "object" && target !== null) {
-		const ctor = target.constructor;
-		if (typeof ctor === "function") return ctor;
-	}
-}
-function registerByConstructor(target, phase, methodName) {
-	const ctor = resolveConstructorFromDecoratorTarget(target);
-	if (ctor === void 0) return;
-	const ctorExisting = lifecycleByConstructorMetadataMap.get(ctor);
-	if (ctorExisting !== void 0) appendUniqueMethod(ctorExisting, phase, methodName);
-	else lifecycleByConstructorMetadataMap.set(ctor, {
-		postConstruct: phase === "postConstruct" ? [methodName] : [],
-		preDestroy: phase === "preDestroy" ? [methodName] : []
-	});
-}
 /**
 * @since 0.3.16-canary.0
 */
 function postConstruct() {
 	return function(target, context) {
-		if (context.static === true) throw new InternalError("@postConstruct() applies to instance methods only; static methods are not invoked during instance lifecycle.");
+		if (context.static) throw new InternalError("@postConstruct() applies to instance methods only; static methods are not invoked during instance lifecycle.");
 		const methodName = String(context.name);
-		registerByConstructor(target, "postConstruct", methodName);
-		const existing = lifecycleMetadataMap.get(context.metadata);
-		if (existing !== void 0) appendUniqueMethod(existing, "postConstruct", methodName);
-		else lifecycleMetadataMap.set(context.metadata, {
-			postConstruct: [methodName],
+		const meta = context.metadata;
+		if (!meta[LIFECYCLE_KEY]) meta[LIFECYCLE_KEY] = {
+			postConstruct: [],
 			preDestroy: []
-		});
-		context.addInitializer(function() {
-			const targetOrInstance = this;
-			const ctor = typeof targetOrInstance === "function" ? targetOrInstance : targetOrInstance.constructor;
-			const ctorExisting = lifecycleByConstructorMetadataMap.get(ctor);
-			if (ctorExisting !== void 0) appendUniqueMethod(ctorExisting, "postConstruct", methodName);
-			else lifecycleByConstructorMetadataMap.set(ctor, {
-				postConstruct: [methodName],
-				preDestroy: []
-			});
-		});
-		try {
-			const meta = context.metadata;
-			if (meta !== null && typeof meta === "object") {
-				if (!meta[LIFECYCLE_KEY]) meta[LIFECYCLE_KEY] = {
-					postConstruct: [],
-					preDestroy: []
-				};
-				const lifecycle = meta[LIFECYCLE_KEY];
-				appendUniqueMethod(lifecycle, "postConstruct", methodName);
-			}
-		} catch {}
+		};
+		appendUniqueMethod(meta[LIFECYCLE_KEY], "postConstruct", methodName);
 	};
 }
 /**
@@ -63,36 +24,14 @@ function postConstruct() {
 */
 function preDestroy() {
 	return function(target, context) {
-		if (context.static === true) throw new InternalError("@preDestroy() applies to instance methods only; static methods are not invoked during instance teardown.");
+		if (context.static) throw new InternalError("@preDestroy() applies to instance methods only; static methods are not invoked during instance teardown.");
 		const methodName = String(context.name);
-		registerByConstructor(target, "preDestroy", methodName);
-		const existing = lifecycleMetadataMap.get(context.metadata);
-		if (existing !== void 0) appendUniqueMethod(existing, "preDestroy", methodName);
-		else lifecycleMetadataMap.set(context.metadata, {
+		const meta = context.metadata;
+		if (!meta[LIFECYCLE_KEY]) meta[LIFECYCLE_KEY] = {
 			postConstruct: [],
-			preDestroy: [methodName]
-		});
-		context.addInitializer(function() {
-			const targetOrInstance = this;
-			const ctor = typeof targetOrInstance === "function" ? targetOrInstance : targetOrInstance.constructor;
-			const ctorExisting = lifecycleByConstructorMetadataMap.get(ctor);
-			if (ctorExisting !== void 0) appendUniqueMethod(ctorExisting, "preDestroy", methodName);
-			else lifecycleByConstructorMetadataMap.set(ctor, {
-				postConstruct: [],
-				preDestroy: [methodName]
-			});
-		});
-		try {
-			const meta = context.metadata;
-			if (meta !== null && typeof meta === "object") {
-				if (!meta[LIFECYCLE_KEY]) meta[LIFECYCLE_KEY] = {
-					postConstruct: [],
-					preDestroy: []
-				};
-				const lifecycle = meta[LIFECYCLE_KEY];
-				appendUniqueMethod(lifecycle, "preDestroy", methodName);
-			}
-		} catch {}
+			preDestroy: []
+		};
+		appendUniqueMethod(meta[LIFECYCLE_KEY], "preDestroy", methodName);
 	};
 }
 //#endregion

package/dist/dependency-graph.d.mts

@@ -1,6 +1,6 @@
 import { BindingScope } from "./types.mjs";
-import { BindingRegistry } from "./registry.mjs";
 import { MetadataReader } from "./metadata/metadata-types.mjs";
+import { BindingRegistry } from "./registry.mjs";
 
 //#region src/dependency-graph.d.ts
 /**

package/dist/dependency-graph.mjs

@@ -20,15 +20,17 @@ function buildDependencyGraph(registry, metadataReader, options, parentRegistry)
 			});
 			if (binding.kind === "class") {
 				const meta = metadataReader.getConstructorMetadata(binding.target);
-				if (meta !== void 0) meta.params.forEach((param, index) => {
+				if (meta !== void 0) for (let index = 0; index < meta.params.length; index += 1) {
+					const param = meta.params[index];
 					const dependencyBinding = sourceRegistry.getAll(param.token)[0];
 					if (dependencyBinding !== void 0) edges.push({
 						from: binding.id,
 						to: dependencyBinding.id,
 						label: `[${index}]`
 					});
-				});
-			} else if (binding.kind === "resolved" || binding.kind === "resolved-async") binding.deps.forEach((dependency, index) => {
+				}
+			} else if (binding.kind === "resolved" || binding.kind === "resolved-async") for (let index = 0; index < binding.deps.length; index += 1) {
+				const dependency = binding.deps[index];
 				const dependencyBindings = sourceRegistry.getAll(dependency.token);
 				if (dependencyBindings.length > 0 && dependencyBindings[0] !== void 0) {
 					const label = dependency.name !== void 0 ? `name:${dependency.name}` : dependency.tags !== void 0 && dependency.tags.length > 0 ? `tag:${dependency.tags[0]?.[0]}=${String(dependency.tags[0]?.[1])}` : `[${index}]`;
@@ -38,7 +40,7 @@ function buildDependencyGraph(registry, metadataReader, options, parentRegistry)
 						label
 					});
 				}
-			});
+			}
 			else if (binding.kind === "alias") {
 				const targetBindings = sourceRegistry.getAll(binding.target);
 				if (targetBindings.length > 0 && targetBindings[0] !== void 0) edges.push({

package/dist/graph-adapters/cytoscape.d.mts

@@ -5,29 +5,29 @@ import { ContainerGraphJson } from "../dependency-graph.mjs";
  * @since 0.3.16-canary.0
  */
 interface CytoscapeNode {
-  data: {
-    id: string;
-    label: string;
-    kind: string;
-    scope: string;
-    fromParent: boolean;
+  readonly data: {
+    readonly id: string;
+    readonly label: string;
+    readonly kind: string;
+    readonly scope: string;
+    readonly fromParent: boolean;
   };
 }
 /**
  * @since 0.3.16-canary.0
  */
 interface CytoscapeEdge {
-  data: {
-    id: string;
-    source: string;
-    target: string;
-    label?: string;
+  readonly data: {
+    readonly id: string;
+    readonly source: string;
+    readonly target: string;
+    readonly label?: string;
   };
 }
 /**
  * @since 0.3.16-canary.0
  */
-type CytoscapeElements = Array<CytoscapeNode | CytoscapeEdge>;
+type CytoscapeElements = ReadonlyArray<CytoscapeNode | CytoscapeEdge>;
 /**
  * @since 0.3.16-canary.0
  */

package/dist/graph-adapters/cytoscape.mjs

@@ -11,15 +11,15 @@ function toCytoscapeGraph(graph) {
 		scope: node.scope,
 		fromParent: node.fromParent
 	} });
-	graph.edges.forEach((edge, idx) => {
-		const data = {
+	for (let idx = 0; idx < graph.edges.length; idx += 1) {
+		const edge = graph.edges[idx];
+		elements.push({ data: {
 			id: `edge-${idx}`,
 			source: edge.from,
-			target: edge.to
-		};
-		if (edge.label !== void 0) data.label = edge.label;
-		elements.push({ data });
-	});
+			target: edge.to,
+			...edge.label !== void 0 ? { label: edge.label } : {}
+		} });
+	}
 	return elements;
 }
 //#endregion

package/dist/graph-adapters/reactflow.d.mts

@@ -5,33 +5,33 @@ import { ContainerGraphJson } from "../dependency-graph.mjs";
  * @since 0.3.16-canary.0
  */
 interface ReactFlowNode {
-  id: string;
-  data: {
-    label: string;
-    kind: string;
-    scope: string;
-    fromParent: boolean;
+  readonly id: string;
+  readonly data: {
+    readonly label: string;
+    readonly kind: string;
+    readonly scope: string;
+    readonly fromParent: boolean;
   };
-  position: {
-    x: number;
-    y: number;
+  readonly position: {
+    readonly x: number;
+    readonly y: number;
   };
 }
 /**
  * @since 0.3.16-canary.0
  */
 interface ReactFlowEdge {
-  id: string;
-  source: string;
-  target: string;
-  label?: string;
+  readonly id: string;
+  readonly source: string;
+  readonly target: string;
+  readonly label?: string;
 }
 /**
  * @since 0.3.16-canary.0
  */
 interface ReactFlowGraph {
-  nodes: Array<ReactFlowNode>;
-  edges: Array<ReactFlowEdge>;
+  readonly nodes: ReadonlyArray<ReactFlowNode>;
+  readonly edges: ReadonlyArray<ReactFlowEdge>;
 }
 /**
  * @since 0.3.16-canary.0

package/dist/graph-adapters/reactflow.mjs

@@ -17,15 +17,12 @@ function toReactFlowGraph(graph) {
 				y: Math.floor(idx / 5) * 100
 			}
 		})),
-		edges: graph.edges.map((edge, idx) => {
-			const reactFlowEdge = {
-				id: `edge-${idx}`,
-				source: edge.from,
-				target: edge.to
-			};
-			if (edge.label !== void 0) reactFlowEdge.label = edge.label;
-			return reactFlowEdge;
-		})
+		edges: graph.edges.map((edge, idx) => ({
+			id: `edge-${idx}`,
+			source: edge.from,
+			target: edge.to,
+			...edge.label !== void 0 ? { label: edge.label } : {}
+		}))
 	};
 }
 //#endregion

package/dist/index.d.mts

@@ -1,18 +1,18 @@
 import { Constructor } from "./constructor-type.mjs";
 import { Token, isToken, token, tokenName } from "./token.mjs";
-import { ActivationHandler, BindingIdentifier, BindingKind, BindingScope, ConstraintContext, DeactivationHandler, DependencyKey, ResolutionContext, ResolutionFrame, ResolveOptions, TokenValue } from "./types.mjs";
+import { ActivationHandler, BindingIdentifier, BindingKind, BindingScope, BindingTag, ConstraintContext, DeactivationHandler, DependencyKey, ResolutionContext, ResolutionFrame, ResolveOptions, TokenValue } from "./types.mjs";
 import { InjectOptions, InjectableDependency, InjectionDescriptor, inject, injectAll, isInjectionDescriptor, optional } from "./decorators/inject.mjs";
-import { AliasBindingBuilder, BindToBuilder, BindingBuilder, ConstantBindingBuilder, ScopedBindingBuilder, SingletonBindingBuilder, SingletonLifecycleBuilder, TransientBindingBuilder } from "./binding.mjs";
+import { AliasBindingBuilder, BindToBuilder, BindingBuilder, ConstantBindingBuilder, ScopedBindingBuilder, SingletonBindingBuilder, SingletonLifecycleBuilder, SlotConstrainedBuilder, TransientBindingBuilder } from "./binding.mjs";
 import { effectiveBindingScope } from "./binding-scope.mjs";
 import { whenAnyAncestorIs, whenAnyAncestorNamed, whenAnyAncestorTagged, whenAnyAncestorTaggedAll, whenNoAncestorIs, whenNoParentIs, whenParentIs, whenParentNamed, whenParentTagged, whenParentTaggedAll } from "./constraints.mjs";
-import { AsyncModule, AsyncModuleBuilder, Module, ModuleBuilder, SyncModule, isSyncModule } from "./module.mjs";
-import { BindingSnapshot, ContainerSnapshot } from "./inspector.mjs";
+import { AutoRegisterRegistry, InjectableOptions, createAutoRegisterRegistry, injectable } from "./decorators/injectable.mjs";
 import { MetadataReader, MutableLifecycleMetadata } from "./metadata/metadata-types.mjs";
 import { ContainerGraphJson, GraphEdge, GraphNode, GraphOptions } from "./dependency-graph.mjs";
-import { AutoRegisterRegistry, InjectableOptions, createAutoRegisterRegistry, injectable } from "./decorators/injectable.mjs";
+import { BindingSnapshot, ContainerSnapshot } from "./inspector.mjs";
+import { AsyncModule, AsyncModuleBuilder, Module, ModuleBuilder, SyncModule, isSyncModule } from "./module.mjs";
 import { Container, ContainerStatic } from "./container.mjs";
 import { postConstruct, preDestroy } from "./decorators/lifecycle-decorators.mjs";
 import { AmbiguousBindingError, AsyncActivationError, AsyncDeactivationError, AsyncModuleLoadError, AsyncResolutionError, CircularDependencyError, DiError, DisposedContainerError, InternalError, MissingContainerContextError, MissingMetadataError, MissingScopeContextError, NoMatchingBindingError, RebindUnboundTokenError, ScopeViolationDetails, ScopeViolationError, SyncDisposalNotSupportedError, TokenNotBoundError } from "./errors.mjs";
 import { bindingSlotToResolveOptions, injectionSlotToResolveOptions } from "./resolve-options.mjs";
 import { MetadataReaderToken } from "./metadata/metadata-reader-token.mjs";
-export { type ActivationHandler, type AliasBindingBuilder, AmbiguousBindingError, AsyncActivationError, AsyncDeactivationError, AsyncModule, type AsyncModuleBuilder, AsyncModuleLoadError, AsyncResolutionError, type AutoRegisterRegistry, type BindToBuilder, type BindingBuilder, type BindingIdentifier, type BindingKind, type BindingScope, type BindingSnapshot, CircularDependencyError, type ConstantBindingBuilder, type ConstraintContext, type Constructor, Container, type ContainerGraphJson, type Container as ContainerInterface, type ContainerSnapshot, type ContainerStatic, type DeactivationHandler, type DependencyKey, DiError, DisposedContainerError, type GraphEdge, type GraphNode, type GraphOptions, type InjectOptions, type InjectableDependency, type InjectableOptions, type InjectionDescriptor, InternalError, type MetadataReader, MetadataReaderToken, MissingContainerContextError, MissingMetadataError, MissingScopeContextError, Module, type ModuleBuilder, type MutableLifecycleMetadata, NoMatchingBindingError, RebindUnboundTokenError, type ResolutionContext, type ResolutionFrame, type ResolveOptions, type ScopeViolationDetails, ScopeViolationError, type ScopedBindingBuilder, type SingletonBindingBuilder, type SingletonLifecycleBuilder, SyncDisposalNotSupportedError, SyncModule, type Token, TokenNotBoundError, type TokenValue, type TransientBindingBuilder, bindingSlotToResolveOptions, createAutoRegisterRegistry, effectiveBindingScope, inject, injectAll, injectable, injectionSlotToResolveOptions, isInjectionDescriptor, isSyncModule, isToken, optional, postConstruct, preDestroy, token, tokenName, whenAnyAncestorIs, whenAnyAncestorNamed, whenAnyAncestorTagged, whenAnyAncestorTaggedAll, whenNoAncestorIs, whenNoParentIs, whenParentIs, whenParentNamed, whenParentTagged, whenParentTaggedAll };
+export { type ActivationHandler, type AliasBindingBuilder, AmbiguousBindingError, AsyncActivationError, AsyncDeactivationError, AsyncModule, type AsyncModuleBuilder, AsyncModuleLoadError, AsyncResolutionError, type AutoRegisterRegistry, type BindToBuilder, type BindingBuilder, type BindingIdentifier, type BindingKind, type BindingScope, type BindingSnapshot, type BindingTag, CircularDependencyError, type ConstantBindingBuilder, type ConstraintContext, type Constructor, Container, type ContainerGraphJson, type Container as ContainerInterface, type ContainerSnapshot, type ContainerStatic, type DeactivationHandler, type DependencyKey, DiError, DisposedContainerError, type GraphEdge, type GraphNode, type GraphOptions, type InjectOptions, type InjectableDependency, type InjectableOptions, type InjectionDescriptor, InternalError, type MetadataReader, MetadataReaderToken, MissingContainerContextError, MissingMetadataError, MissingScopeContextError, Module, type ModuleBuilder, type MutableLifecycleMetadata, NoMatchingBindingError, RebindUnboundTokenError, type ResolutionContext, type ResolutionFrame, type ResolveOptions, type ScopeViolationDetails, ScopeViolationError, type ScopedBindingBuilder, type SingletonBindingBuilder, type SingletonLifecycleBuilder, type SlotConstrainedBuilder, SyncDisposalNotSupportedError, SyncModule, type Token, TokenNotBoundError, type TokenValue, type TransientBindingBuilder, bindingSlotToResolveOptions, createAutoRegisterRegistry, effectiveBindingScope, inject, injectAll, injectable, injectionSlotToResolveOptions, isInjectionDescriptor, isSyncModule, isToken, optional, postConstruct, preDestroy, token, tokenName, whenAnyAncestorIs, whenAnyAncestorNamed, whenAnyAncestorTagged, whenAnyAncestorTaggedAll, whenNoAncestorIs, whenNoParentIs, whenParentIs, whenParentNamed, whenParentTagged, whenParentTaggedAll };

package/dist/index.mjs

@@ -3,8 +3,8 @@ import { AmbiguousBindingError, AsyncActivationError, AsyncDeactivationError, As
 import { isToken, token, tokenName } from "./token.mjs";
 import { whenAnyAncestorIs, whenAnyAncestorNamed, whenAnyAncestorTagged, whenAnyAncestorTaggedAll, whenNoAncestorIs, whenNoParentIs, whenParentIs, whenParentNamed, whenParentTagged, whenParentTaggedAll } from "./constraints.mjs";
 import { bindingSlotToResolveOptions, injectionSlotToResolveOptions } from "./resolve-options.mjs";
-import { MetadataReaderToken } from "./metadata/metadata-reader-token.mjs";
 import { inject, injectAll, isInjectionDescriptor, optional } from "./decorators/inject.mjs";
+import { MetadataReaderToken } from "./metadata/metadata-reader-token.mjs";
 import { AsyncModule, Module, SyncModule, isSyncModule } from "./module.mjs";
 import { Container } from "./container.mjs";
 import { createAutoRegisterRegistry, injectable } from "./decorators/injectable.mjs";

package/dist/inspector.d.mts

@@ -1,6 +1,6 @@
 import { Constructor } from "./constructor-type.mjs";
 import { Token } from "./token.mjs";
-import { BindingIdentifier, BindingKind, BindingScope, ResolveOptions } from "./types.mjs";
+import { BindingIdentifier, BindingKind, BindingScope, BindingTag, ResolveOptions } from "./types.mjs";
 import { BindingRegistry } from "./registry.mjs";
 import { ScopeManager } from "./scope.mjs";
 
@@ -14,7 +14,7 @@ interface BindingSnapshot {
   readonly scope: BindingScope;
   readonly slot: {
     readonly name?: string;
-    readonly tags: ReadonlyArray<readonly [string, unknown]>;
+    readonly tags: ReadonlyArray<BindingTag>;
   };
   readonly id: BindingIdentifier;
 }
@@ -40,6 +40,7 @@ declare class Inspector {
   lookupBindings<Value>(token: Token<Value> | Constructor<Value>): ReadonlyArray<BindingSnapshot>;
   has(token: Token<unknown> | Constructor, hint?: ResolveOptions, parentHas?: () => boolean): boolean;
   hasOwn(token: Token<unknown> | Constructor, hint?: ResolveOptions): boolean;
+  private _makeHintContext;
   private allBindingSnapshots;
   private _toSnapshot;
 }

package/dist/inspector.mjs

@@ -30,27 +30,24 @@ var Inspector = class {
 	has(token, hint, parentHas) {
 		const bindings = this._registry.getAll(token);
 		if (bindings.length > 0) if (hint !== void 0) {
-			if (selectBinding(bindings, hint, {
-				resolutionPath: [],
-				resolutionStack: [],
-				parent: void 0,
-				ancestors: [],
-				currentResolveHint: hint
-			}, tokenName(token)) !== void 0) return true;
+			if (selectBinding(bindings, hint, this._makeHintContext(hint), tokenName(token)) !== void 0) return true;
 		} else return true;
 		return parentHas?.() ?? false;
 	}
 	hasOwn(token, hint) {
 		const bindings = this._registry.getAll(token);
 		if (bindings.length === 0) return false;
-		if (hint !== void 0) return selectBinding(bindings, hint, {
+		if (hint !== void 0) return selectBinding(bindings, hint, this._makeHintContext(hint), tokenName(token)) !== void 0;
+		return true;
+	}
+	_makeHintContext(hint) {
+		return {
 			resolutionPath: [],
 			resolutionStack: [],
 			parent: void 0,
 			ancestors: [],
 			currentResolveHint: hint
-		}, tokenName(token)) !== void 0;
-		return true;
+		};
 	}
 	allBindingSnapshots() {
 		return this._registry.allBindings().map((binding) => this._toSnapshot(binding));

package/dist/lifecycle.mjs

@@ -10,12 +10,7 @@ var LifecycleManager = class {
 	_activationVersion = 0;
 	registerActivation(token, handler) {
 		this._activationVersion += 1;
-		let list = this._activationHooks.get(token);
-		if (list === void 0) {
-			list = [];
-			this._activationHooks.set(token, list);
-		}
-		list.push(handler);
+		this._activationHooks.getOrInsert(token, []).push(handler);
 	}
 	hasActivationHandlers(token) {
 		if (this._activationHooks.size === 0) return false;
@@ -26,12 +21,7 @@ var LifecycleManager = class {
 		return this._activationVersion;
 	}
 	registerDeactivation(token, handler) {
-		let list = this._deactivationHooks.get(token);
-		if (list === void 0) {
-			list = [];
-			this._deactivationHooks.set(token, list);
-		}
-		list.push(handler);
+		this._deactivationHooks.getOrInsert(token, []).push(handler);
 	}
 	async runActivation(resolutionContext, binding, instance, metadataReader) {
 		let activatedInstance = instance;

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

@@ -1,16 +1,4 @@
-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
  */
@@ -24,29 +12,16 @@ declare const LIFECYCLE_KEY: unique symbol;
  */
 declare const INJECT_ACCESSOR_KEY: unique symbol;
 /**
- * @since 0.3.16-canary.0
- */
-declare const constructorMetadataMap: WeakMap<object, ConstructorMetadata>;
-/**
- * @since 0.3.16-canary.0
- */
-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]`).
+ * The well-known symbol used by TC39 Stage 3 decorator transforms to store class 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}.
+ * `Symbol.metadata` is defined natively once the runtime ships the full TC39 decorator
+ * proposal.  Until then (current Node.js / browsers), Babel and esbuild both fall back to
+ * `Symbol.for("Symbol.metadata")` — a global-registry symbol with the same string key.
+ * Resolving it here once keeps the reader and the decorator transforms in sync regardless
+ * of which path is taken.
  *
  * @since 0.3.16-canary.0
  */
-declare const accessorMetadataByConstructorMap: WeakMap<object, AccessorInjectionEntryList>;
+declare const METADATA_SYMBOL: symbol;
 //#endregion
-export { AccessorInjectionEntryList, INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, accessorMetadataByConstructorMap, accessorMetadataByMetadataObjectMap, constructorMetadataMap, lifecycleByConstructorMetadataMap, lifecycleMetadataMap };
+export { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, METADATA_SYMBOL };

package/dist/metadata/metadata-keys.mjs

@@ -12,29 +12,16 @@ const LIFECYCLE_KEY = Symbol("di:lifecycle");
 */
 const INJECT_ACCESSOR_KEY = Symbol("di:inject-accessor");
 /**
-* @since 0.3.16-canary.0
-*/
-const constructorMetadataMap = /* @__PURE__ */ new WeakMap();
-/**
-* @since 0.3.16-canary.0
-*/
-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]`).
+* The well-known symbol used by TC39 Stage 3 decorator transforms to store class 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}.
+* `Symbol.metadata` is defined natively once the runtime ships the full TC39 decorator
+* proposal.  Until then (current Node.js / browsers), Babel and esbuild both fall back to
+* `Symbol.for("Symbol.metadata")` — a global-registry symbol with the same string key.
+* Resolving it here once keeps the reader and the decorator transforms in sync regardless
+* of which path is taken.
 *
 * @since 0.3.16-canary.0
 */
-const accessorMetadataByConstructorMap = /* @__PURE__ */ new WeakMap();
+const METADATA_SYMBOL = Symbol.metadata ?? Symbol.for("Symbol.metadata");
 //#endregion
-export { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, accessorMetadataByConstructorMap, accessorMetadataByMetadataObjectMap, constructorMetadataMap, lifecycleByConstructorMetadataMap, lifecycleMetadataMap };
+export { INJECTABLE_KEY, INJECT_ACCESSOR_KEY, LIFECYCLE_KEY, METADATA_SYMBOL };