@praxisjs/di 0.2.3 → 1.0.0

package/src/decorators.ts

@@ -1,4 +1,15 @@
-import { container, type Container, Token, type Constructor, type InjectableOptions  } from "./container";
+import { createFieldDecorator, type FieldBinding } from "@praxisjs/decorators";
+
+import { container, type Container, Token, type Constructor, type InjectableOptions } from "./container";
+
+// Maps instances to their scoped child containers (set by @Scope).
+const scopedContainers = new WeakMap<object, Container>();
+
+function resolveFrom(instance: object) {
+  return scopedContainers.get(instance) ?? container;
+}
+
+// ── @Injectable ───────────────────────────────────────────────────────────────
 
 export function Injectable(options: InjectableOptions = {}) {
   return function (value: Constructor, _context: ClassDecoratorContext): void {
@@ -6,67 +17,95 @@ export function Injectable(options: InjectableOptions = {}) {
   };
 }
 
+// ── @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?: (c: Container) => void) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return function(cls: new (...args: any[]) => any, _ctx: ClassDecoratorContext): any {
+     
+    return class extends cls {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      constructor(...args: any[]) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        super(...args);
+        const child = container.createChild();
+        configure?.(child);
+        scopedContainers.set(this as object, child);
+      }
+    };
+  };
+}
+
+// ── @Inject ───────────────────────────────────────────────────────────────────
+
 export function Inject<T>(dep: Constructor<T> | Token<T>) {
-  return function (_value: undefined, context: ClassFieldDecoratorContext): void {
-    const cache = new WeakMap<object, T>();
-    const propertyKey = String(context.name);
+  const cache = new WeakMap<object, T>();
 
-    context.addInitializer(function (this: unknown) {
-      Object.defineProperty(this, context.name, {
-        get(this: object): T {
-          if (!cache.has(this)) {
-            let resolved: T;
-            try {
-              resolved = container.resolve(dep as Constructor<T>);
-            } catch (err) {
-              throw new Error(
-                `[Inject] Failed to resolve "${
-                  dep instanceof Token
-                    ? dep.toString()
-                    : (dep as Constructor).name
-                }" in "${(this as { constructor: { name: string } }).constructor.name}.${propertyKey}": ${(err as Error).message}`,
+  return createFieldDecorator({
+    bind(_instance, name, _initialValue): FieldBinding {
+      return {
+        descriptor: {
+          get(this: object): T {
+            if (!cache.has(this)) {
+              const c = resolveFrom(this);
+              let resolved: T;
+              try {
+                resolved = c.resolve(dep as Constructor<T>);
+              } catch (err) {
+                throw new Error(
+                  `[Inject] Failed to resolve "${
+                    dep instanceof Token
+                      ? dep.toString()
+                      : (dep as Constructor).name
+                  }" in "${(this as { constructor: { name: string } }).constructor.name}.${name}": ${(err as Error).message}`,
+                );
+              }
+              cache.set(this, resolved);
+            }
+            return cache.get(this) as T;
+          },
+          set(_value: unknown): void {
+            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) as T;
+          },
         },
-
-        set(_value: unknown): void {
-          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
+  }) as unknown as (_value: undefined, context: ClassFieldDecoratorContext<any>) => void;
 }
 
+// ── @InjectContainer ──────────────────────────────────────────────────────────
+
 export function InjectContainer() {
-  return function (_value: undefined, context: ClassFieldDecoratorContext): void {
-    context.addInitializer(function (this: unknown) {
-      Object.defineProperty(this, context.name, {
-        get() {
-          return container;
+  return createFieldDecorator({
+    bind(_instance, _name, _initialValue): FieldBinding {
+      return {
+        descriptor: {
+          get(this: object) {
+            return resolveFrom(this);
+          },
         },
-        enumerable: true,
-        configurable: true,
-      });
-    });
-  };
-}
-
-export function useService<T>(dep: Constructor<T> | Token<T>): T {
-  return container.resolve(dep as Constructor<T>);
-}
-
-export function createScope(configure?: (c: Container) => void): Container {
-  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
+  }) as unknown as (_value: undefined, context: ClassFieldDecoratorContext<any>) => void;
 }

package/src/index.ts

@@ -4,12 +4,11 @@ export {
   Injectable,
   Inject,
   InjectContainer,
-  useService,
-  createScope,
+  Scope,
 } from "./decorators";
 export { Container, container, Token, token } from "./container";
 export type {
-  Scope,
+  Scope as ScopeType,
   InjectableOptions,
   Constructor,
   ServiceDescriptor,