@codefast/di 0.5.0-canary.5 → 0.5.0-canary.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefast/di",
-  "version": "0.5.0-canary.5",
+  "version": "0.5.0-canary.7",
   "description": "Lightweight dependency injection primitives for Codefast",
   "keywords": [
     "codefast",
@@ -25,9 +25,9 @@
   ],
   "type": "module",
   "sideEffects": false,
-  "main": "./dist/index.mjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.mts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "imports": {
     "#/tests/*": [
       "./tests/*",
@@ -36,159 +36,184 @@
       "./tests/*/index.ts",
       "./tests/*/index.tsx"
     ],
-    "#/*": [
-      "./src/*",
-      "./src/*.ts",
-      "./src/*.tsx",
-      "./src/*/index.ts",
-      "./src/*/index.tsx"
-    ]
+    "#/*": {
+      "source": [
+        "./src/*",
+        "./src/*.ts",
+        "./src/*.tsx",
+        "./src/*/index.ts",
+        "./src/*/index.tsx"
+      ],
+      "types": [
+        "./dist/*.d.ts",
+        "./dist/*/index.d.ts"
+      ],
+      "default": [
+        "./dist/*.js",
+        "./dist/*/index.js"
+      ]
+    }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "types": "./dist/index.d.mts",
-      "import": "./dist/index.mjs"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
     },
     "./binding": {
       "source": "./src/binding.ts",
-      "types": "./dist/binding.d.mts",
-      "import": "./dist/binding.mjs"
-    },
-    "./binding-scope": {
-      "source": "./src/binding-scope.ts",
-      "types": "./dist/binding-scope.d.mts",
-      "import": "./dist/binding-scope.mjs"
-    },
-    "./binding-select": {
-      "source": "./src/binding-select.ts",
-      "types": "./dist/binding-select.d.mts",
-      "import": "./dist/binding-select.mjs"
-    },
-    "./constraints": {
-      "source": "./src/constraints.ts",
-      "types": "./dist/constraints.d.mts",
-      "import": "./dist/constraints.mjs"
+      "types": "./dist/binding.d.ts",
+      "import": "./dist/binding.js"
     },
     "./constructor-type": {
       "source": "./src/constructor-type.ts",
-      "types": "./dist/constructor-type.d.mts",
-      "import": "./dist/constructor-type.mjs"
+      "types": "./dist/constructor-type.d.ts",
+      "import": "./dist/constructor-type.js"
     },
-    "./container": {
-      "source": "./src/container.ts",
-      "types": "./dist/container.d.mts",
-      "import": "./dist/container.mjs"
+    "./container/binding-builders": {
+      "source": "./src/container/binding-builders.ts",
+      "types": "./dist/container/binding-builders.d.ts",
+      "import": "./dist/container/binding-builders.js"
+    },
+    "./container/container": {
+      "source": "./src/container/container.ts",
+      "types": "./dist/container/container.d.ts",
+      "import": "./dist/container/container.js"
     },
     "./decorators/inject": {
       "source": "./src/decorators/inject.ts",
-      "types": "./dist/decorators/inject.d.mts",
-      "import": "./dist/decorators/inject.mjs"
+      "types": "./dist/decorators/inject.d.ts",
+      "import": "./dist/decorators/inject.js"
     },
     "./decorators/injectable": {
       "source": "./src/decorators/injectable.ts",
-      "types": "./dist/decorators/injectable.d.mts",
-      "import": "./dist/decorators/injectable.mjs"
+      "types": "./dist/decorators/injectable.d.ts",
+      "import": "./dist/decorators/injectable.js"
     },
     "./decorators/lifecycle-decorators": {
       "source": "./src/decorators/lifecycle-decorators.ts",
-      "types": "./dist/decorators/lifecycle-decorators.d.mts",
-      "import": "./dist/decorators/lifecycle-decorators.mjs"
-    },
-    "./dependency-graph": {
-      "source": "./src/dependency-graph.ts",
-      "types": "./dist/dependency-graph.d.mts",
-      "import": "./dist/dependency-graph.mjs"
-    },
-    "./environment": {
-      "source": "./src/environment.ts",
-      "types": "./dist/environment.d.mts",
-      "import": "./dist/environment.mjs"
+      "types": "./dist/decorators/lifecycle-decorators.d.ts",
+      "import": "./dist/decorators/lifecycle-decorators.js"
     },
     "./errors": {
       "source": "./src/errors.ts",
-      "types": "./dist/errors.d.mts",
-      "import": "./dist/errors.mjs"
-    },
-    "./graph-adapters/cytoscape": {
-      "source": "./src/graph-adapters/cytoscape.ts",
-      "types": "./dist/graph-adapters/cytoscape.d.mts",
-      "import": "./dist/graph-adapters/cytoscape.mjs"
-    },
-    "./graph-adapters/dot": {
-      "source": "./src/graph-adapters/dot.ts",
-      "types": "./dist/graph-adapters/dot.d.mts",
-      "import": "./dist/graph-adapters/dot.mjs"
-    },
-    "./graph-adapters/reactflow": {
-      "source": "./src/graph-adapters/reactflow.ts",
-      "types": "./dist/graph-adapters/reactflow.d.mts",
-      "import": "./dist/graph-adapters/reactflow.mjs"
-    },
-    "./inspector": {
-      "source": "./src/inspector.ts",
-      "types": "./dist/inspector.d.mts",
-      "import": "./dist/inspector.mjs"
-    },
-    "./lifecycle": {
-      "source": "./src/lifecycle.ts",
-      "types": "./dist/lifecycle.d.mts",
-      "import": "./dist/lifecycle.mjs"
+      "types": "./dist/errors.d.ts",
+      "import": "./dist/errors.js"
+    },
+    "./introspection/dependency-graph": {
+      "source": "./src/introspection/dependency-graph.ts",
+      "types": "./dist/introspection/dependency-graph.d.ts",
+      "import": "./dist/introspection/dependency-graph.js"
+    },
+    "./introspection/graph-adapters/cytoscape": {
+      "source": "./src/introspection/graph-adapters/cytoscape.ts",
+      "types": "./dist/introspection/graph-adapters/cytoscape.d.ts",
+      "import": "./dist/introspection/graph-adapters/cytoscape.js"
+    },
+    "./introspection/graph-adapters/dot": {
+      "source": "./src/introspection/graph-adapters/dot.ts",
+      "types": "./dist/introspection/graph-adapters/dot.d.ts",
+      "import": "./dist/introspection/graph-adapters/dot.js"
+    },
+    "./introspection/graph-adapters/reactflow": {
+      "source": "./src/introspection/graph-adapters/reactflow.ts",
+      "types": "./dist/introspection/graph-adapters/reactflow.d.ts",
+      "import": "./dist/introspection/graph-adapters/reactflow.js"
+    },
+    "./introspection/inspector": {
+      "source": "./src/introspection/inspector.ts",
+      "types": "./dist/introspection/inspector.d.ts",
+      "import": "./dist/introspection/inspector.js"
     },
     "./metadata/metadata-keys": {
       "source": "./src/metadata/metadata-keys.ts",
-      "types": "./dist/metadata/metadata-keys.d.mts",
-      "import": "./dist/metadata/metadata-keys.mjs"
+      "types": "./dist/metadata/metadata-keys.d.ts",
+      "import": "./dist/metadata/metadata-keys.js"
     },
     "./metadata/metadata-reader-token": {
       "source": "./src/metadata/metadata-reader-token.ts",
-      "types": "./dist/metadata/metadata-reader-token.d.mts",
-      "import": "./dist/metadata/metadata-reader-token.mjs"
+      "types": "./dist/metadata/metadata-reader-token.d.ts",
+      "import": "./dist/metadata/metadata-reader-token.js"
     },
     "./metadata/metadata-types": {
       "source": "./src/metadata/metadata-types.ts",
-      "types": "./dist/metadata/metadata-types.d.mts",
-      "import": "./dist/metadata/metadata-types.mjs"
+      "types": "./dist/metadata/metadata-types.d.ts",
+      "import": "./dist/metadata/metadata-types.js"
     },
     "./metadata/symbol-metadata-reader": {
       "source": "./src/metadata/symbol-metadata-reader.ts",
-      "types": "./dist/metadata/symbol-metadata-reader.d.mts",
-      "import": "./dist/metadata/symbol-metadata-reader.mjs"
+      "types": "./dist/metadata/symbol-metadata-reader.d.ts",
+      "import": "./dist/metadata/symbol-metadata-reader.js"
     },
     "./module": {
       "source": "./src/module.ts",
-      "types": "./dist/module.d.mts",
-      "import": "./dist/module.mjs"
+      "types": "./dist/module.d.ts",
+      "import": "./dist/module.js"
     },
     "./registry": {
       "source": "./src/registry.ts",
-      "types": "./dist/registry.d.mts",
-      "import": "./dist/registry.mjs"
-    },
-    "./resolve-options": {
-      "source": "./src/resolve-options.ts",
-      "types": "./dist/resolve-options.d.mts",
-      "import": "./dist/resolve-options.mjs"
-    },
-    "./resolver": {
-      "source": "./src/resolver.ts",
-      "types": "./dist/resolver.d.mts",
-      "import": "./dist/resolver.mjs"
-    },
-    "./scope": {
-      "source": "./src/scope.ts",
-      "types": "./dist/scope.d.mts",
-      "import": "./dist/scope.mjs"
+      "types": "./dist/registry.d.ts",
+      "import": "./dist/registry.js"
+    },
+    "./resolution/binding-scope": {
+      "source": "./src/resolution/binding-scope.ts",
+      "types": "./dist/resolution/binding-scope.d.ts",
+      "import": "./dist/resolution/binding-scope.js"
+    },
+    "./resolution/binding-select": {
+      "source": "./src/resolution/binding-select.ts",
+      "types": "./dist/resolution/binding-select.d.ts",
+      "import": "./dist/resolution/binding-select.js"
+    },
+    "./resolution/class-plan": {
+      "source": "./src/resolution/class-plan.ts",
+      "types": "./dist/resolution/class-plan.d.ts",
+      "import": "./dist/resolution/class-plan.js"
+    },
+    "./resolution/constraints": {
+      "source": "./src/resolution/constraints.ts",
+      "types": "./dist/resolution/constraints.d.ts",
+      "import": "./dist/resolution/constraints.js"
+    },
+    "./resolution/environment": {
+      "source": "./src/resolution/environment.ts",
+      "types": "./dist/resolution/environment.d.ts",
+      "import": "./dist/resolution/environment.js"
+    },
+    "./resolution/lifecycle": {
+      "source": "./src/resolution/lifecycle.ts",
+      "types": "./dist/resolution/lifecycle.d.ts",
+      "import": "./dist/resolution/lifecycle.js"
+    },
+    "./resolution/resolution-path": {
+      "source": "./src/resolution/resolution-path.ts",
+      "types": "./dist/resolution/resolution-path.d.ts",
+      "import": "./dist/resolution/resolution-path.js"
+    },
+    "./resolution/resolve-options": {
+      "source": "./src/resolution/resolve-options.ts",
+      "types": "./dist/resolution/resolve-options.d.ts",
+      "import": "./dist/resolution/resolve-options.js"
+    },
+    "./resolution/resolver": {
+      "source": "./src/resolution/resolver.ts",
+      "types": "./dist/resolution/resolver.d.ts",
+      "import": "./dist/resolution/resolver.js"
+    },
+    "./resolution/scope": {
+      "source": "./src/resolution/scope.ts",
+      "types": "./dist/resolution/scope.d.ts",
+      "import": "./dist/resolution/scope.js"
     },
     "./token": {
       "source": "./src/token.ts",
-      "types": "./dist/token.d.mts",
-      "import": "./dist/token.mjs"
+      "types": "./dist/token.d.ts",
+      "import": "./dist/token.js"
     },
     "./types": {
       "source": "./src/types.ts",
-      "types": "./dist/types.d.mts",
-      "import": "./dist/types.mjs"
+      "types": "./dist/types.d.ts",
+      "import": "./dist/types.js"
     },
     "./package.json": "./package.json"
   },
@@ -199,22 +224,20 @@
     "@babel/core": "^8.0.1",
     "@babel/plugin-proposal-decorators": "8.0.2",
     "@rolldown/plugin-babel": "^0.2.3",
-    "@types/node": "^26.1.0",
-    "@typescript/native-preview": "7.0.0-dev.20260704.1",
-    "@vitest/coverage-v8": "^4.1.9",
+    "@types/node": "^26.1.1",
+    "@vitest/coverage-v8": "^4.1.10",
     "expect-type": "^1.4.0",
-    "tsdown": "^0.22.3",
-    "tsx": "^4.23.0",
-    "typescript": "^6.0.3",
-    "vitest": "^4.1.9",
-    "@codefast/typescript-config": "0.5.0-canary.5"
+    "tsx": "^4.23.1",
+    "typescript": "^7.0.2",
+    "vitest": "^4.1.10",
+    "@codefast/typescript-config": "0.5.0-canary.7"
   },
   "engines": {
     "node": ">=26.0.0"
   },
   "scripts": {
-    "build": "tsdown",
-    "check-types": "tsgo --noEmit",
+    "build": "rm -rf dist && tsc -p tsconfig.build.json",
+    "check-types": "tsc --noEmit",
     "clean": "rm -rf dist",
     "examples": "for file in examples/*/*.ts; do echo \"=== Running $file ===\"; node --import tsx/esm \"$file\"; echo \"\n\" || exit 1; done",
     "test": "vitest run",

package/src/binding.ts

@@ -1,4 +1,4 @@
-import type { InjectionDescriptor } from "#/decorators/inject";
+import type { InjectableDependency, InjectionDescriptor, ResolvedDependencyValue } from "#/decorators/inject";
 import type { Token } from "#/token";
 import type {
   ActivationHandler,
@@ -7,9 +7,8 @@ import type {
   BindingTag,
   Constructor,
   DeactivationHandler,
-  DependencyKey,
   ResolutionContext,
-  TokenValue,
+  ResolutionFrame,
   ConstraintContext,
 } from "#/types";
 
@@ -67,9 +66,26 @@ export function bindingSlotToString(slot: BindingSlot): string {
 
 interface BindingBase<Value> {
   readonly id: BindingIdentifier;
+  /**
+   * True while this binding's factory is on the sync resolution stack. The sync resolver marks
+   * it on enter and clears it on exit, making cycle detection an O(1) field read with no hashing,
+   * no path scan, and no side table. Sync resolution is single-threaded, so the flag is exactly
+   * path membership; the async lane keeps its own per-path check because chains can interleave.
+   *
+   * @remarks Resolver-owned bookkeeping — `registry.add` normalizes it, so callers never set it.
+   */
+  inFlight?: boolean | undefined;
+  /**
+   * Memoized resolution frame for this binding. Its contents derive only from immutable binding
+   * fields, so it is computed once on first resolve and reused instead of a per-resolver Map
+   * lookup on every hop.
+   *
+   * @remarks Resolver-owned bookkeeping — `registry.add` normalizes it, so callers never set it.
+   */
+  frame?: ResolutionFrame | undefined;
   readonly token: Token<Value> | Constructor<Value>;
   readonly slot: BindingSlot;
-  readonly predicate?: (ctx: ConstraintContext) => boolean;
+  readonly predicate?: ((ctx: ConstraintContext) => boolean) | undefined;
 }
 
 type BindingBaseKeys = keyof BindingBase<unknown>;
@@ -83,8 +99,8 @@ export interface ClassBinding<Value> extends BindingBase<Value> {
   readonly kind: "class";
   readonly target: Constructor<Value>;
   readonly scope: BindingScope;
-  readonly onActivation?: ActivationHandler<Value>;
-  readonly onDeactivation?: DeactivationHandler<Value>;
+  readonly onActivation?: ActivationHandler<Value> | undefined;
+  readonly onDeactivation?: DeactivationHandler<Value> | undefined;
 }
 
 /**
@@ -94,8 +110,8 @@ export interface DynamicBinding<Value> extends BindingBase<Value> {
   readonly kind: "dynamic";
   readonly factory: (ctx: ResolutionContext) => Value;
   readonly scope: BindingScope;
-  readonly onActivation?: ActivationHandler<Value>;
-  readonly onDeactivation?: DeactivationHandler<Value>;
+  readonly onActivation?: ActivationHandler<Value> | undefined;
+  readonly onDeactivation?: DeactivationHandler<Value> | undefined;
 }
 
 /**
@@ -105,8 +121,8 @@ export interface DynamicAsyncBinding<Value> extends BindingBase<Value> {
   readonly kind: "dynamic-async";
   readonly factory: (ctx: ResolutionContext) => Promise<Value>;
   readonly scope: BindingScope;
-  readonly onActivation?: ActivationHandler<Value>;
-  readonly onDeactivation?: DeactivationHandler<Value>;
+  readonly onActivation?: ActivationHandler<Value> | undefined;
+  readonly onDeactivation?: DeactivationHandler<Value> | undefined;
 }
 
 /**
@@ -117,8 +133,8 @@ export interface ResolvedBinding<Value> extends BindingBase<Value> {
   readonly factory: (...args: Array<unknown>) => Value;
   readonly deps: ReadonlyArray<InjectionDescriptor>;
   readonly scope: BindingScope;
-  readonly onActivation?: ActivationHandler<Value>;
-  readonly onDeactivation?: DeactivationHandler<Value>;
+  readonly onActivation?: ActivationHandler<Value> | undefined;
+  readonly onDeactivation?: DeactivationHandler<Value> | undefined;
 }
 
 /**
@@ -129,8 +145,8 @@ export interface ResolvedAsyncBinding<Value> extends BindingBase<Value> {
   readonly factory: (...args: Array<unknown>) => Promise<Value>;
   readonly deps: ReadonlyArray<InjectionDescriptor>;
   readonly scope: BindingScope;
-  readonly onActivation?: ActivationHandler<Value>;
-  readonly onDeactivation?: DeactivationHandler<Value>;
+  readonly onActivation?: ActivationHandler<Value> | undefined;
+  readonly onDeactivation?: DeactivationHandler<Value> | undefined;
 }
 
 /**
@@ -140,8 +156,8 @@ export interface ConstantBinding<Value> extends BindingBase<Value> {
   readonly kind: "constant";
   readonly value: Value;
   readonly scope: "singleton";
-  readonly onActivation?: ActivationHandler<Value>;
-  readonly onDeactivation?: DeactivationHandler<Value>;
+  readonly onActivation?: ActivationHandler<Value> | undefined;
+  readonly onDeactivation?: DeactivationHandler<Value> | undefined;
 }
 
 /**
@@ -180,12 +196,12 @@ export type PartialBinding<Value> =
 
 // ── ID generation ─────────────────────────────────────────────────────────────
 
-let _idCounter = 0;
+let bindingIdCounter = 0;
 /**
  * @since 0.3.16-canary.0
  */
 export function generateBindingId(): BindingIdentifier {
-  return String(++_idCounter) as BindingIdentifier;
+  return String(++bindingIdCounter) as BindingIdentifier;
 }
 
 // ── Builder interfaces ────────────────────────────────────────────────────────
@@ -212,12 +228,12 @@ export interface BindToBuilder<Value> {
   toConstantValue(value: Value): ConstantBindingBuilder<Value>;
   toDynamic(factory: (ctx: ResolutionContext) => Value): BindingBuilder<Value>;
   toDynamicAsync(factory: (ctx: ResolutionContext) => Promise<Value>): BindingBuilder<Value>;
-  toResolved<const Deps extends ReadonlyArray<DependencyKey>>(
-    factory: (...args: { [K in keyof Deps]: TokenValue<NoInfer<Deps>[K]> }) => Value,
+  toResolved<const Deps extends ReadonlyArray<InjectableDependency>>(
+    factory: (...args: { [K in keyof Deps]: ResolvedDependencyValue<NoInfer<Deps>[K]> }) => Value,
     deps: Deps,
   ): BindingBuilder<Value>;
-  toResolvedAsync<const Deps extends ReadonlyArray<DependencyKey>>(
-    factory: (...args: { [K in keyof Deps]: TokenValue<NoInfer<Deps>[K]> }) => Promise<Value>,
+  toResolvedAsync<const Deps extends ReadonlyArray<InjectableDependency>>(
+    factory: (...args: { [K in keyof Deps]: ResolvedDependencyValue<NoInfer<Deps>[K]> }) => Promise<Value>,
     deps: Deps,
   ): BindingBuilder<Value>;
   toAlias(target: Token<Value> | Constructor<Value>): AliasBindingBuilder;