bare-script 2.2.17 → 2.3.0

package/lib/parser.js

@@ -510,7 +510,7 @@ const binaryReorder = {
 /**
  * Parse a BareScript expression
  *
- * @param {string} exprText - The [expression text]{@link https://craigahobbs.github.io/bare-script/language/#Expressions}
+ * @param {string} exprText - The [expression text]{@link https://craigahobbs.github.io/bare-script/language/#expressions}
  * @returns {Object} The [expression model]{@link https://craigahobbs.github.io/bare-script/model/#var.vName='Expression'}
  * @throws [BareScriptParserError]{@link module:lib/parser.BareScriptParserError}
  */

package/lib/runtime.js

@@ -176,13 +176,15 @@ export function evaluateExpression(expr, options = null, locals = null, builtins
     // Number
     if (exprKey === 'number') {
         return expr.number;
+    }
 
     // String
-    } else if (exprKey === 'string') {
+    if (exprKey === 'string') {
         return expr.string;
+    }
 
     // Variable
-    } else if (exprKey === 'variable') {
+    if (exprKey === 'variable') {
         // Keywords
         if (expr.variable === 'null') {
             return null;
@@ -193,16 +195,15 @@ export function evaluateExpression(expr, options = null, locals = null, builtins
         }
 
         // Get the local or global variable value or null if undefined
-        let varValue;
-        if (locals !== null && expr.variable in locals) {
-            varValue = locals[expr.variable];
-        } else {
+        let varValue = (locals !== null ? locals[expr.variable] : undefined);
+        if (typeof varValue === 'undefined') {
             varValue = (globals !== null ? (globals[expr.variable] ?? null) : null);
         }
         return varValue;
+    }
 
     // Function
-    } else if (exprKey === 'function') {
+    if (exprKey === 'function') {
         // "if" built-in function?
         const funcName = expr.function.name;
         if (funcName === 'if') {
@@ -222,7 +223,7 @@ export function evaluateExpression(expr, options = null, locals = null, builtins
         if (typeof funcValue === 'undefined') {
             funcValue = (globals !== null ? globals[funcName] : undefined);
             if (typeof funcValue === 'undefined') {
-                funcValue = (builtins ? expressionFunctions[funcName] : null) ?? null;
+                funcValue = (builtins ? (expressionFunctions[funcName] ?? null) : null);
             }
         }
         if (funcValue !== null) {
@@ -249,9 +250,10 @@ export function evaluateExpression(expr, options = null, locals = null, builtins
         }
 
         throw new BareScriptRuntimeError(`Undefined function "${funcName}"`);
+    }
 
     // Binary expression
-    } else if (exprKey === 'binary') {
+    if (exprKey === 'binary') {
         const binOp = expr.binary.op;
         const leftValue = evaluateExpression(expr.binary.left, options, locals, builtins);
 
@@ -289,9 +291,10 @@ export function evaluateExpression(expr, options = null, locals = null, builtins
         }
         // else if (binOp === '!=')
         return leftValue !== rightValue;
+    }
 
     // Unary expression
-    } else if (exprKey === 'unary') {
+    if (exprKey === 'unary') {
         const unaryOp = expr.unary.op;
         const value = evaluateExpression(expr.unary.expr, options, locals, builtins);
         if (unaryOp === '!') {

package/lib/runtimeAsync.js

@@ -244,13 +244,15 @@ export async function evaluateExpressionAsync(expr, options = null, locals = nul
     // Number
     if (exprKey === 'number') {
         return expr.number;
+    }
 
     // String
-    } else if (exprKey === 'string') {
+    if (exprKey === 'string') {
         return expr.string;
+    }
 
     // Variable
-    } else if (exprKey === 'variable') {
+    if (exprKey === 'variable') {
         // Keywords
         if (expr.variable === 'null') {
             return null;
@@ -266,9 +268,10 @@ export async function evaluateExpressionAsync(expr, options = null, locals = nul
             varValue = (globals !== null ? (globals[expr.variable] ?? null) : null);
         }
         return varValue;
+    }
 
     // Function
-    } else if (exprKey === 'function') {
+    if (exprKey === 'function') {
         // "if" built-in function?
         const funcName = expr.function.name;
         if (funcName === 'if') {
@@ -311,9 +314,10 @@ export async function evaluateExpressionAsync(expr, options = null, locals = nul
         }
 
         throw new BareScriptRuntimeError(`Undefined function "${funcName}"`);
+    }
 
     // Binary expression
-    } else if (exprKey === 'binary') {
+    if (exprKey === 'binary') {
         const binOp = expr.binary.op;
         const leftValue = await evaluateExpressionAsync(expr.binary.left, options, locals, builtins);
 
@@ -351,9 +355,10 @@ export async function evaluateExpressionAsync(expr, options = null, locals = nul
         }
         // else if (binOp === '!=')
         return leftValue !== rightValue;
+    }
 
     // Unary expression
-    } else if (exprKey === 'unary') {
+    if (exprKey === 'unary') {
         const unaryOp = expr.unary.op;
         const value = await evaluateExpressionAsync(expr.unary.expr, options, locals, builtins);
         if (unaryOp === '!') {

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "2.2.17",
+    "version": "2.3.0",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",
@@ -30,8 +30,8 @@
         "schema-markdown": "~1.2"
     },
     "devDependencies": {
-        "c8": "~8.0",
-        "eslint": "~8.52",
+        "c8": "~9.1",
+        "eslint": "~8.56",
         "jsdoc": "~4.0"
     }
 }