bare-script 3.8.19 → 3.8.21

package/lib/library.js

@@ -9,8 +9,11 @@ import {
     addCalculatedField, aggregateData, filterData, joinData, parseCSV, sortData, topData, validateData
 } from './data.js';
 import {validateType, validateTypeModel} from 'schema-markdown/lib/schema.js';
+import {evaluateExpression} from './runtime.js';
+import {parseExpression} from './parser.js';
 import {parseSchemaMarkdown} from 'schema-markdown/lib/parser.js';
 import {typeModel} from 'schema-markdown/lib/typeModel.js';
+import {validateExpression} from './model.js';
 
 
 /* eslint-disable id-length */
@@ -385,6 +388,49 @@ const arraySortArgs = valueArgsModel([
 ]);
 
 
+//
+// BareScript functions
+//
+
+
+// $function: barescriptEvaluateExpression
+// $group: barescript
+// $doc: Evaluate a [BareScript expression model](../model/#var.vName='Expression')
+// $arg expr: The [BareScript expression model](../model/#var.vName='Expression')
+// $arg locals: Optional (default is null). The local variables object.
+// $arg globals: Optional (default is null). The global variables object.
+// $return: The expression result
+function barescriptEvaluateExpression(args, options) {
+    const [expr, locals_, globals] = valueArgsValidate(barescriptEvaluateExpressionArgs, args);
+    validateExpression(expr);
+    const evaluateOptions = (globals === null ? options : {...options, 'globals': globals});
+    return evaluateExpression(expr, evaluateOptions, locals_, false);
+}
+
+const barescriptEvaluateExpressionArgs = valueArgsModel([
+    {'name': 'expr', 'type': 'object'},
+    {'name': 'locals', 'type': 'object', 'nullable': true},
+    {'name': 'globals', 'type': 'object', 'nullable': true}
+]);
+
+
+// $function: barescriptParseExpression
+// $group: barescript
+// $doc: Parse a BareScript expression
+// $arg exprStr: The expression string
+// $arg arrayLiterals: Optional (default is true). If true, allow array literals.
+// $return: The [BareScript expression model](../model/#var.vName='Expression')
+function barescriptParseExpression(args) {
+    const [exprStr, arrayLiterals] = valueArgsValidate(barescriptParseExpressionArgs, args);
+    return parseExpression(exprStr, null, null, arrayLiterals);
+}
+
+const barescriptParseExpressionArgs = valueArgsModel([
+    {'name': 'exprStr', 'type': 'string'},
+    {'name': 'arrayLiterals', 'type': 'boolean', 'default': true}
+]);
+
+
 //
 // Coverage functions
 //
@@ -2299,6 +2345,8 @@ export const scriptFunctions = {
     arrayShift,
     arraySlice,
     arraySort,
+    barescriptEvaluateExpression,
+    barescriptParseExpression,
     coverageGlobalGet,
     'coverageGlobalName': coverageGlobalNameFn,
     coverageStart,

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "3.8.19",
+    "version": "3.8.21",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",
@@ -33,7 +33,7 @@
     "devDependencies": {
         "@eslint/js": "~10.0",
         "c8": "~11.0",
-        "eslint": "~10.0",
+        "eslint": "~10.1",
         "globals": "~17.4",
         "jsdoc": "~4.0"
     }