@optionfactory/fml 9.0.0-rc27 → 9.0.0-rc29

package/dist/ftl.mjs

@@ -68,7 +68,7 @@ const nodes = {
     },
 };
 
-// @generated by Peggy 5.1.0.
+// @generated by Peggy 5.1.1.
 //
 // https://peggyjs.org/
 
@@ -134,10 +134,9 @@ class peg$SyntaxError extends SyntaxError {
       return s;
     }
 
-    function literalEscape(s) {
+    function escape(s, special) {
       return unicodeEscape(s
-        .replace(/\\/g, "\\\\")
-        .replace(/"/g,  "\\\"")
+        .replace(special, "\\$&")
         .replace(/\0/g, "\\0")
         .replace(/\t/g, "\\t")
         .replace(/\n/g, "\\n")
@@ -146,18 +145,12 @@ class peg$SyntaxError extends SyntaxError {
         .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
     }
 
+    function literalEscape(s) {
+      return escape(s, /[\\"]/g);
+    }
+
     function classEscape(s) {
-      return unicodeEscape(s
-        .replace(/\\/g, "\\\\")
-        .replace(/\]/g, "\\]")
-        .replace(/\^/g, "\\^")
-        .replace(/-/g,  "\\-")
-        .replace(/\0/g, "\\0")
-        .replace(/\t/g, "\\t")
-        .replace(/\n/g, "\\n")
-        .replace(/\r/g, "\\r")
-        .replace(/[\x00-\x0F]/g,          ch => "\\x0" + hex(ch))
-        .replace(/[\x10-\x1F\x7F-\x9F]/g, ch => "\\x"  + hex(ch)));
+      return escape(s, /[\\\]^-]/g);
     }
 
     const DESCRIBE_EXPECTATION_FNS = {
@@ -275,14 +268,6 @@ function peg$parse(input, options) {
   const peg$c53 = "<=";
   const peg$c54 = "<";
 
-  const peg$r0 = /^[^\\{]/;
-  const peg$r1 = /^[0-9]/;
-  const peg$r2 = /^[^']/;
-  const peg$r3 = /^[^"]/;
-  const peg$r4 = /^[^\\`{]/;
-  const peg$r5 = /^[a-zA-Z$_]/;
-  const peg$r6 = /^[a-zA-Z$_0-9]/;
-  const peg$r7 = /^[ \t\n\r]/;
 
   const peg$e0 = peg$literalExpectation("{{{{", false);
   const peg$e1 = peg$literalExpectation("}}}}", false);
@@ -440,9 +425,10 @@ function peg$parse(input, options) {
   let peg$maxFailExpected = options.peg$maxFailExpected || [];
   let peg$silentFails = options.peg$silentFails | 0;
 
-  let peg$resultsCache = {};
+  let peg$resultsCache = new Map();
 
   let peg$result;
+  let peg$charCode;
 
   if (options.startRule) {
     if (!(options.startRule in peg$startRuleFunctions)) {
@@ -561,7 +547,7 @@ function peg$parse(input, options) {
     let s0, s1;
 
     const key = peg$currPos * 38 + 0;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -570,13 +556,13 @@ function peg$parse(input, options) {
     }
 
     s0 = [];
-    s1 = peg$parseTemplatedExpression();
-    while (s1 !== peg$FAILED) {
-      s0.push(s1);
+    for (;;) {
       s1 = peg$parseTemplatedExpression();
+      if (s1 === peg$FAILED) { break; }
+      s0.push(s1);
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -585,7 +571,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4;
 
     const key = peg$currPos * 38 + 1;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -681,7 +667,7 @@ function peg$parse(input, options) {
       }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -690,7 +676,7 @@ function peg$parse(input, options) {
     let s0;
 
     const key = peg$currPos * 38 + 2;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -706,7 +692,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e0); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -715,7 +701,7 @@ function peg$parse(input, options) {
     let s0;
 
     const key = peg$currPos * 38 + 3;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -731,7 +717,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e1); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -740,7 +726,7 @@ function peg$parse(input, options) {
     let s0;
 
     const key = peg$currPos * 38 + 4;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -756,7 +742,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e2); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -765,7 +751,7 @@ function peg$parse(input, options) {
     let s0;
 
     const key = peg$currPos * 38 + 5;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -781,7 +767,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e3); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -790,7 +776,7 @@ function peg$parse(input, options) {
     let s0;
 
     const key = peg$currPos * 38 + 6;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -806,7 +792,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e4); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -815,7 +801,7 @@ function peg$parse(input, options) {
     let s0;
 
     const key = peg$currPos * 38 + 7;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -831,7 +817,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e5); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -840,7 +826,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5, s6;
 
     const key = peg$currPos * 38 + 8;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -850,211 +836,104 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     s1 = [];
-    s2 = peg$currPos;
-    s3 = [];
-    s4 = input.charAt(peg$currPos);
-    if (peg$r0.test(s4)) {
-      peg$currPos++;
-    } else {
-      s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e6); }
-    }
-    if (s4 !== peg$FAILED) {
-      while (s4 !== peg$FAILED) {
-        s3.push(s4);
+    for (;;) {
+      s2 = peg$currPos;
+      s3 = [];
+      for (;;) {
         s4 = input.charAt(peg$currPos);
-        if (peg$r0.test(s4)) {
+        if (s4 !== "" && !(peg$charCode = s4.charCodeAt(0), peg$charCode === 92 || peg$charCode === 123)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) { peg$fail(peg$e6); }
         }
+        if (s4 === peg$FAILED) { break; }
+        s3.push(s4);
       }
-    } else {
-      s3 = peg$FAILED;
-    }
-    if (s3 !== peg$FAILED) {
-      s2 = input.substring(s2, peg$currPos);
-    } else {
-      s2 = s3;
-    }
-    if (s2 === peg$FAILED) {
-      s2 = peg$currPos;
-      if (input.charCodeAt(peg$currPos) === 92) {
-        s3 = peg$c7;
-        peg$currPos++;
-      } else {
+      if (s3.length < 1) {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e7); }
       }
       if (s3 !== peg$FAILED) {
-        if (input.length > peg$currPos) {
-          s4 = input.charAt(peg$currPos);
-          peg$currPos++;
-        } else {
-          s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e8); }
-        }
-        if (s4 !== peg$FAILED) {
-          s2 = peg$f4(s4);
-        } else {
-          peg$currPos = s2;
-          s2 = peg$FAILED;
-        }
+        s2 = input.substring(s2, peg$currPos);
       } else {
-        peg$currPos = s2;
-        s2 = peg$FAILED;
+        s2 = s3;
       }
       if (s2 === peg$FAILED) {
         s2 = peg$currPos;
-        s3 = peg$currPos;
-        if (input.charCodeAt(peg$currPos) === 123) {
-          s4 = peg$c9;
+        if (input.charCodeAt(peg$currPos) === 92) {
+          s3 = peg$c7;
           peg$currPos++;
         } else {
-          s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e9); }
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e7); }
         }
-        if (s4 !== peg$FAILED) {
-          s5 = peg$currPos;
-          peg$silentFails++;
-          if (input.charCodeAt(peg$currPos) === 123) {
-            s6 = peg$c9;
+        if (s3 !== peg$FAILED) {
+          if (input.length > peg$currPos) {
+            s4 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
-            s6 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e9); }
-          }
-          peg$silentFails--;
-          if (s6 === peg$FAILED) {
-            s5 = undefined;
-          } else {
-            peg$currPos = s5;
-            s5 = peg$FAILED;
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e8); }
           }
-          if (s5 !== peg$FAILED) {
-            s4 = [s4, s5];
-            s3 = s4;
+          if (s4 !== peg$FAILED) {
+            s2 = peg$f4(s4);
           } else {
-            peg$currPos = s3;
-            s3 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s3;
-          s3 = peg$FAILED;
-        }
-        if (s3 !== peg$FAILED) {
-          s2 = input.substring(s2, peg$currPos);
-        } else {
-          s2 = s3;
-        }
-      }
-    }
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
-        s2 = peg$currPos;
-        s3 = [];
-        s4 = input.charAt(peg$currPos);
-        if (peg$r0.test(s4)) {
-          peg$currPos++;
-        } else {
-          s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e6); }
-        }
-        if (s4 !== peg$FAILED) {
-          while (s4 !== peg$FAILED) {
-            s3.push(s4);
-            s4 = input.charAt(peg$currPos);
-            if (peg$r0.test(s4)) {
-              peg$currPos++;
-            } else {
-              s4 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e6); }
-            }
+            peg$currPos = s2;
+            s2 = peg$FAILED;
           }
         } else {
-          s3 = peg$FAILED;
-        }
-        if (s3 !== peg$FAILED) {
-          s2 = input.substring(s2, peg$currPos);
-        } else {
-          s2 = s3;
+          peg$currPos = s2;
+          s2 = peg$FAILED;
         }
         if (s2 === peg$FAILED) {
           s2 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 92) {
-            s3 = peg$c7;
+          s3 = peg$currPos;
+          if (input.charCodeAt(peg$currPos) === 123) {
+            s4 = peg$c9;
             peg$currPos++;
           } else {
-            s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e7); }
-          }
-          if (s3 !== peg$FAILED) {
-            if (input.length > peg$currPos) {
-              s4 = input.charAt(peg$currPos);
-              peg$currPos++;
-            } else {
-              s4 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e8); }
-            }
-            if (s4 !== peg$FAILED) {
-              s2 = peg$f4(s4);
-            } else {
-              peg$currPos = s2;
-              s2 = peg$FAILED;
-            }
-          } else {
-            peg$currPos = s2;
-            s2 = peg$FAILED;
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e9); }
           }
-          if (s2 === peg$FAILED) {
-            s2 = peg$currPos;
-            s3 = peg$currPos;
+          if (s4 !== peg$FAILED) {
+            s5 = peg$currPos;
+            peg$silentFails++;
             if (input.charCodeAt(peg$currPos) === 123) {
-              s4 = peg$c9;
+              s6 = peg$c9;
               peg$currPos++;
             } else {
-              s4 = peg$FAILED;
+              s6 = peg$FAILED;
               if (peg$silentFails === 0) { peg$fail(peg$e9); }
             }
-            if (s4 !== peg$FAILED) {
-              s5 = peg$currPos;
-              peg$silentFails++;
-              if (input.charCodeAt(peg$currPos) === 123) {
-                s6 = peg$c9;
-                peg$currPos++;
-              } else {
-                s6 = peg$FAILED;
-                if (peg$silentFails === 0) { peg$fail(peg$e9); }
-              }
-              peg$silentFails--;
-              if (s6 === peg$FAILED) {
-                s5 = undefined;
-              } else {
-                peg$currPos = s5;
-                s5 = peg$FAILED;
-              }
-              if (s5 !== peg$FAILED) {
-                s4 = [s4, s5];
-                s3 = s4;
-              } else {
-                peg$currPos = s3;
-                s3 = peg$FAILED;
-              }
+            peg$silentFails--;
+            if (s6 === peg$FAILED) {
+              s5 = undefined;
             } else {
-              peg$currPos = s3;
-              s3 = peg$FAILED;
+              peg$currPos = s5;
+              s5 = peg$FAILED;
             }
-            if (s3 !== peg$FAILED) {
-              s2 = input.substring(s2, peg$currPos);
+            if (s5 !== peg$FAILED) {
+              s4 = [s4, s5];
+              s3 = s4;
             } else {
-              s2 = s3;
+              peg$currPos = s3;
+              s3 = peg$FAILED;
             }
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
+          if (s3 !== peg$FAILED) {
+            s2 = input.substring(s2, peg$currPos);
+          } else {
+            s2 = s3;
           }
         }
       }
-    } else {
+      if (s2 === peg$FAILED) { break; }
+      s1.push(s2);
+    }
+    if (s1.length < 1) {
       s1 = peg$FAILED;
     }
     if (s1 !== peg$FAILED) {
@@ -1062,7 +941,7 @@ function peg$parse(input, options) {
     }
     s0 = s1;
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1071,7 +950,7 @@ function peg$parse(input, options) {
     let s0, s2;
 
     const key = peg$currPos * 38 + 9;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1090,7 +969,7 @@ function peg$parse(input, options) {
       s0 = peg$FAILED;
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1099,7 +978,7 @@ function peg$parse(input, options) {
     let s0, s1, s3, s5, s7, s9;
 
     const key = peg$currPos * 38 + 10;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1159,7 +1038,7 @@ function peg$parse(input, options) {
       s0 = peg$parseElvisExpression();
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1168,7 +1047,7 @@ function peg$parse(input, options) {
     let s0, s1, s3, s5;
 
     const key = peg$currPos * 38 + 11;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1208,7 +1087,7 @@ function peg$parse(input, options) {
       s0 = peg$parseNullCoalescingExpression();
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1217,7 +1096,7 @@ function peg$parse(input, options) {
     let s0, s1, s3, s5;
 
     const key = peg$currPos * 38 + 12;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1257,7 +1136,7 @@ function peg$parse(input, options) {
       s0 = peg$parseOrExpression();
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1266,7 +1145,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s5, s7;
 
     const key = peg$currPos * 38 + 13;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1278,30 +1157,7 @@ function peg$parse(input, options) {
     s1 = peg$parseAndExpression();
     if (s1 !== peg$FAILED) {
       s2 = [];
-      s3 = peg$currPos;
-      peg$parse_();
-      if (input.substr(peg$currPos, 2) === peg$c22) {
-        s5 = peg$c22;
-        peg$currPos += 2;
-      } else {
-        s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e14); }
-      }
-      if (s5 !== peg$FAILED) {
-        peg$parse_();
-        s7 = peg$parseAndExpression();
-        if (s7 !== peg$FAILED) {
-          s3 = s7;
-        } else {
-          peg$currPos = s3;
-          s3 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s3;
-        s3 = peg$FAILED;
-      }
-      while (s3 !== peg$FAILED) {
-        s2.push(s3);
+      for (;;) {
         s3 = peg$currPos;
         peg$parse_();
         if (input.substr(peg$currPos, 2) === peg$c22) {
@@ -1324,6 +1180,8 @@ function peg$parse(input, options) {
           peg$currPos = s3;
           s3 = peg$FAILED;
         }
+        if (s3 === peg$FAILED) { break; }
+        s2.push(s3);
       }
       s0 = peg$f10(s1, s2);
     } else {
@@ -1331,7 +1189,7 @@ function peg$parse(input, options) {
       s0 = peg$FAILED;
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1340,7 +1198,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s5, s7;
 
     const key = peg$currPos * 38 + 14;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1352,30 +1210,7 @@ function peg$parse(input, options) {
     s1 = peg$parseEqExpression();
     if (s1 !== peg$FAILED) {
       s2 = [];
-      s3 = peg$currPos;
-      peg$parse_();
-      if (input.substr(peg$currPos, 2) === peg$c24) {
-        s5 = peg$c24;
-        peg$currPos += 2;
-      } else {
-        s5 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e15); }
-      }
-      if (s5 !== peg$FAILED) {
-        peg$parse_();
-        s7 = peg$parseEqExpression();
-        if (s7 !== peg$FAILED) {
-          s3 = s7;
-        } else {
-          peg$currPos = s3;
-          s3 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s3;
-        s3 = peg$FAILED;
-      }
-      while (s3 !== peg$FAILED) {
-        s2.push(s3);
+      for (;;) {
         s3 = peg$currPos;
         peg$parse_();
         if (input.substr(peg$currPos, 2) === peg$c24) {
@@ -1398,6 +1233,8 @@ function peg$parse(input, options) {
           peg$currPos = s3;
           s3 = peg$FAILED;
         }
+        if (s3 === peg$FAILED) { break; }
+        s2.push(s3);
       }
       s0 = peg$f11(s1, s2);
     } else {
@@ -1405,7 +1242,7 @@ function peg$parse(input, options) {
       s0 = peg$FAILED;
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1414,7 +1251,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s5, s7;
 
     const key = peg$currPos * 38 + 15;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1426,24 +1263,7 @@ function peg$parse(input, options) {
     s1 = peg$parseRelExpression();
     if (s1 !== peg$FAILED) {
       s2 = [];
-      s3 = peg$currPos;
-      peg$parse_();
-      s5 = peg$parseEqualityOp();
-      if (s5 !== peg$FAILED) {
-        peg$parse_();
-        s7 = peg$parseRelExpression();
-        if (s7 !== peg$FAILED) {
-          s3 = peg$f12(s1, s5, s7);
-        } else {
-          peg$currPos = s3;
-          s3 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s3;
-        s3 = peg$FAILED;
-      }
-      while (s3 !== peg$FAILED) {
-        s2.push(s3);
+      for (;;) {
         s3 = peg$currPos;
         peg$parse_();
         s5 = peg$parseEqualityOp();
@@ -1460,6 +1280,8 @@ function peg$parse(input, options) {
           peg$currPos = s3;
           s3 = peg$FAILED;
         }
+        if (s3 === peg$FAILED) { break; }
+        s2.push(s3);
       }
       s0 = peg$f13(s1, s2);
     } else {
@@ -1467,7 +1289,7 @@ function peg$parse(input, options) {
       s0 = peg$FAILED;
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1476,7 +1298,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s5, s7;
 
     const key = peg$currPos * 38 + 16;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1488,24 +1310,7 @@ function peg$parse(input, options) {
     s1 = peg$parseNotExpression();
     if (s1 !== peg$FAILED) {
       s2 = [];
-      s3 = peg$currPos;
-      peg$parse_();
-      s5 = peg$parseRelationalOp();
-      if (s5 !== peg$FAILED) {
-        peg$parse_();
-        s7 = peg$parseNotExpression();
-        if (s7 !== peg$FAILED) {
-          s3 = peg$f14(s1, s5, s7);
-        } else {
-          peg$currPos = s3;
-          s3 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s3;
-        s3 = peg$FAILED;
-      }
-      while (s3 !== peg$FAILED) {
-        s2.push(s3);
+      for (;;) {
         s3 = peg$currPos;
         peg$parse_();
         s5 = peg$parseRelationalOp();
@@ -1522,6 +1327,8 @@ function peg$parse(input, options) {
           peg$currPos = s3;
           s3 = peg$FAILED;
         }
+        if (s3 === peg$FAILED) { break; }
+        s2.push(s3);
       }
       s0 = peg$f15(s1, s2);
     } else {
@@ -1529,7 +1336,7 @@ function peg$parse(input, options) {
       s0 = peg$FAILED;
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1538,7 +1345,7 @@ function peg$parse(input, options) {
     let s0, s1, s3;
 
     const key = peg$currPos * 38 + 17;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1571,7 +1378,7 @@ function peg$parse(input, options) {
       s0 = peg$parseAccess();
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1580,7 +1387,7 @@ function peg$parse(input, options) {
     let s0, s1, s3, s4, s5;
 
     const key = peg$currPos * 38 + 18;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1593,29 +1400,20 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       peg$parse_();
       s3 = [];
-      s4 = peg$currPos;
-      s5 = peg$parseAccessExpression();
-      if (s5 !== peg$FAILED) {
-        peg$parse_();
-        s4 = s5;
-      } else {
-        peg$currPos = s4;
-        s4 = peg$FAILED;
-      }
-      if (s4 !== peg$FAILED) {
-        while (s4 !== peg$FAILED) {
-          s3.push(s4);
-          s4 = peg$currPos;
-          s5 = peg$parseAccessExpression();
-          if (s5 !== peg$FAILED) {
-            peg$parse_();
-            s4 = s5;
-          } else {
-            peg$currPos = s4;
-            s4 = peg$FAILED;
-          }
+      for (;;) {
+        s4 = peg$currPos;
+        s5 = peg$parseAccessExpression();
+        if (s5 !== peg$FAILED) {
+          peg$parse_();
+          s4 = s5;
+        } else {
+          peg$currPos = s4;
+          s4 = peg$FAILED;
         }
-      } else {
+        if (s4 === peg$FAILED) { break; }
+        s3.push(s4);
+      }
+      if (s3.length < 1) {
         s3 = peg$FAILED;
       }
       if (s3 !== peg$FAILED) {
@@ -1632,7 +1430,7 @@ function peg$parse(input, options) {
       s0 = peg$parseGroupingExpression();
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1641,7 +1439,7 @@ function peg$parse(input, options) {
     let s0;
 
     const key = peg$currPos * 38 + 19;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1657,7 +1455,7 @@ function peg$parse(input, options) {
       }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1666,7 +1464,7 @@ function peg$parse(input, options) {
     let s0, s1, s3;
 
     const key = peg$currPos * 38 + 20;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1711,7 +1509,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e17); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1720,7 +1518,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s4, s6;
 
     const key = peg$currPos * 38 + 21;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1779,7 +1577,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e20); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1788,7 +1586,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s4, s5, s6, s7, s9;
 
     const key = peg$currPos * 38 + 22;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1830,30 +1628,7 @@ function peg$parse(input, options) {
         s4 = null;
       }
       s5 = [];
-      s6 = peg$currPos;
-      if (input.charCodeAt(peg$currPos) === 44) {
-        s7 = peg$c34;
-        peg$currPos++;
-      } else {
-        s7 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e25); }
-      }
-      if (s7 !== peg$FAILED) {
-        peg$parse_();
-        s9 = peg$parseTernaryExpression();
-        if (s9 !== peg$FAILED) {
-          peg$parse_();
-          s6 = s9;
-        } else {
-          peg$currPos = s6;
-          s6 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s6;
-        s6 = peg$FAILED;
-      }
-      while (s6 !== peg$FAILED) {
-        s5.push(s6);
+      for (;;) {
         s6 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 44) {
           s7 = peg$c34;
@@ -1876,6 +1651,8 @@ function peg$parse(input, options) {
           peg$currPos = s6;
           s6 = peg$FAILED;
         }
+        if (s6 === peg$FAILED) { break; }
+        s5.push(s6);
       }
       if (input.charCodeAt(peg$currPos) === 41) {
         s6 = peg$c36;
@@ -1900,7 +1677,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e23); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1909,7 +1686,7 @@ function peg$parse(input, options) {
     let s0, s1, s3, s5;
 
     const key = peg$currPos * 38 + 23;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -1961,7 +1738,7 @@ function peg$parse(input, options) {
       }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -1970,7 +1747,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s4, s5, s6, s7, s9;
 
     const key = peg$currPos * 38 + 24;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -2004,30 +1781,7 @@ function peg$parse(input, options) {
           s4 = null;
         }
         s5 = [];
-        s6 = peg$currPos;
-        if (input.charCodeAt(peg$currPos) === 44) {
-          s7 = peg$c34;
-          peg$currPos++;
-        } else {
-          s7 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e25); }
-        }
-        if (s7 !== peg$FAILED) {
-          peg$parse_();
-          s9 = peg$parseTernaryExpression();
-          if (s9 !== peg$FAILED) {
-            peg$parse_();
-            s6 = s9;
-          } else {
-            peg$currPos = s6;
-            s6 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s6;
-          s6 = peg$FAILED;
-        }
-        while (s6 !== peg$FAILED) {
-          s5.push(s6);
+        for (;;) {
           s6 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 44) {
             s7 = peg$c34;
@@ -2050,6 +1804,8 @@ function peg$parse(input, options) {
             peg$currPos = s6;
             s6 = peg$FAILED;
           }
+          if (s6 === peg$FAILED) { break; }
+          s5.push(s6);
         }
         if (input.charCodeAt(peg$currPos) === 41) {
           s6 = peg$c36;
@@ -2078,7 +1834,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e27); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -2087,7 +1843,7 @@ function peg$parse(input, options) {
     let s0;
 
     const key = peg$currPos * 38 + 25;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -2106,7 +1862,7 @@ function peg$parse(input, options) {
       }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -2115,7 +1871,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
     const key = peg$currPos * 38 + 26;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -2139,25 +1895,18 @@ function peg$parse(input, options) {
     }
     s4 = peg$currPos;
     s5 = [];
-    s6 = input.charAt(peg$currPos);
-    if (peg$r1.test(s6)) {
-      peg$currPos++;
-    } else {
-      s6 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e30); }
-    }
-    if (s6 !== peg$FAILED) {
-      while (s6 !== peg$FAILED) {
-        s5.push(s6);
-        s6 = input.charAt(peg$currPos);
-        if (peg$r1.test(s6)) {
-          peg$currPos++;
-        } else {
-          s6 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e30); }
-        }
+    for (;;) {
+      s6 = input.charAt(peg$currPos);
+      if ((peg$charCode = s6.charCodeAt(0), (peg$charCode >= 48 && peg$charCode <= 57))) {
+        peg$currPos++;
+      } else {
+        s6 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e30); }
       }
-    } else {
+      if (s6 === peg$FAILED) { break; }
+      s5.push(s6);
+    }
+    if (s5.length < 1) {
       s5 = peg$FAILED;
     }
     if (s5 !== peg$FAILED) {
@@ -2171,22 +1920,16 @@ function peg$parse(input, options) {
       }
       if (s7 !== peg$FAILED) {
         s8 = [];
-        s9 = input.charAt(peg$currPos);
-        if (peg$r1.test(s9)) {
-          peg$currPos++;
-        } else {
-          s9 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e30); }
-        }
-        while (s9 !== peg$FAILED) {
-          s8.push(s9);
+        for (;;) {
           s9 = input.charAt(peg$currPos);
-          if (peg$r1.test(s9)) {
+          if ((peg$charCode = s9.charCodeAt(0), (peg$charCode >= 48 && peg$charCode <= 57))) {
             peg$currPos++;
           } else {
             s9 = peg$FAILED;
             if (peg$silentFails === 0) { peg$fail(peg$e30); }
           }
+          if (s9 === peg$FAILED) { break; }
+          s8.push(s9);
         }
         s7 = [s7, s8];
         s6 = s7;
@@ -2214,25 +1957,18 @@ function peg$parse(input, options) {
       }
       if (s5 !== peg$FAILED) {
         s6 = [];
-        s7 = input.charAt(peg$currPos);
-        if (peg$r1.test(s7)) {
-          peg$currPos++;
-        } else {
-          s7 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e30); }
-        }
-        if (s7 !== peg$FAILED) {
-          while (s7 !== peg$FAILED) {
-            s6.push(s7);
-            s7 = input.charAt(peg$currPos);
-            if (peg$r1.test(s7)) {
-              peg$currPos++;
-            } else {
-              s7 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e30); }
-            }
+        for (;;) {
+          s7 = input.charAt(peg$currPos);
+          if ((peg$charCode = s7.charCodeAt(0), (peg$charCode >= 48 && peg$charCode <= 57))) {
+            peg$currPos++;
+          } else {
+            s7 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e30); }
           }
-        } else {
+          if (s7 === peg$FAILED) { break; }
+          s6.push(s7);
+        }
+        if (s6.length < 1) {
           s6 = peg$FAILED;
         }
         if (s6 !== peg$FAILED) {
@@ -2269,7 +2005,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e28); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -2278,7 +2014,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4;
 
     const key = peg$currPos * 38 + 27;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -2298,22 +2034,16 @@ function peg$parse(input, options) {
     if (s1 !== peg$FAILED) {
       s2 = peg$currPos;
       s3 = [];
-      s4 = input.charAt(peg$currPos);
-      if (peg$r2.test(s4)) {
-        peg$currPos++;
-      } else {
-        s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e33); }
-      }
-      while (s4 !== peg$FAILED) {
-        s3.push(s4);
+      for (;;) {
         s4 = input.charAt(peg$currPos);
-        if (peg$r2.test(s4)) {
+        if (s4 !== "" && !(peg$charCode = s4.charCodeAt(0), peg$charCode === 39)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) { peg$fail(peg$e33); }
         }
+        if (s4 === peg$FAILED) { break; }
+        s3.push(s4);
       }
       s2 = input.substring(s2, peg$currPos);
       if (input.charCodeAt(peg$currPos) === 39) {
@@ -2345,22 +2075,16 @@ function peg$parse(input, options) {
       if (s1 !== peg$FAILED) {
         s2 = peg$currPos;
         s3 = [];
-        s4 = input.charAt(peg$currPos);
-        if (peg$r3.test(s4)) {
-          peg$currPos++;
-        } else {
-          s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e35); }
-        }
-        while (s4 !== peg$FAILED) {
-          s3.push(s4);
+        for (;;) {
           s4 = input.charAt(peg$currPos);
-          if (peg$r3.test(s4)) {
+          if (s4 !== "" && !(peg$charCode = s4.charCodeAt(0), peg$charCode === 34)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) { peg$fail(peg$e35); }
           }
+          if (s4 === peg$FAILED) { break; }
+          s3.push(s4);
         }
         s2 = input.substring(s2, peg$currPos);
         if (input.charCodeAt(peg$currPos) === 34) {
@@ -2391,16 +2115,13 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           s2 = [];
-          s3 = peg$parseTemplateStringExpression();
-          if (s3 === peg$FAILED) {
-            s3 = peg$parseTemplateStringLiteral();
-          }
-          while (s3 !== peg$FAILED) {
-            s2.push(s3);
+          for (;;) {
             s3 = peg$parseTemplateStringExpression();
             if (s3 === peg$FAILED) {
               s3 = peg$parseTemplateStringLiteral();
             }
+            if (s3 === peg$FAILED) { break; }
+            s2.push(s3);
           }
           if (input.charCodeAt(peg$currPos) === 96) {
             s3 = peg$c42;
@@ -2427,7 +2148,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e31); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -2436,7 +2157,7 @@ function peg$parse(input, options) {
     let s0, s1, s3, s5;
 
     const key = peg$currPos * 38 + 28;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -2485,7 +2206,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e37); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -2494,7 +2215,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4;
 
     const key = peg$currPos * 38 + 29;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -2505,123 +2226,60 @@ function peg$parse(input, options) {
     peg$silentFails++;
     s0 = peg$currPos;
     s1 = [];
-    s2 = peg$currPos;
-    s3 = [];
-    s4 = input.charAt(peg$currPos);
-    if (peg$r4.test(s4)) {
-      peg$currPos++;
-    } else {
-      s4 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e40); }
-    }
-    if (s4 !== peg$FAILED) {
-      while (s4 !== peg$FAILED) {
-        s3.push(s4);
+    for (;;) {
+      s2 = peg$currPos;
+      s3 = [];
+      for (;;) {
         s4 = input.charAt(peg$currPos);
-        if (peg$r4.test(s4)) {
+        if (s4 !== "" && !(peg$charCode = s4.charCodeAt(0), peg$charCode === 92 || peg$charCode === 96 || peg$charCode === 123)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) { peg$fail(peg$e40); }
         }
+        if (s4 === peg$FAILED) { break; }
+        s3.push(s4);
       }
-    } else {
-      s3 = peg$FAILED;
-    }
-    if (s3 !== peg$FAILED) {
-      s2 = input.substring(s2, peg$currPos);
-    } else {
-      s2 = s3;
-    }
-    if (s2 === peg$FAILED) {
-      s2 = peg$currPos;
-      if (input.charCodeAt(peg$currPos) === 92) {
-        s3 = peg$c7;
-        peg$currPos++;
-      } else {
+      if (s3.length < 1) {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e7); }
       }
       if (s3 !== peg$FAILED) {
-        if (input.length > peg$currPos) {
-          s4 = input.charAt(peg$currPos);
-          peg$currPos++;
-        } else {
-          s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e8); }
-        }
-        if (s4 !== peg$FAILED) {
-          s2 = peg$f28(s4);
-        } else {
-          peg$currPos = s2;
-          s2 = peg$FAILED;
-        }
+        s2 = input.substring(s2, peg$currPos);
       } else {
-        peg$currPos = s2;
-        s2 = peg$FAILED;
+        s2 = s3;
       }
-    }
-    if (s2 !== peg$FAILED) {
-      while (s2 !== peg$FAILED) {
-        s1.push(s2);
+      if (s2 === peg$FAILED) {
         s2 = peg$currPos;
-        s3 = [];
-        s4 = input.charAt(peg$currPos);
-        if (peg$r4.test(s4)) {
+        if (input.charCodeAt(peg$currPos) === 92) {
+          s3 = peg$c7;
           peg$currPos++;
-        } else {
-          s4 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e40); }
-        }
-        if (s4 !== peg$FAILED) {
-          while (s4 !== peg$FAILED) {
-            s3.push(s4);
-            s4 = input.charAt(peg$currPos);
-            if (peg$r4.test(s4)) {
-              peg$currPos++;
-            } else {
-              s4 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e40); }
-            }
-          }
         } else {
           s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e7); }
         }
         if (s3 !== peg$FAILED) {
-          s2 = input.substring(s2, peg$currPos);
-        } else {
-          s2 = s3;
-        }
-        if (s2 === peg$FAILED) {
-          s2 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 92) {
-            s3 = peg$c7;
+          if (input.length > peg$currPos) {
+            s4 = input.charAt(peg$currPos);
             peg$currPos++;
           } else {
-            s3 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e7); }
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e8); }
           }
-          if (s3 !== peg$FAILED) {
-            if (input.length > peg$currPos) {
-              s4 = input.charAt(peg$currPos);
-              peg$currPos++;
-            } else {
-              s4 = peg$FAILED;
-              if (peg$silentFails === 0) { peg$fail(peg$e8); }
-            }
-            if (s4 !== peg$FAILED) {
-              s2 = peg$f28(s4);
-            } else {
-              peg$currPos = s2;
-              s2 = peg$FAILED;
-            }
+          if (s4 !== peg$FAILED) {
+            s2 = peg$f28(s4);
           } else {
             peg$currPos = s2;
             s2 = peg$FAILED;
           }
+        } else {
+          peg$currPos = s2;
+          s2 = peg$FAILED;
         }
       }
-    } else {
+      if (s2 === peg$FAILED) { break; }
+      s1.push(s2);
+    }
+    if (s1.length < 1) {
       s1 = peg$FAILED;
     }
     if (s1 !== peg$FAILED) {
@@ -2648,7 +2306,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e39); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -2657,7 +2315,7 @@ function peg$parse(input, options) {
     let s0, s1, s3, s5, s6, s7, s9;
 
     const key = peg$currPos * 38 + 30;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -2682,30 +2340,7 @@ function peg$parse(input, options) {
       }
       peg$parse_();
       s5 = [];
-      s6 = peg$currPos;
-      if (input.charCodeAt(peg$currPos) === 44) {
-        s7 = peg$c34;
-        peg$currPos++;
-      } else {
-        s7 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e25); }
-      }
-      if (s7 !== peg$FAILED) {
-        peg$parse_();
-        s9 = peg$parseTernaryExpression();
-        if (s9 !== peg$FAILED) {
-          peg$parse_();
-          s6 = s9;
-        } else {
-          peg$currPos = s6;
-          s6 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s6;
-        s6 = peg$FAILED;
-      }
-      while (s6 !== peg$FAILED) {
-        s5.push(s6);
+      for (;;) {
         s6 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 44) {
           s7 = peg$c34;
@@ -2728,6 +2363,8 @@ function peg$parse(input, options) {
           peg$currPos = s6;
           s6 = peg$FAILED;
         }
+        if (s6 === peg$FAILED) { break; }
+        s5.push(s6);
       }
       if (input.charCodeAt(peg$currPos) === 93) {
         s6 = peg$c31;
@@ -2752,7 +2389,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -2761,7 +2398,7 @@ function peg$parse(input, options) {
     let s0, s1, s3, s4, s5, s6, s7, s8, s9, s11, s13;
 
     const key = peg$currPos * 38 + 31;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -2813,50 +2450,7 @@ function peg$parse(input, options) {
       }
       s4 = peg$parse_();
       s5 = [];
-      s6 = peg$currPos;
-      if (input.charCodeAt(peg$currPos) === 44) {
-        s7 = peg$c34;
-        peg$currPos++;
-      } else {
-        s7 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e25); }
-      }
-      if (s7 !== peg$FAILED) {
-        s8 = peg$parse_();
-        s9 = peg$parseStringLiteral();
-        if (s9 !== peg$FAILED) {
-          peg$parse_();
-          if (input.charCodeAt(peg$currPos) === 58) {
-            s11 = peg$c15;
-            peg$currPos++;
-          } else {
-            s11 = peg$FAILED;
-            if (peg$silentFails === 0) { peg$fail(peg$e11); }
-          }
-          if (s11 !== peg$FAILED) {
-            peg$parse_();
-            s13 = peg$parseTernaryExpression();
-            if (s13 !== peg$FAILED) {
-              peg$parse_();
-              s6 = [ s9, s13 ];
-            } else {
-              peg$currPos = s6;
-              s6 = peg$FAILED;
-            }
-          } else {
-            peg$currPos = s6;
-            s6 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s6;
-          s6 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s6;
-        s6 = peg$FAILED;
-      }
-      while (s6 !== peg$FAILED) {
-        s5.push(s6);
+      for (;;) {
         s6 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 44) {
           s7 = peg$c34;
@@ -2899,6 +2493,8 @@ function peg$parse(input, options) {
           peg$currPos = s6;
           s6 = peg$FAILED;
         }
+        if (s6 === peg$FAILED) { break; }
+        s5.push(s6);
       }
       if (input.charCodeAt(peg$currPos) === 125) {
         s6 = peg$c43;
@@ -2923,7 +2519,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e42); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -2932,7 +2528,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4;
 
     const key = peg$currPos * 38 + 32;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -2990,7 +2586,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -2999,7 +2595,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4;
 
     const key = peg$currPos * 38 + 33;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -3010,7 +2606,7 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     s2 = input.charAt(peg$currPos);
-    if (peg$r5.test(s2)) {
+    if ((peg$charCode = s2.charCodeAt(0), (peg$charCode >= 97 && peg$charCode <= 122) || (peg$charCode >= 65 && peg$charCode <= 90) || peg$charCode === 36 || peg$charCode === 95)) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
@@ -3018,22 +2614,16 @@ function peg$parse(input, options) {
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
-      s4 = input.charAt(peg$currPos);
-      if (peg$r6.test(s4)) {
-        peg$currPos++;
-      } else {
-        s4 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e46); }
-      }
-      while (s4 !== peg$FAILED) {
-        s3.push(s4);
+      for (;;) {
         s4 = input.charAt(peg$currPos);
-        if (peg$r6.test(s4)) {
+        if ((peg$charCode = s4.charCodeAt(0), (peg$charCode >= 97 && peg$charCode <= 122) || (peg$charCode >= 65 && peg$charCode <= 90) || peg$charCode === 36 || peg$charCode === 95 || (peg$charCode >= 48 && peg$charCode <= 57))) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) { peg$fail(peg$e46); }
         }
+        if (s4 === peg$FAILED) { break; }
+        s3.push(s4);
       }
       s2 = [s2, s3];
       s1 = s2;
@@ -3047,7 +2637,7 @@ function peg$parse(input, options) {
       s0 = s1;
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -3056,7 +2646,7 @@ function peg$parse(input, options) {
     let s0, s1;
 
     const key = peg$currPos * 38 + 34;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -3077,7 +2667,7 @@ function peg$parse(input, options) {
       if (peg$silentFails === 0) { peg$fail(peg$e47); }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -3086,7 +2676,7 @@ function peg$parse(input, options) {
     let s0;
 
     const key = peg$currPos * 38 + 35;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -3111,7 +2701,7 @@ function peg$parse(input, options) {
       }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -3120,7 +2710,7 @@ function peg$parse(input, options) {
     let s0;
 
     const key = peg$currPos * 38 + 36;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -3163,7 +2753,7 @@ function peg$parse(input, options) {
       }
     }
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -3172,7 +2762,7 @@ function peg$parse(input, options) {
     let s0, s1;
 
     const key = peg$currPos * 38 + 37;
-    const cached = peg$resultsCache[key];
+    const cached = peg$resultsCache.get(key);
 
     if (cached) {
       peg$currPos = cached.nextPos;
@@ -3182,26 +2772,20 @@ function peg$parse(input, options) {
 
     peg$silentFails++;
     s0 = [];
-    s1 = input.charAt(peg$currPos);
-    if (peg$r7.test(s1)) {
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e54); }
-    }
-    while (s1 !== peg$FAILED) {
-      s0.push(s1);
+    for (;;) {
       s1 = input.charAt(peg$currPos);
-      if (peg$r7.test(s1)) {
+      if ((peg$charCode = s1.charCodeAt(0), peg$charCode === 32 || peg$charCode === 9 || peg$charCode === 10 || peg$charCode === 13)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) { peg$fail(peg$e54); }
       }
+      if (s1 === peg$FAILED) { break; }
+      s0.push(s1);
     }
     peg$silentFails--;
 
-    peg$resultsCache[key] = { nextPos: peg$currPos, result: s0 };
+    peg$resultsCache.set(key, { nextPos: peg$currPos, result: s0 });
 
     return s0;
   }
@@ -3714,7 +3298,7 @@ class LightSlots {
                 el.removeAttribute('slot');
                 return [slot, LightSlots.slotFromNode(el)];
             });
-        const slots = {};
+        const slots = Object.create(null);
         slots.default = new DocumentFragment();
         slots.default.append(...el.childNodes);
         for (const [name, el] of namedSlots) {
@@ -3780,6 +3364,13 @@ class Nodes {
         if (win === null) {
             return Promise.resolve();
         }
+        // interactive spans both the deferred scripts and the time between DOMContentLoaded and load
+        const [navigation] = /** @type {PerformanceNavigationTiming[]} */ (
+            win.performance?.getEntriesByType('navigation') ?? []
+        );
+        if (navigation?.domContentLoadedEventStart > 0) {
+            return Promise.resolve();
+        }
         return new Promise((resolve) => {
             const done = () => {
                 win.removeEventListener('DOMContentLoaded', done);
@@ -3796,12 +3387,12 @@ class Nodes {
      * resolves once the element, or any of its ancestors, gains a next sibling,
      * which is the parser having moved past this subtree. The document's
      * DOMContentLoaded is the deadline. Resolves immediately for an element
-     * that is already parsed.
+     * that is already parsed, or once the parser has finished the document.
      * @param {Element} el
      * @returns {Promise<Element>} the element
      */
     static waitParsed(el) {
-        if (Nodes.isParsed(el)) {
+        if (Nodes.isParsed(el) || el.ownerDocument.readyState !== 'loading') {
             return Promise.resolve(el);
         }
         return new Promise((resolve) => {
@@ -3943,7 +3534,8 @@ class CommandsHandler {
         const statName = ops.popData(node, 'tplStat');
         const template = new Template(node, evaluator);
         const evaluated = evaluator.evaluateExpression(expression);
-        const proto = evaluated === null || typeof evaluated !== 'object' ? undefined : Object.getPrototypeOf(evaluated);
+        const proto =
+            evaluated === null || typeof evaluated !== 'object' ? undefined : Object.getPrototypeOf(evaluated);
         const plain = !evaluated?.[Symbol.iterator] && (proto === Object.prototype || proto === null);
         const dict = plain ? Object.entries(evaluated) : null;
         const keyed = evaluated instanceof Map ? [...evaluated] : dict;
@@ -4023,6 +3615,9 @@ class CommandsHandler {
         }
         const tuples = Array.isArray(attributesAndValues[0]) ? attributesAndValues : [attributesAndValues];
         tuples.forEach(([k, v]) => {
+            if (v === null || v === undefined) {
+                return;
+            }
             node.setAttribute(k, v);
         });
     }
@@ -5140,7 +4735,8 @@ class ParsedElement extends HTMLElement {
 const PLACEHOLDER = /\{(\w+)\}/g;
 const POSITIONAL = /\{(\d+)\}/g;
 /** @param {any} v @returns {v is Record<string, string>} */
-const isPlainObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
+const isPlainObject = (v) =>
+    typeof v === 'object' && v !== null && [Object.prototype, null].includes(Object.getPrototypeOf(v));
 
 /** @param {any} problem @returns {string|undefined} the reason, unless it is missing or blank */
 const reasonOf = (problem) =>
@@ -5175,8 +4771,8 @@ const formatter = (ctor, locale, options) => {
 class Localization {
     /**
      * Resolves a message from the translations and interpolates its arguments.
-     * A single plain object argument interpolates named placeholders
-     * ({name}); anything else interpolates positional ones ({0}).
+     * A single plain object argument (an object literal, or one with a null
+     * prototype) interpolates named placeholders ({name}); anything else interpolates positional ones ({0}).
      * A plural leaf selects its form through Intl.PluralRules over the
      * numeric {count} named argument.
      *