bare-script 3.8.18 → 3.8.20

package/lib/include/args.bare

@@ -232,7 +232,7 @@ function argsGlobalName(argument):
     global = objectGet(argument, 'global')
     if global == null:
         name = objectGet(argument, 'name')
-        global = 'v' + stringUpper(stringSlice(name, 0, 1)) + stringSlice(name, 1)
+        global = 'v' + stringUpper(stringCharAt(name, 0)) + stringSlice(name, 1)
     endif
     return global
 endfunction

package/lib/include/diff.bare

@@ -132,19 +132,15 @@ function diffLinesToArray(input):
     if systemType(input) == 'array':
         lines = []
         for part in input:
-            arrayExtend(lines, regexSplit(diffRegexLineSplit, part))
+            arrayExtend(lines, stringSplitLines(part))
         endfor
         return lines
     endif
 
     # String input
-    lines = regexSplit(diffRegexLineSplit, input)
+    lines = stringSplitLines(input)
     if arrayLength(lines) == 1 && arrayGet(lines, 0) == '':
         return []
     endif
     return lines
 endfunction
-
-
-# Regex for splitting lines
-diffRegexLineSplit = regexNew('\r?\n')

package/lib/include/qrcode.bare

@@ -583,8 +583,8 @@ function qrcodeModeAlphanumericBits(message):
     messageLengthMinusOne = messageLength - 1
     ixChar = 0
     while ixChar < messageLength:
-        value1 = stringIndexOf(qrcodeModeAlphanumericStr, stringSlice(message, ixChar, ixChar + 1))
-        value2 = if(ixChar < messageLengthMinusOne, stringIndexOf(qrcodeModeAlphanumericStr, stringSlice(message, ixChar + 1, ixChar + 2)))
+        value1 = stringIndexOf(qrcodeModeAlphanumericStr, stringCharAt(message, ixChar))
+        value2 = if(ixChar < messageLengthMinusOne, stringIndexOf(qrcodeModeAlphanumericStr, stringCharAt(message, ixChar + 1)))
         if value2 == null:
             arrayExtend(messageBits, qrcodeBytesToBits([value1], 6))
         else:

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,48 @@ 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 builtins: Optional (default is true). If true, include the [built-in expression functions](expression.html).
+// $return: The expression result
+function barescriptEvaluateExpression(args, options) {
+    const [expr, locals_, builtins] = valueArgsValidate(barescriptEvaluateExpressionArgs, args);
+    validateExpression(expr);
+    return evaluateExpression(expr, options, locals_, builtins);
+}
+
+const barescriptEvaluateExpressionArgs = valueArgsModel([
+    {'name': 'expr', 'type': 'object'},
+    {'name': 'locals', 'type': 'object', 'nullable': true},
+    {'name': 'builtins', 'type': 'boolean', 'default': 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
 //
@@ -1918,6 +1963,23 @@ const stringSplitArgs = valueArgsModel([
 ]);
 
 
+// $function: stringSplitLines
+// $group: string
+// $doc: Split a string at line boundaries
+// $arg string: The string to split
+// $return: The array of line strings
+function stringSplitLines(args) {
+    const [string] = valueArgsValidate(stringSplitLinesArgs, args);
+    return string.split(stringSplitLinesRegex);
+}
+
+const stringSplitLinesArgs = valueArgsModel([
+    {'name': 'string', 'type': 'string'}
+]);
+
+const stringSplitLinesRegex = /\r?\n/;
+
+
 // $function: stringStartsWith
 // $group: string
 // $doc: Determine if a string starts with a search string
@@ -2282,6 +2344,8 @@ export const scriptFunctions = {
     arrayShift,
     arraySlice,
     arraySort,
+    barescriptEvaluateExpression,
+    barescriptParseExpression,
     coverageGlobalGet,
     'coverageGlobalName': coverageGlobalNameFn,
     coverageStart,
@@ -2366,6 +2430,7 @@ export const scriptFunctions = {
     stringReplace,
     stringSlice,
     stringSplit,
+    stringSplitLines,
     stringStartsWith,
     stringTrim,
     stringUpper,

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "3.8.18",
+    "version": "3.8.20",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",
@@ -31,8 +31,10 @@
         "schema-markdown": "~1.2"
     },
     "devDependencies": {
-        "c8": "~10.1",
-        "eslint": "~9.39",
+        "@eslint/js": "~10.0",
+        "c8": "~11.0",
+        "eslint": "~10.0",
+        "globals": "~17.4",
         "jsdoc": "~4.0"
     }
 }