@codefast/di 0.5.0 → 0.6.1

package/dist/{token.d.ts → core/token.d.ts}

@@ -1,9 +1,9 @@
-import type { Constructor } from "#/constructor-type";
+import type { Constructor } from "#/core/constructor-type";
 declare const TOKEN_BRAND: unique symbol;
 /**
  * @since 0.3.16-canary.0
  */
-export interface Token<Value> {
+export interface Token<out Value> {
     readonly name: string;
     readonly [TOKEN_BRAND]: Value;
 }
@@ -15,9 +15,5 @@ export declare function token<Value>(name: string): Token<Value>;
  * @since 0.3.16-canary.0
  */
 export declare function tokenName(dependency: Token<unknown> | Constructor): string;
-/**
- * @since 0.3.16-canary.0
- */
-export declare function isToken(value: unknown): value is Token<unknown>;
 export {};
 //# sourceMappingURL=token.d.ts.map

package/dist/core/token.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../../src/core/token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAE3D,OAAO,CAAC,MAAM,WAAW,EAAE,OAAO,MAAM,CAAC;AAEzC;;GAEG;AACH,MAAM,WAAW,KAAK,CAAC,GAAG,CAAC,KAAK;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC;CAC/B;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAEvD;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,MAAM,CAE1E"}

package/dist/core/token.js

@@ -0,0 +1,13 @@
+/**
+ * @since 0.3.16-canary.0
+ */
+export function token(name) {
+    return { name };
+}
+/**
+ * @since 0.3.16-canary.0
+ */
+export function tokenName(dependency) {
+    return dependency.name;
+}
+//# sourceMappingURL=token.js.map

package/dist/core/token.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/core/token.ts"],"names":[],"mappings":"AAYA;;GAEG;AACH,MAAM,UAAU,KAAK,CAAQ,IAAY;IACvC,OAAO,EAAE,IAAI,EAAkB,CAAC;AAClC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,SAAS,CAAC,UAAwC;IAChE,OAAO,UAAU,CAAC,IAAI,CAAC;AACzB,CAAC"}

package/dist/{types.d.ts → core/types.d.ts}

@@ -1,12 +1,8 @@
-import type { Constructor } from "#/constructor-type";
-import type { Token } from "#/token";
-export type { Constructor } from "#/constructor-type";
-/**
- * A single [tag, value] pair used in slot constraints and resolve options.
- *
- * @since 0.3.16-canary.0
- */
-export type BindingTag = readonly [tag: string, value: unknown];
+import type { Constructor } from "#/core/constructor-type";
+import type { BindingTag, TagKeyMask } from "#/core/tag";
+import type { Token } from "#/core/token";
+export type { Constructor } from "#/core/constructor-type";
+export type { BindingTag, TagKey, TagKeyMask } from "#/core/tag";
 /**
  * Token or class constructor used as a binding / injection / resolve key.
  *
@@ -40,13 +36,15 @@ export type DeactivationHandler<Value> = (instance: Value) => void | Promise<voi
  * @since 0.3.16-canary.0
  */
 export interface ResolveOptions {
-    name?: string;
+    name?: string | undefined;
     /**
-     * Single-tag shorthand — semantics match including one pair in `tags`.
-     * Enables fast-path lookup alongside `tags`.
+     * Single-tag shorthand, equivalent to listing the one pair in `tags`.
+     *
+     * @remarks Reaches the same tagged index, so choosing it costs nothing. `InjectOptions` accepts it
+     * too and folds it into `tags`. Only `tags` expresses a request for more than one tag.
      */
-    tag?: BindingTag;
-    tags?: ReadonlyArray<BindingTag>;
+    tag?: BindingTag | undefined;
+    tags?: ReadonlyArray<BindingTag> | undefined;
 }
 /**
  * @since 0.3.16-canary.0
@@ -59,6 +57,7 @@ export interface ResolutionFrame {
     readonly slot: {
         readonly name: string | undefined;
         readonly tags: ReadonlyArray<BindingTag>;
+        readonly keyMask: TagKeyMask;
     };
 }
 /**
@@ -69,18 +68,25 @@ export interface ConstraintContext {
     readonly resolutionStack: ReadonlyArray<ResolutionFrame>;
     readonly parent: ResolutionFrame | undefined;
     readonly ancestors: ReadonlyArray<ResolutionFrame>;
-    readonly currentResolveOptions: ResolveOptions | undefined;
+    /** Readonly because one frozen object answers every resolve of a slot — a write would throw. */
+    readonly currentResolveOptions: Readonly<ResolveOptions> | undefined;
 }
+/**
+ * The predicate `when()` selects a binding by, and the shape every `when*` helper returns.
+ *
+ * @since 0.6.0
+ */
+export type BindingConstraint = (ctx: ConstraintContext) => boolean;
 /**
  * @since 0.3.16-canary.0
  */
 export interface ResolutionContext {
-    resolve<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Value;
-    resolveAsync<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Promise<Value>;
-    resolveOptional<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Value | undefined;
-    resolveOptionalAsync<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Promise<Value | undefined>;
-    resolveAll<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Array<Value>;
-    resolveAllAsync<const Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Promise<Array<Value>>;
+    resolve<Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Value;
+    resolveAsync<Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Promise<Value>;
+    resolveOptional<Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Value | undefined;
+    resolveOptionalAsync<Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Promise<Value | undefined>;
+    resolveAll<Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Array<Value>;
+    resolveAllAsync<Value>(token: Token<Value> | Constructor<Value>, options?: ResolveOptions): Promise<Array<Value>>;
     readonly graph: ConstraintContext;
 }
 /**

package/dist/core/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAG1C,YAAY,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAC3D,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEjE;;;;GAIG;AACH,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,CAAC;AAIzD;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,CAAC;AAIhE,OAAO,CAAC,MAAM,gBAAgB,EAAE,OAAO,MAAM,CAAC;AAC9C;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,CAAC,gBAAgB,CAAC,EAAE,IAAI,CAAA;CAAE,CAAC;AAI/E;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,SAAS,GAAG,eAAe,GAAG,UAAU,GAAG,gBAAgB,GAAG,UAAU,GAAG,OAAO,CAAC;AAIvH;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE,iBAAiB,EAAE,QAAQ,EAAE,KAAK,KAAK,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAE3G;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAInF;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B;;;;;OAKG;IACH,GAAG,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC7B,IAAI,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;CAC9C;AAID;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QAClC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;QACzC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;KAC9B,CAAC;CACH;AAID;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/C,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IACzD,QAAQ,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,CAAC;IAC7C,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;IACnD,gGAAgG;IAChG,QAAQ,CAAC,qBAAqB,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;CACtE;AAED;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,iBAAiB,KAAK,OAAO,CAAC;AAIpE;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,KAAK,CAAC;IAC1F,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IACxG,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS,CAAC;IAC9G,oBAAoB,CAAC,KAAK,EACxB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EACxC,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC;IAC9B,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;IACpG,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAClH,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;CACnC;AAID;;GAEG;AACH,MAAM,MAAM,UAAU,CAAC,IAAI,IACzB,IAAI,SAAS,KAAK,CAAC,MAAM,KAAK,CAAC,GAAG,KAAK,GAAG,IAAI,SAAS,WAAW,CAAC,MAAM,KAAK,CAAC,GAAG,KAAK,GAAG,KAAK,CAAC"}

package/dist/core/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/core/types.ts"],"names":[],"mappings":""}

package/dist/decorators/inject.d.ts

@@ -1,55 +1,11 @@
-import type { Token } from "#/token";
-import type { BindingTag, Constructor, TokenValue } from "#/types";
-/**
- * @since 0.3.16-canary.0
- */
-export interface InjectOptions {
-    name?: string;
-    tags?: ReadonlyArray<BindingTag>;
-}
-/**
- * @since 0.3.16-canary.0
- */
-export interface InjectionDescriptor<Value = unknown> {
-    readonly token: Token<Value> | Constructor<Value>;
-    readonly optional: boolean;
-    readonly multi: boolean;
-    readonly name?: string;
-    readonly tags?: ReadonlyArray<BindingTag>;
-}
-/**
- * @since 0.3.16-canary.0
- */
-export type InjectableDependency<Value = unknown> = Token<Value> | Constructor<Value> | InjectionDescriptor<Value>;
-/**
- * The value a factory receives for one declared dependency.
- *
- * @remarks `optional()` and `injectAll()` fold their effect into the descriptor's own type
- * parameter, so reading it back is enough; bare tokens fall through to {@link TokenValue}.
- *
- * @since 0.5.0-canary.7
- */
-export type ResolvedDependencyValue<Dependency> = Dependency extends InjectionDescriptor<infer Value> ? Value : TokenValue<Dependency>;
-/**
- * @since 0.3.16-canary.0
- */
-export declare function isInjectionDescriptor(value: unknown): value is InjectionDescriptor;
-/**
- * @since 0.3.16-canary.0
- */
-export declare function normalizeToDescriptor(dependency: InjectableDependency): InjectionDescriptor;
+/** `@inject` — the accessor-decorator channel, resolving from the ambient container. */
+import type { Token } from "#/core/token";
+import type { Constructor } from "#/core/types";
+import type { InjectionDescriptor, InjectOptions } from "#/injection/descriptor";
 type ClassAccessorDecorator<This, Value> = (target: ClassAccessorDecoratorTarget<This, Value>, context: ClassAccessorDecoratorContext<This, Value>) => ClassAccessorDecoratorResult<This, Value> | void;
 /**
  * @since 0.3.16-canary.0
  */
-export declare function inject<const Value>(token: Token<Value> | Constructor<Value>, options?: InjectOptions): InjectionDescriptor<Value> & ClassAccessorDecorator<unknown, Value>;
-/**
- * @since 0.3.16-canary.0
- */
-export declare function optional<const Value>(token: Token<Value> | Constructor<Value>, options?: InjectOptions): InjectionDescriptor<Value | undefined>;
-/**
- * @since 0.3.16-canary.0
- */
-export declare function injectAll<const Value>(token: Token<Value> | Constructor<Value>, options?: InjectOptions): InjectionDescriptor<Array<Value>>;
+export declare function inject<Value>(token: Token<Value> | Constructor<Value>, options?: InjectOptions): InjectionDescriptor<Value> & ClassAccessorDecorator<unknown, Value>;
 export {};
 //# sourceMappingURL=inject.d.ts.map

package/dist/decorators/inject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../../src/decorators/inject.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAInE;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,mBAAmB,CAAC,KAAK,GAAG,OAAO;IAClD,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAClD,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CAC3C;AAED;;GAEG;AACH,MAAM,MAAM,oBAAoB,CAAC,KAAK,GAAG,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAEnH;;;;;;;GAOG;AACH,MAAM,MAAM,uBAAuB,CAAC,UAAU,IAC5C,UAAU,SAAS,mBAAmB,CAAC,MAAM,KAAK,CAAC,GAAG,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;AAEvF;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAgBlF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,oBAAoB,GAAG,mBAAmB,CAK3F;AA8DD,KAAK,sBAAsB,CAAC,IAAI,EAAE,KAAK,IAAI,CACzC,MAAM,EAAE,4BAA4B,CAAC,IAAI,EAAE,KAAK,CAAC,EACjD,OAAO,EAAE,6BAA6B,CAAC,IAAI,EAAE,KAAK,CAAC,KAChD,4BAA4B,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC;AAEtD;;GAEG;AACH,wBAAgB,MAAM,CAAC,KAAK,CAAC,KAAK,EAChC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EACxC,OAAO,CAAC,EAAE,aAAa,GACtB,mBAAmB,CAAC,KAAK,CAAC,GAAG,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,CAkDrE;AAID;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,CAAC,KAAK,EAClC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EACxC,OAAO,CAAC,EAAE,aAAa,GACtB,mBAAmB,CAAC,KAAK,GAAG,SAAS,CAAC,CASxC;AAID;;GAEG;AACH,wBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,EACnC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EACxC,OAAO,CAAC,EAAE,aAAa,GACtB,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CASnC"}
+{"version":3,"file":"inject.d.ts","sourceRoot":"","sources":["../../src/decorators/inject.ts"],"names":[],"mappings":"AACA,wFAAwF;AACxF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AA0BjF,KAAK,sBAAsB,CAAC,IAAI,EAAE,KAAK,IAAI,CACzC,MAAM,EAAE,4BAA4B,CAAC,IAAI,EAAE,KAAK,CAAC,EACjD,OAAO,EAAE,6BAA6B,CAAC,IAAI,EAAE,KAAK,CAAC,KAChD,4BAA4B,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC;AAEtD;;GAEG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAC1B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EACxC,OAAO,CAAC,EAAE,aAAa,GACtB,mBAAmB,CAAC,KAAK,CAAC,GAAG,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,CAwDrE"}

package/dist/decorators/inject.js

@@ -1,93 +1,41 @@
-import { InternalError, MissingContainerContextError } from "#/errors";
+import { getActiveContainer, getAmbientResolution } from "#/ambient/active-container";
+import { MissingContainerContextError, StaticMemberDecoratorError } from "#/errors/errors";
+import { buildInjectionDescriptor } from "#/injection/descriptor";
+import { injectionSlotToResolveOptions } from "#/injection/resolve-options";
 import { INJECT_ACCESSOR_KEY } from "#/metadata/metadata-keys";
-import { getActiveContainer } from "#/resolution/environment";
-import { injectionSlotToResolveOptions } from "#/resolution/resolve-options";
 /**
- * @since 0.3.16-canary.0
- */
-export function isInjectionDescriptor(value) {
-    if (value === null || value === undefined) {
-        return false;
-    }
-    const type = typeof value;
-    // inject() returns a function (dual-role), so must check both object and function
-    if (type !== "object" && type !== "function") {
-        return false;
-    }
-    return ("token" in value &&
-        "optional" in value &&
-        "multi" in value &&
-        typeof value.optional === "boolean" &&
-        typeof value.multi === "boolean");
-}
-/**
- * @since 0.3.16-canary.0
+ * The name of the class being constructed, or `undefined` when there is none to report.
+ *
+ * @remarks Two ways there is none: an anonymous class expression has an empty `name`, and an
+ * instance whose prototype chain answers no `constructor` has nothing to read. Narrowed rather than
+ * asserted — the value arrives as `unknown` and the platform makes no promise about it.
  */
-export function normalizeToDescriptor(dependency) {
-    if (isInjectionDescriptor(dependency)) {
-        return materializeInjectionDescriptor(dependency);
-    }
-    return { token: dependency, optional: false, multi: false };
-}
-/**
- * Dual-role `inject()` values are functions: [[Function]].name must not be treated as a DI slot name.
- * Only enumerable own `name` / `tags` from `Object.defineProperties` are real injection options.
- */
-function materializeInjectionDescriptor(dependency) {
-    if (typeof dependency !== "function") {
-        return dependency;
-    }
-    const dualRole = dependency;
-    const base = {
-        token: dualRole.token,
-        optional: dualRole.optional,
-        multi: dualRole.multi,
-    };
-    const nameDesc = Object.getOwnPropertyDescriptor(dualRole, "name");
-    const tagsDesc = Object.getOwnPropertyDescriptor(dualRole, "tags");
-    const explicitName = nameDesc?.enumerable === true && typeof nameDesc.value === "string" ? nameDesc.value : undefined;
-    const explicitTags = tagsDesc?.enumerable === true ? tagsDesc.value : undefined;
-    if (explicitName !== undefined && explicitTags !== undefined) {
-        return {
-            ...base,
-            name: explicitName,
-            tags: explicitTags,
-        };
-    }
-    if (explicitName !== undefined) {
-        return { ...base, name: explicitName };
+function classNameOf(instance) {
+    if (typeof instance !== "object" || instance === null) {
+        return undefined;
     }
-    if (explicitTags !== undefined) {
-        return { ...base, tags: explicitTags };
+    const constructor = Reflect.get(instance, "constructor");
+    if (typeof constructor !== "function" || constructor.name === "") {
+        return undefined;
     }
-    return base;
-}
-function withOptions(base, options) {
-    if (options?.name !== undefined && options.tags !== undefined) {
-        return { ...base, name: options.name, tags: options.tags };
-    }
-    if (options?.name !== undefined) {
-        return { ...base, name: options.name };
-    }
-    if (options?.tags !== undefined) {
-        return { ...base, tags: options.tags };
-    }
-    return base;
-}
-function buildInjectionDescriptor(token, options) {
-    return withOptions({ token, optional: false, multi: false }, options);
+    return constructor.name;
 }
 /**
  * @since 0.3.16-canary.0
  */
 export function inject(token, options) {
     const descriptor = buildInjectionDescriptor(token, options);
+    // Derived from the descriptor, not from `options`: the descriptor is where the tag shorthand has
+    // already been folded. Built once here rather than per constructed instance.
+    const resolveOptions = injectionSlotToResolveOptions(descriptor);
     const decoratorFn = (_target, context) => {
         if (context.static) {
-            throw new InternalError("@inject() on static accessors is not supported; only instance accessors participate in runWithContainer-based property injection.");
+            throw new StaticMemberDecoratorError("inject", String(context.name));
         }
         const meta = context.metadata;
-        if (!Array.isArray(meta[INJECT_ACCESSOR_KEY])) {
+        // Own bucket only: the metadata record inherits the base class's, and pushing into an inherited
+        // array would register this accessor on the base class instead.
+        if (!Object.hasOwn(meta, INJECT_ACCESSOR_KEY) || !Array.isArray(meta[INJECT_ACCESSOR_KEY])) {
             meta[INJECT_ACCESSOR_KEY] = [];
         }
         meta[INJECT_ACCESSOR_KEY].push({
@@ -95,16 +43,20 @@ export function inject(token, options) {
             descriptor,
         });
         context.addInitializer(function () {
+            // Prefer the engine's path-continuing resolver: it keeps this accessor's dependencies on the
+            // live resolution path, so a cycle through an accessor is detected instead of recursing.
+            const ambient = getAmbientResolution();
+            if (ambient !== undefined) {
+                const value = descriptor.optional
+                    ? ambient.resolveOptional(token, resolveOptions)
+                    : ambient.resolve(token, resolveOptions);
+                context.access.set(this, value);
+                return;
+            }
             const container = getActiveContainer();
             if (container === undefined) {
-                throw new MissingContainerContextError(String(context.name));
+                throw new MissingContainerContextError(classNameOf(this), context.name);
             }
-            const resolveOptions = options === undefined
-                ? undefined
-                : injectionSlotToResolveOptions({
-                    ...(options.name !== undefined ? { name: options.name } : {}),
-                    ...(options.tags !== undefined ? { tags: options.tags } : {}),
-                });
             const value = descriptor.optional
                 ? container.resolveOptional(token, resolveOptions)
                 : container.resolve(token, resolveOptions);
@@ -120,26 +72,4 @@ export function inject(token, options) {
     Object.defineProperties(decoratorFn, props);
     return decoratorFn;
 }
-// ── optional() ────────────────────────────────────────────────────────────────
-/**
- * @since 0.3.16-canary.0
- */
-export function optional(token, options) {
-    return withOptions({
-        token: token,
-        optional: true,
-        multi: false,
-    }, options);
-}
-// ── injectAll() ───────────────────────────────────────────────────────────────
-/**
- * @since 0.3.16-canary.0
- */
-export function injectAll(token, options) {
-    return withOptions({
-        token: token,
-        optional: false,
-        multi: true,
-    }, options);
-}
 //# sourceMappingURL=inject.js.map

package/dist/decorators/inject.js.map

@@ -1 +1 @@
-{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../src/decorators/inject.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inject.js","sourceRoot":"","sources":["../../src/decorators/inject.ts"],"names":[],"mappings":"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"}

package/dist/decorators/injectable.d.ts

@@ -1,5 +1,5 @@
-import type { InjectableDependency } from "#/decorators/inject";
-import type { BindingScope, Constructor } from "#/types";
+import type { BindingScope, Constructor } from "#/core/types";
+import type { InjectableDependency, ResolvedDependencyValue } from "#/injection/descriptor";
 /**
  * @since 0.3.16-canary.0
  */
@@ -18,12 +18,32 @@ export declare function createAutoRegisterRegistry(): AutoRegisterRegistry;
  * @since 0.3.16-canary.0
  */
 export interface InjectableOptions {
-    autoRegister?: AutoRegisterRegistry;
-    scope?: BindingScope;
+    autoRegister?: AutoRegisterRegistry | undefined;
+    scope?: BindingScope | undefined;
 }
 /**
+ * The parameters a constructor is handed, given what its `deps` declare.
+ *
+ * @remarks Reuses the same reading a `toResolved` factory gets, so `injectAll` arrives as an array
+ * and `optional` as possibly undefined in both places.
+ */
+type InjectedParameters<Deps extends ReadonlyArray<InjectableDependency>> = {
+    -readonly [Index in keyof Deps]: ResolvedDependencyValue<Deps[Index]>;
+};
+/**
+ * Declare a class injectable, and what its constructor is to be handed.
+ *
+ * @since 0.3.16-canary.0
+ */
+export declare function injectable(): (target: unknown, context: ClassDecoratorContext) => void;
+/**
+ * @remarks Declaring dependencies constrains the class: the decorator only accepts one whose
+ * constructor takes exactly what `deps` resolve to, in that order. A class taking fewer parameters
+ * than `deps` declares still satisfies it, which is the one mismatch TypeScript's arity rules let
+ * through — the surplus dependency is resolved and discarded.
+ *
  * @since 0.3.16-canary.0
  */
-export declare function injectable(deps?: ReadonlyArray<InjectableDependency>, options?: InjectableOptions): (target: unknown, context: ClassDecoratorContext) => void;
+export declare function injectable<const Deps extends ReadonlyArray<InjectableDependency>>(deps: Deps, options?: InjectableOptions): (target: abstract new (...args: InjectedParameters<Deps>) => unknown, context: ClassDecoratorContext) => void;
 export type { InjectableDependency };
 //# sourceMappingURL=injectable.d.ts.map

package/dist/decorators/injectable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"injectable.d.ts","sourceRoot":"","sources":["../../src/decorators/injectable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAIhE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAIzD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IACzD,OAAO,IAAI,aAAa,CAAC;QAAE,MAAM,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,YAAY,CAAA;KAAE,CAAC,CAAC;CACxE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,oBAAoB,CAUjE;AAID;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,YAAY,CAAC,EAAE,oBAAoB,CAAC;IACpC,KAAK,CAAC,EAAE,YAAY,CAAC;CACtB;AAID;;GAEG;AACH,wBAAgB,UAAU,CACxB,IAAI,CAAC,EAAE,aAAa,CAAC,oBAAoB,CAAC,EAC1C,OAAO,CAAC,EAAE,iBAAiB,GAC1B,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAiC3D;AAED,YAAY,EAAE,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"injectable.d.ts","sourceRoot":"","sources":["../../src/decorators/injectable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAO5F;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IACzD,OAAO,IAAI,aAAa,CAAC;QAAE,MAAM,EAAE,WAAW,CAAC;QAAC,KAAK,EAAE,YAAY,CAAA;KAAE,CAAC,CAAC;CACxE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,oBAAoB,CAUjE;AAID;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,YAAY,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAChD,KAAK,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CAClC;AAID;;;;;GAKG;AACH,KAAK,kBAAkB,CAAC,IAAI,SAAS,aAAa,CAAC,oBAAoB,CAAC,IAAI;IAC1E,CAAC,UAAU,KAAK,IAAI,MAAM,IAAI,GAAG,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;CACtE,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,UAAU,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAC;AAExF;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,KAAK,CAAC,IAAI,SAAS,aAAa,CAAC,oBAAoB,CAAC,EAC/E,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,iBAAiB,GAC1B,CAAC,MAAM,EAAE,QAAQ,MAAM,GAAG,IAAI,EAAE,kBAAkB,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,OAAO,EAAE,qBAAqB,KAAK,IAAI,CAAC;AA2CjH,YAAY,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/decorators/injectable.js

@@ -1,4 +1,4 @@
-import { normalizeToDescriptor } from "#/decorators/inject";
+import { normalizeToDescriptor } from "#/injection/descriptor";
 import { INJECTABLE_KEY } from "#/metadata/metadata-keys";
 /**
  * @since 0.3.16-canary.0
@@ -14,9 +14,8 @@ export function createAutoRegisterRegistry() {
         },
     };
 }
-// ── @injectable() ─────────────────────────────────────────────────────────────
 /**
- * @since 0.3.16-canary.0
+ * @since 0.6.0
  */
 export function injectable(deps, options) {
     return function (target, context) {

package/dist/decorators/injectable.js.map

@@ -1 +1 @@
-{"version":3,"file":"injectable.js","sourceRoot":"","sources":["../../src/decorators/injectable.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAc1D;;GAEG;AACH,MAAM,UAAU,0BAA0B;IACxC,MAAM,iBAAiB,GAAwD,EAAE,CAAC;IAClF,OAAO;QACL,QAAQ,CAAC,MAAmB,EAAE,KAAmB;YAC/C,iBAAiB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO;YACL,OAAO,iBAAiB,CAAC;QAC3B,CAAC;KACF,CAAC;AACJ,CAAC;AAYD,iFAAiF;AAEjF;;GAEG;AACH,MAAM,UAAU,UAAU,CACxB,IAA0C,EAC1C,OAA2B;IAE3B,OAAO,UAAU,MAAe,EAAE,OAA8B;QAC9D,MAAM,qBAAqB,GAAyB,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;YACzF,MAAM,UAAU,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;YACrD,MAAM,qBAAqB,GAAkE;gBAC3F,KAAK;gBACL,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;aACxB,CAAC;YACF,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACnE,OAAO,EAAE,GAAG,qBAAqB,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;YACpF,CAAC;YACD,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAClC,OAAO,EAAE,GAAG,qBAAqB,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;YAC7D,CAAC;YACD,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAClC,OAAO,EAAE,GAAG,qBAAqB,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;YAC7D,CAAC;YACD,OAAO,qBAAqB,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,iFAAiF;QACjF,qDAAqD;QACpD,OAAO,CAAC,QAA6C,CAAC,cAAc,CAAC,GAAG;YACvE,MAAM,EAAE,qBAAqB;SAC9B,CAAC;QAEF,IAAI,OAAO,EAAE,YAAY,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,KAAK,GAAiB,OAAO,CAAC,KAAK,IAAI,WAAW,CAAC;YACzD,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAqB,EAAE,KAAK,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"injectable.js","sourceRoot":"","sources":["../../src/decorators/injectable.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAa1D;;GAEG;AACH,MAAM,UAAU,0BAA0B;IACxC,MAAM,iBAAiB,GAAwD,EAAE,CAAC;IAClF,OAAO;QACL,QAAQ,CAAC,MAAmB,EAAE,KAAmB;YAC/C,iBAAiB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO;YACL,OAAO,iBAAiB,CAAC;QAC3B,CAAC;KACF,CAAC;AACJ,CAAC;AA4CD;;GAEG;AACH,MAAM,UAAU,UAAU,CACxB,IAA0C,EAC1C,OAA2B;IAE3B,OAAO,UAAU,MAAa,EAAE,OAA8B;QAC5D,MAAM,qBAAqB,GAAyB,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;YACzF,MAAM,UAAU,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;YACrD,MAAM,qBAAqB,GAAkE;gBAC3F,KAAK;gBACL,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,KAAK,EAAE,UAAU,CAAC,KAAK;aACxB,CAAC;YACF,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACnE,OAAO,EAAE,GAAG,qBAAqB,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;YACpF,CAAC;YACD,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAClC,OAAO,EAAE,GAAG,qBAAqB,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;YAC7D,CAAC;YACD,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAClC,OAAO,EAAE,GAAG,qBAAqB,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,CAAC;YAC7D,CAAC;YACD,OAAO,qBAAqB,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,iFAAiF;QACjF,qDAAqD;QACpD,OAAO,CAAC,QAA6C,CAAC,cAAc,CAAC,GAAG;YACvE,MAAM,EAAE,qBAAqB;SAC9B,CAAC;QAEF,IAAI,OAAO,EAAE,YAAY,KAAK,SAAS,EAAE,CAAC;YACxC,MAAM,KAAK,GAAiB,OAAO,CAAC,KAAK,IAAI,WAAW,CAAC;YACzD,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAqB,EAAE,KAAK,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/decorators/lifecycle-decorators.d.ts

@@ -1,9 +1,11 @@
+type MethodDecorator = (target: unknown, context: ClassMethodDecoratorContext) => void;
 /**
  * @since 0.3.16-canary.0
  */
-export declare function postConstruct(): (target: unknown, context: ClassMethodDecoratorContext) => void;
+export declare function postConstruct(): MethodDecorator;
 /**
  * @since 0.3.16-canary.0
  */
-export declare function preDestroy(): (target: unknown, context: ClassMethodDecoratorContext) => void;
+export declare function preDestroy(): MethodDecorator;
+export {};
 //# sourceMappingURL=lifecycle-decorators.d.ts.map

package/dist/decorators/lifecycle-decorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle-decorators.d.ts","sourceRoot":"","sources":["../../src/decorators/lifecycle-decorators.ts"],"names":[],"mappings":"AAcA;;GAEG;AACH,wBAAgB,aAAa,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,2BAA2B,KAAK,IAAI,CAc/F;AAED;;GAEG;AACH,wBAAgB,UAAU,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,2BAA2B,KAAK,IAAI,CAc5F"}
+{"version":3,"file":"lifecycle-decorators.d.ts","sourceRoot":"","sources":["../../src/decorators/lifecycle-decorators.ts"],"names":[],"mappings":"AAIA,KAAK,eAAe,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,2BAA2B,KAAK,IAAI,CAAC;AAsBvF;;GAEG;AACH,wBAAgB,aAAa,IAAI,eAAe,CAE/C;AAED;;GAEG;AACH,wBAAgB,UAAU,IAAI,eAAe,CAE5C"}

package/dist/decorators/lifecycle-decorators.js

@@ -1,40 +1,34 @@
-import { InternalError } from "#/errors";
+import { StaticMemberDecoratorError } from "#/errors/errors";
 import { LIFECYCLE_KEY } from "#/metadata/metadata-keys";
-function appendUniqueMethod(metadata, phase, methodName) {
-    if (!metadata[phase].includes(methodName)) {
-        metadata[phase].push(methodName);
-    }
-}
-/**
- * @since 0.3.16-canary.0
- */
-export function postConstruct() {
+/** Records the decorated method under one lifecycle phase; both decorators differ only in that phase. */
+function recordLifecycleMethod(phase) {
     return function (target, context) {
         if (context.static) {
-            throw new InternalError("@postConstruct() applies to instance methods only; static methods are not invoked during instance lifecycle.");
+            throw new StaticMemberDecoratorError(phase, String(context.name));
         }
-        const methodName = String(context.name);
         const meta = context.metadata;
-        if (!meta[LIFECYCLE_KEY]) {
+        // Own bucket only: `context.metadata` inherits the base class's record, and writing through an
+        // inherited bucket would register this hook on the base class instead.
+        if (!Object.hasOwn(meta, LIFECYCLE_KEY)) {
             meta[LIFECYCLE_KEY] = { postConstruct: [], preDestroy: [] };
         }
-        appendUniqueMethod(meta[LIFECYCLE_KEY], "postConstruct", methodName);
+        const lifecycle = meta[LIFECYCLE_KEY];
+        const methodName = String(context.name);
+        if (!lifecycle[phase].includes(methodName)) {
+            lifecycle[phase].push(methodName);
+        }
     };
 }
+/**
+ * @since 0.3.16-canary.0
+ */
+export function postConstruct() {
+    return recordLifecycleMethod("postConstruct");
+}
 /**
  * @since 0.3.16-canary.0
  */
 export function preDestroy() {
-    return function (target, context) {
-        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);
-        const meta = context.metadata;
-        if (!meta[LIFECYCLE_KEY]) {
-            meta[LIFECYCLE_KEY] = { postConstruct: [], preDestroy: [] };
-        }
-        appendUniqueMethod(meta[LIFECYCLE_KEY], "preDestroy", methodName);
-    };
+    return recordLifecycleMethod("preDestroy");
 }
 //# sourceMappingURL=lifecycle-decorators.js.map

package/dist/decorators/lifecycle-decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"lifecycle-decorators.js","sourceRoot":"","sources":["../../src/decorators/lifecycle-decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,SAAS,kBAAkB,CACzB,QAAkC,EAClC,KAAqC,EACrC,UAAkB;IAElB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1C,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa;IAC3B,OAAO,UAAU,MAAe,EAAE,OAAoC;QACpE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,aAAa,CACrB,8GAA8G,CAC/G,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,OAAO,CAAC,QAA4C,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;QAC9D,CAAC;QACD,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAA6B,EAAE,eAAe,EAAE,UAAU,CAAC,CAAC;IACnG,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU;IACxB,OAAO,UAAU,MAAe,EAAE,OAAoC;QACpE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,aAAa,CACrB,0GAA0G,CAC3G,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,OAAO,CAAC,QAA4C,CAAC;QAClE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;QAC9D,CAAC;QACD,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAA6B,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;IAChG,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"lifecycle-decorators.js","sourceRoot":"","sources":["../../src/decorators/lifecycle-decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,yGAAyG;AACzG,SAAS,qBAAqB,CAAC,KAAqC;IAClE,OAAO,UAAU,MAAe,EAAE,OAAoC;QACpE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,0BAA0B,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,IAAI,GAAG,OAAO,CAAC,QAA4C,CAAC;QAClE,+FAA+F;QAC/F,uEAAuE;QACvE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC;QAC9D,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAA6B,CAAC;QAClE,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3C,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa;IAC3B,OAAO,qBAAqB,CAAC,eAAe,CAAC,CAAC;AAChD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU;IACxB,OAAO,qBAAqB,CAAC,YAAY,CAAC,CAAC;AAC7C,CAAC"}

package/dist/{resolution → errors}/diagnostics.d.ts

@@ -23,6 +23,8 @@ export declare const RESOLUTION_DIAGNOSTICS: unique symbol;
 export interface ResolutionDiagnostics {
     /** Bindings with a compiled instantiation plan. */
     readonly compiledPlanCount: number;
+    /** Bindings with a compiled async instantiation plan. */
+    readonly compiledAsyncPlanCount: number;
     /** Contexts held by the depth-indexed sync pool. */
     readonly syncContextPoolSize: number;
     /** Scoped instances currently cached by this container's scope manager. */

package/dist/errors/diagnostics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../src/errors/diagnostics.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,EAAE,OAAO,MAA4C,CAAC;AAEzF;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IACpC,mDAAmD;IACnD,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,yDAAyD;IACzD,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,oDAAoD;IACpD,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,2EAA2E;IAC3E,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,8DAA8D;IAC9D,QAAQ,CAAC,eAAe,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACjD;AAED;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC,CAAC,sBAAsB,CAAC,IAAI,qBAAqB,CAAC;CACnD"}

package/dist/errors/diagnostics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../src/errors/diagnostics.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAkB,MAAM,CAAC,2BAA2B,CAAC,CAAC"}