@codefast/di 0.5.0 → 0.6.1

package/dist/injection/descriptor.js

@@ -0,0 +1,118 @@
+/**
+ * @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
+ */
+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;
+    // Annotated because `PropertyDescriptor.value` is `any`, and an `any` reaching the cast below
+    // would make it look checked when nothing checked it.
+    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 };
+    }
+    if (explicitTags !== undefined) {
+        return { ...base, tags: explicitTags };
+    }
+    return base;
+}
+/**
+ * The one tag list a request carries, with the single-tag shorthand folded in.
+ *
+ * @remarks Folding here is what keeps `tag` from reaching `InjectionDescriptor` and everything
+ * derived from it, so one request never has two spellings past this point.
+ */
+function requestedTagsOf(options) {
+    const shorthand = options?.tag;
+    const listed = options?.tags;
+    if (shorthand === undefined) {
+        return listed;
+    }
+    return listed === undefined || listed.length === 0 ? [shorthand] : [shorthand, ...listed];
+}
+function withOptions(base, options) {
+    const tags = requestedTagsOf(options);
+    if (options?.name !== undefined && tags !== undefined) {
+        return { ...base, name: options.name, tags };
+    }
+    if (options?.name !== undefined) {
+        return { ...base, name: options.name };
+    }
+    if (tags !== undefined) {
+        return { ...base, tags };
+    }
+    return base;
+}
+/**
+ * The descriptor half of `inject()`, shared with the accessor decorator that wraps it.
+ *
+ * @since 0.6.0
+ */
+export function buildInjectionDescriptor(token, options) {
+    return withOptions({ token, optional: false, multi: false }, options);
+}
+/**
+ * @since 0.3.16-canary.0
+ */
+export function optional(token, options) {
+    return withOptions({
+        token: token,
+        optional: true,
+        multi: false,
+    }, options);
+}
+/**
+ * @since 0.3.16-canary.0
+ */
+export function injectAll(token, options) {
+    return withOptions({
+        token: token,
+        optional: false,
+        multi: true,
+    }, options);
+}
+//# sourceMappingURL=descriptor.js.map

package/dist/injection/descriptor.js.map

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

package/dist/{resolution → injection}/resolve-options.d.ts

@@ -1,5 +1,6 @@
-import type { Token } from "#/token";
-import type { BindingTag, Constructor, ResolveOptions } from "#/types";
+import type { BindingTag } from "#/core/tag";
+import type { Token } from "#/core/token";
+import type { Constructor, ResolveOptions } from "#/core/types";
 /**
  * What one resolvable dependency declares.
  *
@@ -12,8 +13,8 @@ export interface DependencySlot {
     readonly token: Token<unknown> | Constructor;
     readonly optional: boolean;
     readonly multi: boolean;
-    readonly name?: string;
-    readonly tags?: ReadonlyArray<BindingTag>;
+    readonly name?: string | undefined;
+    readonly tags?: ReadonlyArray<BindingTag> | undefined;
 }
 /**
  * A request whose only criterion is a name — the shape the registry has a direct index for.
@@ -24,8 +25,10 @@ export declare function isNameOnlyOptions(options: ResolveOptions): options is R
     name: string;
 };
 /**
- * The lone entry of a request whose only criterion is a one-element `tags` list — the shape the
- * registry has a direct tag index for.
+ * The lone tag of a request that asks for exactly one, written either way — the shape the registry
+ * has a direct tag index for.
+ *
+ * @remarks Both spellings answer here, so the index is not something one of them silently misses.
  *
  * @since 0.5.0-canary.9
  */
@@ -36,10 +39,17 @@ export declare function singleTagOnlyOf(options: ResolveOptions): BindingTag | u
  *
  * @since 0.3.16-canary.0
  */
-export declare function injectionSlotToResolveOptions(injectionSlot: {
-    readonly name?: string;
-    readonly tags?: ReadonlyArray<BindingTag>;
-}): ResolveOptions | undefined;
+export declare function injectionSlotToResolveOptions(injectionSlot: Pick<DependencySlot, "name" | "tags">): ResolveOptions | undefined;
+/**
+ * The options a dependency resolves with — one object per slot, since a slot's criteria are fixed
+ * when it is declared.
+ *
+ * @remarks A slot carrying no criterion answers from its two fields, so the common shape never
+ * reaches the memo.
+ *
+ * @since 0.6.0
+ */
+export declare function resolveOptionsForSlot(injectionSlot: DependencySlot): ResolveOptions | undefined;
 /**
  * Resolve options derived from a binding slot (tags may be empty; omits when nothing to match).
  *
@@ -51,6 +61,6 @@ export declare function injectionSlotToResolveOptions(injectionSlot: {
  */
 export declare function bindingSlotToResolveOptions(bindingSlot: {
     readonly name?: string | undefined;
-    readonly tags: ReadonlyArray<BindingTag>;
+    readonly tags?: ReadonlyArray<BindingTag> | undefined;
 }): ResolveOptions | undefined;
 //# sourceMappingURL=resolve-options.d.ts.map

package/dist/injection/resolve-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-options.d.ts","sourceRoot":"","sources":["../../src/injection/resolve-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEhE;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,WAAW,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;CACvD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,IAAI,cAAc,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAIvG;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU,GAAG,SAAS,CAW/E;AAoBD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC,GACnD,cAAc,GAAG,SAAS,CAE5B;AASD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,cAAc,GAAG,cAAc,GAAG,SAAS,CAQ/F;AAsBD;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CAAC,WAAW,EAAE;IACvD,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;CACvD,GAAG,cAAc,GAAG,SAAS,CAG7B"}

package/dist/injection/resolve-options.js

@@ -0,0 +1,101 @@
+/**
+ * A request whose only criterion is a name — the shape the registry has a direct index for.
+ *
+ * @since 0.5.0-canary.9
+ */
+export function isNameOnlyOptions(options) {
+    return (options.name !== undefined && options.tag === undefined && (options.tags === undefined || options.tags.length === 0));
+}
+/**
+ * The lone tag of a request that asks for exactly one, written either way — the shape the registry
+ * has a direct tag index for.
+ *
+ * @remarks Both spellings answer here, so the index is not something one of them silently misses.
+ *
+ * @since 0.5.0-canary.9
+ */
+export function singleTagOnlyOf(options) {
+    if (options.name !== undefined) {
+        return undefined;
+    }
+    const listed = options.tags;
+    const shorthand = options.tag;
+    if (shorthand !== undefined) {
+        // Both sources present means the request carries two tags, which no single-tag index can answer.
+        return listed === undefined || listed.length === 0 ? shorthand : undefined;
+    }
+    return listed !== undefined && listed.length === 1 ? listed[0] : undefined;
+}
+/** Shared core: build a ResolveOptions from already-normalised name + tags. */
+function buildOptions(name, tags) {
+    if (name === undefined && tags === undefined) {
+        return undefined;
+    }
+    const options = {};
+    if (name !== undefined) {
+        options.name = name;
+    }
+    if (tags !== undefined) {
+        options.tags = tags;
+    }
+    return options;
+}
+/**
+ * Builds a {@link ResolveOptions} safe for `exactOptionalPropertyTypes`:
+ * omits keys instead of assigning `undefined`.
+ *
+ * @since 0.3.16-canary.0
+ */
+export function injectionSlotToResolveOptions(injectionSlot) {
+    return buildOptions(injectionSlot.name, injectionSlot.tags);
+}
+/** Where a slot's derived options are memoized, so the same object is handed out every resolve. */
+const MEMOIZED_RESOLVE_OPTIONS = Symbol("di:resolve-options");
+/**
+ * The options a dependency resolves with — one object per slot, since a slot's criteria are fixed
+ * when it is declared.
+ *
+ * @remarks A slot carrying no criterion answers from its two fields, so the common shape never
+ * reaches the memo.
+ *
+ * @since 0.6.0
+ */
+export function resolveOptionsForSlot(injectionSlot) {
+    const { name, tags } = injectionSlot;
+    if (name === undefined && tags === undefined) {
+        return undefined;
+    }
+    const slot = injectionSlot;
+    const memoized = slot[MEMOIZED_RESOLVE_OPTIONS];
+    return memoized ?? memoizeResolveOptions(slot, name, tags);
+}
+/**
+ * Builds, freezes and stores a slot's options on first use.
+ *
+ * @remarks Frozen because one object answers every resolve of the slot and a constraint predicate is
+ * handed it. Split out for the `try`: in the caller it would cost the early return its inlining.
+ */
+function memoizeResolveOptions(slot, name, tags) {
+    const built = Object.freeze(buildOptions(name, tags));
+    try {
+        slot[MEMOIZED_RESOLVE_OPTIONS] = built;
+    }
+    catch {
+        // A frozen slot rebuilds on every hop rather than throwing.
+    }
+    return built;
+}
+/**
+ * Resolve options derived from a binding slot (tags may be empty; omits when nothing to match).
+ *
+ * @remarks Takes the slot structurally rather than as `BindingSlot`, so the slot on a public
+ * `BindingSnapshot` — where `name` is an optional property, not a required one holding `undefined` —
+ * is accepted by the same call.
+ *
+ * @since 0.3.16-canary.0
+ */
+export function bindingSlotToResolveOptions(bindingSlot) {
+    const tags = bindingSlot.tags;
+    return buildOptions(bindingSlot.name, tags !== undefined && tags.length > 0 ? tags : undefined);
+}
+//# sourceMappingURL=resolve-options.js.map

package/dist/injection/resolve-options.js.map

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

package/dist/introspection/dependency-graph.d.ts

@@ -1,23 +1,34 @@
+import type { BindingRegistry } from "#/core/registry";
+import type { BindingKind, BindingScope } from "#/core/types";
 import type { MetadataReader } from "#/metadata/metadata-types";
-import type { BindingRegistry } from "#/registry";
-import type { BindingScope } from "#/types";
 /**
+ * @remarks `kind`/`scope` are `"unbound"` for the placeholder node an optional, currently
+ * unsatisfied dependency points at.
+ *
  * @since 0.3.16-canary.0
  */
 export interface GraphNode {
     readonly id: string;
     readonly tokenName: string;
-    readonly kind: string;
-    readonly scope: BindingScope;
+    /** Identifies the token itself, so bindings that share a display name stay distinguishable. */
+    readonly tokenKey: string;
+    readonly kind: BindingKind | "unbound";
+    readonly scope: BindingScope | "unbound";
     readonly fromParent: boolean;
 }
 /**
+ * @remarks `label` is presentation, assembled for the adapters; read `optional` and `slotName`
+ * rather than parsing it.
+ *
  * @since 0.3.16-canary.0
  */
 export interface GraphEdge {
     readonly from: string;
     readonly to: string;
     readonly label?: string;
+    readonly optional: boolean;
+    /** The named slot this edge resolves to, when the binding declares one. */
+    readonly slotName?: string;
 }
 /**
  * @since 0.3.16-canary.0
@@ -31,7 +42,7 @@ export interface ContainerGraphJson {
  * @since 0.3.16-canary.0
  */
 export interface GraphOptions {
-    readonly includeParent?: boolean;
+    readonly includeParent?: boolean | undefined;
 }
 /**
  * @since 0.3.16-canary.0

package/dist/introspection/dependency-graph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dependency-graph.d.ts","sourceRoot":"","sources":["../../src/introspection/dependency-graph.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAGlD,OAAO,KAAK,EAAE,YAAY,EAAe,MAAM,SAAS,CAAC;AAIzD;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACzC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC;AAID;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,YAAY,GAAG,SAAS,EACjC,cAAc,CAAC,EAAE,eAAe,GAC/B,kBAAkB,CA6DpB"}
+{"version":3,"file":"dependency-graph.d.ts","sourceRoot":"","sources":["../../src/introspection/dependency-graph.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAGvD,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAe,MAAM,cAAc,CAAC;AAG3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAKhE;;;;;GAKG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,+FAA+F;IAC/F,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,WAAW,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAED;;;;;GAKG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,2EAA2E;IAC3E,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACzC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CAClC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC9C;AAsMD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,eAAe,EACzB,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,YAAY,GAAG,SAAS,EACjC,cAAc,CAAC,EAAE,eAAe,GAC/B,kBAAkB,CAWpB"}

package/dist/introspection/dependency-graph.js

@@ -1,66 +1,147 @@
-import { effectiveBindingScope } from "#/resolution/binding-scope";
-import { tokenName } from "#/token";
-// ── Builder ───────────────────────────────────────────────────────────────────
+import { effectiveBindingScope } from "#/core/binding-scope";
+import { tokenName } from "#/core/token";
+import { bindingSlotToResolveOptions } from "#/injection/resolve-options";
+import { matchesSlot } from "#/resolution/select/binding-select";
+// ── Builder ──────────────────────────────────────────────────────────────────────────────────────────────────────────
+// Tokens are compared by object identity, and a name is free to repeat, so the graph mints its
+// own per-process key. Weakly held: a discarded token takes its key with it.
+const tokenKeys = new WeakMap();
+let tokenKeySequence = 0;
+function tokenKeyOf(dependency) {
+    const existing = tokenKeys.get(dependency);
+    if (existing !== undefined) {
+        return existing;
+    }
+    tokenKeySequence += 1;
+    const key = `${tokenName(dependency)}@${String(tokenKeySequence)}`;
+    tokenKeys.set(dependency, key);
+    return key;
+}
+// Mirrors filterBindings' slot semantics; predicates need a live resolution context, so the graph
+// keeps every predicate-carrying candidate.
+function matchingTargets(candidates, ref) {
+    const criterion = bindingSlotToResolveOptions(ref);
+    if (ref.multi && criterion === undefined) {
+        return candidates;
+    }
+    return candidates.filter((candidate) => matchesSlot(candidate.slot, criterion));
+}
+function edgeLabel(ref, index) {
+    const criterion = ref.name !== undefined
+        ? `name:${ref.name}`
+        : ref.tags !== undefined && ref.tags.length > 0
+            ? `tag:${ref.tags[0]?.key.name}=${String(ref.tags[0]?.value)}`
+            : `[${index}]`;
+    return ref.optional ? `${criterion} optional` : criterion;
+}
+function bindingLookup(sourceRegistry, fallbackRegistry) {
+    return (token) => {
+        const own = sourceRegistry.getAll(token);
+        if (own.length > 0 || fallbackRegistry === undefined) {
+            return own;
+        }
+        return fallbackRegistry.getAll(token);
+    };
+}
+/** The placeholder node an optional-but-unbound dependency points at, minted once per token. */
+function unboundNodeIdFor(accumulator, dependency) {
+    const key = tokenKeyOf(dependency);
+    const existing = accumulator.unboundNodeIds.get(key);
+    if (existing !== undefined) {
+        return existing;
+    }
+    const id = `unbound:${key}`;
+    accumulator.unboundNodeIds.set(key, id);
+    accumulator.nodes.push({
+        id,
+        tokenName: tokenName(dependency),
+        tokenKey: key,
+        kind: "unbound",
+        scope: "unbound",
+        fromParent: false,
+    });
+    return id;
+}
+function addDependencyEdges(accumulator, from, ref, index, lookup) {
+    const targets = matchingTargets(lookup(ref.token), ref);
+    const label = edgeLabel(ref, index);
+    if (targets.length === 0) {
+        // A required-but-unbound dependency is validate()'s story, not the graph's.
+        if (!ref.optional) {
+            return;
+        }
+        accumulator.edges.push({
+            from,
+            to: unboundNodeIdFor(accumulator, ref.token),
+            label,
+            optional: true,
+            ...(ref.name !== undefined ? { slotName: ref.name } : {}),
+        });
+        return;
+    }
+    for (const target of targets) {
+        // A multi dep with no criterion of its own fans out — each edge names the slot it hits.
+        const slotName = target.slot.name ?? ref.name;
+        const perTargetLabel = ref.multi && ref.name === undefined && slotName !== undefined
+            ? edgeLabel({ ...ref, name: slotName }, index)
+            : label;
+        accumulator.edges.push({
+            from,
+            to: target.id,
+            label: perTargetLabel,
+            optional: ref.optional,
+            ...(slotName !== undefined ? { slotName } : {}),
+        });
+    }
+}
+/** What one binding declares up front — a class's params, a factory's descriptors, an alias's target. */
+function addBindingEdges(accumulator, binding, metadataReader, lookup) {
+    if (binding.kind === "class") {
+        const meta = metadataReader.getConstructorMetadata(binding.target);
+        if (meta !== undefined) {
+            for (const [index, param] of meta.params.entries()) {
+                addDependencyEdges(accumulator, binding.id, param, index, lookup);
+            }
+        }
+        return;
+    }
+    if (binding.kind === "resolved" || binding.kind === "resolved-async") {
+        for (const [index, dependency] of binding.deps.entries()) {
+            addDependencyEdges(accumulator, binding.id, dependency, index, lookup);
+        }
+        return;
+    }
+    if (binding.kind === "alias") {
+        const aliasRef = { token: binding.target, optional: false, multi: false };
+        for (const target of matchingTargets(lookup(binding.target), aliasRef)) {
+            accumulator.edges.push({ from: binding.id, to: target.id, label: "alias", optional: false });
+        }
+    }
+}
+function addRegistryBindings(accumulator, sourceRegistry, metadataReader, fromParent, fallbackRegistry) {
+    const lookup = bindingLookup(sourceRegistry, fallbackRegistry);
+    for (const binding of sourceRegistry.allBindings()) {
+        accumulator.nodes.push({
+            id: binding.id,
+            tokenName: tokenName(binding.token),
+            tokenKey: tokenKeyOf(binding.token),
+            kind: binding.kind,
+            scope: effectiveBindingScope(binding),
+            fromParent,
+        });
+        addBindingEdges(accumulator, binding, metadataReader, lookup);
+    }
+}
 /**
  * @since 0.3.16-canary.0
  */
 export function buildDependencyGraph(registry, metadataReader, options, parentRegistry) {
-    const nodes = [];
-    const edges = [];
+    const accumulator = { nodes: [], edges: [], unboundNodeIds: new Map() };
     const includesParent = options?.includeParent === true;
-    const addBindings = (sourceRegistry, fromParent) => {
-        for (const binding of sourceRegistry.allBindings()) {
-            const scope = effectiveBindingScope(binding);
-            nodes.push({
-                id: binding.id,
-                tokenName: tokenName(binding.token),
-                kind: binding.kind,
-                scope,
-                fromParent,
-            });
-            // Build edges
-            if (binding.kind === "class") {
-                const meta = metadataReader.getConstructorMetadata(binding.target);
-                if (meta !== undefined) {
-                    for (let index = 0; index < meta.params.length; index += 1) {
-                        const param = meta.params[index];
-                        const dependencyBinding = sourceRegistry.getAll(param.token)[0];
-                        if (dependencyBinding !== undefined) {
-                            edges.push({
-                                from: binding.id,
-                                to: dependencyBinding.id,
-                                label: `[${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] !== undefined) {
-                        const label = dependency.name !== undefined
-                            ? `name:${dependency.name}`
-                            : dependency.tags !== undefined && dependency.tags.length > 0
-                                ? `tag:${dependency.tags[0]?.[0]}=${String(dependency.tags[0]?.[1])}`
-                                : `[${index}]`;
-                        edges.push({ from: binding.id, to: dependencyBindings[0].id, label });
-                    }
-                }
-            }
-            else if (binding.kind === "alias") {
-                const targetBindings = sourceRegistry.getAll(binding.target);
-                if (targetBindings.length > 0 && targetBindings[0] !== undefined) {
-                    edges.push({ from: binding.id, to: targetBindings[0].id, label: "alias" });
-                }
-            }
-        }
-    };
-    addBindings(registry, false);
+    addRegistryBindings(accumulator, registry, metadataReader, false, includesParent ? parentRegistry : undefined);
     if (includesParent && parentRegistry !== undefined) {
-        addBindings(parentRegistry, true);
+        addRegistryBindings(accumulator, parentRegistry, metadataReader, true);
     }
-    return { nodes, edges, includesParent };
+    return { nodes: accumulator.nodes, edges: accumulator.edges, includesParent };
 }
 //# sourceMappingURL=dependency-graph.js.map

package/dist/introspection/dependency-graph.js.map

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

package/dist/introspection/graph-adapters/cytoscape.d.ts

@@ -1,4 +1,4 @@
-import type { ContainerGraphJson } from "#/introspection/dependency-graph";
+import type { ContainerGraphJson, GraphNode } from "#/introspection/dependency-graph";
 /**
  * @since 0.3.16-canary.0
  */
@@ -6,8 +6,9 @@ export interface CytoscapeNode {
     readonly data: {
         readonly id: string;
         readonly label: string;
-        readonly kind: string;
-        readonly scope: string;
+        readonly tokenKey: string;
+        readonly kind: GraphNode["kind"];
+        readonly scope: GraphNode["scope"];
         readonly fromParent: boolean;
     };
 }
@@ -20,6 +21,8 @@ export interface CytoscapeEdge {
         readonly source: string;
         readonly target: string;
         readonly label?: string;
+        readonly optional: boolean;
+        readonly slotName?: string;
     };
 }
 /**

package/dist/introspection/graph-adapters/cytoscape.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cytoscape.d.ts","sourceRoot":"","sources":["../../../src/introspection/graph-adapters/cytoscape.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAE3E;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;KAC9B,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;CACH;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,aAAa,CAAC,aAAa,GAAG,aAAa,CAAC,CAAC;AAE7E;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,kBAAkB,GAAG,iBAAiB,CA4B7E"}
+{"version":3,"file":"cytoscape.d.ts","sourceRoot":"","sources":["../../../src/introspection/graph-adapters/cytoscape.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAEtF;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QACjC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QACnC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;KAC9B,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE;QACb,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;KAC5B,CAAC;CACH;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,aAAa,CAAC,aAAa,GAAG,aAAa,CAAC,CAAC;AAE7E;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,kBAAkB,GAAG,iBAAiB,CA+B7E"}

package/dist/introspection/graph-adapters/cytoscape.js

@@ -8,6 +8,7 @@ export function toCytoscapeGraph(graph) {
             data: {
                 id: node.id,
                 label: node.tokenName,
+                tokenKey: node.tokenKey,
                 kind: node.kind,
                 scope: node.scope,
                 fromParent: node.fromParent,
@@ -22,6 +23,8 @@ export function toCytoscapeGraph(graph) {
                 source: edge.from,
                 target: edge.to,
                 ...(edge.label !== undefined ? { label: edge.label } : {}),
+                optional: edge.optional,
+                ...(edge.slotName !== undefined ? { slotName: edge.slotName } : {}),
             },
         });
     }