@praxisjs/di 0.2.3 → 1.0.0

package/dist/decorators.d.ts

@@ -1,7 +1,19 @@
 import { type Container, Token, type Constructor, type InjectableOptions } from "./container";
 export declare function Injectable(options?: InjectableOptions): (value: Constructor, _context: ClassDecoratorContext) => void;
-export declare function Inject<T>(dep: Constructor<T> | Token<T>): (_value: undefined, context: ClassFieldDecoratorContext) => void;
-export declare function InjectContainer(): (_value: undefined, context: ClassFieldDecoratorContext) => void;
-export declare function useService<T>(dep: Constructor<T> | Token<T>): T;
-export declare function createScope(configure?: (c: Container) => void): Container;
+/**
+ * Creates a child DI container scoped to each instance of the decorated class.
+ * Services registered in the configure callback are available within the scope,
+ * and @Inject / @InjectContainer will resolve from it automatically.
+ *
+ * @Scope((c) => {
+ *   c.register(UserRepository);
+ *   c.registerValue(AuthToken, 'abc');
+ * })
+ * class UserModule extends StatefulComponent {
+ *   @Inject(UserRepository) repo!: UserRepository;
+ * }
+ */
+export declare function Scope(configure?: (c: Container) => void): (cls: new (...args: any[]) => any, _ctx: ClassDecoratorContext) => any;
+export declare function Inject<T>(dep: Constructor<T> | Token<T>): (_value: undefined, context: ClassFieldDecoratorContext<any>) => void;
+export declare function InjectContainer(): (_value: undefined, context: ClassFieldDecoratorContext<any>) => void;
 //# sourceMappingURL=decorators.d.ts.map

package/dist/decorators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,SAAS,EAAE,KAAK,EAAE,KAAK,WAAW,EAAE,KAAK,iBAAiB,EAAG,MAAM,aAAa,CAAC;AAE1G,wBAAgB,UAAU,CAAC,OAAO,GAAE,iBAAsB,IACvC,OAAO,WAAW,EAAE,UAAU,qBAAqB,KAAG,IAAI,CAG5E;AAED,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,IACrC,QAAQ,SAAS,EAAE,SAAS,0BAA0B,KAAG,IAAI,CAsC/E;AAED,wBAAgB,eAAe,KACZ,QAAQ,SAAS,EAAE,SAAS,0BAA0B,KAAG,IAAI,CAW/E;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAE/D;AAED,wBAAgB,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,IAAI,GAAG,SAAS,CAIzE"}
+{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,KAAK,SAAS,EAAE,KAAK,EAAE,KAAK,WAAW,EAAE,KAAK,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAWzG,wBAAgB,UAAU,CAAC,OAAO,GAAE,iBAAsB,IACvC,OAAO,WAAW,EAAE,UAAU,qBAAqB,KAAG,IAAI,CAG5E;AAID;;;;;;;;;;;;GAYG;AACH,wBAAgB,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,KAAK,IAAI,IAEtC,KAAK,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,MAAM,qBAAqB,KAAG,GAAG,CAapF;AAID,wBAAgB,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,GAsCrC,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,0BAA0B,CAAC,GAAG,CAAC,KAAK,IAAI,CACvF;AAID,wBAAgB,eAAe,IAaZ,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,0BAA0B,CAAC,GAAG,CAAC,KAAK,IAAI,CACvF"}

package/dist/decorators.js

@@ -1,60 +1,94 @@
+import { createFieldDecorator } from "@praxisjs/decorators";
 import { container, Token } from "./container";
+// Maps instances to their scoped child containers (set by @Scope).
+const scopedContainers = new WeakMap();
+function resolveFrom(instance) {
+    return scopedContainers.get(instance) ?? container;
+}
+// ── @Injectable ───────────────────────────────────────────────────────────────
 export function Injectable(options = {}) {
     return function (value, _context) {
         container.register(value, options);
     };
 }
+// ── @Scope ────────────────────────────────────────────────────────────────────
+/**
+ * Creates a child DI container scoped to each instance of the decorated class.
+ * Services registered in the configure callback are available within the scope,
+ * and @Inject / @InjectContainer will resolve from it automatically.
+ *
+ * @Scope((c) => {
+ *   c.register(UserRepository);
+ *   c.registerValue(AuthToken, 'abc');
+ * })
+ * class UserModule extends StatefulComponent {
+ *   @Inject(UserRepository) repo!: UserRepository;
+ * }
+ */
+export function Scope(configure) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return function (cls, _ctx) {
+        return class extends cls {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            constructor(...args) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                super(...args);
+                const child = container.createChild();
+                configure?.(child);
+                scopedContainers.set(this, child);
+            }
+        };
+    };
+}
+// ── @Inject ───────────────────────────────────────────────────────────────────
 export function Inject(dep) {
-    return function (_value, context) {
-        const cache = new WeakMap();
-        const propertyKey = String(context.name);
-        context.addInitializer(function () {
-            Object.defineProperty(this, context.name, {
-                get() {
-                    if (!cache.has(this)) {
-                        let resolved;
-                        try {
-                            resolved = container.resolve(dep);
+    const cache = new WeakMap();
+    return createFieldDecorator({
+        bind(_instance, name, _initialValue) {
+            return {
+                descriptor: {
+                    get() {
+                        if (!cache.has(this)) {
+                            const c = resolveFrom(this);
+                            let resolved;
+                            try {
+                                resolved = c.resolve(dep);
+                            }
+                            catch (err) {
+                                throw new Error(`[Inject] Failed to resolve "${dep instanceof Token
+                                    ? dep.toString()
+                                    : dep.name}" in "${this.constructor.name}.${name}": ${err.message}`);
+                            }
+                            cache.set(this, resolved);
                         }
-                        catch (err) {
-                            throw new Error(`[Inject] Failed to resolve "${dep instanceof Token
-                                ? dep.toString()
-                                : dep.name}" in "${this.constructor.name}.${propertyKey}": ${err.message}`);
+                        return cache.get(this);
+                    },
+                    set(_value) {
+                        if (process.env.NODE_ENV !== "production") {
+                            console.warn(`[Inject] "${name}" is managed by the DI container and cannot be assigned directly.`);
                         }
-                        cache.set(this, resolved);
-                    }
-                    return cache.get(this);
-                },
-                set(_value) {
-                    if (process.env.NODE_ENV !== "production") {
-                        console.warn(`[Inject] "${propertyKey}" is managed by the DI container and cannot be assigned directly.`);
-                    }
+                    },
                 },
-                enumerable: true,
-                configurable: true,
-            });
-        });
-    };
+            };
+        },
+        // DI decorators work on any class, not just StatefulComponent
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    });
 }
+// ── @InjectContainer ──────────────────────────────────────────────────────────
 export function InjectContainer() {
-    return function (_value, context) {
-        context.addInitializer(function () {
-            Object.defineProperty(this, context.name, {
-                get() {
-                    return container;
+    return createFieldDecorator({
+        bind(_instance, _name, _initialValue) {
+            return {
+                descriptor: {
+                    get() {
+                        return resolveFrom(this);
+                    },
                 },
-                enumerable: true,
-                configurable: true,
-            });
-        });
-    };
-}
-export function useService(dep) {
-    return container.resolve(dep);
-}
-export function createScope(configure) {
-    const child = container.createChild();
-    configure?.(child);
-    return child;
+            };
+        },
+        // DI decorators work on any class, not just StatefulComponent
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    });
 }
 //# sourceMappingURL=decorators.js.map

package/dist/decorators.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAkB,KAAK,EAA6C,MAAM,aAAa,CAAC;AAE1G,MAAM,UAAU,UAAU,CAAC,UAA6B,EAAE;IACxD,OAAO,UAAU,KAAkB,EAAE,QAA+B;QAClE,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACrC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,MAAM,CAAI,GAA8B;IACtD,OAAO,UAAU,MAAiB,EAAE,OAAmC;QACrE,MAAM,KAAK,GAAG,IAAI,OAAO,EAAa,CAAC;QACvC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEzC,OAAO,CAAC,cAAc,CAAC;YACrB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;gBACxC,GAAG;oBACD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;wBACrB,IAAI,QAAW,CAAC;wBAChB,IAAI,CAAC;4BACH,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,GAAqB,CAAC,CAAC;wBACtD,CAAC;wBAAC,OAAO,GAAG,EAAE,CAAC;4BACb,MAAM,IAAI,KAAK,CACb,+BACE,GAAG,YAAY,KAAK;gCAClB,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE;gCAChB,CAAC,CAAE,GAAmB,CAAC,IAC3B,SAAU,IAA0C,CAAC,WAAW,CAAC,IAAI,IAAI,WAAW,MAAO,GAAa,CAAC,OAAO,EAAE,CACnH,CAAC;wBACJ,CAAC;wBACD,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;oBAC5B,CAAC;oBACD,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAM,CAAC;gBAC9B,CAAC;gBAED,GAAG,CAAC,MAAe;oBACjB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;wBAC1C,OAAO,CAAC,IAAI,CACV,aAAa,WAAW,mEAAmE,CAC5F,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAED,UAAU,EAAE,IAAI;gBAChB,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,UAAU,MAAiB,EAAE,OAAmC;QACrE,OAAO,CAAC,cAAc,CAAC;YACrB,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;gBACxC,GAAG;oBACD,OAAO,SAAS,CAAC;gBACnB,CAAC;gBACD,UAAU,EAAE,IAAI;gBAChB,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,UAAU,CAAI,GAA8B;IAC1D,OAAO,SAAS,CAAC,OAAO,CAAC,GAAqB,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,SAAkC;IAC5D,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;IACtC,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../src/decorators.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import "reflect-metadata";
-export { Injectable, Inject, InjectContainer, useService, createScope, } from "./decorators";
+export { Injectable, Inject, InjectContainer, Scope, } from "./decorators";
 export { Container, container, Token, token } from "./container";
-export type { Scope, InjectableOptions, Constructor, ServiceDescriptor, } from "./container";
+export type { Scope as ScopeType, InjectableOptions, Constructor, ServiceDescriptor, } from "./container";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EACL,UAAU,EACV,MAAM,EACN,eAAe,EACf,UAAU,EACV,WAAW,GACZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACjE,YAAY,EACV,KAAK,EACL,iBAAiB,EACjB,WAAW,EACX,iBAAiB,GAClB,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EACL,UAAU,EACV,MAAM,EACN,eAAe,EACf,KAAK,GACN,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACjE,YAAY,EACV,KAAK,IAAI,SAAS,EAClB,iBAAiB,EACjB,WAAW,EACX,iBAAiB,GAClB,MAAM,aAAa,CAAC"}

package/dist/index.js

@@ -1,4 +1,4 @@
 import "reflect-metadata";
-export { Injectable, Inject, InjectContainer, useService, createScope, } from "./decorators";
+export { Injectable, Inject, InjectContainer, Scope, } from "./decorators";
 export { Container, container, Token, token } from "./container";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EACL,UAAU,EACV,MAAM,EACN,eAAe,EACf,UAAU,EACV,WAAW,GACZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EACL,UAAU,EACV,MAAM,EACN,eAAe,EACf,KAAK,GACN,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@praxisjs/di",
-  "version": "0.2.3",
+  "version": "1.0.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -12,7 +12,8 @@
   },
   "dependencies": {
     "reflect-metadata": "^0.2.2",
-    "@praxisjs/core": "0.4.2"
+    "@praxisjs/core": "1.0.0",
+    "@praxisjs/decorators": "0.5.0"
   },
   "devDependencies": {
     "@types/node": "^25.3.0",

package/src/__tests__/container.test.ts

@@ -133,6 +133,26 @@ describe("Container", () => {
     expect(grandchild.resolve(URL_TOKEN)).toBe("https://grandparent.com");
   });
 
+  it("resolves constructor injection from di:inject metadata", () => {
+    class Engine {}
+    class Car {
+      constructor(public engine: Engine) {}
+    }
+
+    const c = new Container();
+    c.register(Engine);
+    c.register(Car);
+
+    // Simulate what a @Inject constructor param decorator would set
+    Reflect.defineMetadata("di:inject", [Engine], Car);
+
+    const car = c.resolve(Car);
+    expect(car).toBeInstanceOf(Car);
+    expect(car.engine).toBeInstanceOf(Engine);
+
+    Reflect.deleteMetadata("di:inject", Car);
+  });
+
   it("registering the same class twice replaces the previous registration", () => {
     class Counter {
       value = Math.random();

package/src/__tests__/decorators.test.ts

@@ -1,191 +1,228 @@
 import "reflect-metadata";
 import { describe, it, expect, vi } from "vitest";
 
-import { Container, token } from "../container";
+import { Container, container, token } from "../container";
 import {
   Injectable,
   Inject,
   InjectContainer,
-  useService,
-  createScope,
+  Scope,
 } from "../decorators";
 
-// ── Injectable ────────────────────────────────────────────────────────────────
+function makeFieldCtx(name: string) {
+  const initializers: Array<(this: unknown) => void> = [];
+  return {
+    ctx: {
+      name,
+      kind: "field" as const,
+      addInitializer(fn: (this: unknown) => void) { initializers.push(fn); },
+    } as ClassFieldDecoratorContext,
+    run(instance: unknown) { initializers.forEach((fn) => { fn.call(instance); }); },
+  };
+}
+
+// ── @Injectable ───────────────────────────────────────────────────────────────
 
 describe("Injectable", () => {
   it("registers the class in the global container", () => {
-    // We test via useService resolving without throwing
     class MyService {
-      greet() {
-        return "hello";
-      }
+      greet() { return "hello"; }
     }
     Injectable()(MyService, {} as ClassDecoratorContext);
-    const instance = useService(MyService);
-    expect(instance).toBeInstanceOf(MyService);
-    expect(instance.greet()).toBe("hello");
+    expect(container.resolve(MyService)).toBeInstanceOf(MyService);
+    expect(container.resolve(MyService).greet()).toBe("hello");
   });
 
-  it("registers with transient scope", () => {
+  it("registers with transient scope — each resolve returns a new instance", () => {
     class TmpService {}
     Injectable({ scope: "transient" })(TmpService, {} as ClassDecoratorContext);
-    const a = useService(TmpService);
-    const b = useService(TmpService);
-    expect(a).not.toBe(b);
+    expect(container.resolve(TmpService)).not.toBe(container.resolve(TmpService));
   });
 });
 
-// ── Inject ────────────────────────────────────────────────────────────────────
+// ── @Inject ───────────────────────────────────────────────────────────────────
 
 describe("Inject", () => {
   it("injects a registered service via property", () => {
     class Logger {
-      log(msg: string) {
-        return msg;
-      }
+      log(msg: string) { return msg; }
     }
     Injectable()(Logger, {} as ClassDecoratorContext);
 
-    const initializers: Array<(this: unknown) => void> = [];
-    const ctx = {
-      name: "logger",
-      kind: "field" as const,
-      addInitializer(fn: (this: unknown) => void) {
-        initializers.push(fn);
-      },
-    } as ClassFieldDecoratorContext;
-
+    const { ctx, run } = makeFieldCtx("logger");
     Inject(Logger)(undefined, ctx);
-
     const instance: Record<string, unknown> = {};
-    initializers.forEach((fn) => {
-      fn.call(instance);
-    });
-
+    run(instance);
     expect(instance.logger).toBeInstanceOf(Logger);
+    // second access covers the cache-hit branch (line 62: !cache.has(this) === false)
+    expect(instance.logger).toBe(instance.logger);
   });
 
   it("throws a descriptive error when dep is not registered", () => {
     class UnknownDep {}
-
-    const initializers: Array<(this: unknown) => void> = [];
-    const ctx = {
-      name: "dep",
-      kind: "field" as const,
-      addInitializer(fn: (this: unknown) => void) {
-        initializers.push(fn);
-      },
-    } as ClassFieldDecoratorContext;
-
+    const { ctx, run } = makeFieldCtx("dep");
     Inject(UnknownDep)(undefined, ctx);
-
-    class MyClass {
-      constructor() {}
-    }
+    class MyClass {}
     const instance = new MyClass() as Record<string, unknown>;
-    initializers.forEach((fn) => {
-      fn.call(instance);
-    });
-
+    run(instance);
     expect(() => instance.dep).toThrow("[Inject]");
   });
 
   it("warns on direct assignment in non-production", () => {
     class Dep2 {}
     Injectable()(Dep2, {} as ClassDecoratorContext);
-
-    const initializers: Array<(this: unknown) => void> = [];
-    const ctx = {
-      name: "dep2",
-      kind: "field" as const,
-      addInitializer(fn: (this: unknown) => void) {
-        initializers.push(fn);
-      },
-    } as ClassFieldDecoratorContext;
-
+    const { ctx, run } = makeFieldCtx("dep2");
     Inject(Dep2)(undefined, ctx);
     const instance: Record<string, unknown> = {};
-    initializers.forEach((fn) => {
-      fn.call(instance);
-    });
-
+    run(instance);
     const spy = vi.spyOn(console, "warn").mockImplementation(() => {});
     instance.dep2 = "override";
     expect(spy).toHaveBeenCalledWith(expect.stringContaining("[Inject]"));
     spy.mockRestore();
   });
-});
 
-// ── InjectContainer ───────────────────────────────────────────────────────────
+  it("returns cached value on second access (cache hit)", () => {
+    class CachedService {
+      id = Math.random();
+    }
+    Injectable()(CachedService, {} as ClassDecoratorContext);
 
-describe("InjectContainer", () => {
-  it("injects the global container instance", () => {
-    const initializers: Array<(this: unknown) => void> = [];
-    const ctx = {
-      name: "container",
-      kind: "field" as const,
-      addInitializer(fn: (this: unknown) => void) {
-        initializers.push(fn);
-      },
-    } as ClassFieldDecoratorContext;
+    const { ctx, run } = makeFieldCtx("svc");
+    Inject(CachedService)(undefined, ctx);
+    const instance: Record<string, unknown> = {};
+    run(instance);
 
-    InjectContainer()(undefined, ctx);
+    const first = instance.svc;
+    const second = instance.svc;
+    expect(first).toBe(second); // same cached instance
+  });
+
+  it("does not warn on direct assignment in production mode", () => {
+    class ProdDep {}
+    Injectable()(ProdDep, {} as ClassDecoratorContext);
+    const { ctx, run } = makeFieldCtx("dep");
+    Inject(ProdDep)(undefined, ctx);
     const instance: Record<string, unknown> = {};
-    initializers.forEach((fn) => {
-      fn.call(instance);
-    });
+    run(instance);
 
-    expect(instance.container).toBeInstanceOf(Container);
+    const spy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.stubEnv("NODE_ENV", "production");
+    instance.dep = "override";
+    expect(spy).not.toHaveBeenCalled();
+
+    vi.unstubAllEnvs();
+    spy.mockRestore();
+  });
+
+  it("includes the Token description in the error when resolution fails", () => {
+    const MY_TOKEN = token<string>("MY_SERVICE");
+    const { ctx, run } = makeFieldCtx("svc");
+    Inject(MY_TOKEN)(undefined, ctx);
+    class Consumer {}
+    const instance = new Consumer() as Record<string, unknown>;
+    run(instance);
+    expect(() => instance.svc).toThrow("MY_SERVICE");
   });
 });
 
-// ── useService ────────────────────────────────────────────────────────────────
+// ── @InjectContainer ──────────────────────────────────────────────────────────
 
-describe("useService", () => {
-  it("resolves by Token", () => {
-    const VERSION = token<string>("VERSION");
-    const c = createScope((sc) => sc.registerValue(VERSION, "1.0.0"));
-    // useService uses global container — test via token on a fresh child
-    expect(c.resolve(VERSION)).toBe("1.0.0");
+describe("InjectContainer", () => {
+  it("injects the global container on an unscoped class", () => {
+    const { ctx, run } = makeFieldCtx("c");
+    InjectContainer()(undefined, ctx);
+    const instance: Record<string, unknown> = {};
+    run(instance);
+    expect(instance.c).toBeInstanceOf(Container);
+    expect(instance.c).toBe(container);
   });
 });
 
-// ── createScope ───────────────────────────────────────────────────────────────
+// ── @Scope ────────────────────────────────────────────────────────────────────
+
+describe("Scope", () => {
+  it("creates a child container per instance", () => {
+    @Scope()
+    class Widget {}
+    const { ctx, run } = makeFieldCtx("c");
+    InjectContainer()(undefined, ctx);
+
+    const a = new Widget() as Record<string, unknown>;
+    run(a);
+    const b = new Widget() as Record<string, unknown>;
+    run(b);
 
-describe("createScope", () => {
-  it("creates a child container without configure fn", () => {
-    const child = createScope();
-    expect(child).toBeInstanceOf(Container);
+    expect(a.c).toBeInstanceOf(Container);
+    expect(b.c).toBeInstanceOf(Container);
+    expect(a.c).not.toBe(b.c); // each instance gets its own scope
+    expect(a.c).not.toBe(container); // it's a child, not the root
   });
 
-  it("applies the configure callback", () => {
-    const DB = token<string>("DB");
-    const child = createScope((c) =>
-      c.registerValue(DB, "postgres://localhost"),
-    );
-    expect(child.resolve(DB)).toBe("postgres://localhost");
+  it("services registered in configure are resolvable within the scope", () => {
+    const DB_URL = token<string>("DB_URL");
+
+    @Scope((c) => { c.registerValue(DB_URL, "postgres://localhost"); })
+    class DataModule {}
+
+    const { ctx, run } = makeFieldCtx("db");
+    Inject(DB_URL)(undefined, ctx);
+
+    const instance = new DataModule() as Record<string, unknown>;
+    run(instance);
+
+    expect(instance.db).toBe("postgres://localhost");
   });
-});
 
-// ── Inject — Token in error message ──────────────────────────────────────────
+  it("@Inject resolves from the scoped container, not the global one", () => {
+    class ScopedRepo {}
+    // NOT registered in global container
+    const VERSION = token<string>("VERSION");
 
-describe("Inject — Token error display", () => {
-  it("includes the Token description in the error message when resolution fails", () => {
-    const MY_TOKEN = token<string>("MY_SERVICE");
+    @Scope((c) => {
+      c.register(ScopedRepo);
+      c.registerValue(VERSION, "2.0");
+    })
+    class App {}
 
-    const initializers: Array<(this: unknown) => void> = [];
-    const ctx = {
-      name: "svc",
-      kind: "field" as const,
-      addInitializer(fn: (this: unknown) => void) { initializers.push(fn); },
-    } as ClassFieldDecoratorContext;
+    const { ctx: repoCtx, run: runRepo } = makeFieldCtx("repo");
+    Inject(ScopedRepo)(undefined, repoCtx);
+    const { ctx: verCtx, run: runVer } = makeFieldCtx("version");
+    Inject(VERSION)(undefined, verCtx);
 
-    Inject(MY_TOKEN)(undefined, ctx);
+    const instance = new App() as Record<string, unknown>;
+    runRepo(instance);
+    runVer(instance);
 
-    class Consumer { constructor() {} }
-    const instance = new Consumer() as Record<string, unknown>;
-    initializers.forEach((fn) => { fn.call(instance); });
+    expect(instance.repo).toBeInstanceOf(ScopedRepo);
+    expect(instance.version).toBe("2.0");
+  });
 
-    expect(() => instance.svc).toThrow("MY_SERVICE");
+  it("@InjectContainer returns the scoped child container", () => {
+    @Scope((c) => { c.registerValue(token<number>("X"), 42); })
+    class Service {}
+
+    const { ctx, run } = makeFieldCtx("container");
+    InjectContainer()(undefined, ctx);
+
+    const instance = new Service() as Record<string, unknown>;
+    run(instance);
+
+    expect(instance.container).toBeInstanceOf(Container);
+    expect(instance.container).not.toBe(container);
+  });
+
+  it("child container inherits registrations from the parent", () => {
+    class GlobalService {}
+    Injectable()(GlobalService, {} as ClassDecoratorContext);
+
+    @Scope()
+    class Child {}
+
+    const { ctx, run } = makeFieldCtx("svc");
+    Inject(GlobalService)(undefined, ctx);
+    const instance = new Child() as Record<string, unknown>;
+    run(instance);
+
+    expect(instance.svc).toBeInstanceOf(GlobalService);
   });
 });

package/src/container.ts

@@ -10,7 +10,8 @@ export interface ServiceDescriptor {
   instance?: unknown;
 }
 
-export type Constructor<T = unknown> = new (...args: unknown[]) => T;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type Constructor<T = unknown> = new (...args: any[]) => T;
 
 export class Token<_T> {
   readonly description: string;