feat(cordis): support mixin with prop mapping

cordiverse · Apr 17, 2024 · 1ee7e8a · 1ee7e8a
1 parent 1a3f50a
commit 1ee7e8a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/core/src/context.ts b/packages/core/src/context.ts
@@ -284,9 +284,10 @@ export class Context {
     }
   }
 
-  mixin(name: string, mixins: string[]) {
-    for (const key of mixins) {
-      this.accessor(key, {
+  mixin(name: string, mixins: string[] | Dict<string>) {
+    const entries = Array.isArray(mixins) ? mixins.map(key => [key, key]) : Object.entries(mixins)
+    for (const [key, value] of entries) {
+      this.accessor(value, {
         get() {
           const service = this[name]
           if (isNullable(service)) return service

diff --git a/packages/core/src/service.ts b/packages/core/src/service.ts
@@ -87,7 +87,7 @@ export abstract class Service<T = unknown, C extends Context = Context> {
       self = Object.create(this)
     }
     defineProperty(self, symbols.origin, caller)
-    return Context.associate(Object.assign(self, props), this.name)
+    return Context.associate<this>(Object.assign(self, props), this.name)
   }
 
   static [Symbol.hasInstance](instance: any) {