Clean up mixin impl

loopbackio · May 30, 2017 · 0dfdc07 · 0dfdc07
1 parent d6dd9f8
commit 0dfdc07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/packages/juggler/src/mixin.ts b/packages/juggler/src/mixin.ts
@@ -9,9 +9,12 @@ import {Class, AnyType} from './common';
  * Interface for functions that can mix properties/methods into a base class
  */
 export interface MixinFunc {
-  <BC extends Class<{}>>(baseClass: BC): BC;
+  <BC extends Class<AnyType>>(baseClass: BC): BC;
 }
 
+/**
+ * A builder to compose mixins
+ */
 export class MixinBuilder {
   constructor(public baseClass: Class<AnyType>) {
   }
@@ -24,13 +27,3 @@ export class MixinBuilder {
     return new MixinBuilder(baseClass);
   }
 }
-
-
-function extend<T extends Class<{}>>(superClass: T, ...mixins: Class<{}>[]): T {
-  const mixed = class extends superClass {
-  };
-  Object.assign(mixed, ...mixins);
-  const prototypes: Class<{}>[] = mixins.map((c) => c.prototype);
-  Object.assign(mixed.prototype, ...prototypes);
-  return mixed;
-}
diff --git a/packages/juggler/test/unit/mixin/mixin.ts b/packages/juggler/test/unit/mixin/mixin.ts
@@ -18,7 +18,7 @@ class BaseClass {
   }
 }
 
-function Mixin1<T extends Class<{}>>(superClass: T) {
+function Mixin1<T extends Class<AnyType>>(superClass: T) {
   return class extends superClass {
     mixinProp1: string = 'mixinProp1';
 
@@ -32,7 +32,7 @@ function Mixin1<T extends Class<{}>>(superClass: T) {
   };
 }
 
-function Mixin2<T extends Class<{}>>(superClass: T) {
+function Mixin2<T extends Class<AnyType>>(superClass: T) {
   return class extends superClass {
     mixinProp2: string = 'mixinProp2';