phecda-vue 1.0.1 → 1.0.3

package/dist/index.d.ts

@@ -26,14 +26,18 @@ declare function Watcher(eventName: string): (obj: any, key: string) => void;
 declare const phecdaSymbol: unique symbol;
 declare function createPhecda(): vue.Raw<{
     install(app: App): void;
-    uesVMap: WeakMap<object, any>;
-    uesOMap: WeakMap<object, any>;
-    uesRMap: WeakMap<object, any>;
+    useVMap: WeakMap<object, any>;
+    useOMap: WeakMap<object, any>;
+    useRMap: WeakMap<object, any>;
+    fnMap: WeakMap<object, any>;
+    computedMap: WeakMap<object, any>;
 }>;
 interface PhecdaInstance {
-    uesVMap: WeakMap<any, any>;
-    uesOMap: WeakMap<any, any>;
-    uesRMap: WeakMap<any, any>;
+    useVMap: WeakMap<any, any>;
+    useOMap: WeakMap<any, any>;
+    useRMap: WeakMap<any, any>;
+    fnMap: WeakMap<any, any>;
+    computedMap: WeakMap<any, any>;
 }
 declare function setActivePhecda(phecda: PhecdaInstance): void;
 declare function getActivePhecda(): PhecdaInstance;

package/dist/index.js

@@ -86,16 +86,20 @@ function createPhecda() {
       app.provide(phecdaSymbol, phecda);
       app.config.globalProperties.$phecda = phecda;
     },
-    uesVMap: /* @__PURE__ */ new WeakMap(),
-    uesOMap: /* @__PURE__ */ new WeakMap(),
-    uesRMap: /* @__PURE__ */ new WeakMap()
+    useVMap: /* @__PURE__ */ new WeakMap(),
+    useOMap: /* @__PURE__ */ new WeakMap(),
+    useRMap: /* @__PURE__ */ new WeakMap(),
+    fnMap: /* @__PURE__ */ new WeakMap(),
+    computedMap: /* @__PURE__ */ new WeakMap()
   });
   return phecda;
 }
 var activePhecda = {
-  uesVMap: /* @__PURE__ */ new WeakMap(),
-  uesOMap: /* @__PURE__ */ new WeakMap(),
-  uesRMap: /* @__PURE__ */ new WeakMap()
+  useVMap: /* @__PURE__ */ new WeakMap(),
+  useOMap: /* @__PURE__ */ new WeakMap(),
+  useRMap: /* @__PURE__ */ new WeakMap(),
+  fnMap: /* @__PURE__ */ new WeakMap(),
+  computedMap: /* @__PURE__ */ new WeakMap()
 };
 function setActivePhecda(phecda) {
   activePhecda = phecda;
@@ -145,6 +149,26 @@ function wrapError(target, key, errorHandler) {
 function isAsyncFunc(fn) {
   return fn[Symbol.toStringTag] === "AsyncFunction";
 }
+function createSharedReactive(composable) {
+  let subscribers = 0;
+  let state;
+  let scope;
+  const dispose = () => {
+    if (scope && --subscribers <= 0) {
+      scope.stop();
+      state = scope = null;
+    }
+  };
+  return () => {
+    subscribers++;
+    if (!state) {
+      scope = (0, import_vue2.effectScope)(true);
+      state = scope.run(() => composable());
+    }
+    (0, import_vue2.onScopeDispose)(dispose);
+    return state;
+  };
+}
 
 // src/vue/composable.ts
 function useO(Model) {
@@ -153,33 +177,37 @@ function useO(Model) {
     if (cur)
       setActivePhecda(cur);
   }
-  const { uesOMap } = getActivePhecda();
-  if (!uesOMap.has(Model)) {
+  const { useOMap } = getActivePhecda();
+  if (!useOMap.has(Model)) {
     const instance = (0, import_vue3.reactive)(new Model());
-    uesOMap.set(Model, instance);
+    useOMap.set(Model, instance);
     (0, import_phecda_core2.register)(instance);
   }
-  return uesOMap.get(Model);
+  return useOMap.get(Model);
 }
 function usePatch(Model, Data) {
   useO(Model);
-  const { uesOMap } = getActivePhecda();
-  const target = uesOMap.get(Model);
+  const { useOMap } = getActivePhecda();
+  const target = useOMap.get(Model);
   mergeReactiveObjects(target, Data);
 }
 function useR(Model) {
   useO(Model);
-  const { uesRMap, uesOMap } = getActivePhecda();
-  if (uesRMap.has(Model))
-    return uesRMap.get(Model);
-  const instance = uesOMap.get(Model);
+  const { useRMap, useOMap, fnMap } = getActivePhecda();
+  if (useRMap.has(Model))
+    return useRMap.get(Model);
+  const instance = useOMap.get(Model);
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
+        if (fnMap.has(target[key]))
+          return fnMap.get(target[key]);
         const errorHandler = (0, import_phecda_core2.getHandler)(target, key).find((item) => item.error)?.error;
         if (!errorHandler)
           return target[key].bind(target);
-        return wrapError(target, key, errorHandler);
+        const wrapper = wrapError(target, key, errorHandler);
+        fnMap.set(target[key], wrapper);
+        return wrapper;
       }
       return target[key];
     },
@@ -188,41 +216,52 @@ function useR(Model) {
       return true;
     }
   });
-  uesRMap.set(Model, proxy);
+  useRMap.set(Model, proxy);
   return proxy;
 }
 function useV(Model) {
   useO(Model);
-  const { uesVMap, uesOMap } = getActivePhecda();
-  if (uesVMap.has(Model))
-    return uesVMap.get(Model);
-  const instance = uesOMap.get(Model);
+  const { useVMap, useOMap, fnMap, computedMap } = getActivePhecda();
+  if (useVMap.has(Model))
+    return useVMap.get(Model);
+  computedMap.set(Model, {});
+  const instance = useOMap.get(Model);
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
+        if (fnMap.has(target[key]))
+          return fnMap.get(target[key]);
         const errorHandler = (0, import_phecda_core2.getHandler)(target, key).find((item) => item.error)?.error;
         if (!errorHandler)
           return target[key].bind(target);
-        return wrapError(target, key, errorHandler);
+        const wrapper = wrapError(target, key, errorHandler);
+        fnMap.set(target[key], wrapper);
+        return wrapper;
       }
-      return (0, import_vue3.computed)({
-        get() {
-          return target[key];
-        },
-        set(v) {
-          return target[key] = v;
-        }
+      const cache = computedMap.get(Model);
+      if (key in cache)
+        return cache[key]();
+      cache[key] = createSharedReactive(() => {
+        return (0, import_vue3.computed)({
+          get() {
+            return target[key];
+          },
+          set(v) {
+            return target[key] = v;
+          }
+        });
       });
+      return cache[key]();
     },
     set() {
       return false;
     }
   });
-  uesVMap.set(Model, proxy);
+  useVMap.set(Model, proxy);
   return proxy;
 }
 function useOn(eventName, cb) {
-  (0, import_vue3.onUnmounted)(() => {
+  (0, import_vue3.onScopeDispose)(() => {
     emitter.off(eventName, cb);
   });
   emitter.on(eventName, cb);
@@ -256,7 +295,8 @@ function createFilter(initState = {}, option = {}) {
     },
     option
   );
-  let data = (0, import_vue4.ref)(initState);
+  const scope = (0, import_vue4.effectScope)(true);
+  let data = scope.run(() => (0, import_vue4.ref)(initState));
   let store = {};
   function traverse(obj) {
     for (const i in obj) {
@@ -314,6 +354,7 @@ function createFilter(initState = {}, option = {}) {
   function dispose() {
     data = null;
     store = null;
+    scope.stop();
   }
   return { filter, data, init, setState, storeState, store, applyStore, dispose, clearStore };
 }
@@ -346,7 +387,7 @@ var import_vue5 = require("vue");
 function createForm(compSet, form, formItem, modelKey = "modelValue") {
   function generateChildVNode(props) {
     return props._children?.map(
-      (item) => (0, import_vue5.h)(compSet[item._component], item)
+      (item) => item._active === false ? null : (0, import_vue5.h)(compSet[item._component], item)
     );
   }
   function generateVNode(props) {
@@ -417,7 +458,7 @@ function createForm(compSet, form, formItem, modelKey = "modelValue") {
       return () => {
         return (0, import_vue5.h)(form, Object.assign({ ref: dom }, ctx.attrs), {
           default: () => Object.keys(props.config).map((item) => {
-            return (0, import_vue5.h)(FormItem, {
+            return props.config[item]._active === false ? null : (0, import_vue5.h)(FormItem, {
               formItem: props.config[item]._formItem,
               config: props.config,
               property: item,

package/dist/index.mjs

@@ -25,16 +25,20 @@ function createPhecda() {
       app.provide(phecdaSymbol, phecda);
       app.config.globalProperties.$phecda = phecda;
     },
-    uesVMap: /* @__PURE__ */ new WeakMap(),
-    uesOMap: /* @__PURE__ */ new WeakMap(),
-    uesRMap: /* @__PURE__ */ new WeakMap()
+    useVMap: /* @__PURE__ */ new WeakMap(),
+    useOMap: /* @__PURE__ */ new WeakMap(),
+    useRMap: /* @__PURE__ */ new WeakMap(),
+    fnMap: /* @__PURE__ */ new WeakMap(),
+    computedMap: /* @__PURE__ */ new WeakMap()
   });
   return phecda;
 }
 var activePhecda = {
-  uesVMap: /* @__PURE__ */ new WeakMap(),
-  uesOMap: /* @__PURE__ */ new WeakMap(),
-  uesRMap: /* @__PURE__ */ new WeakMap()
+  useVMap: /* @__PURE__ */ new WeakMap(),
+  useOMap: /* @__PURE__ */ new WeakMap(),
+  useRMap: /* @__PURE__ */ new WeakMap(),
+  fnMap: /* @__PURE__ */ new WeakMap(),
+  computedMap: /* @__PURE__ */ new WeakMap()
 };
 function setActivePhecda(phecda) {
   activePhecda = phecda;
@@ -44,11 +48,11 @@ function getActivePhecda() {
 }
 
 // src/vue/composable.ts
-import { computed, getCurrentInstance, inject, onUnmounted, reactive } from "vue";
+import { computed, getCurrentInstance, inject, onScopeDispose as onScopeDispose2, reactive } from "vue";
 import { getHandler, register } from "phecda-core";
 
 // src/vue/utils.ts
-import { isReactive, isRef } from "vue";
+import { effectScope, isReactive, isRef, onScopeDispose } from "vue";
 function isObject(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
 }
@@ -84,6 +88,26 @@ function wrapError(target, key, errorHandler) {
 function isAsyncFunc(fn) {
   return fn[Symbol.toStringTag] === "AsyncFunction";
 }
+function createSharedReactive(composable) {
+  let subscribers = 0;
+  let state;
+  let scope;
+  const dispose = () => {
+    if (scope && --subscribers <= 0) {
+      scope.stop();
+      state = scope = null;
+    }
+  };
+  return () => {
+    subscribers++;
+    if (!state) {
+      scope = effectScope(true);
+      state = scope.run(() => composable());
+    }
+    onScopeDispose(dispose);
+    return state;
+  };
+}
 
 // src/vue/composable.ts
 function useO(Model) {
@@ -92,33 +116,37 @@ function useO(Model) {
     if (cur)
       setActivePhecda(cur);
   }
-  const { uesOMap } = getActivePhecda();
-  if (!uesOMap.has(Model)) {
+  const { useOMap } = getActivePhecda();
+  if (!useOMap.has(Model)) {
     const instance = reactive(new Model());
-    uesOMap.set(Model, instance);
+    useOMap.set(Model, instance);
     register(instance);
   }
-  return uesOMap.get(Model);
+  return useOMap.get(Model);
 }
 function usePatch(Model, Data) {
   useO(Model);
-  const { uesOMap } = getActivePhecda();
-  const target = uesOMap.get(Model);
+  const { useOMap } = getActivePhecda();
+  const target = useOMap.get(Model);
   mergeReactiveObjects(target, Data);
 }
 function useR(Model) {
   useO(Model);
-  const { uesRMap, uesOMap } = getActivePhecda();
-  if (uesRMap.has(Model))
-    return uesRMap.get(Model);
-  const instance = uesOMap.get(Model);
+  const { useRMap, useOMap, fnMap } = getActivePhecda();
+  if (useRMap.has(Model))
+    return useRMap.get(Model);
+  const instance = useOMap.get(Model);
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
+        if (fnMap.has(target[key]))
+          return fnMap.get(target[key]);
         const errorHandler = getHandler(target, key).find((item) => item.error)?.error;
         if (!errorHandler)
           return target[key].bind(target);
-        return wrapError(target, key, errorHandler);
+        const wrapper = wrapError(target, key, errorHandler);
+        fnMap.set(target[key], wrapper);
+        return wrapper;
       }
       return target[key];
     },
@@ -127,41 +155,52 @@ function useR(Model) {
       return true;
     }
   });
-  uesRMap.set(Model, proxy);
+  useRMap.set(Model, proxy);
   return proxy;
 }
 function useV(Model) {
   useO(Model);
-  const { uesVMap, uesOMap } = getActivePhecda();
-  if (uesVMap.has(Model))
-    return uesVMap.get(Model);
-  const instance = uesOMap.get(Model);
+  const { useVMap, useOMap, fnMap, computedMap } = getActivePhecda();
+  if (useVMap.has(Model))
+    return useVMap.get(Model);
+  computedMap.set(Model, {});
+  const instance = useOMap.get(Model);
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
+        if (fnMap.has(target[key]))
+          return fnMap.get(target[key]);
         const errorHandler = getHandler(target, key).find((item) => item.error)?.error;
         if (!errorHandler)
           return target[key].bind(target);
-        return wrapError(target, key, errorHandler);
+        const wrapper = wrapError(target, key, errorHandler);
+        fnMap.set(target[key], wrapper);
+        return wrapper;
       }
-      return computed({
-        get() {
-          return target[key];
-        },
-        set(v) {
-          return target[key] = v;
-        }
+      const cache = computedMap.get(Model);
+      if (key in cache)
+        return cache[key]();
+      cache[key] = createSharedReactive(() => {
+        return computed({
+          get() {
+            return target[key];
+          },
+          set(v) {
+            return target[key] = v;
+          }
+        });
       });
+      return cache[key]();
     },
     set() {
       return false;
     }
   });
-  uesVMap.set(Model, proxy);
+  useVMap.set(Model, proxy);
   return proxy;
 }
 function useOn(eventName, cb) {
-  onUnmounted(() => {
+  onScopeDispose2(() => {
     emitter.off(eventName, cb);
   });
   emitter.on(eventName, cb);
@@ -183,7 +222,7 @@ function deleteStorage(tag) {
 }
 
 // src/filter.ts
-import { reactive as reactive2, ref } from "vue";
+import { effectScope as effectScope2, reactive as reactive2, ref } from "vue";
 var EXPRESS_RE = /^{{(.*)}}$/;
 var FN_RE = /^\[\[(.*)\]\]$/;
 function createFilter(initState = {}, option = {}) {
@@ -195,7 +234,8 @@ function createFilter(initState = {}, option = {}) {
     },
     option
   );
-  let data = ref(initState);
+  const scope = effectScope2(true);
+  let data = scope.run(() => ref(initState));
   let store = {};
   function traverse(obj) {
     for (const i in obj) {
@@ -253,6 +293,7 @@ function createFilter(initState = {}, option = {}) {
   function dispose() {
     data = null;
     store = null;
+    scope.stop();
   }
   return { filter, data, init, setState, storeState, store, applyStore, dispose, clearStore };
 }
@@ -285,7 +326,7 @@ import { defineComponent, h, onMounted, ref as ref2 } from "vue";
 function createForm(compSet, form, formItem, modelKey = "modelValue") {
   function generateChildVNode(props) {
     return props._children?.map(
-      (item) => h(compSet[item._component], item)
+      (item) => item._active === false ? null : h(compSet[item._component], item)
     );
   }
   function generateVNode(props) {
@@ -356,7 +397,7 @@ function createForm(compSet, form, formItem, modelKey = "modelValue") {
       return () => {
         return h(form, Object.assign({ ref: dom }, ctx.attrs), {
           default: () => Object.keys(props.config).map((item) => {
-            return h(FormItem, {
+            return props.config[item]._active === false ? null : h(FormItem, {
               formItem: props.config[item]._formItem,
               config: props.config,
               property: item,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -14,7 +14,7 @@
   "dependencies": {
     "mitt": "^3.0.0",
     "vue": "^3.2.45",
-    "phecda-core": "1.0.1"
+    "phecda-core": "1.0.2"
   },
   "devDependencies": {
     "tsup": "^6.5.0"