bare-script 3.0.7 → 3.0.9

package/lib/library.js

@@ -342,7 +342,7 @@ const arraySortArgs = valueArgsModel([
 // $group: Data
 // $doc: Aggregate a data array
 // $arg data: The data array
-// $arg aggregation: The [aggregation model](model.html#var.vName='Aggregation')
+// $arg aggregation: The [aggregation model](https://craigahobbs.github.io/bare-script/library/model.html#var.vName='Aggregation')
 // $return: The aggregated data array
 function dataAggregate(args) {
     const [data, aggregation] = valueArgsValidate(dataAggregateArgs, args);
@@ -1256,7 +1256,8 @@ const rRegexEscape = /[.*+?^${}()|[\]\\]/g;
 // $doc: Find the first match of a regular expression in a string
 // $arg regex: The regular expression
 // $arg string: The string
-// $return: The [match object](model.html#var.vName='RegexMatch'), or null if no matches are found
+// $return: The [match object](https://craigahobbs.github.io/bare-script/library/model.html#var.vName='RegexMatch'),
+// $return: or null if no matches are found
 function regexMatch(args) {
     const [regex, string] = valueArgsValidate(regexMatchArgs, args);
     const match = string.match(regex);
@@ -1274,13 +1275,10 @@ const regexMatchArgs = valueArgsModel([
 // $doc: Find all matches of regular expression in a string
 // $arg regex: The regular expression
 // $arg string: The string
-// $return: The array of [match objects](model.html#var.vName='RegexMatch')
+// $return: The array of [match objects](https://craigahobbs.github.io/bare-script/library/model.html#var.vName='RegexMatch')
 function regexMatchAll(args) {
     const [regex, string] = valueArgsValidate(regexMatchAllArgs, args);
-
-    // Re-compile the regex with the "g" flag, if necessary
-    const regexGlobal = (regex.flags.indexOf('g') !== -1 ? regex : new RegExp(regex.source, `${regex.flags}g`));
-
+    const regexGlobal = regexEnsureGlobal(regex);
     return Array.from(string.matchAll(regexGlobal)).map((match) => regexMatchGroups(match));
 }
 
@@ -1290,6 +1288,33 @@ const regexMatchAllArgs = valueArgsModel([
 ]);
 
 
+// Helper te re-compile regex with the global flag and cache
+function regexEnsureGlobal(regex) {
+    let regexGlobal = regex;
+    const {source, flags} = regex;
+    if (flags.indexOf('g') === -1) {
+        let sourceCache = regexGlobalCache[source] ?? null;
+        if (sourceCache === null) {
+            sourceCache = {};
+            regexGlobalCache[source] = sourceCache;
+        }
+        let flagsCache = sourceCache[flags] ?? null;
+        if (flagsCache === null) {
+            flagsCache = {};
+            sourceCache[flags] = flagsCache;
+        }
+        regexGlobal = flagsCache[flags] ?? null;
+        if (regexGlobal === null) {
+            regexGlobal = new RegExp(source, `${flags}g`);
+            flagsCache[flags] = regexGlobal;
+        }
+    }
+    return regexGlobal;
+}
+
+const regexGlobalCache = {};
+
+
 // Helper function to create a match model from a metch object
 function regexMatchGroups(match) {
     const groups = {};
@@ -1368,10 +1393,7 @@ const regexNewArgs = valueArgsModel([
 // $return: The updated string
 function regexReplace(args) {
     const [regex, string, substr] = valueArgsValidate(regexReplaceArgs, args);
-
-    // Re-compile the regex with the "g" flag, if necessary
-    const regexGlobal = (regex.flags.indexOf('g') !== -1 ? regex : new RegExp(regex.source, `${regex.flags}g`));
-
+    const regexGlobal = regexEnsureGlobal(regex);
     return string.replaceAll(regexGlobal, substr);
 }
 
@@ -1787,8 +1809,10 @@ function systemCompare([left = null, right = null]) {
 // $function: systemFetch
 // $group: System
 // $doc: Retrieve a URL resource
-// $arg url: The resource URL, [request model](model.html#var.vName='SystemFetchRequest'), or array of URL and
-// $arg url: [request model](model.html#var.vName='SystemFetchRequest')
+// $arg url: The resource URL,
+// $arg url: [request model](https://craigahobbs.github.io/bare-script/library/model.html#var.vName='SystemFetchRequest'),
+// $arg url: or array of URL and
+// $arg url: [request model](https://craigahobbs.github.io/bare-script/library/model.html#var.vName='SystemFetchRequest')
 // $return: The response string or array of strings; null if an error occurred
 async function systemFetch([url = null], options) {
     // Options
@@ -1823,6 +1847,7 @@ async function systemFetch([url = null], options) {
             const fetchURL = urlFn !== null ? urlFn(request.url) : request.url;
             const fetchOptions = {};
             if ((request.body ?? null) !== null) {
+                fetchOptions.method = 'POST';
                 fetchOptions.body = request.body;
             }
             if ((request.headers ?? null) !== null) {

package/lib/parser.js

@@ -589,7 +589,7 @@ function parseUnaryExpression(exprText) {
     if (matchFunctionOpen !== null) {
         let argText = exprText.slice(matchFunctionOpen[0].length);
         const args = [];
-        while (true) { // eslint-disable-line no-constant-condition
+        while (true) {
             // Function close?
             const matchFunctionClose = argText.match(rExprFunctionClose);
             if (matchFunctionClose !== null) {

package/lib/runtimeAsync.js

@@ -139,7 +139,7 @@ async function executeScriptHelperAsync(statements, options, locals) {
                 }
 
                 // Parse the include script
-                let scriptModel = null;
+                let scriptModel;
                 try {
                     scriptModel = parseScript(scriptText);
                 } catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "bare-script",
-    "version": "3.0.7",
+    "version": "3.0.9",
     "description": "BareScript; a lightweight scripting and expression language",
     "keywords": [
         "expression",
@@ -31,7 +31,7 @@
     },
     "devDependencies": {
         "c8": "~9.1",
-        "eslint": "~8.57",
+        "eslint": "~9.1",
         "jsdoc": "~4.0"
     }
 }