phecda-vue 2.1.3-alpha.2 → 2.1.3-alpha.4

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Events } from 'phecda-core';
+import { Events, Construct } from 'phecda-core';
 export * from 'phecda-core';
 import * as vue from 'vue';
 import { Ref, App, UnwrapNestedRefs } from 'vue';
@@ -34,17 +34,18 @@ declare function setActivePhecda(phecda: PhecdaInstance): void;
 declare function getActivePhecda(): PhecdaInstance;
 declare function getReactiveMap(symbol: string): Map<string, any> | null;
 
-type _DeepPartial<T> = {
-    [K in keyof T]?: _DeepPartial<T[K]>;
+type DeepPartial<T> = {
+    [K in keyof T]?: DeepPartial<T[K]>;
 };
 
-declare function useO<T extends new (...args: any) => any>(Model: T): UnwrapNestedRefs<InstanceType<T>>;
-declare function useRaw<T extends new (...args: any) => any>(Model: T): InstanceType<T>;
-declare function usePatch<T extends new (...args: any) => any>(Model: T, Data: _DeepPartial<InstanceType<T>>): void;
-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 useO<T extends Construct>(module: T): UnwrapNestedRefs<InstanceType<T>>;
+declare function useRaw<T extends Construct>(module: T): InstanceType<T>;
+declare function usePatch<T extends Construct>(module: T, Data: DeepPartial<InstanceType<T>>): void;
+declare function useR<T extends Construct>(module: T): UnwrapNestedRefs<InstanceType<T>>;
+declare function useV<T extends Construct>(module: 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, deleteOtherProperty?: boolean): InstanceType<M> | void;
+declare function initialize<M extends Construct>(module: M, deleteOtherProperty?: boolean): InstanceType<M> | void;
+declare function waitUntilInit(...modules: Construct[]): Promise<void>;
 
 declare const RE: RegExp;
 declare function createFilter<Data extends Record<string, any>>(initState?: Object, option?: {
@@ -75,4 +76,4 @@ declare class PV {
     off<Key extends keyof Events>(type: Key, handler?: (arg: Events[Key]) => void): void;
 }
 
-export { PV, PhecdaEmitter, PhecdaInstance, RE, ReplaceInstanceValues, SchemaToObj, createFilter, createPhecda, emitter, getActivePhecda, getReactiveMap, initialize, interval, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useRaw, useV };
+export { PV, PhecdaEmitter, PhecdaInstance, RE, ReplaceInstanceValues, SchemaToObj, createFilter, createPhecda, emitter, getActivePhecda, getReactiveMap, initialize, interval, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useRaw, useV, waitUntilInit };

package/dist/index.js

@@ -44,7 +44,8 @@ __export(src_exports, {
   usePatch: () => usePatch,
   useR: () => useR,
   useRaw: () => useRaw,
-  useV: () => useV
+  useV: () => useV,
+  waitUntilInit: () => waitUntilInit
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -231,28 +232,29 @@ function createSharedReactive(composable) {
 __name(createSharedReactive, "createSharedReactive");
 
 // src/vue/composable.ts
-function useO(Model) {
+function useO(module2) {
   const { useOMap } = getActivePhecda();
-  if (!useOMap.has(Model)) {
-    const instance = (0, import_vue3.reactive)(new Model());
-    useOMap.set(Model, instance);
-    (0, import_phecda_core2.register)(instance);
+  const tag = (0, import_phecda_core2.getTag)(module2) || module2.name;
+  if (!useOMap.has(tag)) {
+    const instance = (0, import_vue3.reactive)(new module2());
+    useOMap.set(tag, instance);
+    instance._promise = (0, import_phecda_core2.registerAsync)(instance);
   }
-  return useOMap.get(Model);
+  return useOMap.get(tag);
 }
 __name(useO, "useO");
-function useRaw(Model) {
-  return (0, import_vue3.toRaw)(useO(Model));
+function useRaw(module2) {
+  return (0, import_vue3.toRaw)(useO(module2));
 }
 __name(useRaw, "useRaw");
-function usePatch(Model, Data) {
-  const instance = useO(Model);
+function usePatch(module2, Data) {
+  const instance = useO(module2);
   mergeReactiveObjects(instance, Data);
 }
 __name(usePatch, "usePatch");
-function useR(Model) {
+function useR(module2) {
   const { useRMap, fnMap } = getActivePhecda();
-  const instance = useO(Model);
+  const instance = useO(module2);
   if (useRMap.has(instance))
     return useRMap.get(instance);
   const proxy = new Proxy(instance, {
@@ -278,9 +280,9 @@ function useR(Model) {
   return proxy;
 }
 __name(useR, "useR");
-function useV(Model) {
+function useV(module2) {
   const { useVMap, fnMap, computedMap } = getActivePhecda();
-  const instance = useO(Model);
+  const instance = useO(module2);
   if (useVMap.has(instance))
     return useVMap.get(instance);
   computedMap.set(instance, {});
@@ -320,9 +322,9 @@ function useEvent(eventName, cb) {
   return () => emitter.off(eventName, cb);
 }
 __name(useEvent, "useEvent");
-function initialize(Model, deleteOtherProperty = true) {
-  const instance = useO(Model);
-  const newInstance = new Model();
+function initialize(module2, deleteOtherProperty = true) {
+  const instance = useO(module2);
+  const newInstance = new module2();
   Object.assign(instance, newInstance);
   if (deleteOtherProperty) {
     for (const key in instance) {
@@ -332,6 +334,10 @@ function initialize(Model, deleteOtherProperty = true) {
   }
 }
 __name(initialize, "initialize");
+async function waitUntilInit(...modules) {
+  await Promise.all(modules.map((m) => useO(m)._promise));
+}
+__name(waitUntilInit, "waitUntilInit");
 
 // src/filter.ts
 var import_vue4 = require("vue");
@@ -467,5 +473,6 @@ __name(PV, "PV");
   usePatch,
   useR,
   useRaw,
-  useV
+  useV,
+  waitUntilInit
 });

package/dist/index.mjs

@@ -118,7 +118,7 @@ __name(getReactiveMap, "getReactiveMap");
 
 // src/vue/composable.ts
 import { onBeforeUnmount, reactive, toRaw, toRef } from "vue";
-import { getHandler, register } from "phecda-core";
+import { getHandler, getTag as getTag2, registerAsync } from "phecda-core";
 
 // src/vue/utils.ts
 import { effectScope, isReactive, isRef, onScopeDispose } from "vue";
@@ -184,28 +184,29 @@ function createSharedReactive(composable) {
 __name(createSharedReactive, "createSharedReactive");
 
 // src/vue/composable.ts
-function useO(Model) {
+function useO(module) {
   const { useOMap } = getActivePhecda();
-  if (!useOMap.has(Model)) {
-    const instance = reactive(new Model());
-    useOMap.set(Model, instance);
-    register(instance);
+  const tag = getTag2(module) || module.name;
+  if (!useOMap.has(tag)) {
+    const instance = reactive(new module());
+    useOMap.set(tag, instance);
+    instance._promise = registerAsync(instance);
   }
-  return useOMap.get(Model);
+  return useOMap.get(tag);
 }
 __name(useO, "useO");
-function useRaw(Model) {
-  return toRaw(useO(Model));
+function useRaw(module) {
+  return toRaw(useO(module));
 }
 __name(useRaw, "useRaw");
-function usePatch(Model, Data) {
-  const instance = useO(Model);
+function usePatch(module, Data) {
+  const instance = useO(module);
   mergeReactiveObjects(instance, Data);
 }
 __name(usePatch, "usePatch");
-function useR(Model) {
+function useR(module) {
   const { useRMap, fnMap } = getActivePhecda();
-  const instance = useO(Model);
+  const instance = useO(module);
   if (useRMap.has(instance))
     return useRMap.get(instance);
   const proxy = new Proxy(instance, {
@@ -231,9 +232,9 @@ function useR(Model) {
   return proxy;
 }
 __name(useR, "useR");
-function useV(Model) {
+function useV(module) {
   const { useVMap, fnMap, computedMap } = getActivePhecda();
-  const instance = useO(Model);
+  const instance = useO(module);
   if (useVMap.has(instance))
     return useVMap.get(instance);
   computedMap.set(instance, {});
@@ -273,9 +274,9 @@ function useEvent(eventName, cb) {
   return () => emitter.off(eventName, cb);
 }
 __name(useEvent, "useEvent");
-function initialize(Model, deleteOtherProperty = true) {
-  const instance = useO(Model);
-  const newInstance = new Model();
+function initialize(module, deleteOtherProperty = true) {
+  const instance = useO(module);
+  const newInstance = new module();
   Object.assign(instance, newInstance);
   if (deleteOtherProperty) {
     for (const key in instance) {
@@ -285,6 +286,10 @@ function initialize(Model, deleteOtherProperty = true) {
   }
 }
 __name(initialize, "initialize");
+async function waitUntilInit(...modules) {
+  await Promise.all(modules.map((m) => useO(m)._promise));
+}
+__name(waitUntilInit, "waitUntilInit");
 
 // src/filter.ts
 import { effectScope as effectScope2, ref } from "vue";
@@ -419,5 +424,6 @@ export {
   usePatch,
   useR,
   useRaw,
-  useV
+  useV,
+  waitUntilInit
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "2.1.3-alpha.2",
+  "version": "2.1.3-alpha.4",
   "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": "3.0.0-alpha.1"
+    "phecda-core": "3.0.0-alpha.2"
   },
   "devDependencies": {
     "tsup": "^6.5.0"