Better errors

StevenThuriot · Dec 29, 2022 · cf7ac12 · cf7ac12
1 parent aa4713a
commit cf7ac12
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -1,3 +1,3 @@
 export declare const executeExpression: (model: {
     [key: string]: any;
-}, expression: string) => boolean;
+}, expression: string | boolean) => boolean;
diff --git a/lib/index.js b/lib/index.js
@@ -18,7 +18,6 @@ exports.executeExpression = (function () {
             return value1 < value2;
         };
         var contains = function (value1, value2) {
-            value1 = value1;
             if (typeof value1 === 'string') {
                 return value1.indexOf(value2) >= 0;
             }
@@ -71,7 +70,7 @@ exports.executeExpression = (function () {
                         break;
                 }
             }
-            throw new Error("Invalid Expression");
+            throw new Error("Invalid Expression Part: " + value);
         };
         var parseEquals = function (value) {
             var parameters = resolveParameters(value);
@@ -177,13 +176,16 @@ exports.executeExpression = (function () {
         return toReturn;
     };
     return function (m, e) {
-        if (!e) {
-            throw new Error("Invalid Expression: null");
+        if (typeof e === 'boolean') {
+            return function () { return e; };
         }
-        e = e.trim();
         if (!e) {
             throw new Error("Invalid Expression: empty");
         }
+        e = ('' + e).trim();
+        if (!e) {
+            throw new Error("Invalid Expression: whitespace");
+        }
         if (e.indexOf('.') > 0) {
             m = ___flattenObject(m);
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-expressions",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "main": "lib/index.js",
   "devDependencies": {
     "typescript": "^4.9.4"

diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,4 @@
-export const executeExpression = (function (): (model: { [key: string]: any; }, expression: string) => boolean {
+export const executeExpression = (function (): (model: { [key: string]: any; }, expression: string | boolean) => boolean {
     const ___expressionCache: { [key: string]: any; } = {};
     const ___parseExpression = (expression: string): (model: { [key: string]: any; }) => any => {
         const cachedExpression = ___expressionCache[expression];
@@ -19,8 +19,6 @@ export const executeExpression = (function (): (model: { [key: string]: any; },
         }
 
         const contains = (value1: any, value2: any): boolean => {
-            value1 = value1;
-
             if (typeof value1 === 'string') {
                 return value1.indexOf(value2) >= 0;
             }
@@ -85,7 +83,7 @@ export const executeExpression = (function (): (model: { [key: string]: any; },
                         break;
                 }
             }
-            throw new Error("Invalid Expression");
+            throw new Error("Invalid Expression Part: " + value);
         }
 
         const parseEquals = (value: string): (model: { [key: string]: any; }) => boolean => {
@@ -217,14 +215,18 @@ export const executeExpression = (function (): (model: { [key: string]: any; },
     }
 
     return (m, e) => {
+        if (typeof e === 'boolean') {
+            return () => e;
+        }
+
         if (!e) {
-            throw new Error("Invalid Expression: null");
+            throw new Error("Invalid Expression: empty");
         }
 
-        e = e.trim();
+        e = (''+e).trim();
 
         if (!e) {
-            throw new Error("Invalid Expression: empty");
+            throw new Error("Invalid Expression: whitespace");
         }
 
         if (e.indexOf('.') > 0) {