bare-script 3.0.7 → 3.0.8

package/lib/library.js

@@ -1277,10 +1277,7 @@ const regexMatchArgs = valueArgsModel([
 // $return: The array of [match objects](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 +1287,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 +1392,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);
 }
 

package/package.json

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