phecda-vue 1.2.1 → 1.2.5

package/dist/index.d.ts

@@ -1,9 +1,8 @@
-import * as mitt from 'mitt';
-import { EventType, Handler, Emitter } from 'mitt';
-import * as vue from 'vue';
-import { Ref, App, UnwrapNestedRefs, Component, DefineComponent, ExtractPropTypes, VNode } from 'vue';
-import { Phecda } from 'phecda-core';
+import { PhecdaEvents } from 'phecda-core';
 export * from 'phecda-core';
+import * as vue from 'vue';
+import { Ref, App, UnwrapNestedRefs, Component, DefineComponent, VNode } from 'vue';
+import { Handler } from 'mitt';
 
 type ReadonlyValue<T> = {
     readonly [K in keyof T]: K extends 'value' ? T[K] : ReadonlyValue<T[K]>;
@@ -17,15 +16,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 PhecdaEvents extends Record<EventType, unknown> {
-    [key: EventType]: any;
+interface PhecdaEmitter {
+    on<N extends keyof PhecdaEvents>(eventName: N, cb: (args: PhecdaEvents[N]) => void): void;
+    off<N extends keyof PhecdaEvents>(eventName: N, cb?: (args: PhecdaEvents[N]) => void): void;
+    emit<N extends keyof PhecdaEvents>(eventName: N, param: PhecdaEvents[N]): void;
 }
 
-declare const emitter: mitt.Emitter<PhecdaEvents>;
-declare const invokeAction: {
-    <Key extends keyof PhecdaEvents>(type: Key, event: PhecdaEvents[Key]): void;
-    <Key_1 extends keyof PhecdaEvents>(type: undefined extends PhecdaEvents[Key_1] ? Key_1 : never): void;
-};
+declare const emitter: PhecdaEmitter;
 
 declare const phecdaSymbol: unique symbol;
 declare function createPhecda(symbol?: string): vue.Raw<{
@@ -81,16 +78,6 @@ declare function createFilter<Data extends Record<string, any>>(initState?: Obje
     clearStore: (key: string) => void;
 };
 
-declare class P {
-    protected static emitter: Emitter<PhecdaEvents>;
-    protected _namespace: Phecda['_namespace'];
-    constructor();
-    get tag(): string;
-    on<Key extends keyof PhecdaEvents>(type: Key, handler: Handler<PhecdaEvents[Key]>): void;
-    emit(type: keyof PhecdaEvents, event: PhecdaEvents[keyof PhecdaEvents]): void;
-    off<Key extends keyof PhecdaEvents>(type: Key, handler?: Handler<PhecdaEvents[Key]>): void;
-}
-
 declare function createForm<P extends {
     $props: any;
 }>(compSet: Record<string, Component> | any, form: Component<P>, formItem: Component | false, modelKey?: string): DefineComponent<{
@@ -114,7 +101,7 @@ declare const getAntDRules: typeof getNaiveUIRules;
 declare function getNutUIRules<M, O extends object>(Model: M, options?: O): any;
 declare const getVantRules: typeof getNutUIRules;
 
-declare const createModal: <P>(w: Component) => (comp: DefineComponent<P, any, any>, props?: ExtractPropTypes<P>) => void;
+declare const createModal: <T>(wrapComp: Component<T>, props?: Partial<T>, modelKey?: string) => <P>(comp: Component<P>, props?: P) => void;
 
 declare function createTable<P extends {
     $props: any;
@@ -136,4 +123,12 @@ interface PipeRet {
     get: Record<string, () => VNode>;
 }
 
-export { EXPRESS_RE, FN_RE, GetDevUIRules, P, PhecdaEvents, PublicOnly, ReplaceInstanceValues, SchemaToObj, clearStorage, createFilter, createForm, createFormData, createModal, createPhecda, createPipe, createTable, deleteStorage, emitter, getActivePhecda, getAntDRules, getElementPlusRules, getNaiveUIRules, getNutUIRules, getReactiveMap, getVantRules, initalize, invokeAction, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useV };
+declare class PV {
+    constructor();
+    get tag(): any;
+    on<Key extends keyof PhecdaEvents>(type: Key, handler: (arg: PhecdaEvents[Key]) => void): void;
+    emit<Key extends keyof PhecdaEvents>(type: Key, param: PhecdaEvents[Key]): void;
+    off<Key extends keyof PhecdaEvents>(type: Key, handler?: (arg: PhecdaEvents[Key]) => void): void;
+}
+
+export { EXPRESS_RE, FN_RE, GetDevUIRules, PV, PhecdaEmitter, PublicOnly, ReplaceInstanceValues, SchemaToObj, clearStorage, createFilter, createForm, createFormData, createModal, createPhecda, createPipe, createTable, deleteStorage, emitter, getActivePhecda, getAntDRules, getElementPlusRules, getNaiveUIRules, getNutUIRules, getReactiveMap, getVantRules, initalize, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useV };

package/dist/index.js

@@ -5,7 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -25,10 +24,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 
 // src/index.ts
 var src_exports = {};
@@ -36,7 +31,7 @@ __export(src_exports, {
   EXPRESS_RE: () => EXPRESS_RE,
   FN_RE: () => FN_RE,
   GetDevUIRules: () => GetDevUIRules,
-  P: () => P,
+  PV: () => PV,
   clearStorage: () => clearStorage,
   createFilter: () => createFilter,
   createForm: () => createForm,
@@ -55,7 +50,6 @@ __export(src_exports, {
   getReactiveMap: () => getReactiveMap,
   getVantRules: () => getVantRules,
   initalize: () => initalize,
-  invokeAction: () => invokeAction,
   phecdaSymbol: () => phecdaSymbol,
   setActivePhecda: () => setActivePhecda,
   useEvent: () => useEvent,
@@ -69,7 +63,6 @@ module.exports = __toCommonJS(src_exports);
 // src/emitter.ts
 var import_mitt = __toESM(require("mitt"));
 var emitter = (0, import_mitt.default)();
-var invokeAction = emitter.emit.bind(emitter);
 
 // src/vue/phecda.ts
 var import_vue = require("vue");
@@ -96,18 +89,31 @@ function createPhecda(symbol) {
           }
         };
       }
-      const eventRecord = [];
-      (0, import_phecda_core.injectProperty)("watcher", ({ eventName, instance, key }) => {
+      let eventRecord = [];
+      (0, import_phecda_core.injectProperty)("watcher", ({ eventName, instance, key, options }) => {
         const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
-        eventRecord.push([
-          eventName,
-          fn
-        ]);
-        emitter.on(eventName, fn);
+        if (options?.once) {
+          const handler = /* @__PURE__ */ __name((...args) => {
+            fn(...args);
+            emitter.off(eventName, handler);
+          }, "handler");
+          emitter.on(eventName, handler);
+          eventRecord.push([
+            eventName,
+            handler
+          ]);
+        } else {
+          eventRecord.push([
+            eventName,
+            fn
+          ]);
+          emitter.on(eventName, fn);
+        }
       });
       const originUnmount = app.unmount.bind(app);
       app.unmount = () => {
         eventRecord.forEach(([eventName, handler]) => emitter.off(eventName, handler));
+        eventRecord = [];
         if (symbol)
           delete window.__PHECDA_VUE__[symbol];
         originUnmount();
@@ -428,28 +434,6 @@ __name(createFilter, "createFilter");
 // src/index.ts
 __reExport(src_exports, require("phecda-core"), module.exports);
 
-// src/wrapper.ts
-var _P = class {
-  _namespace;
-  constructor() {
-  }
-  get tag() {
-    return this._namespace.__TAG__;
-  }
-  on(type, handler) {
-    _P.emitter.on(type, handler);
-  }
-  emit(type, event) {
-    _P.emitter.emit(type, event);
-  }
-  off(type, handler) {
-    _P.emitter.off(type, handler);
-  }
-};
-var P = _P;
-__name(P, "P");
-__publicField(P, "emitter", emitter);
-
 // src/components/createForm.ts
 var import_vue5 = require("vue");
 function createForm(compSet, form, formItem, modelKey = "modelValue") {
@@ -560,7 +544,7 @@ __name(createFormData, "createFormData");
 // src/components/formResolve.ts
 var import_phecda_core3 = require("phecda-core");
 function getElementPlusRules(Model, options = {}) {
-  const stateVars = (0, import_phecda_core3.getModelState)(Model);
+  const stateVars = (0, import_phecda_core3.getExposeKey)(Model);
   const ret = {};
   for (const item of stateVars) {
     const handlers = (0, import_phecda_core3.getHandler)(Model, item);
@@ -589,7 +573,7 @@ function getElementPlusRules(Model, options = {}) {
 __name(getElementPlusRules, "getElementPlusRules");
 var GetDevUIRules = getElementPlusRules;
 function getNaiveUIRules(Model, options = {}) {
-  const stateVars = (0, import_phecda_core3.getModelState)(Model);
+  const stateVars = (0, import_phecda_core3.getExposeKey)(Model);
   const ret = {};
   for (const item of stateVars) {
     const handlers = (0, import_phecda_core3.getHandler)(Model, item);
@@ -618,7 +602,7 @@ function getNaiveUIRules(Model, options = {}) {
 __name(getNaiveUIRules, "getNaiveUIRules");
 var getAntDRules = getNaiveUIRules;
 function getNutUIRules(Model, options = {}) {
-  const stateVars = (0, import_phecda_core3.getModelState)(Model);
+  const stateVars = (0, import_phecda_core3.getExposeKey)(Model);
   const ret = {};
   for (const item of stateVars) {
     const handlers = (0, import_phecda_core3.getHandler)(Model, item);
@@ -650,7 +634,7 @@ var getVantRules = getNutUIRules;
 
 // src/components/createModal.ts
 var import_vue6 = require("vue");
-var createModal = /* @__PURE__ */ __name(function(modalWrapper, modelKey = "modelValue") {
+var createModal = /* @__PURE__ */ __name(function(modalWrapper, props = {}, modelKey = "modelValue") {
   let isMounted = false;
   const isShow = (0, import_vue6.ref)(true);
   const content = (0, import_vue6.shallowRef)();
@@ -661,15 +645,16 @@ var createModal = /* @__PURE__ */ __name(function(modalWrapper, modelKey = "mode
         [modelKey]: isShow.value,
         [`onUpdate:${modelKey}`]: (v) => {
           isShow.value = v;
-        }
+        },
+        ...props
       }, {
         default: () => content.value && (0, import_vue6.h)(content.value, propsRef.value)
       });
     }
   });
-  return (comp, props) => {
+  return (comp, props2) => {
     content.value = comp;
-    propsRef.value = props;
+    propsRef.value = props2;
     if (!isMounted) {
       const el = document.createElement("div");
       const vnode = (0, import_vue6.h)(wrapper);
@@ -757,12 +742,31 @@ function createPipe(comp, props, to = "default", slot) {
   };
 }
 __name(createPipe, "createPipe");
+
+// src/wrapper.ts
+var PV = class {
+  constructor() {
+  }
+  get tag() {
+    return this._namespace.__TAG__;
+  }
+  on(type, handler) {
+    emitter.on(type, handler);
+  }
+  emit(type, param) {
+    emitter.emit(type, param);
+  }
+  off(type, handler) {
+    emitter.off(type, handler);
+  }
+};
+__name(PV, "PV");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   EXPRESS_RE,
   FN_RE,
   GetDevUIRules,
-  P,
+  PV,
   clearStorage,
   createFilter,
   createForm,
@@ -781,7 +785,6 @@ __name(createPipe, "createPipe");
   getReactiveMap,
   getVantRules,
   initalize,
-  invokeAction,
   phecdaSymbol,
   setActivePhecda,
   useEvent,

package/dist/index.mjs

@@ -1,15 +1,9 @@
 var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 
 // src/emitter.ts
 import mitt from "mitt";
 var emitter = mitt();
-var invokeAction = emitter.emit.bind(emitter);
 
 // src/vue/phecda.ts
 import { markRaw } from "vue";
@@ -36,18 +30,31 @@ function createPhecda(symbol) {
           }
         };
       }
-      const eventRecord = [];
-      injectProperty("watcher", ({ eventName, instance, key }) => {
+      let eventRecord = [];
+      injectProperty("watcher", ({ eventName, instance, key, options }) => {
         const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
-        eventRecord.push([
-          eventName,
-          fn
-        ]);
-        emitter.on(eventName, fn);
+        if (options?.once) {
+          const handler = /* @__PURE__ */ __name((...args) => {
+            fn(...args);
+            emitter.off(eventName, handler);
+          }, "handler");
+          emitter.on(eventName, handler);
+          eventRecord.push([
+            eventName,
+            handler
+          ]);
+        } else {
+          eventRecord.push([
+            eventName,
+            fn
+          ]);
+          emitter.on(eventName, fn);
+        }
       });
       const originUnmount = app.unmount.bind(app);
       app.unmount = () => {
         eventRecord.forEach(([eventName, handler]) => emitter.off(eventName, handler));
+        eventRecord = [];
         if (symbol)
           delete window.__PHECDA_VUE__[symbol];
         originUnmount();
@@ -368,28 +375,6 @@ __name(createFilter, "createFilter");
 // src/index.ts
 export * from "phecda-core";
 
-// src/wrapper.ts
-var _P = class {
-  _namespace;
-  constructor() {
-  }
-  get tag() {
-    return this._namespace.__TAG__;
-  }
-  on(type, handler) {
-    _P.emitter.on(type, handler);
-  }
-  emit(type, event) {
-    _P.emitter.emit(type, event);
-  }
-  off(type, handler) {
-    _P.emitter.off(type, handler);
-  }
-};
-var P = _P;
-__name(P, "P");
-__publicField(P, "emitter", emitter);
-
 // src/components/createForm.ts
 import { defineComponent, h, onMounted, ref as ref2 } from "vue";
 function createForm(compSet, form, formItem, modelKey = "modelValue") {
@@ -498,9 +483,9 @@ function createFormData(schema, initData = {}, options = {}) {
 __name(createFormData, "createFormData");
 
 // src/components/formResolve.ts
-import { getHandler as getHandler2, getModelState, validate } from "phecda-core";
+import { getExposeKey, getHandler as getHandler2, validate } from "phecda-core";
 function getElementPlusRules(Model, options = {}) {
-  const stateVars = getModelState(Model);
+  const stateVars = getExposeKey(Model);
   const ret = {};
   for (const item of stateVars) {
     const handlers = getHandler2(Model, item);
@@ -529,7 +514,7 @@ function getElementPlusRules(Model, options = {}) {
 __name(getElementPlusRules, "getElementPlusRules");
 var GetDevUIRules = getElementPlusRules;
 function getNaiveUIRules(Model, options = {}) {
-  const stateVars = getModelState(Model);
+  const stateVars = getExposeKey(Model);
   const ret = {};
   for (const item of stateVars) {
     const handlers = getHandler2(Model, item);
@@ -558,7 +543,7 @@ function getNaiveUIRules(Model, options = {}) {
 __name(getNaiveUIRules, "getNaiveUIRules");
 var getAntDRules = getNaiveUIRules;
 function getNutUIRules(Model, options = {}) {
-  const stateVars = getModelState(Model);
+  const stateVars = getExposeKey(Model);
   const ret = {};
   for (const item of stateVars) {
     const handlers = getHandler2(Model, item);
@@ -590,7 +575,7 @@ var getVantRules = getNutUIRules;
 
 // src/components/createModal.ts
 import { defineComponent as defineComponent2, h as h2, ref as ref3, render, shallowRef } from "vue";
-var createModal = /* @__PURE__ */ __name(function(modalWrapper, modelKey = "modelValue") {
+var createModal = /* @__PURE__ */ __name(function(modalWrapper, props = {}, modelKey = "modelValue") {
   let isMounted = false;
   const isShow = ref3(true);
   const content = shallowRef();
@@ -601,15 +586,16 @@ var createModal = /* @__PURE__ */ __name(function(modalWrapper, modelKey = "mode
         [modelKey]: isShow.value,
         [`onUpdate:${modelKey}`]: (v) => {
           isShow.value = v;
-        }
+        },
+        ...props
       }, {
         default: () => content.value && h2(content.value, propsRef.value)
       });
     }
   });
-  return (comp, props) => {
+  return (comp, props2) => {
     content.value = comp;
-    propsRef.value = props;
+    propsRef.value = props2;
     if (!isMounted) {
       const el = document.createElement("div");
       const vnode = h2(wrapper);
@@ -697,11 +683,30 @@ function createPipe(comp, props, to = "default", slot) {
   };
 }
 __name(createPipe, "createPipe");
+
+// src/wrapper.ts
+var PV = class {
+  constructor() {
+  }
+  get tag() {
+    return this._namespace.__TAG__;
+  }
+  on(type, handler) {
+    emitter.on(type, handler);
+  }
+  emit(type, param) {
+    emitter.emit(type, param);
+  }
+  off(type, handler) {
+    emitter.off(type, handler);
+  }
+};
+__name(PV, "PV");
 export {
   EXPRESS_RE,
   FN_RE,
   GetDevUIRules,
-  P,
+  PV,
   clearStorage,
   createFilter,
   createForm,
@@ -720,7 +725,6 @@ export {
   getReactiveMap,
   getVantRules,
   initalize,
-  invokeAction,
   phecdaSymbol,
   setActivePhecda,
   useEvent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "1.2.1",
+  "version": "1.2.5",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -14,7 +14,7 @@
   "dependencies": {
     "mitt": "^3.0.0",
     "vue": "^3.2.45",
-    "phecda-core": "1.0.7"
+    "phecda-core": "1.1.1"
   },
   "devDependencies": {
     "tsup": "^6.5.0"