phecda-vue 2.0.0 → 2.0.1

package/dist/index.d.ts

@@ -45,11 +45,10 @@ declare function useV<T extends new (...args: any) => any>(Model: T): ReplaceIns
 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 const EXPRESS_RE: RegExp;
-declare const FN_RE: RegExp;
+declare const RE: RegExp;
 declare function createFilter<Data extends Record<string, any>>(initState?: Object, option?: {
-    expressionRE?: RegExp;
-    fnRE?: RegExp;
+    RE?: RegExp;
+    needReturn?: boolean;
     exclude?: string[];
     errorHandler?: (error?: Error, errorPath?: string) => any;
 }): {
@@ -136,4 +135,4 @@ declare class PV {
     off<Key extends keyof Events>(type: Key, handler?: (arg: Events[Key]) => void): void;
 }
 
-export { EXPRESS_RE, FN_RE, GetDevUIRules, PV, PhecdaEmitter, ReplaceInstanceValues, SchemaToObj, createFilter, createForm, createFormData, createLayer, createModal, createPhecda, createPipe, createTable, emitter, getActivePhecda, getAntDRules, getArcoRules, getElementPlusRules, getNaiveUIRules, getNutUIRules, getReactiveMap, getVantRules, initialize, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useRaw, useV };
+export { GetDevUIRules, PV, PhecdaEmitter, RE, ReplaceInstanceValues, SchemaToObj, createFilter, createForm, createFormData, createLayer, createModal, createPhecda, createPipe, createTable, emitter, getActivePhecda, getAntDRules, getArcoRules, getElementPlusRules, getNaiveUIRules, getNutUIRules, getReactiveMap, getVantRules, initialize, phecdaSymbol, setActivePhecda, useEvent, useO, usePatch, useR, useRaw, useV };

package/dist/index.js

@@ -28,10 +28,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  EXPRESS_RE: () => EXPRESS_RE,
-  FN_RE: () => FN_RE,
   GetDevUIRules: () => GetDevUIRules,
   PV: () => PV,
+  RE: () => RE,
   createFilter: () => createFilter,
   createForm: () => createForm,
   createFormData: () => createFormData,
@@ -346,12 +345,10 @@ __name(initialize, "initialize");
 
 // src/filter.ts
 var import_vue4 = require("vue");
-var EXPRESS_RE = /^{{(.*)}}$/;
-var FN_RE = /^\[\[(.*)\]\]$/;
+var RE = /{{(.*)}}/;
 function createFilter(initState = {}, option = {}) {
   const resolveOption = Object.assign({
-    expressionRE: EXPRESS_RE,
-    fnRE: FN_RE,
+    RE,
     exclude: []
   }, option);
   const scope = (0, import_vue4.effectScope)(true);
@@ -365,11 +362,13 @@ function createFilter(initState = {}, option = {}) {
       if (typeof obj[i] === "object" && obj[i])
         traverse(obj[i], errorPath);
       if (typeof obj[i] === "string") {
-        if (resolveOption.expressionRE.test(obj[i])) {
-          const body = obj[i].match(resolveOption.expressionRE)[1];
+        if (resolveOption.RE.test(obj[i])) {
+          const body = obj[i].replace(resolveOption.RE, (_, s) => {
+            return s;
+          });
           Object.defineProperty(obj, i, {
             get() {
-              return new Function(...Object.keys(data.value), "_eh", resolveOption.errorHandler ? `try{return ${body}}catch(e){return _eh(e,"${errorPath}")}` : `return ${body}`)(...Object.values(data.value), resolveOption.errorHandler);
+              return new Function(...Object.keys(data.value), "_eh", resolveOption.errorHandler ? `try{${resolveOption.needReturn ? "" : "return"} ${body}}catch(e){return _eh(e,"${errorPath}")}` : `${resolveOption.needReturn ? "" : "return"} ${body}`)(...Object.values(data.value), resolveOption.errorHandler);
             },
             set(value) {
               try {
@@ -382,14 +381,6 @@ function createFilter(initState = {}, option = {}) {
             }
           });
         }
-        if (resolveOption.fnRE.test(obj[i])) {
-          const body = obj[i].match(resolveOption.fnRE)[1];
-          Object.defineProperty(obj, i, {
-            get() {
-              return new Function(...Object.keys(data.value), "_eh", resolveOption.errorHandler ? `try{${body}}catch(e){return _eh(e,"${errorPath}")}` : `${body}`)(...Object.values(data.value), resolveOption.errorHandler);
-            }
-          });
-        }
       }
     }
   }
@@ -883,10 +874,9 @@ var PV = class {
 __name(PV, "PV");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  EXPRESS_RE,
-  FN_RE,
   GetDevUIRules,
   PV,
+  RE,
   createFilter,
   createForm,
   createFormData,

package/dist/index.mjs

@@ -286,12 +286,10 @@ __name(initialize, "initialize");
 
 // src/filter.ts
 import { effectScope as effectScope2, ref } from "vue";
-var EXPRESS_RE = /^{{(.*)}}$/;
-var FN_RE = /^\[\[(.*)\]\]$/;
+var RE = /{{(.*)}}/;
 function createFilter(initState = {}, option = {}) {
   const resolveOption = Object.assign({
-    expressionRE: EXPRESS_RE,
-    fnRE: FN_RE,
+    RE,
     exclude: []
   }, option);
   const scope = effectScope2(true);
@@ -305,11 +303,13 @@ function createFilter(initState = {}, option = {}) {
       if (typeof obj[i] === "object" && obj[i])
         traverse(obj[i], errorPath);
       if (typeof obj[i] === "string") {
-        if (resolveOption.expressionRE.test(obj[i])) {
-          const body = obj[i].match(resolveOption.expressionRE)[1];
+        if (resolveOption.RE.test(obj[i])) {
+          const body = obj[i].replace(resolveOption.RE, (_, s) => {
+            return s;
+          });
           Object.defineProperty(obj, i, {
             get() {
-              return new Function(...Object.keys(data.value), "_eh", resolveOption.errorHandler ? `try{return ${body}}catch(e){return _eh(e,"${errorPath}")}` : `return ${body}`)(...Object.values(data.value), resolveOption.errorHandler);
+              return new Function(...Object.keys(data.value), "_eh", resolveOption.errorHandler ? `try{${resolveOption.needReturn ? "" : "return"} ${body}}catch(e){return _eh(e,"${errorPath}")}` : `${resolveOption.needReturn ? "" : "return"} ${body}`)(...Object.values(data.value), resolveOption.errorHandler);
             },
             set(value) {
               try {
@@ -322,14 +322,6 @@ function createFilter(initState = {}, option = {}) {
             }
           });
         }
-        if (resolveOption.fnRE.test(obj[i])) {
-          const body = obj[i].match(resolveOption.fnRE)[1];
-          Object.defineProperty(obj, i, {
-            get() {
-              return new Function(...Object.keys(data.value), "_eh", resolveOption.errorHandler ? `try{${body}}catch(e){return _eh(e,"${errorPath}")}` : `${body}`)(...Object.values(data.value), resolveOption.errorHandler);
-            }
-          });
-        }
       }
     }
   }
@@ -822,10 +814,9 @@ var PV = class {
 };
 __name(PV, "PV");
 export {
-  EXPRESS_RE,
-  FN_RE,
   GetDevUIRules,
   PV,
+  RE,
   createFilter,
   createForm,
   createFormData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "provide store/form/table with phecda function to vue",
   "main": "dist/index.js",
   "module": "dist/index.mjs",