fix: extending context

izatop · May 7, 2020 · 99b1d6b · 99b1d6b
1 parent 8357173
commit 99b1d6b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/packages/test/src/unit/Context.test.ts b/packages/test/src/unit/Context.test.ts
@@ -15,6 +15,7 @@ test("Context", async () => {
     expect(await context.getMemoryDb()).toBeInstanceOf(MemoryDb);
     expect(await context.getMemoryDb() === context.memoryDb).toBe(true);
 
+    expect(context.parentDb).toBeInstanceOf(MemoryDb);
     expect(context.randomBytes).not.toStrictEqual(context.randomBytes);
     expect(context.randomBytes).toBeInstanceOf(Buffer);
 

diff --git a/packages/test/src/unit/src/context/BaseContext.ts b/packages/test/src/unit/src/context/BaseContext.ts
@@ -1,6 +1,12 @@
-import {Context} from "@typesafeunit/unit";
+import {Context, resolve} from "@typesafeunit/unit";
+import {MemoryDbServiceResolver} from "./services/MemoryDbServiceResolver";
 
 export class BaseContext extends Context {
     public version = "1.0.0";
     public startAt = new Date();
+
+    @resolve
+    public get parentDb() {
+        return new MemoryDbServiceResolver("parent");
+    }
 }
diff --git a/packages/unit/src/Context/Context.ts b/packages/unit/src/Context/Context.ts
@@ -29,7 +29,7 @@ export class Context {
         const finish = this.logger.perf("Resolve context", {context: name});
         try {
             const descriptionMap: PropertyDescriptorMap = Object.getOwnPropertyDescriptors(context);
-            for (const key of Service.getRef(context)) {
+            for (const key of Service.getReferences(context, Context)) {
                 if (Reflect.has(context, key)) {
                     const service: Service<any> = Reflect.get(context, key);
                     const finishResolve = this.logger.perf(

diff --git a/packages/unit/src/Service/Service.ts b/packages/unit/src/Service/Service.ts
@@ -2,8 +2,13 @@ import {IServiceResolver} from "../interfaces";
 import {ServiceRef} from "./ServiceRef";
 
 export abstract class Service<T> implements IServiceResolver<T> {
-    public static getRef(target: object) {
-        return ServiceRef.get(target);
+    public static getReferences(target: object, base: Function | null = null) {
+        const references = [];
+        for (const proto of this.getPrototypes(target, base)) {
+            references.push(...ServiceRef.get(proto));
+        }
+
+        return references;
     }
 
     public static resolve(): PropertyDecorator {
@@ -12,5 +17,14 @@ export abstract class Service<T> implements IServiceResolver<T> {
         };
     }
 
+    protected static* getPrototypes(target: object, base: Function | null = null) {
+        let proto = Object.getPrototypeOf(target);
+        const baseProto = base === null ? null : base.prototype;
+        while (baseProto !== proto) {
+            yield proto;
+            proto = Object.getPrototypeOf(proto);
+        }
+    }
+
     public abstract resolve(): Promise<T>;
 }