Until While specs and error handling

nikkorn · Feb 29, 2024 · 858c0e4 · 858c0e4
1 parent 758adb4
commit 858c0e4
Show file tree

Hide file tree

Showing 9 changed files with 726 additions and 18 deletions.
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/dist/bundle.js.map b/dist/bundle.js.map
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/attributes/guards/Until.ts b/src/attributes/guards/Until.ts
@@ -30,7 +30,24 @@ export default class Until extends Guard {
             );
         }
 
-        // Call the condition function to determine whether this guard is satisfied.
-        return !!!conditionFuncInvoker(this.args);
+        let conditionFunctionResult;
+
+        try {
+            // Call the guard condition function to determine the state of this node, the result of which should be a boolean.
+            conditionFunctionResult = conditionFuncInvoker(this.args);
+        } catch (error) {
+            // The user was naughty and threw something.
+            throw new Error(`guard condition function '${this.getCondition()}' threw '${error}'`);
+        }
+
+        // The result of calling the guard condition function must be a boolean value.
+        if (typeof conditionFunctionResult !== "boolean") {
+            throw new Error(
+                `expected guard condition function '${this.getCondition()}' to return a boolean but returned '${conditionFunctionResult}'`
+            );
+        }
+
+        // Return whether this guard is satisfied.
+        return !conditionFunctionResult;
     };
 }
diff --git a/src/attributes/guards/While.ts b/src/attributes/guards/While.ts
@@ -30,7 +30,24 @@ export default class While extends Guard {
             );
         }
 
-        // Call the condition function to determine whether this guard is satisfied.
-        return !!conditionFuncInvoker(this.args);
+        let conditionFunctionResult;
+
+        try {
+            // Call the guard condition function to determine the state of this node, the result of which should be a boolean.
+            conditionFunctionResult = conditionFuncInvoker(this.args);
+        } catch (error) {
+            // The user was naughty and threw something.
+            throw new Error(`guard condition function '${this.getCondition()}' threw '${error}'`);
+        }
+
+        // The result of calling the guard condition function must be a boolean value.
+        if (typeof conditionFunctionResult !== "boolean") {
+            throw new Error(
+                `expected guard condition function '${this.getCondition()}' to return a boolean but returned '${conditionFunctionResult}'`
+            );
+        }
+
+        // Return whether this guard is satisfied.
+        return conditionFunctionResult;
     };
 }