perf: improve regexp on reearth/core (#533)

reearth · Mar 13, 2023 · ca7b052 · ca7b052
1 parent 39bfb06
commit ca7b052
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/core/mantle/evaluator/simple/expression/variableReplacer.ts b/src/core/mantle/evaluator/simple/expression/variableReplacer.ts
@@ -110,13 +110,13 @@ const RESERVED_WORDS: Record<string, string> = {
 
 const replaceReservedWord = (word: string) => {
   const wordFiltered = word.replace(/-/g, RESERVED_WORDS["-"]);
-  return wordFiltered.replaceAll(
-    /(.*)(\[|\{|\()(.*)(\]|\}|\))(?!\.|\[)(.+)/g,
-    (_match, prefix, openedBracket, inner, closedBracket, suffix) => {
-      return `${prefix}${RESERVED_WORDS[openedBracket]}${inner}${RESERVED_WORDS[closedBracket]}${suffix}`;
-    },
-  );
+  if (!/(\]|\)|\})[^[.]+$/.test(wordFiltered)) {
+    return wordFiltered;
+  }
+  return Object.entries(RESERVED_WORDS).reduce((res, [key, val]) => {
+    return res.replaceAll(key, val);
+  }, wordFiltered);
 };
 
 export const restoreReservedWord = (text: string) =>
-  Object.entries(RESERVED_WORDS).reduce((res, [key, val]) => res.replace(val, key), text);
+  Object.entries(RESERVED_WORDS).reduce((res, [key, val]) => res.replaceAll(val, key), text);