Fix Symbol.hasInstance not added on mixin

aedart · Feb 6, 2024 · 0bdb6f4 · 0bdb6f4
1 parent 026feec
commit 0bdb6f4
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/packages/support/src/mixins/mixins/HasInstance.ts b/packages/support/src/mixins/mixins/HasInstance.ts
@@ -12,14 +12,16 @@ export const HasInstance = function(mixin: Mixin): Mixin
 {
     // The following source code is an adaptation of Justin Fagnani's "mixwith.js" (Apache License 2.0)
     // @see https://github.com/justinfagnani/mixwith.js
-
-    if (!Reflect.has(mixin, Symbol.hasInstance)) {
-        Reflect.defineProperty(mixin, Symbol.hasInstance, {
-            value(instance) {
-                return hasMixin(instance, mixin);
-            },
-        })
+
+    // Skip if mixin already has Symbol.hasInstance
+    if (Object.hasOwn(mixin, Symbol.hasInstance)) {
+        return mixin;
     }
 
-    return mixin;
+    // Otherwise, define the Symbol.hasInstance
+    return Object.defineProperty(mixin, Symbol.hasInstance, {
+        value: (instance: object) => {
+            return hasMixin(instance, mixin);
+        },
+    });
 }