phecda-vue 1.2.5 → 1.2.7

package/dist/index.d.ts

@@ -27,15 +27,10 @@ declare const emitter: PhecdaEmitter;
 declare const phecdaSymbol: unique symbol;
 declare function createPhecda(symbol?: string): vue.Raw<{
     install(app: App): void;
-    useVMap: WeakMap<object, any>;
-    useOMap: WeakMap<object, any>;
-    useRMap: WeakMap<object, any>;
-    fnMap: WeakMap<object, any>;
-    computedMap: WeakMap<object, any>;
 }>;
 interface PhecdaInstance {
     useVMap: WeakMap<any, any>;
-    useOMap: WeakMap<any, any>;
+    useOMap: Map<any, any>;
     useRMap: WeakMap<any, any>;
     fnMap: WeakMap<any, any>;
     computedMap: WeakMap<any, any>;

package/dist/index.js

@@ -80,7 +80,8 @@ function createPhecda(symbol) {
           instance: phecda,
           snapshot: () => {
             const ret = [];
-            for (const [key, value] of phecda.useOMap)
+            const { useOMap } = getActivePhecda();
+            for (const [key, value] of useOMap)
               ret.push({
                 key: (0, import_phecda_core.getTag)(key) || key.name,
                 value
@@ -118,19 +119,14 @@ function createPhecda(symbol) {
           delete window.__PHECDA_VUE__[symbol];
         originUnmount();
       };
-    },
-    useVMap: /* @__PURE__ */ new WeakMap(),
-    useOMap: new (symbol ? Map : WeakMap)(),
-    useRMap: /* @__PURE__ */ new WeakMap(),
-    fnMap: /* @__PURE__ */ new WeakMap(),
-    computedMap: /* @__PURE__ */ new WeakMap()
+    }
   });
   return phecda;
 }
 __name(createPhecda, "createPhecda");
 var activePhecda = {
   useVMap: /* @__PURE__ */ new WeakMap(),
-  useOMap: /* @__PURE__ */ new WeakMap(),
+  useOMap: /* @__PURE__ */ new Map(),
   useRMap: /* @__PURE__ */ new WeakMap(),
   fnMap: /* @__PURE__ */ new WeakMap(),
   computedMap: /* @__PURE__ */ new WeakMap()
@@ -223,11 +219,6 @@ __name(createSharedReactive, "createSharedReactive");
 
 // src/vue/composable.ts
 function useO(Model) {
-  if ((0, import_vue3.getCurrentInstance)()) {
-    const cur = (0, import_vue3.inject)(phecdaSymbol, null);
-    if (cur)
-      setActivePhecda(cur);
-  }
   const { useOMap } = getActivePhecda();
   if (!useOMap.has(Model)) {
     const instance = (0, import_vue3.reactive)(new Model());
@@ -356,7 +347,7 @@ function createFilter(initState = {}, option = {}) {
   let store = {};
   function traverse(obj, path) {
     for (const i in obj) {
-      if (Array.isArray(obj[i]) || resolveOption.exclude.includes(i))
+      if (resolveOption.exclude.includes(i))
         continue;
       const errorPath = path ? `${path}.${i}` : i;
       if (typeof obj[i] === "object" && obj[i])

package/dist/index.mjs

@@ -21,7 +21,8 @@ function createPhecda(symbol) {
           instance: phecda,
           snapshot: () => {
             const ret = [];
-            for (const [key, value] of phecda.useOMap)
+            const { useOMap } = getActivePhecda();
+            for (const [key, value] of useOMap)
               ret.push({
                 key: getTag(key) || key.name,
                 value
@@ -59,19 +60,14 @@ function createPhecda(symbol) {
           delete window.__PHECDA_VUE__[symbol];
         originUnmount();
       };
-    },
-    useVMap: /* @__PURE__ */ new WeakMap(),
-    useOMap: new (symbol ? Map : WeakMap)(),
-    useRMap: /* @__PURE__ */ new WeakMap(),
-    fnMap: /* @__PURE__ */ new WeakMap(),
-    computedMap: /* @__PURE__ */ new WeakMap()
+    }
   });
   return phecda;
 }
 __name(createPhecda, "createPhecda");
 var activePhecda = {
   useVMap: /* @__PURE__ */ new WeakMap(),
-  useOMap: /* @__PURE__ */ new WeakMap(),
+  useOMap: /* @__PURE__ */ new Map(),
   useRMap: /* @__PURE__ */ new WeakMap(),
   fnMap: /* @__PURE__ */ new WeakMap(),
   computedMap: /* @__PURE__ */ new WeakMap()
@@ -96,7 +92,7 @@ function getReactiveMap(symbol) {
 __name(getReactiveMap, "getReactiveMap");
 
 // src/vue/composable.ts
-import { computed, getCurrentInstance, inject, onBeforeUnmount, reactive } from "vue";
+import { computed, onBeforeUnmount, reactive } from "vue";
 import { getHandler, register } from "phecda-core";
 
 // src/vue/utils.ts
@@ -164,11 +160,6 @@ __name(createSharedReactive, "createSharedReactive");
 
 // src/vue/composable.ts
 function useO(Model) {
-  if (getCurrentInstance()) {
-    const cur = inject(phecdaSymbol, null);
-    if (cur)
-      setActivePhecda(cur);
-  }
   const { useOMap } = getActivePhecda();
   if (!useOMap.has(Model)) {
     const instance = reactive(new Model());
@@ -297,7 +288,7 @@ function createFilter(initState = {}, option = {}) {
   let store = {};
   function traverse(obj, path) {
     for (const i in obj) {
-      if (Array.isArray(obj[i]) || resolveOption.exclude.includes(i))
+      if (resolveOption.exclude.includes(i))
         continue;
       const errorPath = path ? `${path}.${i}` : i;
       if (typeof obj[i] === "object" && obj[i])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",