bare-script 2.2.15 → 2.2.17

package/lib/data.js

@@ -376,6 +376,9 @@ enum AggregationFunction
     # The least of the measure's values
     min
 
+    # The standard deviation of the measure's values
+    stddev
+
     # The sum of the measure's values
     sum
 `);
@@ -434,7 +437,9 @@ export function aggregateData(data, aggregation) {
             if (!(field in aggregateRow)) {
                 aggregateRow[field] = [];
             }
-            aggregateRow[field].push(value);
+            if (value !== null) {
+                aggregateRow[field].push(value);
+            }
         }
     }
 
@@ -445,7 +450,9 @@ export function aggregateData(data, aggregation) {
             const field = measure.name ?? measure.field;
             const func = measure.function;
             const measureValues = aggregateRow[field];
-            if (func === 'count') {
+            if (!measureValues.length) {
+                aggregateRow[field] = null;
+            } else if (func === 'count') {
                 aggregateRow[field] = measureValues.length;
             } else if (func === 'max') {
                 aggregateRow[field] = measureValues.reduce((max, val) => (val > max ? val : max));
@@ -453,7 +460,11 @@ export function aggregateData(data, aggregation) {
                 aggregateRow[field] = measureValues.reduce((min, val) => (val < min ? val : min));
             } else if (func === 'sum') {
                 aggregateRow[field] = measureValues.reduce((sum, val) => sum + val, 0);
+            } else if (func === 'stddev') {
+                const average = measureValues.reduce((sum, val) => sum + val, 0) / measureValues.length;
+                aggregateRow[field] = Math.sqrt(measureValues.reduce((sum, val) => sum + (val - average) ** 2, 0) / measureValues.length);
             } else {
+                // func === 'average'
                 aggregateRow[field] = measureValues.reduce((sum, val) => sum + val, 0) / measureValues.length;
             }
         }

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

@@ -193,8 +193,10 @@ export function evaluateExpression(expr, options = null, locals = null, builtins
         }
 
         // Get the local or global variable value or null if undefined
-        let varValue = (locals !== null ? locals[expr.variable] : undefined);
-        if (typeof varValue === 'undefined') {
+        let varValue;
+        if (locals !== null && expr.variable in locals) {
+            varValue = locals[expr.variable];
+        } else {
             varValue = (globals !== null ? (globals[expr.variable] ?? null) : null);
         }
         return varValue;
@@ -312,7 +314,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/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "2.2.15",
+    "version": "2.2.17",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",