release: [email protected]

Author: lzxb

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.4.4
+
+-   fix: multiple inheritance unbinding object errors
+
 ## 1.4.3
 
 -   fix: memory leak caused by unused `@Setup` decorator

package.json

@@ -1,6 +1,6 @@
 {
     "name": "vue-class-setup",
-    "version": "1.4.3",
+    "version": "1.4.4",
     "main": "dist/index.cjs.js",
     "module": "dist/index.es.js",
     "types": "dist/index.d.ts",

src/setup-reference.ts

@@ -1,18 +1,19 @@
 let count = 0;
-let isOpen = false;
+let isBind = false;
 
-export function add() {
-    if (isOpen) {
+export function addCount() {
+    // 如果还是处于绑定状态，说明上一次解绑的过程中程序执行报错了，需要重置
+    if (isBind) {
+        isBind = false;
         count = 1;
     } else {
-        isOpen = true;
         count++;
     }
 }
 
 const weakMap = new WeakMap<object, number>();
 
-export function popTarget(target: object): boolean {
+export function unBindTarget(target: object): boolean {
     let count = weakMap.get(target);
     if (typeof count === 'number') {
         count--;
@@ -21,7 +22,7 @@ export function popTarget(target: object): boolean {
             return false;
         } else {
             weakMap.delete(target);
-            isOpen = false;
+            isBind = false;
             return true;
         }
     }
@@ -32,6 +33,7 @@ export function bindTarget(target: object) {
     if (count > 0) {
         weakMap.set(target, count);
         count = 0;
+        isBind = true;
     } else {
         console.warn(`The instance did not use the '@Setup' decorator`);
     }

src/setup.ts

@@ -10,7 +10,7 @@ import {
 import { initComputed } from './computed';
 import { getOptions, getSetupOptions } from './options';
 import { initDefine } from './define';
-import { add, popTarget } from './setup-reference';
+import { addCount, unBindTarget } from './setup-reference';
 import { getPropertyDescriptors } from './property-descriptors';
 
 export type TargetConstructor = {
@@ -68,9 +68,9 @@ function Setup<T extends TargetConstructor>(Target: T) {
         public static [SETUP_PROPERTY_DESCRIPTOR] =
             getPropertyDescriptors(Target);
         public constructor(...args: any[]) {
-            add();
+            addCount();
             super(...args);
-            if (popTarget(this)) {
+            if (unBindTarget(this)) {
                 // Vue3 needs to return, vue2 does not need to return
                 return initHook(reactive(this));
             }