phecda-vue 1.1.1 → 1.1.2

package/dist/index.d.ts

@@ -60,6 +60,7 @@ declare function createFilter<Data extends Record<string, any>>(initState?: Obje
     expressionRE?: RegExp;
     fnRE?: RegExp;
     exclude?: string[];
+    errorHandler?: (error?: Error, errorPath?: string) => any;
 }): {
     filter: <Schema>(obj: Schema) => SchemaToObj<Schema>;
     data: [Data] extends [vue.Ref<any>] ? Data : vue.Ref<vue.UnwrapRef<Data>>;

package/dist/index.js

@@ -324,19 +324,21 @@ function createFilter(initState = {}, option = {}) {
   const scope = (0, import_vue4.effectScope)(true);
   let data = scope.run(() => (0, import_vue4.ref)(initState));
   let store = {};
-  function traverse(obj) {
+  function traverse(obj, path) {
     for (const i in obj) {
       if (Array.isArray(obj[i]) || resolveOption.exclude.includes(i))
         continue;
+      const errorPath = path ? `${path}.${i}` : i;
       if (typeof obj[i] === "object" && obj[i])
-        traverse(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];
           Object.defineProperty(obj, i, {
             get() {
-              return new Function(...Object.keys(data.value), `return ${body}`)(
-                ...Object.values(data.value)
+              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
               );
             }
           });
@@ -345,8 +347,9 @@ function createFilter(initState = {}, option = {}) {
           const body = obj[i].match(resolveOption.fnRE)[1];
           Object.defineProperty(obj, i, {
             get() {
-              return new Function(...Object.keys(data.value), `${body}`)(
-                ...Object.values(data.value)
+              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
               );
             }
           });

package/dist/index.mjs

@@ -262,19 +262,21 @@ function createFilter(initState = {}, option = {}) {
   const scope = effectScope2(true);
   let data = scope.run(() => ref(initState));
   let store = {};
-  function traverse(obj) {
+  function traverse(obj, path) {
     for (const i in obj) {
       if (Array.isArray(obj[i]) || resolveOption.exclude.includes(i))
         continue;
+      const errorPath = path ? `${path}.${i}` : i;
       if (typeof obj[i] === "object" && obj[i])
-        traverse(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];
           Object.defineProperty(obj, i, {
             get() {
-              return new Function(...Object.keys(data.value), `return ${body}`)(
-                ...Object.values(data.value)
+              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
               );
             }
           });
@@ -283,8 +285,9 @@ function createFilter(initState = {}, option = {}) {
           const body = obj[i].match(resolveOption.fnRE)[1];
           Object.defineProperty(obj, i, {
             get() {
-              return new Function(...Object.keys(data.value), `${body}`)(
-                ...Object.values(data.value)
+              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
               );
             }
           });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",