bare-script 2.2.16 → 2.2.18

package/lib/library.js

@@ -682,7 +682,7 @@ export const scriptFunctions = {
     // $doc: Escape a string for use in a regular expression
     // $arg string: The string to escape
     // $return: The escaped string
-    'regexEscape': ([string]) => (typeof string === 'string' ? string.replace(reRegexEscape, '\\$&') : null),
+    'regexEscape': ([string]) => (typeof string === 'string' ? string.replace(rRegexEscape, '\\$&') : null),
 
     // $function: regexMatch
     // $group: Regex
@@ -1055,7 +1055,7 @@ export const scriptFunctions = {
 
 
 // Regex escape regular expression
-const reRegexEscape = /[.*+?^${}()|[\]\\]/g;
+const rRegexEscape = /[.*+?^${}()|[\]\\]/g;
 
 
 // Fixed-number trim regular expression
@@ -1108,8 +1108,6 @@ export const expressionFunctionMap = {
     'today': 'datetimeToday',
     'trim': 'stringTrim',
     'upper': 'stringUpper',
-    'urlEncode': 'urlEncode',
-    'urlEncodeComponent': 'urlEncodeComponent',
     'year': 'datetimeYear'
 };
 
@@ -1117,4 +1115,4 @@ export const expressionFunctionMap = {
 // The built-in expression functions
 export const expressionFunctions = Object.fromEntries(Object.entries(expressionFunctionMap).map(
     ([exprFnName, scriptFnName]) => [exprFnName, scriptFunctions[scriptFnName]]
-).filter(([, exprFn]) => exprFn !== null));
+));

package/lib/parser.js

@@ -63,6 +63,11 @@ export function parseScript(scriptText, startLineNumber = 1) {
     for (const [ixLinePart, linePart] of lines.entries()) {
         const statements = (functionDef !== null ? functionDef.function.statements : script.statements);
 
+        // Comment?
+        if (linePart.match(rScriptComment) !== null) {
+            continue;
+        }
+
         // Set the line index
         const isContinued = (lineContinuation.length !== 0);
         if (!isContinued) {
@@ -72,7 +77,7 @@ export function parseScript(scriptText, startLineNumber = 1) {
         // Line continuation?
         const linePartNoContinuation = linePart.replace(rScriptContinuation, '');
         if (linePart !== linePartNoContinuation) {
-            lineContinuation.push(lineContinuation.length === 0 ? linePartNoContinuation.trimEnd() : linePartNoContinuation.trim());
+            lineContinuation.push(isContinued ? linePartNoContinuation.trim() : linePartNoContinuation.trimEnd());
             continue;
         } else if (isContinued) {
             lineContinuation.push(linePartNoContinuation.trim());
@@ -87,11 +92,6 @@ export function parseScript(scriptText, startLineNumber = 1) {
             line = linePart;
         }
 
-        // Comment?
-        if (line.match(rScriptComment) !== null) {
-            continue;
-        }
-
         // Assignment?
         const matchAssignment = line.match(rScriptAssignment);
         if (matchAssignment !== null) {
@@ -709,7 +709,7 @@ export class BareScriptParserError extends Error {
         let lineError = line;
         let lineColumn = columnNumber;
         if (line.length > lineLengthMax) {
-            const lineLeft = columnNumber - 1 - 0.5 * lineLengthMax;
+            const lineLeft = columnNumber - 1 - lineLengthMax / 2;
             const lineRight = lineLeft + lineLengthMax;
             if (lineLeft < 0) {
                 lineError = line.slice(0, lineLengthMax) + lineSuffix;

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;
@@ -198,9 +200,10 @@ export function evaluateExpression(expr, options = null, locals = null, builtins
             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') {
@@ -220,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) {
@@ -247,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);
 
@@ -287,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 === '!') {
@@ -312,7 +317,7 @@ export function evaluateExpression(expr, options = null, locals = null, builtins
  */
 export class BareScriptRuntimeError extends Error {
     /**
-     * Create a BareScript parser error
+     * Create a BareScript runtime error
      *
      * @param {string} message - The runtime error message
      */

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.16",
+    "version": "2.2.18",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",