phecda-vue 3.0.0-alpha.12 → 3.0.0-alpha.14

package/dist/index.d.ts

@@ -1,10 +1,14 @@
-import * as _vue_reactivity from '@vue/reactivity';
+import * as vue from 'vue';
 import { Ref, App, UnwrapNestedRefs } from 'vue';
 import { Events, Construct } from 'phecda-web';
 export * from 'phecda-web';
 
+declare const RawSymbol: unique symbol;
+type Raw<T> = T & {
+    [RawSymbol]: true;
+};
 type ReplaceInstanceValues<I> = {
-    [P in keyof I]: I[P] extends (...args: any[]) => any ? I[P] : Ref<I[P]>;
+    [P in keyof I]: I[P] extends (...args: any[]) => any ? I[P] : I[P] extends Raw<infer O> ? O : Ref<I[P]>;
 };
 type SchemaToObj<S> = {
     [P in keyof S]: S[P] extends object ? SchemaToObj<S[P]> : (S[P] extends string ? any : S[P]);
@@ -18,7 +22,7 @@ declare function createFilter<Data extends Record<string, any>>(initState?: Obje
     errorHandler?: (error?: Error, errorPath?: string) => any;
 }): {
     filter: <Schema>(obj: Schema) => SchemaToObj<Schema>;
-    data: [Data] extends [_vue_reactivity.Ref<any>] ? Data : _vue_reactivity.Ref<_vue_reactivity.UnwrapRef<Data>>;
+    data: [Data] extends [vue.Ref<any>] ? Data : vue.Ref<vue.UnwrapRef<Data>>;
     init: (params?: Data) => void;
     setState: <Key extends string>(key: Key, value: Data[Key]) => void;
     storeState: (key: string, params?: Data) => void;
@@ -40,7 +44,7 @@ declare class PV {
 }
 
 declare const phecdaSymbol: unique symbol;
-declare function createPhecda(): _vue_reactivity.Raw<{
+declare function createPhecda(): vue.Raw<{
     install(app: App): void;
     load(state: any): any;
     unmount(): Promise<void>;
@@ -49,6 +53,10 @@ declare function createPhecda(): _vue_reactivity.Raw<{
 type DeepPartial<T> = {
     [K in keyof T]?: DeepPartial<T[K]>;
 };
+declare function markRaw<T extends object>(value: T): Raw<T>;
+declare function isObject(o: any): boolean;
+declare function mergeReactiveObjects<T extends Record<any, unknown> | Map<unknown, unknown> | Set<unknown>>(target: T, patchToApply: DeepPartial<T>): T;
+declare function createSharedReactive<F extends (...args: any) => any>(composable: F): () => ReturnType<F>;
 
 declare function useO<T extends Construct>(module: T): UnwrapNestedRefs<InstanceType<T>>;
 declare function useRaw<T extends Construct>(module: T): InstanceType<T>;
@@ -61,4 +69,6 @@ declare function useEvent<Key extends keyof Events>(eventName: Key, cb: (event:
 };
 declare function initialize<M extends Construct>(module: M, deleteOtherProperty?: boolean): InstanceType<M> | void;
 
-export { PV, RE, createFilter, createPhecda, initialize, phecdaSymbol, useEvent, useO, usePatch, useR, useRaw, useV };
+declare function Shallow(module: any): void;
+
+export { DeepPartial, PV, RE, Raw, RawSymbol, ReplaceInstanceValues, SchemaToObj, Shallow, createFilter, createPhecda, createSharedReactive, initialize, isObject, markRaw, mergeReactiveObjects, phecdaSymbol, useEvent, useO, usePatch, useR, useRaw, useV };

package/dist/index.js

@@ -24,9 +24,14 @@ var src_exports = {};
 __export(src_exports, {
   PV: () => PV,
   RE: () => RE,
+  Shallow: () => Shallow,
   createFilter: () => createFilter,
   createPhecda: () => createPhecda,
+  createSharedReactive: () => createSharedReactive,
   initialize: () => initialize,
+  isObject: () => isObject,
+  markRaw: () => markRaw2,
+  mergeReactiveObjects: () => mergeReactiveObjects,
   phecdaSymbol: () => phecdaSymbol,
   useEvent: () => useEvent,
   useO: () => useO,
@@ -90,7 +95,7 @@ function createFilter(initState = {}, option = {}) {
   __name(setState, "setState");
   function storeState(key, params) {
     store[key] = data.value;
-    init(params);
+    init2(params);
   }
   __name(storeState, "storeState");
   function applyStore(key) {
@@ -99,10 +104,10 @@ function createFilter(initState = {}, option = {}) {
     data.value = store[key];
   }
   __name(applyStore, "applyStore");
-  function init(params) {
+  function init2(params) {
     data.value = params || initState || {};
   }
-  __name(init, "init");
+  __name(init2, "init");
   function delState(key) {
     delete data.value[key];
   }
@@ -120,7 +125,7 @@ function createFilter(initState = {}, option = {}) {
   return {
     filter,
     data,
-    init,
+    init: init2,
     setState,
     storeState,
     store,
@@ -189,6 +194,10 @@ var import_phecda_web3 = require("phecda-web");
 
 // src/utils.ts
 var import_vue3 = require("vue");
+function markRaw2(value) {
+  return (0, import_vue3.markRaw)(value);
+}
+__name(markRaw2, "markRaw");
 function isObject(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
 }
@@ -218,7 +227,7 @@ function createSharedReactive(composable) {
       state = scope = null;
     }
   }, "dispose");
-  return () => {
+  const cb = /* @__PURE__ */ __name(() => {
     subscribers++;
     if (!state) {
       scope = (0, import_vue3.effectScope)(true);
@@ -226,27 +235,28 @@ function createSharedReactive(composable) {
     }
     (0, import_vue3.onScopeDispose)(dispose);
     return state;
-  };
+  }, "cb");
+  cb.r = true;
+  return cb;
 }
 __name(createSharedReactive, "createSharedReactive");
 
 // src/composable.ts
+var REF_SYMBOL = Symbol("ref");
 function useO(module2) {
-  const { state, _o: oMap } = (0, import_phecda_web3.getActiveInstance)();
+  const { state, origin } = (0, import_phecda_web3.getActiveInstance)();
+  const proxyFn = module2.prototype.__SHALLOW__ ? import_vue4.shallowReactive : import_vue4.reactive;
   if (module2.prototype.__ISOLATE__) {
-    const instance = (0, import_vue4.reactive)(new module2());
+    const instance = proxyFn(new module2());
     instance._promise = (0, import_phecda_web3.invokeHandler)("init", instance);
     return instance;
   }
   const tag = (0, import_phecda_web3.getTag)(module2);
   if (!(tag in state)) {
-    const instance = (0, import_vue4.reactive)(new module2());
+    const instance = proxyFn(new module2());
     instance._promise = (0, import_phecda_web3.invokeHandler)("init", instance);
     state[tag] = instance;
-    oMap.set(instance, module2);
-  } else {
-    if (oMap.get(state[tag]) !== module2)
-      console.warn(`Synonym module: Module taged "${String(tag)}" has been loaded before, so won't load Module "${module2.name}"`);
+    origin.set(instance, module2);
   }
   return state[tag];
 }
@@ -261,54 +271,27 @@ function usePatch(module2, Data) {
 }
 __name(usePatch, "usePatch");
 function useR(module2) {
-  const { _r: rmap, _f: fmap } = (0, import_phecda_web3.getActiveInstance)();
-  const instance = useO(module2);
-  if (rmap.has(instance))
-    return rmap.get(instance);
-  const proxy = new Proxy(instance, {
-    get(target, key) {
-      if (typeof target[key] === "function") {
-        if (fmap.has(target[key]))
-          return fmap.get(target[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);
-        fmap.set(target[key], wrapper);
-        return wrapper;
-      }
-      return target[key];
-    },
-    set(target, key, v) {
-      target[key] = v;
-      return true;
-    }
-  });
-  rmap.set(instance, proxy);
-  return proxy;
+  return useO(module2);
 }
 __name(useR, "useR");
 function useV(module2) {
-  const { _v: vmap, _f: fmap, _c: cmap } = (0, import_phecda_web3.getActiveInstance)();
+  const { cache: cacheMap } = (0, import_phecda_web3.getActiveInstance)();
   const instance = useO(module2);
-  if (vmap.has(instance))
-    return vmap.get(instance);
-  cmap.set(instance, {});
+  const cache = cacheMap.get(instance) || {};
+  if (cache[REF_SYMBOL])
+    return cache[REF_SYMBOL];
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
-        if (fmap.has(target[key]))
-          return fmap.get(target[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);
-        fmap.set(target[key], wrapper);
-        return wrapper;
+        if (!cache[key])
+          cache[key] = target[key].bind(this);
+        return cache[key];
       }
-      const cache = cmap.get(instance);
-      if (key in cache)
-        return cache[key]();
+      if (target[key]?.__v_skip)
+        return target[key];
+      const cacheRef = cache[key];
+      if (cacheRef && cacheRef.r)
+        return cacheRef();
       cache[key] = createSharedReactive(() => {
         return (0, import_vue4.toRef)(target, key);
       });
@@ -318,7 +301,9 @@ function useV(module2) {
       return false;
     }
   });
-  vmap.set(instance, proxy);
+  cache[REF_SYMBOL] = proxy;
+  if (!cacheMap.has(instance))
+    cacheMap.set(instance, cache);
   return proxy;
 }
 __name(useV, "useV");
@@ -345,13 +330,26 @@ function initialize(module2, deleteOtherProperty = true) {
   }
 }
 __name(initialize, "initialize");
+
+// src/decorator.ts
+var import_phecda_web4 = require("phecda-web");
+function Shallow(module2) {
+  (0, import_phecda_web4.init)(module2.prototype);
+  module2.prototype.__SHALLOW__ = true;
+}
+__name(Shallow, "Shallow");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PV,
   RE,
+  Shallow,
   createFilter,
   createPhecda,
+  createSharedReactive,
   initialize,
+  isObject,
+  markRaw,
+  mergeReactiveObjects,
   phecdaSymbol,
   useEvent,
   useO,

package/dist/index.mjs

@@ -54,7 +54,7 @@ function createFilter(initState = {}, option = {}) {
   __name(setState, "setState");
   function storeState(key, params) {
     store[key] = data.value;
-    init(params);
+    init2(params);
   }
   __name(storeState, "storeState");
   function applyStore(key) {
@@ -63,10 +63,10 @@ function createFilter(initState = {}, option = {}) {
     data.value = store[key];
   }
   __name(applyStore, "applyStore");
-  function init(params) {
+  function init2(params) {
     data.value = params || initState || {};
   }
-  __name(init, "init");
+  __name(init2, "init");
   function delState(key) {
     delete data.value[key];
   }
@@ -84,7 +84,7 @@ function createFilter(initState = {}, option = {}) {
   return {
     filter,
     data,
-    init,
+    init: init2,
     setState,
     storeState,
     store,
@@ -148,11 +148,15 @@ function createPhecda() {
 __name(createPhecda, "createPhecda");
 
 // src/composable.ts
-import { onBeforeUnmount, reactive, toRaw, toRef } from "vue";
-import { emitter as emitter2, getActiveInstance as getActiveInstance2, getHandler, getTag, invokeHandler as invokeHandler2, wrapError } from "phecda-web";
+import { onBeforeUnmount, reactive, shallowReactive, toRaw, toRef } from "vue";
+import { emitter as emitter2, getActiveInstance as getActiveInstance2, getTag, invokeHandler as invokeHandler2 } from "phecda-web";
 
 // src/utils.ts
-import { effectScope as effectScope2, isReactive, isRef, onScopeDispose } from "vue";
+import { effectScope as effectScope2, isReactive, isRef, onScopeDispose, markRaw as raw } from "vue";
+function markRaw2(value) {
+  return raw(value);
+}
+__name(markRaw2, "markRaw");
 function isObject(o) {
   return Object.prototype.toString.call(o) === "[object Object]";
 }
@@ -182,7 +186,7 @@ function createSharedReactive(composable) {
       state = scope = null;
     }
   }, "dispose");
-  return () => {
+  const cb = /* @__PURE__ */ __name(() => {
     subscribers++;
     if (!state) {
       scope = effectScope2(true);
@@ -190,27 +194,28 @@ function createSharedReactive(composable) {
     }
     onScopeDispose(dispose);
     return state;
-  };
+  }, "cb");
+  cb.r = true;
+  return cb;
 }
 __name(createSharedReactive, "createSharedReactive");
 
 // src/composable.ts
+var REF_SYMBOL = Symbol("ref");
 function useO(module) {
-  const { state, _o: oMap } = getActiveInstance2();
+  const { state, origin } = getActiveInstance2();
+  const proxyFn = module.prototype.__SHALLOW__ ? shallowReactive : reactive;
   if (module.prototype.__ISOLATE__) {
-    const instance = reactive(new module());
+    const instance = proxyFn(new module());
     instance._promise = invokeHandler2("init", instance);
     return instance;
   }
   const tag = getTag(module);
   if (!(tag in state)) {
-    const instance = reactive(new module());
+    const instance = proxyFn(new module());
     instance._promise = invokeHandler2("init", instance);
     state[tag] = instance;
-    oMap.set(instance, module);
-  } else {
-    if (oMap.get(state[tag]) !== module)
-      console.warn(`Synonym module: Module taged "${String(tag)}" has been loaded before, so won't load Module "${module.name}"`);
+    origin.set(instance, module);
   }
   return state[tag];
 }
@@ -225,54 +230,27 @@ function usePatch(module, Data) {
 }
 __name(usePatch, "usePatch");
 function useR(module) {
-  const { _r: rmap, _f: fmap } = getActiveInstance2();
-  const instance = useO(module);
-  if (rmap.has(instance))
-    return rmap.get(instance);
-  const proxy = new Proxy(instance, {
-    get(target, key) {
-      if (typeof target[key] === "function") {
-        if (fmap.has(target[key]))
-          return fmap.get(target[key]);
-        const errorHandler = getHandler(target, key).find((item) => item.error)?.error;
-        if (!errorHandler)
-          return target[key].bind(target);
-        const wrapper = wrapError(target, key, errorHandler);
-        fmap.set(target[key], wrapper);
-        return wrapper;
-      }
-      return target[key];
-    },
-    set(target, key, v) {
-      target[key] = v;
-      return true;
-    }
-  });
-  rmap.set(instance, proxy);
-  return proxy;
+  return useO(module);
 }
 __name(useR, "useR");
 function useV(module) {
-  const { _v: vmap, _f: fmap, _c: cmap } = getActiveInstance2();
+  const { cache: cacheMap } = getActiveInstance2();
   const instance = useO(module);
-  if (vmap.has(instance))
-    return vmap.get(instance);
-  cmap.set(instance, {});
+  const cache = cacheMap.get(instance) || {};
+  if (cache[REF_SYMBOL])
+    return cache[REF_SYMBOL];
   const proxy = new Proxy(instance, {
     get(target, key) {
       if (typeof target[key] === "function") {
-        if (fmap.has(target[key]))
-          return fmap.get(target[key]);
-        const errorHandler = getHandler(target, key).find((item) => item.error)?.error;
-        if (!errorHandler)
-          return target[key].bind(target);
-        const wrapper = wrapError(target, key, errorHandler);
-        fmap.set(target[key], wrapper);
-        return wrapper;
+        if (!cache[key])
+          cache[key] = target[key].bind(this);
+        return cache[key];
       }
-      const cache = cmap.get(instance);
-      if (key in cache)
-        return cache[key]();
+      if (target[key]?.__v_skip)
+        return target[key];
+      const cacheRef = cache[key];
+      if (cacheRef && cacheRef.r)
+        return cacheRef();
       cache[key] = createSharedReactive(() => {
         return toRef(target, key);
       });
@@ -282,7 +260,9 @@ function useV(module) {
       return false;
     }
   });
-  vmap.set(instance, proxy);
+  cache[REF_SYMBOL] = proxy;
+  if (!cacheMap.has(instance))
+    cacheMap.set(instance, cache);
   return proxy;
 }
 __name(useV, "useV");
@@ -309,12 +289,25 @@ function initialize(module, deleteOtherProperty = true) {
   }
 }
 __name(initialize, "initialize");
+
+// src/decorator.ts
+import { init } from "phecda-web";
+function Shallow(module) {
+  init(module.prototype);
+  module.prototype.__SHALLOW__ = true;
+}
+__name(Shallow, "Shallow");
 export {
   PV,
   RE,
+  Shallow,
   createFilter,
   createPhecda,
+  createSharedReactive,
   initialize,
+  isObject,
+  markRaw2 as markRaw,
+  mergeReactiveObjects,
   phecdaSymbol,
   useEvent,
   useO,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "3.0.0-alpha.12",
+  "version": "3.0.0-alpha.14",
   "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.6"
+    "phecda-web": "1.0.1-alpha.8"
   },
   "devDependencies": {
     "tsup": "^6.5.0"