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

package/dist/container.mjs

@@ -1,11 +1,11 @@
 import { effectiveBindingScope } from "./binding-scope.mjs";
 import { AsyncModuleLoadError, CircularDependencyError, DisposedContainerError, InternalError, RebindUnboundTokenError, ScopeViolationError, SyncDisposalNotSupportedError } from "./errors.mjs";
-import { DEFAULT_SLOT, generateBindingId } from "./binding.mjs";
+import { DEFAULT_BINDING_SLOT, generateBindingId } from "./binding.mjs";
 import { tokenName } from "./token.mjs";
 import { BindingRegistry } from "./registry.mjs";
 import { ScopeManager } from "./scope.mjs";
 import { LifecycleManager } from "./lifecycle.mjs";
-import { injectableSlotToResolveOptions, slotKeyToResolveOptions } from "./resolve-options.mjs";
+import { bindingSlotToResolveOptions, injectionSlotToResolveOptions } from "./resolve-options.mjs";
 import { DependencyResolver } from "./resolver.mjs";
 import { Inspector } from "./inspector.mjs";
 import { buildDependencyGraph } from "./dependency-graph.mjs";
@@ -53,7 +53,7 @@ var DefaultContainer = class DefaultContainer {
 	}
 	_createBindToBuilder(token, moduleRef) {
 		const registry = this._registry;
-		const commitBinding = (b, previousId) => {
+		const commitBinding = (binding, previousId) => {
 			if (previousId !== void 0) {
 				registry.removeById(previousId);
 				if (moduleRef !== void 0) {
@@ -64,63 +64,62 @@ var DefaultContainer = class DefaultContainer {
 					}
 				}
 			}
-			registry.add(b);
+			registry.add(binding);
 			if (moduleRef !== void 0) {
 				let ids = this._moduleBindingIds.get(moduleRef);
 				if (ids === void 0) {
 					ids = [];
 					this._moduleBindingIds.set(moduleRef, ids);
 				}
-				ids.push(b.id);
+				ids.push(binding.id);
 			}
-			return b.id;
+			return binding.id;
 		};
-		return new BindToBuilderImpl(token, commitBinding);
+		return new BindingEntry(token, commitBinding);
 	}
 	unbind(tokenOrId) {
 		this._assertNotDisposed();
 		this._unbindSync(tokenOrId);
 	}
-	_unbindSync(tokenOrId) {
-		const bindings = this._getBindingsForTokenOrId(tokenOrId);
-		for (const binding of bindings) {
+	/** Remove bindings from registry + scope and collect [binding, instance] pairs for deactivation. */
+	_collectDeactivationPairs(tokenOrId) {
+		const pairs = [];
+		for (const binding of this._getBindingsForTokenOrId(tokenOrId)) {
 			this._registry.removeById(binding.id);
 			if (this._scope.hasSingleton(binding.id)) {
-				const instance = this._scope.getSingleton(binding.id);
+				pairs.push([binding, this._scope.getSingleton(binding.id)]);
 				this._scope.deleteSingleton(binding.id);
-				this._lifecycle.runDeactivationSync(binding, instance, this._getMetadataReader());
 			}
 		}
+		return pairs;
+	}
+	/** Drain singleton scope entries for a set of already-removed bindings. */
+	_drainSingletons(bindings) {
+		const pairs = [];
+		for (const binding of bindings) if (this._scope.hasSingleton(binding.id)) {
+			pairs.push([binding, this._scope.getSingleton(binding.id)]);
+			this._scope.deleteSingleton(binding.id);
+		}
+		return pairs;
+	}
+	_unbindSync(tokenOrId) {
+		const reader = this._getMetadataReader();
+		for (const [binding, instance] of this._collectDeactivationPairs(tokenOrId)) this._lifecycle.runDeactivationSync(binding, instance, reader);
 	}
 	async unbindAsync(tokenOrId) {
 		this._assertNotDisposed();
-		const bindings = this._getBindingsForTokenOrId(tokenOrId);
-		for (const binding of bindings) {
-			this._registry.removeById(binding.id);
-			if (this._scope.hasSingleton(binding.id)) {
-				const instance = this._scope.getSingleton(binding.id);
-				this._scope.deleteSingleton(binding.id);
-				await this._lifecycle.runDeactivation(binding, instance, this._getMetadataReader());
-			}
-		}
+		const reader = this._getMetadataReader();
+		for (const [binding, instance] of this._collectDeactivationPairs(tokenOrId)) await this._lifecycle.runDeactivation(binding, instance, reader);
 	}
 	unbindAll() {
 		this._assertNotDisposed();
-		const all = this._registry.clear();
-		for (const binding of all) if (this._scope.hasSingleton(binding.id)) {
-			const instance = this._scope.getSingleton(binding.id);
-			this._scope.deleteSingleton(binding.id);
-			this._lifecycle.runDeactivationSync(binding, instance, this._getMetadataReader());
-		}
+		const reader = this._getMetadataReader();
+		for (const [binding, instance] of this._drainSingletons(this._registry.clear())) this._lifecycle.runDeactivationSync(binding, instance, reader);
 	}
 	async unbindAllAsync() {
 		this._assertNotDisposed();
-		const all = this._registry.clear();
-		for (const binding of all) if (this._scope.hasSingleton(binding.id)) {
-			const instance = this._scope.getSingleton(binding.id);
-			this._scope.deleteSingleton(binding.id);
-			await this._lifecycle.runDeactivation(binding, instance, this._getMetadataReader());
-		}
+		const reader = this._getMetadataReader();
+		for (const [binding, instance] of this._drainSingletons(this._registry.clear())) await this._lifecycle.runDeactivation(binding, instance, reader);
 	}
 	rebind(token) {
 		this._assertNotDisposed();
@@ -130,8 +129,8 @@ var DefaultContainer = class DefaultContainer {
 	}
 	_getBindingsForTokenOrId(tokenOrId) {
 		if (typeof tokenOrId === "string") {
-			const b = this._registry.getById(tokenOrId);
-			return b !== void 0 ? [b] : [];
+			const binding = this._registry.getById(tokenOrId);
+			return binding !== void 0 ? [binding] : [];
 		}
 		return [...this._registry.getAll(tokenOrId)];
 	}
@@ -141,123 +140,117 @@ var DefaultContainer = class DefaultContainer {
 	}
 	_loadSyncModules(modules) {
 		const toLoad = this._collectModuleDeps(modules);
-		for (const mod of toLoad) {
-			if (!isSyncModule(mod)) throw new AsyncModuleLoadError(mod.name);
-			const ref = mod;
-			const existing = this._moduleRefs.get(ref);
+		for (const module of toLoad) {
+			if (!isSyncModule(module)) throw new AsyncModuleLoadError(module.name);
+			const moduleRef = module;
+			const existing = this._moduleRefs.get(moduleRef);
 			if (existing !== void 0) {
-				this._moduleRefs.set(ref, existing + 1);
+				this._moduleRefs.set(moduleRef, existing + 1);
 				continue;
 			}
-			this._moduleRefs.set(ref, 1);
-			const builder = this._createModuleBuilder(ref);
-			mod._setup(builder);
+			this._moduleRefs.set(moduleRef, 1);
+			const builder = this._createModuleBuilder(moduleRef);
+			module._setup(builder);
 		}
 	}
 	_collectModuleDeps(modules) {
 		const seen = /* @__PURE__ */ new Set();
 		const result = [];
-		const visit = (mod) => {
-			const ref = mod;
-			if (seen.has(ref)) return;
-			seen.add(ref);
-			result.push(mod);
+		const visit = (module) => {
+			const moduleRef = module;
+			if (seen.has(moduleRef)) return;
+			seen.add(moduleRef);
+			result.push(module);
 		};
-		for (const m of modules) visit(m);
+		for (const module of modules) visit(module);
 		return result;
 	}
 	async loadAsync(...modules) {
 		this._assertNotDisposed();
-		for (const mod of modules) await this._loadOneModuleAsync(mod);
+		for (const module of modules) await this._loadOneModuleAsync(module);
 	}
-	async _loadOneModuleAsync(mod) {
-		const ref = mod;
-		const existing = this._moduleRefs.get(ref);
+	async _loadOneModuleAsync(module) {
+		const moduleRef = module;
+		const existing = this._moduleRefs.get(moduleRef);
 		if (existing !== void 0) {
-			this._moduleRefs.set(ref, existing + 1);
+			this._moduleRefs.set(moduleRef, existing + 1);
 			return;
 		}
-		this._moduleRefs.set(ref, 1);
-		if (isSyncModule(mod)) {
-			const builder = this._createModuleBuilder(ref);
-			mod._setup(builder);
+		this._moduleRefs.set(moduleRef, 1);
+		if (isSyncModule(module)) {
+			const builder = this._createModuleBuilder(moduleRef);
+			module._setup(builder);
 		} else {
 			const importPromises = [];
-			const builder = this._createAsyncModuleBuilder(ref, importPromises);
-			await mod._setup(builder);
+			const builder = this._createAsyncModuleBuilder(moduleRef, importPromises);
+			await module._setup(builder);
 			if (importPromises.length > 0) await Promise.all(importPromises);
 		}
 	}
 	_createModuleBuilder(moduleRef) {
 		return {
-			bind: (t) => this._createBindToBuilder(t, moduleRef),
-			import: (...mods) => {
-				this._loadSyncModules(mods);
+			bind: (token) => this._createBindToBuilder(token, moduleRef),
+			import: (...modules) => {
+				this._loadSyncModules(modules);
 			}
 		};
 	}
 	_createAsyncModuleBuilder(moduleRef, importPromises) {
 		return {
-			bind: (t) => this._createBindToBuilder(t, moduleRef),
-			import: (...mods) => {
-				for (const mod of mods) importPromises.push(this._loadOneModuleAsync(mod));
+			bind: (token) => this._createBindToBuilder(token, moduleRef),
+			import: (...modules) => {
+				for (const module of modules) importPromises.push(this._loadOneModuleAsync(module));
 			}
 		};
 	}
 	unload(...modules) {
 		this._assertNotDisposed();
-		for (const mod of modules) this._unloadModuleSync(mod);
+		for (const module of modules) this._unloadModuleSync(module);
+	}
+	/** Unregister module bindings and collect [binding, instance] pairs for deactivation. */
+	_removeModuleBindings(ref) {
+		this._moduleRefs.delete(ref);
+		const ids = this._moduleBindingIds.get(ref) ?? [];
+		this._moduleBindingIds.delete(ref);
+		const pairs = [];
+		for (const id of ids) {
+			const binding = this._registry.getById(id);
+			if (binding !== void 0) {
+				this._registry.removeById(id);
+				if (this._scope.hasSingleton(id)) {
+					pairs.push([binding, this._scope.getSingleton(id)]);
+					this._scope.deleteSingleton(id);
+				}
+			}
+		}
+		return pairs;
 	}
 	_unloadModuleSync(ref) {
 		const count = this._moduleRefs.get(ref) ?? 0;
 		if (count <= 1) {
-			this._moduleRefs.delete(ref);
-			const ids = this._moduleBindingIds.get(ref) ?? [];
-			this._moduleBindingIds.delete(ref);
-			for (const id of ids) {
-				const binding = this._registry.getById(id);
-				if (binding !== void 0) {
-					this._registry.removeById(id);
-					if (this._scope.hasSingleton(id)) {
-						const instance = this._scope.getSingleton(id);
-						this._scope.deleteSingleton(id);
-						this._lifecycle.runDeactivationSync(binding, instance, this._getMetadataReader());
-					}
-				}
-			}
+			const reader = this._getMetadataReader();
+			for (const [binding, instance] of this._removeModuleBindings(ref)) this._lifecycle.runDeactivationSync(binding, instance, reader);
 		} else this._moduleRefs.set(ref, count - 1);
 	}
 	async unloadAsync(...modules) {
 		this._assertNotDisposed();
-		for (const mod of modules) await this._unloadModuleAsync(mod);
+		for (const module of modules) await this._unloadModuleAsync(module);
 	}
 	async _unloadModuleAsync(ref) {
 		const count = this._moduleRefs.get(ref) ?? 0;
 		if (count <= 1) {
-			this._moduleRefs.delete(ref);
-			const ids = this._moduleBindingIds.get(ref) ?? [];
-			this._moduleBindingIds.delete(ref);
-			for (const id of ids) {
-				const binding = this._registry.getById(id);
-				if (binding !== void 0) {
-					this._registry.removeById(id);
-					if (this._scope.hasSingleton(id)) {
-						const instance = this._scope.getSingleton(id);
-						this._scope.deleteSingleton(id);
-						await this._lifecycle.runDeactivation(binding, instance, this._getMetadataReader());
-					}
-				}
-			}
+			const reader = this._getMetadataReader();
+			for (const [binding, instance] of this._removeModuleBindings(ref)) await this._lifecycle.runDeactivation(binding, instance, reader);
 		} else this._moduleRefs.set(ref, count - 1);
 	}
 	loadAutoRegistered(registry) {
 		this._assertNotDisposed();
 		const entries = registry.entries();
 		for (const { target, scope } of entries) {
-			const bb = this._createBindToBuilder(target).toSelf();
-			if (scope === "singleton") bb.singleton();
-			else if (scope === "scoped") bb.scoped();
-			else bb.transient();
+			const bindingBuilder = this._createBindToBuilder(target).toSelf();
+			if (scope === "singleton") bindingBuilder.singleton();
+			else if (scope === "scoped") bindingBuilder.scoped();
+			else bindingBuilder.transient();
 		}
 		return entries.length;
 	}
@@ -323,7 +316,7 @@ var DefaultContainer = class DefaultContainer {
 			if (effectiveBindingScope(binding) === "singleton" && !this._scope.hasSingleton(binding.id)) {
 				if (binding.predicate !== void 0) continue;
 				if (binding.kind === "constant" && binding.onActivation === void 0) continue;
-				const slotHint = slotKeyToResolveOptions(binding.slot);
+				const slotHint = bindingSlotToResolveOptions(binding.slot);
 				await this.resolveAsync(binding.token, slotHint);
 			}
 		}
@@ -407,7 +400,7 @@ var DefaultContainer = class DefaultContainer {
 			const meta = reader.getConstructorMetadata(binding.target);
 			if (meta === void 0) return edges;
 			for (const param of meta.params) {
-				const paramHint = injectableSlotToResolveOptions(param);
+				const paramHint = injectionSlotToResolveOptions(param);
 				if (param.optional) continue;
 				const tokenRef = param.token;
 				if (param.multi) {
@@ -426,7 +419,7 @@ var DefaultContainer = class DefaultContainer {
 			return edges;
 		}
 		if (binding.kind === "resolved" || binding.kind === "resolved-async") for (const dep of binding.deps) {
-			const depHint = injectableSlotToResolveOptions(dep);
+			const depHint = injectionSlotToResolveOptions(dep);
 			if (dep.optional) continue;
 			const tokenRef = dep.token;
 			if (dep.multi) {
@@ -478,7 +471,36 @@ function updateSlotTag(slot, tag, value) {
 		tags: existing
 	};
 }
-var BindToBuilderImpl = class {
+var SlotBuilder = class {
+	_slot = DEFAULT_BINDING_SLOT;
+	_predicate;
+	_committed;
+	when(predicate) {
+		this._predicate = predicate;
+		this._doCommit();
+		return this;
+	}
+	whenNamed(name) {
+		this._slot = {
+			...this._slot,
+			name
+		};
+		this._doCommit();
+		return this;
+	}
+	whenTagged(tag, value) {
+		this._slot = updateSlotTag(this._slot, tag, value);
+		this._doCommit();
+		return this;
+	}
+	whenDefault() {
+		return this;
+	}
+	id() {
+		return this._committed;
+	}
+};
+var BindingEntry = class {
 	_token;
 	_commit;
 	constructor(_token, _commit) {
@@ -486,7 +508,7 @@ var BindToBuilderImpl = class {
 		this._commit = _commit;
 	}
 	to(type) {
-		return new BindingBuilderImpl(this._token, {
+		return new ConstraintBuilder(this._token, {
 			kind: "class",
 			target: type,
 			scope: "transient"
@@ -494,32 +516,32 @@ var BindToBuilderImpl = class {
 	}
 	toSelf() {
 		if (typeof this._token !== "function") throw new Error("toSelf() requires token to be a Constructor");
-		return new BindingBuilderImpl(this._token, {
+		return new ConstraintBuilder(this._token, {
 			kind: "class",
 			target: this._token,
 			scope: "transient"
 		}, this._commit);
 	}
 	toConstantValue(value) {
-		return new ConstantBindingBuilderImpl(this._token, value, this._commit);
+		return new ConstantBuilder(this._token, value, this._commit);
 	}
 	toDynamic(factory) {
-		return new BindingBuilderImpl(this._token, {
+		return new ConstraintBuilder(this._token, {
 			kind: "dynamic",
 			factory,
 			scope: "transient"
 		}, this._commit);
 	}
 	toDynamicAsync(factory) {
-		return new BindingBuilderImpl(this._token, {
+		return new ConstraintBuilder(this._token, {
 			kind: "dynamic-async",
 			factory,
 			scope: "transient"
 		}, this._commit);
 	}
 	toResolved(factory, deps) {
-		const normalizedDeps = deps.map((d) => normalizeToDescriptor(d));
-		return new BindingBuilderImpl(this._token, {
+		const normalizedDeps = deps.map((dependency) => normalizeToDescriptor(dependency));
+		return new ConstraintBuilder(this._token, {
 			kind: "resolved",
 			factory,
 			deps: normalizedDeps,
@@ -527,8 +549,8 @@ var BindToBuilderImpl = class {
 		}, this._commit);
 	}
 	toResolvedAsync(factory, deps) {
-		const normalizedDeps = deps.map((d) => normalizeToDescriptor(d));
-		return new BindingBuilderImpl(this._token, {
+		const normalizedDeps = deps.map((dependency) => normalizeToDescriptor(dependency));
+		return new ConstraintBuilder(this._token, {
 			kind: "resolved-async",
 			factory,
 			deps: normalizedDeps,
@@ -536,24 +558,18 @@ var BindToBuilderImpl = class {
 		}, this._commit);
 	}
 	toAlias(target) {
-		return new AliasBindingBuilderImpl(this._token, target, this._commit);
+		return new AliasBuilder(this._token, target, this._commit);
 	}
 };
-var BindingBuilderImpl = class {
+var ConstraintBuilder = class extends SlotBuilder {
 	_token;
 	_partial;
 	_commit;
-	_slot;
-	_predicate;
-	_committed;
 	constructor(_token, _partial, _commit) {
+		super();
 		this._token = _token;
 		this._partial = _partial;
 		this._commit = _commit;
-		this._slot = {
-			...DEFAULT_SLOT,
-			tags: []
-		};
 		this._doCommit();
 	}
 	_doCommit() {
@@ -567,31 +583,10 @@ var BindingBuilderImpl = class {
 		};
 		this._committed = this._commit(binding, previousId);
 	}
-	when(predicate) {
-		this._predicate = predicate;
-		this._doCommit();
-		return this;
-	}
-	whenNamed(name) {
-		this._slot = {
-			...this._slot,
-			name
-		};
-		this._doCommit();
-		return this;
-	}
-	whenTagged(tag, value) {
-		this._slot = updateSlotTag(this._slot, tag, value);
-		this._doCommit();
-		return this;
-	}
-	whenDefault() {
-		return this;
-	}
 	singleton() {
 		const previousId = this._committed;
 		this._committed = void 0;
-		return new ScopeBuilderImpl(this._token, {
+		return new ScopeBuilder(this._token, {
 			...this._partial,
 			scope: "singleton"
 		}, this._slot, this._predicate, this._commit, "singleton", previousId);
@@ -599,7 +594,7 @@ var BindingBuilderImpl = class {
 	transient() {
 		const previousId = this._committed;
 		this._committed = void 0;
-		return new ScopeBuilderImpl(this._token, {
+		return new ScopeBuilder(this._token, {
 			...this._partial,
 			scope: "transient"
 		}, this._slot, this._predicate, this._commit, "transient", previousId);
@@ -607,16 +602,13 @@ var BindingBuilderImpl = class {
 	scoped() {
 		const previousId = this._committed;
 		this._committed = void 0;
-		return new ScopeBuilderImpl(this._token, {
+		return new ScopeBuilder(this._token, {
 			...this._partial,
 			scope: "scoped"
 		}, this._slot, this._predicate, this._commit, "scoped", previousId);
 	}
-	id() {
-		return this._committed;
-	}
 };
-var ScopeBuilderImpl = class {
+var ScopeBuilder = class {
 	_token;
 	_partial;
 	_slot;
@@ -664,23 +656,17 @@ var ScopeBuilderImpl = class {
 		return this._committed;
 	}
 };
-var ConstantBindingBuilderImpl = class {
+var ConstantBuilder = class extends SlotBuilder {
 	_token;
 	_value;
 	_commit;
-	_slot;
-	_predicate;
 	_onActivation;
 	_onDeactivation;
-	_committed;
 	constructor(_token, _value, _commit) {
+		super();
 		this._token = _token;
 		this._value = _value;
 		this._commit = _commit;
-		this._slot = {
-			...DEFAULT_SLOT,
-			tags: []
-		};
 		this._doCommit();
 	}
 	_doCommit() {
@@ -698,27 +684,6 @@ var ConstantBindingBuilderImpl = class {
 		};
 		this._committed = this._commit(binding, previousId);
 	}
-	when(predicate) {
-		this._predicate = predicate;
-		this._doCommit();
-		return this;
-	}
-	whenNamed(name) {
-		this._slot = {
-			...this._slot,
-			name
-		};
-		this._doCommit();
-		return this;
-	}
-	whenTagged(tag, value) {
-		this._slot = updateSlotTag(this._slot, tag, value);
-		this._doCommit();
-		return this;
-	}
-	whenDefault() {
-		return this;
-	}
 	onActivation(fn) {
 		this._onActivation = fn;
 		this._doCommit();
@@ -729,25 +694,16 @@ var ConstantBindingBuilderImpl = class {
 		this._doCommit();
 		return this;
 	}
-	id() {
-		return this._committed;
-	}
 };
-var AliasBindingBuilderImpl = class {
+var AliasBuilder = class extends SlotBuilder {
 	_token;
 	_target;
 	_commit;
-	_slot;
-	_predicate;
-	_committed;
 	constructor(_token, _target, _commit) {
+		super();
 		this._token = _token;
 		this._target = _target;
 		this._commit = _commit;
-		this._slot = {
-			...DEFAULT_SLOT,
-			tags: []
-		};
 		this._doCommit();
 	}
 	_doCommit() {
@@ -762,30 +718,6 @@ var AliasBindingBuilderImpl = class {
 		};
 		this._committed = this._commit(binding, previousId);
 	}
-	when(predicate) {
-		this._predicate = predicate;
-		this._doCommit();
-		return this;
-	}
-	whenNamed(name) {
-		this._slot = {
-			...this._slot,
-			name
-		};
-		this._doCommit();
-		return this;
-	}
-	whenTagged(tag, value) {
-		this._slot = updateSlotTag(this._slot, tag, value);
-		this._doCommit();
-		return this;
-	}
-	whenDefault() {
-		return this;
-	}
-	id() {
-		return this._committed;
-	}
 };
 /**
 * @since 0.3.16-canary.0

package/dist/decorators/inject.d.mts

@@ -1,5 +1,6 @@
 import { Constructor } from "../constructor-type.mjs";
 import { Token } from "../token.mjs";
+import { BindingTag } from "../types.mjs";
 
 //#region src/decorators/inject.d.ts
 /**
@@ -7,7 +8,7 @@ import { Token } from "../token.mjs";
  */
 interface InjectOptions {
   name?: string;
-  tags?: ReadonlyArray<readonly [tag: string, value: unknown]>;
+  tags?: ReadonlyArray<BindingTag>;
 }
 /**
  * @since 0.3.16-canary.0
@@ -17,7 +18,7 @@ interface InjectionDescriptor<Value = unknown> {
   readonly optional: boolean;
   readonly multi: boolean;
   readonly name?: string;
-  readonly tags?: ReadonlyArray<readonly [string, unknown]>;
+  readonly tags?: ReadonlyArray<BindingTag>;
 }
 /**
  * @since 0.3.16-canary.0
@@ -30,7 +31,7 @@ declare function isInjectionDescriptor(value: unknown): value is InjectionDescri
 /**
  * @since 0.3.16-canary.0
  */
-declare function normalizeToDescriptor(dep: InjectableDependency): InjectionDescriptor;
+declare function normalizeToDescriptor(dependency: InjectableDependency): InjectionDescriptor;
 type ClassAccessorDecorator<This, Value> = (target: ClassAccessorDecoratorTarget<This, Value>, context: ClassAccessorDecoratorContext<This, Value>) => ClassAccessorDecoratorResult<This, Value> | void;
 /**
  * @since 0.3.16-canary.0