phecda-vue 5.1.2 → 5.2.0-alpha.1

package/dist/index.d.mts

@@ -17,20 +17,21 @@ type ReplaceInstanceValues<I> = {
     [P in keyof I]: I[P] extends (...args: any[]) => any ? I[P] : I[P] extends Raw<infer O> ? O : Ref<I[P]>;
 };
 
-declare function useRaw<T extends Construct>(model: T): InstanceType<T>;
-declare function getRaw<T extends Construct>(model: T): InstanceType<T>;
+declare function useRaw<Model extends Construct>(model: Model): InstanceType<Model>;
+declare function getRaw<Model extends Construct>(model: Model): InstanceType<Model>;
 declare function usePhecda(): VuePhecda;
 declare function getPhecda(phecda?: VuePhecda): VuePhecda;
 declare function useEvent<Key extends keyof Events>(eventName: Key, cb: (event: Events[Key]) => void): {
     emit: (arg: Events[Key]) => void;
     cancel: () => void;
 };
-declare function useR<T extends Construct>(model: T): UnwrapNestedRefs<InstanceType<T>>;
-declare function getR<T extends Construct>(model: T, phecda?: VuePhecda): UnwrapNestedRefs<InstanceType<T>>;
-declare function useV<T extends Construct>(model: T): ReplaceInstanceValues<InstanceType<T>>;
-declare function getV<T extends Construct>(model: T, phecda?: VuePhecda): ReplaceInstanceValues<InstanceType<T>>;
+declare function useR<Model extends Construct>(model: Model): UnwrapNestedRefs<InstanceType<Model>>;
+declare function getR<Model extends Construct>(model: Model, phecda?: VuePhecda): UnwrapNestedRefs<InstanceType<Model>>;
+declare function useV<Model extends Construct>(model: Model): ReplaceInstanceValues<InstanceType<Model>>;
+declare function getV<Model extends Construct>(model: Model, phecda?: VuePhecda): ReplaceInstanceValues<InstanceType<Model>>;
 
 declare function Shallow(model: any): void;
+declare function KeepAlive(isKeepAlive?: boolean): (model: any) => void;
 declare function WatchEffect(option?: WatchOptions): (proto: any, key: string) => void;
 
 declare function markRaw<T extends object>(value: T): Raw<T>;
@@ -40,4 +41,4 @@ declare function hasI(model: Construct): boolean;
 declare function useIR<T extends Construct>(model: T, forceProvide?: boolean): UnwrapNestedRefs<InstanceType<T>>;
 declare function useIV<T extends Construct>(model: T, forceProvide?: boolean): ReplaceInstanceValues<InstanceType<T>>;
 
-export { type Raw, RawSymbol, type ReplaceInstanceValues, Shallow, VuePhecda, WatchEffect, createPhecda, createSharedReactive, getPhecda, getR, getRaw, getV, hasI, markRaw, phecdaSymbol, useEvent, useIR, useIV, usePhecda, useR, useRaw, useV };
+export { KeepAlive, type Raw, RawSymbol, type ReplaceInstanceValues, Shallow, VuePhecda, WatchEffect, createPhecda, createSharedReactive, getPhecda, getR, getRaw, getV, hasI, markRaw, phecdaSymbol, useEvent, useIR, useIV, usePhecda, useR, useRaw, useV };

package/dist/index.d.ts

@@ -17,20 +17,21 @@ type ReplaceInstanceValues<I> = {
     [P in keyof I]: I[P] extends (...args: any[]) => any ? I[P] : I[P] extends Raw<infer O> ? O : Ref<I[P]>;
 };
 
-declare function useRaw<T extends Construct>(model: T): InstanceType<T>;
-declare function getRaw<T extends Construct>(model: T): InstanceType<T>;
+declare function useRaw<Model extends Construct>(model: Model): InstanceType<Model>;
+declare function getRaw<Model extends Construct>(model: Model): InstanceType<Model>;
 declare function usePhecda(): VuePhecda;
 declare function getPhecda(phecda?: VuePhecda): VuePhecda;
 declare function useEvent<Key extends keyof Events>(eventName: Key, cb: (event: Events[Key]) => void): {
     emit: (arg: Events[Key]) => void;
     cancel: () => void;
 };
-declare function useR<T extends Construct>(model: T): UnwrapNestedRefs<InstanceType<T>>;
-declare function getR<T extends Construct>(model: T, phecda?: VuePhecda): UnwrapNestedRefs<InstanceType<T>>;
-declare function useV<T extends Construct>(model: T): ReplaceInstanceValues<InstanceType<T>>;
-declare function getV<T extends Construct>(model: T, phecda?: VuePhecda): ReplaceInstanceValues<InstanceType<T>>;
+declare function useR<Model extends Construct>(model: Model): UnwrapNestedRefs<InstanceType<Model>>;
+declare function getR<Model extends Construct>(model: Model, phecda?: VuePhecda): UnwrapNestedRefs<InstanceType<Model>>;
+declare function useV<Model extends Construct>(model: Model): ReplaceInstanceValues<InstanceType<Model>>;
+declare function getV<Model extends Construct>(model: Model, phecda?: VuePhecda): ReplaceInstanceValues<InstanceType<Model>>;
 
 declare function Shallow(model: any): void;
+declare function KeepAlive(isKeepAlive?: boolean): (model: any) => void;
 declare function WatchEffect(option?: WatchOptions): (proto: any, key: string) => void;
 
 declare function markRaw<T extends object>(value: T): Raw<T>;
@@ -40,4 +41,4 @@ declare function hasI(model: Construct): boolean;
 declare function useIR<T extends Construct>(model: T, forceProvide?: boolean): UnwrapNestedRefs<InstanceType<T>>;
 declare function useIV<T extends Construct>(model: T, forceProvide?: boolean): ReplaceInstanceValues<InstanceType<T>>;
 
-export { type Raw, RawSymbol, type ReplaceInstanceValues, Shallow, VuePhecda, WatchEffect, createPhecda, createSharedReactive, getPhecda, getR, getRaw, getV, hasI, markRaw, phecdaSymbol, useEvent, useIR, useIV, usePhecda, useR, useRaw, useV };
+export { KeepAlive, type Raw, RawSymbol, type ReplaceInstanceValues, Shallow, VuePhecda, WatchEffect, createPhecda, createSharedReactive, getPhecda, getR, getRaw, getV, hasI, markRaw, phecdaSymbol, useEvent, useIR, useIV, usePhecda, useR, useRaw, useV };

package/dist/index.js

@@ -20,8 +20,9 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
+  KeepAlive: () => KeepAlive,
   Shallow: () => Shallow,
   VuePhecda: () => VuePhecda,
   WatchEffect: () => WatchEffect,
@@ -42,8 +43,8 @@ __export(src_exports, {
   useRaw: () => useRaw,
   useV: () => useV
 });
-module.exports = __toCommonJS(src_exports);
-__reExport(src_exports, require("phecda-web"), module.exports);
+module.exports = __toCommonJS(index_exports);
+__reExport(index_exports, require("phecda-web"), module.exports);
 
 // src/core.ts
 var import_vue = require("vue");
@@ -451,7 +452,7 @@ function getPhecda(phecda) {
 }
 __name(getPhecda, "getPhecda");
 function useEvent(eventName, cb) {
-  (0, import_vue3.onBeforeUnmount)(() => {
+  (0, import_vue3.onUnmounted)(() => {
     import_phecda_web2.emitter.off(eventName, cb);
   });
   import_phecda_web2.emitter.on(eventName, cb);
@@ -462,8 +463,10 @@ function useEvent(eventName, cb) {
 }
 __name(useEvent, "useEvent");
 function useR(model) {
+  const phecda = usePhecda();
+  if (phecda.has(model) && (0, import_phecda_web2.get)(model.prototype, "keepAlive") === false) (0, import_vue3.onUnmounted)(() => phecda.unmount(model));
   setMetaToComponent(model);
-  return usePhecda().init(model);
+  return phecda.init(model);
 }
 __name(useR, "useR");
 function getR(model, phecda) {
@@ -472,7 +475,9 @@ function getR(model, phecda) {
 __name(getR, "getR");
 function useV(model) {
   setMetaToComponent(model);
-  const instance = usePhecda().init(model);
+  const phecda = usePhecda();
+  if (phecda.has(model) && (0, import_phecda_web2.get)(model.prototype, "keepAlive") === false) (0, import_vue3.onUnmounted)(() => phecda.unmount(model));
+  const instance = phecda.init(model);
   if (cacheMap.has(instance)) return cacheMap.get(instance);
   const cache = {};
   const proxy = new Proxy(instance, {
@@ -525,6 +530,10 @@ function Shallow(model) {
   (0, import_phecda_web3.set)(model.prototype, "shallow", true);
 }
 __name(Shallow, "Shallow");
+function KeepAlive(isKeepAlive = true) {
+  return (model) => (0, import_phecda_web3.set)(model.prototype, "keepAlive", isKeepAlive);
+}
+__name(KeepAlive, "KeepAlive");
 function WatchEffect(option) {
   return (proto, key) => {
     let stopHandler;
@@ -601,6 +610,7 @@ function useIV(model, forceProvide = false) {
 __name(useIV, "useIV");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  KeepAlive,
   Shallow,
   VuePhecda,
   WatchEffect,

package/dist/index.mjs

@@ -339,8 +339,8 @@ function getAllGetters(obj) {
 __name(getAllGetters, "getAllGetters");
 
 // src/composable.ts
-import { bindMethod as bindMethod2, emitter, getDefaultPhecda, getTag as getTag2 } from "phecda-web";
-import { getCurrentInstance, hasInjectionContext, inject, onBeforeUnmount, toRaw as toRaw2, toRef } from "vue";
+import { bindMethod as bindMethod2, emitter, get as get2, getDefaultPhecda, getTag as getTag2 } from "phecda-web";
+import { getCurrentInstance, hasInjectionContext, inject, onUnmounted, toRaw as toRaw2, toRef } from "vue";
 
 // src/utils.ts
 import { effectScope, onScopeDispose, markRaw as raw } from "vue";
@@ -410,7 +410,7 @@ function getPhecda(phecda) {
 }
 __name(getPhecda, "getPhecda");
 function useEvent(eventName, cb) {
-  onBeforeUnmount(() => {
+  onUnmounted(() => {
     emitter.off(eventName, cb);
   });
   emitter.on(eventName, cb);
@@ -421,8 +421,10 @@ function useEvent(eventName, cb) {
 }
 __name(useEvent, "useEvent");
 function useR(model) {
+  const phecda = usePhecda();
+  if (phecda.has(model) && get2(model.prototype, "keepAlive") === false) onUnmounted(() => phecda.unmount(model));
   setMetaToComponent(model);
-  return usePhecda().init(model);
+  return phecda.init(model);
 }
 __name(useR, "useR");
 function getR(model, phecda) {
@@ -431,7 +433,9 @@ function getR(model, phecda) {
 __name(getR, "getR");
 function useV(model) {
   setMetaToComponent(model);
-  const instance = usePhecda().init(model);
+  const phecda = usePhecda();
+  if (phecda.has(model) && get2(model.prototype, "keepAlive") === false) onUnmounted(() => phecda.unmount(model));
+  const instance = phecda.init(model);
   if (cacheMap.has(instance)) return cacheMap.get(instance);
   const cache = {};
   const proxy = new Proxy(instance, {
@@ -484,6 +488,10 @@ function Shallow(model) {
   set(model.prototype, "shallow", true);
 }
 __name(Shallow, "Shallow");
+function KeepAlive(isKeepAlive = true) {
+  return (model) => set(model.prototype, "keepAlive", isKeepAlive);
+}
+__name(KeepAlive, "KeepAlive");
 function WatchEffect(option) {
   return (proto, key) => {
     let stopHandler;
@@ -502,7 +510,7 @@ __name(WatchEffect, "WatchEffect");
 
 // src/lib.ts
 import { bindMethod as bindMethod3, getParamtypes, getTag as getTag3, invokeInit, invokeUnmount } from "phecda-web";
-import { getCurrentInstance as getCurrentInstance2, inject as inject2, onBeforeUnmount as onBeforeUnmount2, provide, reactive as reactive2, toRef as toRef2 } from "vue";
+import { getCurrentInstance as getCurrentInstance2, inject as inject2, onBeforeUnmount, provide, reactive as reactive2, toRef as toRef2 } from "vue";
 function hasI(model) {
   const tag = getTag3(model);
   const injectKey = `phecda-vue:lib ${tag.toString()}`;
@@ -527,7 +535,7 @@ function useIR(model, forceProvide = false) {
     invokeInit(existModule);
     provide(injectKey, existModule);
     modelMap.set(model, existModule);
-    onBeforeUnmount2(() => invokeUnmount(existModule));
+    onBeforeUnmount(() => invokeUnmount(existModule));
     return existModule;
   } else {
     return existModule;
@@ -559,6 +567,7 @@ function useIV(model, forceProvide = false) {
 }
 __name(useIV, "useIV");
 export {
+  KeepAlive,
   Shallow,
   VuePhecda,
   WatchEffect,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "5.1.2",
+  "version": "5.2.0-alpha.1",
   "description": "provide phecda function to vue",
   "author": "fgsreally",
   "license": "MIT",
@@ -18,7 +18,7 @@
   "dependencies": {
     "@vue/devtools-api": "^6.6.3",
     "vue": "^3.2.45",
-    "phecda-web": "3.0.1"
+    "phecda-web": "3.0.2-alpha.1"
   },
   "devDependencies": {
     "@vue/test-utils": "^2.4.6",