[BUGFIX] fix detect usage for native class polymorphism

emberjs · Nov 19, 2019 · 294d399 · 294d399
1 parent c702a0a
commit 294d399
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/packages/store/addon/-debug/index.js b/packages/store/addon/-debug/index.js
@@ -25,9 +25,11 @@ let assertPolymorphicType;
 if (DEBUG) {
   let checkPolymorphic = function checkPolymorphic(modelClass, addedModelClass) {
     if (modelClass.__isMixin) {
-      //TODO Need to do this in order to support mixins, should convert to public api
-      //once it exists in Ember
-      return modelClass.__mixin.detect(addedModelClass.PrototypeMixin);
+      return (
+        modelClass.__mixin.detect(addedModelClass.PrototypeMixin) ||
+        // handle native class extension e.g. `class Post extends Model.extend(Commentable) {}`
+        modelClass.__mixin.detect(Object.getPrototypeOf(addedModelClass).PrototypeMixin)
+      );
     }
 
     return addedModelClass.prototype instanceof modelClass || modelClass.detect(addedModelClass);