phecda-vue 3.0.0-alpha.13 → 3.0.0-alpha.15

package/dist/index.js

@@ -243,7 +243,6 @@ __name(createSharedReactive, "createSharedReactive");
 
 // src/composable.ts
 var REF_SYMBOL = Symbol("ref");
-var REACTIVE_SYMBOL = Symbol("reactive");
 function useO(module2) {
   const { state, origin } = (0, import_phecda_web3.getActiveInstance)();
   const proxyFn = module2.prototype.__SHALLOW__ ? import_vue4.shallowReactive : import_vue4.reactive;
@@ -272,34 +271,7 @@ function usePatch(module2, Data) {
 }
 __name(usePatch, "usePatch");
 function useR(module2) {
-  const { cache: cacheMap } = (0, import_phecda_web3.getActiveInstance)();
-  const instance = useO(module2);
-  const cache = cacheMap.get(instance) || {};
-  if (cache[REACTIVE_SYMBOL])
-    return cache[REACTIVE_SYMBOL];
-  const proxy = new Proxy(instance, {
-    get(target, key) {
-      if (typeof target[key] === "function") {
-        if (cache[key])
-          return cache[key];
-        const errorHandler = (0, import_phecda_web3.getHandler)(target, key).find((item) => item.error)?.error;
-        if (!errorHandler)
-          return target[key].bind(target);
-        const wrapper = (0, import_phecda_web3.wrapError)(target, key, errorHandler);
-        cache[key] = wrapper;
-        return wrapper;
-      }
-      return target[key];
-    },
-    set(target, key, v) {
-      target[key] = v;
-      return true;
-    }
-  });
-  cache[REACTIVE_SYMBOL] = proxy;
-  if (!cacheMap.has(instance))
-    cacheMap.set(instance, cache);
-  return proxy;
+  return useO(module2);
 }
 __name(useR, "useR");
 function useV(module2) {
@@ -311,14 +283,9 @@ function useV(module2) {
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
-        if (cache[key])
-          return cache[key];
-        const errorHandler = (0, import_phecda_web3.getHandler)(target, key).find((item) => item.error)?.error;
-        if (!errorHandler)
-          return target[key].bind(target);
-        const wrapper = (0, import_phecda_web3.wrapError)(target, key, errorHandler);
-        cache[key] = wrapper;
-        return wrapper;
+        if (!cache[key])
+          cache[key] = target[key].bind(this);
+        return cache[key];
       }
       if (target[key]?.__v_skip)
         return target[key];

package/dist/index.mjs

@@ -149,7 +149,7 @@ __name(createPhecda, "createPhecda");
 
 // src/composable.ts
 import { onBeforeUnmount, reactive, shallowReactive, toRaw, toRef } from "vue";
-import { emitter as emitter2, getActiveInstance as getActiveInstance2, getHandler, getTag, invokeHandler as invokeHandler2, wrapError } from "phecda-web";
+import { emitter as emitter2, getActiveInstance as getActiveInstance2, getTag, invokeHandler as invokeHandler2 } from "phecda-web";
 
 // src/utils.ts
 import { effectScope as effectScope2, isReactive, isRef, onScopeDispose, markRaw as raw } from "vue";
@@ -202,7 +202,6 @@ __name(createSharedReactive, "createSharedReactive");
 
 // src/composable.ts
 var REF_SYMBOL = Symbol("ref");
-var REACTIVE_SYMBOL = Symbol("reactive");
 function useO(module) {
   const { state, origin } = getActiveInstance2();
   const proxyFn = module.prototype.__SHALLOW__ ? shallowReactive : reactive;
@@ -231,34 +230,7 @@ function usePatch(module, Data) {
 }
 __name(usePatch, "usePatch");
 function useR(module) {
-  const { cache: cacheMap } = getActiveInstance2();
-  const instance = useO(module);
-  const cache = cacheMap.get(instance) || {};
-  if (cache[REACTIVE_SYMBOL])
-    return cache[REACTIVE_SYMBOL];
-  const proxy = new Proxy(instance, {
-    get(target, key) {
-      if (typeof target[key] === "function") {
-        if (cache[key])
-          return cache[key];
-        const errorHandler = getHandler(target, key).find((item) => item.error)?.error;
-        if (!errorHandler)
-          return target[key].bind(target);
-        const wrapper = wrapError(target, key, errorHandler);
-        cache[key] = wrapper;
-        return wrapper;
-      }
-      return target[key];
-    },
-    set(target, key, v) {
-      target[key] = v;
-      return true;
-    }
-  });
-  cache[REACTIVE_SYMBOL] = proxy;
-  if (!cacheMap.has(instance))
-    cacheMap.set(instance, cache);
-  return proxy;
+  return useO(module);
 }
 __name(useR, "useR");
 function useV(module) {
@@ -270,14 +242,9 @@ function useV(module) {
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
-        if (cache[key])
-          return cache[key];
-        const errorHandler = getHandler(target, key).find((item) => item.error)?.error;
-        if (!errorHandler)
-          return target[key].bind(target);
-        const wrapper = wrapError(target, key, errorHandler);
-        cache[key] = wrapper;
-        return wrapper;
+        if (!cache[key])
+          cache[key] = target[key].bind(this);
+        return cache[key];
       }
       if (target[key]?.__v_skip)
         return target[key];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "3.0.0-alpha.13",
+  "version": "3.0.0-alpha.15",
   "description": "provide phecda function to vue",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -13,7 +13,7 @@
   "license": "MIT",
   "dependencies": {
     "vue": "^3.2.45",
-    "phecda-web": "1.0.1-alpha.7"
+    "phecda-web": "1.0.1-alpha.9"
   },
   "devDependencies": {
     "tsup": "^6.5.0"