phecda-vue 2.1.0 → 2.1.2

package/dist/index.d.ts

@@ -10,6 +10,13 @@ type ReplaceInstanceValues<I> = {
 type SchemaToObj<S> = {
     [P in keyof S]: S[P] extends object ? SchemaToObj<S[P]> : (S[P] extends string ? any : S[P]);
 };
+interface PhecdaInstance {
+    useOMap: Map<any, any>;
+    useVMap: WeakMap<any, any>;
+    useRMap: WeakMap<any, any>;
+    fnMap: WeakMap<any, any>;
+    computedMap: WeakMap<any, any>;
+}
 interface PhecdaEmitter {
     on<N extends keyof Events>(eventName: N, cb: (args: Events[N]) => void): void;
     off<N extends keyof Events>(eventName: N, cb?: (args: Events[N]) => void): void;
@@ -23,13 +30,6 @@ declare const interval: any;
 declare function createPhecda(symbol?: string): vue.Raw<{
     install(app: App): void;
 }>;
-interface PhecdaInstance {
-    useVMap: WeakMap<any, any>;
-    useOMap: Map<any, any>;
-    useRMap: WeakMap<any, any>;
-    fnMap: WeakMap<any, any>;
-    computedMap: WeakMap<any, any>;
-}
 declare function setActivePhecda(phecda: PhecdaInstance): void;
 declare function getActivePhecda(): PhecdaInstance;
 declare function getReactiveMap(symbol: string): Map<string, any> | null;
@@ -44,7 +44,7 @@ declare function usePatch<T extends new (...args: any) => any>(Model: T, Data: _
 declare function useR<T extends new (...args: any) => any>(Model: T): UnwrapNestedRefs<InstanceType<T>>;
 declare function useV<T extends new (...args: any) => any>(Model: T): ReplaceInstanceValues<InstanceType<T>>;
 declare function useEvent<Key extends keyof Events>(eventName: Key, cb: Handler<Events[Key]>): () => void;
-declare function initialize<M extends new (...args: any) => any>(Model: M): InstanceType<M> | void;
+declare function initialize<M extends new (...args: any) => any>(Model: M, deleteOtherProperty?: boolean): InstanceType<M> | void;
 
 declare const RE: RegExp;
 declare function createFilter<Data extends Record<string, any>>(initState?: Object, option?: {
@@ -82,4 +82,4 @@ declare class PV {
     off<Key extends keyof Events>(type: Key, handler?: (arg: Events[Key]) => void): void;
 }
 
-export { PV, PhecdaEmitter, RE, ReplaceInstanceValues, SchemaToObj, createDialog, createFilter, createLayer, createPhecda, emitter, getActivePhecda, getReactiveMap, initialize, interval, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useRaw, useV };
+export { PV, PhecdaEmitter, PhecdaInstance, RE, ReplaceInstanceValues, SchemaToObj, createDialog, createFilter, createLayer, createPhecda, emitter, getActivePhecda, getReactiveMap, initialize, interval, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useRaw, useV };

package/dist/index.js

@@ -248,18 +248,15 @@ function useRaw(Model) {
 }
 __name(useRaw, "useRaw");
 function usePatch(Model, Data) {
-  useO(Model);
-  const { useOMap } = getActivePhecda();
-  const target = useOMap.get(Model);
-  mergeReactiveObjects(target, Data);
+  const instance = useO(Model);
+  mergeReactiveObjects(instance, Data);
 }
 __name(usePatch, "usePatch");
 function useR(Model) {
-  useO(Model);
-  const { useRMap, useOMap, fnMap } = getActivePhecda();
-  if (useRMap.has(Model))
-    return useRMap.get(Model);
-  const instance = useOMap.get(Model);
+  const { useRMap, fnMap } = getActivePhecda();
+  const instance = useO(Model);
+  if (useRMap.has(instance))
+    return useRMap.get(instance);
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
@@ -279,17 +276,16 @@ function useR(Model) {
       return true;
     }
   });
-  useRMap.set(Model, proxy);
+  useRMap.set(instance, proxy);
   return proxy;
 }
 __name(useR, "useR");
 function useV(Model) {
-  useO(Model);
-  const { useVMap, useOMap, fnMap, computedMap } = getActivePhecda();
-  if (useVMap.has(Model))
-    return useVMap.get(Model);
-  computedMap.set(Model, {});
-  const instance = useOMap.get(Model);
+  const { useVMap, fnMap, computedMap } = getActivePhecda();
+  const instance = useO(Model);
+  if (useVMap.has(instance))
+    return useVMap.get(instance);
+  computedMap.set(instance, {});
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
@@ -302,7 +298,7 @@ function useV(Model) {
         fnMap.set(target[key], wrapper);
         return wrapper;
       }
-      const cache = computedMap.get(Model);
+      const cache = computedMap.get(instance);
       if (key in cache)
         return cache[key]();
       cache[key] = createSharedReactive(() => {
@@ -314,7 +310,7 @@ function useV(Model) {
       return false;
     }
   });
-  useVMap.set(Model, proxy);
+  useVMap.set(instance, proxy);
   return proxy;
 }
 __name(useV, "useV");
@@ -326,11 +322,15 @@ function useEvent(eventName, cb) {
   return () => emitter.off(eventName, cb);
 }
 __name(useEvent, "useEvent");
-function initialize(Model) {
+function initialize(Model, deleteOtherProperty = true) {
   const instance = useO(Model);
-  if (instance) {
-    Object.assign(instance, new Model());
-    return instance;
+  const newInstance = new Model();
+  Object.assign(instance, newInstance);
+  if (deleteOtherProperty) {
+    for (const key in instance) {
+      if (!(key in newInstance))
+        delete instance[key];
+    }
   }
 }
 __name(initialize, "initialize");

package/dist/index.mjs

@@ -199,18 +199,15 @@ function useRaw(Model) {
 }
 __name(useRaw, "useRaw");
 function usePatch(Model, Data) {
-  useO(Model);
-  const { useOMap } = getActivePhecda();
-  const target = useOMap.get(Model);
-  mergeReactiveObjects(target, Data);
+  const instance = useO(Model);
+  mergeReactiveObjects(instance, Data);
 }
 __name(usePatch, "usePatch");
 function useR(Model) {
-  useO(Model);
-  const { useRMap, useOMap, fnMap } = getActivePhecda();
-  if (useRMap.has(Model))
-    return useRMap.get(Model);
-  const instance = useOMap.get(Model);
+  const { useRMap, fnMap } = getActivePhecda();
+  const instance = useO(Model);
+  if (useRMap.has(instance))
+    return useRMap.get(instance);
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
@@ -230,17 +227,16 @@ function useR(Model) {
       return true;
     }
   });
-  useRMap.set(Model, proxy);
+  useRMap.set(instance, proxy);
   return proxy;
 }
 __name(useR, "useR");
 function useV(Model) {
-  useO(Model);
-  const { useVMap, useOMap, fnMap, computedMap } = getActivePhecda();
-  if (useVMap.has(Model))
-    return useVMap.get(Model);
-  computedMap.set(Model, {});
-  const instance = useOMap.get(Model);
+  const { useVMap, fnMap, computedMap } = getActivePhecda();
+  const instance = useO(Model);
+  if (useVMap.has(instance))
+    return useVMap.get(instance);
+  computedMap.set(instance, {});
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
@@ -253,7 +249,7 @@ function useV(Model) {
         fnMap.set(target[key], wrapper);
         return wrapper;
       }
-      const cache = computedMap.get(Model);
+      const cache = computedMap.get(instance);
       if (key in cache)
         return cache[key]();
       cache[key] = createSharedReactive(() => {
@@ -265,7 +261,7 @@ function useV(Model) {
       return false;
     }
   });
-  useVMap.set(Model, proxy);
+  useVMap.set(instance, proxy);
   return proxy;
 }
 __name(useV, "useV");
@@ -277,11 +273,15 @@ function useEvent(eventName, cb) {
   return () => emitter.off(eventName, cb);
 }
 __name(useEvent, "useEvent");
-function initialize(Model) {
+function initialize(Model, deleteOtherProperty = true) {
   const instance = useO(Model);
-  if (instance) {
-    Object.assign(instance, new Model());
-    return instance;
+  const newInstance = new Model();
+  Object.assign(instance, newInstance);
+  if (deleteOtherProperty) {
+    for (const key in instance) {
+      if (!(key in newInstance))
+        delete instance[key];
+    }
   }
 }
 __name(initialize, "initialize");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "provide store/form/table with phecda function to vue",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -14,7 +14,7 @@
   "dependencies": {
     "mitt": "^3.0.0",
     "vue": "^3.2.45",
-    "phecda-core": "2.1.0"
+    "phecda-core": "2.1.1"
   },
   "devDependencies": {
     "tsup": "^6.5.0"