@env-spec/parser 0.3.2 → 0.3.3

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { __name, ParsedEnvSpecCommentBlock, ParsedEnvSpecDivider, ParsedEnvSpecComment, ParsedEnvSpecBlankLine, ParsedEnvSpecDecoratorComment, ParsedEnvSpecConfigItem, ParsedEnvSpecFile, ParsedEnvSpecDecorator, ParsedEnvSpecFunctionCall, ParsedEnvSpecKeyValuePair, ParsedEnvSpecFunctionArgs, ParsedEnvSpecStaticValue } from './chunk-N4D6RSUR.mjs';
-export { ParsedEnvSpecBlankLine, ParsedEnvSpecComment, ParsedEnvSpecCommentBlock, ParsedEnvSpecConfigItem, ParsedEnvSpecDecorator, ParsedEnvSpecDecoratorComment, ParsedEnvSpecDivider, ParsedEnvSpecFile, ParsedEnvSpecFunctionArgs, ParsedEnvSpecFunctionCall, ParsedEnvSpecKeyValuePair, ParsedEnvSpecStaticValue, expand } from './chunk-N4D6RSUR.mjs';
+import { __name, ParsedEnvSpecCommentBlock, ParsedEnvSpecDivider, ParsedEnvSpecComment, ParsedEnvSpecBlankLine, ParsedEnvSpecDecoratorComment, ParsedEnvSpecConfigItem, ParsedEnvSpecFile, ParsedEnvSpecDecorator, ParsedEnvSpecFunctionCall, ParsedEnvSpecKeyValuePair, ParsedEnvSpecFunctionArgs, ParsedEnvSpecStaticValue } from './chunk-5ODZC3GU.mjs';
+export { ParsedEnvSpecBlankLine, ParsedEnvSpecComment, ParsedEnvSpecCommentBlock, ParsedEnvSpecConfigItem, ParsedEnvSpecDecorator, ParsedEnvSpecDecoratorComment, ParsedEnvSpecDivider, ParsedEnvSpecFile, ParsedEnvSpecFunctionArgs, ParsedEnvSpecFunctionCall, ParsedEnvSpecKeyValuePair, ParsedEnvSpecStaticValue, expand } from './chunk-5ODZC3GU.mjs';
 
 // src/updater.ts
 function ensureHeader(file, newHeaderContents) {
@@ -259,22 +259,24 @@ function peg$parse(input, options) {
   const peg$r0 = /^[a-zA-Z_]/;
   const peg$r1 = /^[a-zA-Z0-9_.\-]/;
   const peg$r2 = /^[^\n]/;
-  const peg$r3 = /^[a-zA-Z]/;
-  const peg$r4 = /^[^ \t\n=()#@]/;
-  const peg$r5 = /^[^ \n,)]/;
-  const peg$r6 = /^[ \t]/;
-  const peg$r7 = /^[a-zA-Z0-9_]/;
-  const peg$r8 = /^[ \t\n]/;
-  const peg$r9 = /^[\-=*#]/;
-  const peg$r10 = /^['"`]/;
-  const peg$r11 = /^[^#\n]/;
-  const peg$r12 = /^[^# \n]/;
-  const peg$r13 = /^["]/;
-  const peg$r14 = /^[^"\n]/;
-  const peg$r15 = /^[']/;
-  const peg$r16 = /^[^'\n]/;
-  const peg$r17 = /^[`]/;
-  const peg$r18 = /^[^`\n]/;
+  const peg$r3 = /^[^ \t@#\n]/;
+  const peg$r4 = /^[^ \t@\n]/;
+  const peg$r5 = /^[a-zA-Z]/;
+  const peg$r6 = /^[^ \t\n=()#@]/;
+  const peg$r7 = /^[^ \n,)]/;
+  const peg$r8 = /^[ \t]/;
+  const peg$r9 = /^[a-zA-Z0-9_]/;
+  const peg$r10 = /^[ \t\n]/;
+  const peg$r11 = /^[\-=*#]/;
+  const peg$r12 = /^['"`]/;
+  const peg$r13 = /^[^#\n]/;
+  const peg$r14 = /^[^# \n]/;
+  const peg$r15 = /^["]/;
+  const peg$r16 = /^[^"\n]/;
+  const peg$r17 = /^[']/;
+  const peg$r18 = /^[^'\n]/;
+  const peg$r19 = /^[`]/;
+  const peg$r20 = /^[^`\n]/;
   const peg$e0 = peg$literalExpectation("\n", false);
   const peg$e1 = peg$literalExpectation("export ", false);
   const peg$e2 = peg$literalExpectation("=", false);
@@ -283,33 +285,35 @@ function peg$parse(input, options) {
   const peg$e5 = peg$literalExpectation("#", false);
   const peg$e6 = peg$literalExpectation("@", false);
   const peg$e7 = peg$classExpectation(["\n"], true, false, false);
-  const peg$e8 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false, false);
-  const peg$e9 = peg$classExpectation([" ", "	", "\n", "=", "(", ")", "#", "@"], true, false, false);
-  const peg$e10 = peg$literalExpectation("(", false);
-  const peg$e11 = peg$literalExpectation(",", false);
-  const peg$e12 = peg$literalExpectation(")", false);
-  const peg$e13 = peg$classExpectation([" ", "\n", ",", ")"], true, false, false);
-  const peg$e14 = peg$classExpectation([" ", "	"], false, false, false);
-  const peg$e15 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_"], false, false, false);
-  const peg$e16 = peg$classExpectation([" ", "	", "\n"], false, false, false);
-  const peg$e17 = peg$classExpectation(["-", "=", "*", "#"], false, false, false);
-  const peg$e18 = peg$classExpectation(["'", '"', "`"], false, false, false);
-  const peg$e19 = peg$classExpectation(["#", "\n"], true, false, false);
-  const peg$e20 = peg$classExpectation(["#", " ", "\n"], true, false, false);
-  const peg$e21 = peg$classExpectation(['"'], false, false, false);
-  const peg$e22 = peg$literalExpectation('\\"', false);
-  const peg$e23 = peg$classExpectation(['"', "\n"], true, false, false);
-  const peg$e24 = peg$classExpectation(["'"], false, false, false);
-  const peg$e25 = peg$literalExpectation("\\'", false);
-  const peg$e26 = peg$classExpectation(["'", "\n"], true, false, false);
-  const peg$e27 = peg$classExpectation(["`"], false, false, false);
-  const peg$e28 = peg$literalExpectation("\\`", false);
-  const peg$e29 = peg$classExpectation(["`", "\n"], true, false, false);
-  const peg$e30 = peg$literalExpectation('"""', false);
-  const peg$e31 = peg$literalExpectation('\\"""', false);
-  const peg$e32 = peg$literalExpectation("```", false);
-  const peg$e33 = peg$literalExpectation("\\```", false);
-  const peg$e34 = peg$anyExpectation();
+  const peg$e8 = peg$classExpectation([" ", "	", "@", "#", "\n"], true, false, false);
+  const peg$e9 = peg$classExpectation([" ", "	", "@", "\n"], true, false, false);
+  const peg$e10 = peg$classExpectation([["a", "z"], ["A", "Z"]], false, false, false);
+  const peg$e11 = peg$classExpectation([" ", "	", "\n", "=", "(", ")", "#", "@"], true, false, false);
+  const peg$e12 = peg$literalExpectation("(", false);
+  const peg$e13 = peg$literalExpectation(",", false);
+  const peg$e14 = peg$literalExpectation(")", false);
+  const peg$e15 = peg$classExpectation([" ", "\n", ",", ")"], true, false, false);
+  const peg$e16 = peg$classExpectation([" ", "	"], false, false, false);
+  const peg$e17 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_"], false, false, false);
+  const peg$e18 = peg$classExpectation([" ", "	", "\n"], false, false, false);
+  const peg$e19 = peg$classExpectation(["-", "=", "*", "#"], false, false, false);
+  const peg$e20 = peg$classExpectation(["'", '"', "`"], false, false, false);
+  const peg$e21 = peg$classExpectation(["#", "\n"], true, false, false);
+  const peg$e22 = peg$classExpectation(["#", " ", "\n"], true, false, false);
+  const peg$e23 = peg$classExpectation(['"'], false, false, false);
+  const peg$e24 = peg$literalExpectation('\\"', false);
+  const peg$e25 = peg$classExpectation(['"', "\n"], true, false, false);
+  const peg$e26 = peg$classExpectation(["'"], false, false, false);
+  const peg$e27 = peg$literalExpectation("\\'", false);
+  const peg$e28 = peg$classExpectation(["'", "\n"], true, false, false);
+  const peg$e29 = peg$classExpectation(["`"], false, false, false);
+  const peg$e30 = peg$literalExpectation("\\`", false);
+  const peg$e31 = peg$classExpectation(["`", "\n"], true, false, false);
+  const peg$e32 = peg$literalExpectation('"""', false);
+  const peg$e33 = peg$literalExpectation('\\"""', false);
+  const peg$e34 = peg$literalExpectation("```", false);
+  const peg$e35 = peg$literalExpectation("\\```", false);
+  const peg$e36 = peg$anyExpectation();
   function peg$f0() {
     return new ParsedEnvSpecBlankLine({ _location: location() });
   }
@@ -344,16 +348,15 @@ function peg$parse(input, options) {
     });
   }
   __name(peg$f4, "peg$f4");
-  function peg$f5(leadingSpace, first, rest, trailingText) {
-    const allDecorators = [first, ...rest];
-    let postComment;
-    if (trailingText) {
-      if (trailingText.startsWith("#")) {
-        postComment = trailingText;
+  function peg$f5(leadingSpace, first, rest, postComment) {
+    const allDecorators = [first];
+    let lastDecorator = first;
+    for (const item of rest) {
+      if (item instanceof ParsedEnvSpecDecorator) {
+        allDecorators.push(item);
+        lastDecorator = item;
       } else {
-        const lastDec = allDecorators[allDecorators.length - 1];
-        lastDec.data.warning = `Unexpected trailing text after @${lastDec.name}`;
-        postComment = trailingText;
+        lastDecorator.data.strayText = item;
       }
     }
     return new ParsedEnvSpecDecoratorComment({
@@ -364,7 +367,11 @@ function peg$parse(input, options) {
     });
   }
   __name(peg$f5, "peg$f5");
-  function peg$f6(name, val) {
+  function peg$f6(first, rest) {
+    return [first, ...rest].join(" ");
+  }
+  __name(peg$f6, "peg$f6");
+  function peg$f7(name, val) {
     return new ParsedEnvSpecDecorator({
       name,
       value: Array.isArray(val) ? val[1] : val,
@@ -372,71 +379,67 @@ function peg$parse(input, options) {
       _location: location()
     });
   }
-  __name(peg$f6, "peg$f6");
-  function peg$f7(name, args) {
+  __name(peg$f7, "peg$f7");
+  function peg$f8(name, args) {
     return new ParsedEnvSpecFunctionCall({
       name,
       args,
       _location: location()
     });
   }
-  __name(peg$f7, "peg$f7");
-  function peg$f8(key, val) {
+  __name(peg$f8, "peg$f8");
+  function peg$f9(key, val) {
     return new ParsedEnvSpecKeyValuePair({ key, val });
   }
-  __name(peg$f8, "peg$f8");
-  function peg$f9(values) {
+  __name(peg$f9, "peg$f9");
+  function peg$f10(values) {
     return new ParsedEnvSpecFunctionArgs({
       values: values || [],
       _location: location()
     });
   }
-  __name(peg$f9, "peg$f9");
-  function peg$f10() {
+  __name(peg$f10, "peg$f10");
+  function peg$f11() {
     return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
-  __name(peg$f10, "peg$f10");
-  function peg$f11(name, args) {
+  __name(peg$f11, "peg$f11");
+  function peg$f12(name, args) {
     return new ParsedEnvSpecFunctionCall({
       name,
       args,
       _location: location()
     });
   }
-  __name(peg$f11, "peg$f11");
-  function peg$f12(key, val) {
+  __name(peg$f12, "peg$f12");
+  function peg$f13(key, val) {
     return new ParsedEnvSpecKeyValuePair({ key, val });
   }
-  __name(peg$f12, "peg$f12");
-  function peg$f13(values) {
+  __name(peg$f13, "peg$f13");
+  function peg$f14(values) {
     return new ParsedEnvSpecFunctionArgs({
       values: values || [],
       _location: location()
     });
   }
-  __name(peg$f13, "peg$f13");
-  function peg$f14() {
+  __name(peg$f14, "peg$f14");
+  function peg$f15() {
     return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
-  __name(peg$f14, "peg$f14");
-  function peg$f15(leadingSpace, contents) {
+  __name(peg$f15, "peg$f15");
+  function peg$f16(leadingSpace, contents) {
     return new ParsedEnvSpecDivider({
       contents,
       leadingSpace,
       _location: location()
     });
   }
-  __name(peg$f15, "peg$f15");
-  function peg$f16() {
-    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
-  }
   __name(peg$f16, "peg$f16");
   function peg$f17() {
     return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
   __name(peg$f17, "peg$f17");
-  function peg$f18(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
+  function peg$f18() {
+    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
   __name(peg$f18, "peg$f18");
   function peg$f19(quote) {
@@ -448,7 +451,7 @@ function peg$parse(input, options) {
   }
   __name(peg$f20, "peg$f20");
   function peg$f21(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
+    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
   }
   __name(peg$f21, "peg$f21");
   function peg$f22(quote) {
@@ -463,6 +466,10 @@ function peg$parse(input, options) {
     return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
   }
   __name(peg$f24, "peg$f24");
+  function peg$f25(quote) {
+    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
+  }
+  __name(peg$f25, "peg$f25");
   let peg$currPos = options.peg$currPos | 0;
   let peg$savedPos = peg$currPos;
   const peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -1034,7 +1041,7 @@ function peg$parse(input, options) {
   }
   __name(peg$parseComment, "peg$parseComment");
   function peg$parseDecoratorComment() {
-    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 35) {
       s1 = peg$c3;
@@ -1055,7 +1062,7 @@ function peg$parse(input, options) {
         s5 = peg$currPos;
         s6 = peg$parse__();
         if (s6 !== peg$FAILED) {
-          s7 = peg$parseDecorator();
+          s7 = peg$parseDecoratorOrText();
           if (s7 !== peg$FAILED) {
             s5 = s7;
           } else {
@@ -1071,7 +1078,7 @@ function peg$parse(input, options) {
           s5 = peg$currPos;
           s6 = peg$parse__();
           if (s6 !== peg$FAILED) {
-            s7 = peg$parseDecorator();
+            s7 = peg$parseDecoratorOrText();
             if (s7 !== peg$FAILED) {
               s5 = s7;
             } else {
@@ -1084,121 +1091,256 @@ function peg$parse(input, options) {
           }
         }
         s5 = peg$currPos;
-        s6 = peg$parse__();
-        if (s6 !== peg$FAILED) {
-          s7 = peg$currPos;
-          s8 = [];
-          s9 = input.charAt(peg$currPos);
-          if (peg$r2.test(s9)) {
+        s6 = peg$parse_();
+        s7 = peg$currPos;
+        s8 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 35) {
+          s9 = peg$c3;
+          peg$currPos++;
+        } else {
+          s9 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e5);
+          }
+        }
+        if (s9 !== peg$FAILED) {
+          s10 = [];
+          s11 = input.charAt(peg$currPos);
+          if (peg$r2.test(s11)) {
             peg$currPos++;
           } else {
-            s9 = peg$FAILED;
+            s11 = peg$FAILED;
             if (peg$silentFails === 0) {
               peg$fail(peg$e7);
             }
           }
-          if (s9 !== peg$FAILED) {
-            while (s9 !== peg$FAILED) {
-              s8.push(s9);
-              s9 = input.charAt(peg$currPos);
-              if (peg$r2.test(s9)) {
-                peg$currPos++;
-              } else {
-                s9 = peg$FAILED;
-                if (peg$silentFails === 0) {
-                  peg$fail(peg$e7);
-                }
+          while (s11 !== peg$FAILED) {
+            s10.push(s11);
+            s11 = input.charAt(peg$currPos);
+            if (peg$r2.test(s11)) {
+              peg$currPos++;
+            } else {
+              s11 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e7);
               }
             }
-          } else {
-            s8 = peg$FAILED;
-          }
-          if (s8 !== peg$FAILED) {
-            s7 = input.substring(s7, peg$currPos);
-          } else {
-            s7 = s8;
-          }
-          if (s7 !== peg$FAILED) {
-            s5 = s7;
-          } else {
-            peg$currPos = s5;
-            s5 = peg$FAILED;
           }
+          s9 = [s9, s10];
+          s8 = s9;
+        } else {
+          peg$currPos = s8;
+          s8 = peg$FAILED;
+        }
+        if (s8 !== peg$FAILED) {
+          s7 = input.substring(s7, peg$currPos);
+        } else {
+          s7 = s8;
+        }
+        if (s7 !== peg$FAILED) {
+          s5 = s7;
         } else {
           peg$currPos = s5;
           s5 = peg$FAILED;
         }
         if (s5 === peg$FAILED) {
+          s5 = null;
+        }
+        s6 = peg$parse_();
+        peg$savedPos = s0;
+        s0 = peg$f5(s2, s3, s4, s5);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    return s0;
+  }
+  __name(peg$parseDecoratorComment, "peg$parseDecoratorComment");
+  function peg$parseDecoratorOrText() {
+    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+    s0 = peg$parseDecorator();
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$currPos;
+      s2 = peg$currPos;
+      s3 = input.charAt(peg$currPos);
+      if (peg$r3.test(s3)) {
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e8);
+        }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = [];
+        s5 = input.charAt(peg$currPos);
+        if (peg$r4.test(s5)) {
+          peg$currPos++;
+        } else {
+          s5 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e9);
+          }
+        }
+        while (s5 !== peg$FAILED) {
+          s4.push(s5);
+          s5 = input.charAt(peg$currPos);
+          if (peg$r4.test(s5)) {
+            peg$currPos++;
+          } else {
+            s5 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e9);
+            }
+          }
+        }
+        s3 = [s3, s4];
+        s2 = s3;
+      } else {
+        peg$currPos = s2;
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        s1 = input.substring(s1, peg$currPos);
+      } else {
+        s1 = s2;
+      }
+      if (s1 !== peg$FAILED) {
+        s2 = [];
+        s3 = peg$currPos;
+        s4 = peg$parse__();
+        if (s4 !== peg$FAILED) {
           s5 = peg$currPos;
           s6 = peg$currPos;
-          s7 = peg$currPos;
-          if (input.charCodeAt(peg$currPos) === 35) {
-            s8 = peg$c3;
+          s7 = input.charAt(peg$currPos);
+          if (peg$r3.test(s7)) {
             peg$currPos++;
           } else {
-            s8 = peg$FAILED;
+            s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e5);
+              peg$fail(peg$e8);
             }
           }
-          if (s8 !== peg$FAILED) {
-            s9 = [];
-            s10 = input.charAt(peg$currPos);
-            if (peg$r2.test(s10)) {
+          if (s7 !== peg$FAILED) {
+            s8 = [];
+            s9 = input.charAt(peg$currPos);
+            if (peg$r4.test(s9)) {
               peg$currPos++;
             } else {
-              s10 = peg$FAILED;
+              s9 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e7);
+                peg$fail(peg$e9);
               }
             }
-            while (s10 !== peg$FAILED) {
-              s9.push(s10);
-              s10 = input.charAt(peg$currPos);
-              if (peg$r2.test(s10)) {
+            while (s9 !== peg$FAILED) {
+              s8.push(s9);
+              s9 = input.charAt(peg$currPos);
+              if (peg$r4.test(s9)) {
                 peg$currPos++;
               } else {
-                s10 = peg$FAILED;
+                s9 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e7);
+                  peg$fail(peg$e9);
                 }
               }
             }
-            s8 = [s8, s9];
-            s7 = s8;
-          } else {
-            peg$currPos = s7;
-            s7 = peg$FAILED;
-          }
-          if (s7 !== peg$FAILED) {
-            s6 = input.substring(s6, peg$currPos);
-          } else {
+            s7 = [s7, s8];
             s6 = s7;
+          } else {
+            peg$currPos = s6;
+            s6 = peg$FAILED;
           }
           if (s6 !== peg$FAILED) {
+            s5 = input.substring(s5, peg$currPos);
+          } else {
             s5 = s6;
+          }
+          if (s5 !== peg$FAILED) {
+            s3 = s5;
           } else {
-            peg$currPos = s5;
-            s5 = peg$FAILED;
+            peg$currPos = s3;
+            s3 = peg$FAILED;
           }
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
         }
-        if (s5 === peg$FAILED) {
-          s5 = null;
+        while (s3 !== peg$FAILED) {
+          s2.push(s3);
+          s3 = peg$currPos;
+          s4 = peg$parse__();
+          if (s4 !== peg$FAILED) {
+            s5 = peg$currPos;
+            s6 = peg$currPos;
+            s7 = input.charAt(peg$currPos);
+            if (peg$r3.test(s7)) {
+              peg$currPos++;
+            } else {
+              s7 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e8);
+              }
+            }
+            if (s7 !== peg$FAILED) {
+              s8 = [];
+              s9 = input.charAt(peg$currPos);
+              if (peg$r4.test(s9)) {
+                peg$currPos++;
+              } else {
+                s9 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$e9);
+                }
+              }
+              while (s9 !== peg$FAILED) {
+                s8.push(s9);
+                s9 = input.charAt(peg$currPos);
+                if (peg$r4.test(s9)) {
+                  peg$currPos++;
+                } else {
+                  s9 = peg$FAILED;
+                  if (peg$silentFails === 0) {
+                    peg$fail(peg$e9);
+                  }
+                }
+              }
+              s7 = [s7, s8];
+              s6 = s7;
+            } else {
+              peg$currPos = s6;
+              s6 = peg$FAILED;
+            }
+            if (s6 !== peg$FAILED) {
+              s5 = input.substring(s5, peg$currPos);
+            } else {
+              s5 = s6;
+            }
+            if (s5 !== peg$FAILED) {
+              s3 = s5;
+            } else {
+              peg$currPos = s3;
+              s3 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
+          }
         }
-        s6 = peg$parse_();
         peg$savedPos = s0;
-        s0 = peg$f5(s2, s3, s4, s5);
+        s0 = peg$f6(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
       }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
     }
     return s0;
   }
-  __name(peg$parseDecoratorComment, "peg$parseDecoratorComment");
+  __name(peg$parseDecoratorOrText, "peg$parseDecoratorOrText");
   function peg$parseDecorator() {
     let s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
@@ -1244,7 +1386,7 @@ function peg$parse(input, options) {
           s3 = null;
         }
         peg$savedPos = s0;
-        s0 = peg$f6(s2, s3);
+        s0 = peg$f7(s2, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1261,34 +1403,34 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     s2 = input.charAt(peg$currPos);
-    if (peg$r3.test(s2)) {
+    if (peg$r5.test(s2)) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e8);
+        peg$fail(peg$e10);
       }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r4.test(s4)) {
+      if (peg$r6.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e9);
+          peg$fail(peg$e11);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r4.test(s4)) {
+        if (peg$r6.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e9);
+            peg$fail(peg$e11);
           }
         }
       }
@@ -1326,7 +1468,7 @@ function peg$parse(input, options) {
       s2 = peg$parseDecoratorFunctionArgs();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f7(s1, s2);
+        s0 = peg$f8(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1347,7 +1489,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e10);
+        peg$fail(peg$e12);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -1370,7 +1512,7 @@ function peg$parse(input, options) {
           s8 = peg$parseDecoratorFunctionArgValue();
           if (s8 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f8(s6, s8);
+            s5 = peg$f9(s6, s8);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -1397,7 +1539,7 @@ function peg$parse(input, options) {
         } else {
           s8 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e13);
           }
         }
         if (s8 !== peg$FAILED) {
@@ -1425,7 +1567,7 @@ function peg$parse(input, options) {
               s9 = peg$parseDecoratorFunctionArgValue();
               if (s9 !== peg$FAILED) {
                 peg$savedPos = s6;
-                s6 = peg$f8(s7, s9);
+                s6 = peg$f9(s7, s9);
               } else {
                 peg$currPos = s6;
                 s6 = peg$FAILED;
@@ -1468,7 +1610,7 @@ function peg$parse(input, options) {
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e13);
         }
       }
       if (s6 !== peg$FAILED) {
@@ -1488,12 +1630,12 @@ function peg$parse(input, options) {
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e12);
+          peg$fail(peg$e14);
         }
       }
       if (s6 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f9(s3);
+        s0 = peg$f10(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1515,24 +1657,24 @@ function peg$parse(input, options) {
         s1 = peg$currPos;
         s2 = [];
         s3 = input.charAt(peg$currPos);
-        if (peg$r5.test(s3)) {
+        if (peg$r7.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e13);
+            peg$fail(peg$e15);
           }
         }
         if (s3 !== peg$FAILED) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
             s3 = input.charAt(peg$currPos);
-            if (peg$r5.test(s3)) {
+            if (peg$r7.test(s3)) {
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e13);
+                peg$fail(peg$e15);
               }
             }
           }
@@ -1546,7 +1688,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f10();
+          s1 = peg$f11();
         }
         s0 = s1;
       }
@@ -1558,12 +1700,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5, s6;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r6.test(s1)) {
+    if (peg$r8.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e14);
+        peg$fail(peg$e16);
       }
     }
     if (s1 === peg$FAILED) {
@@ -1580,23 +1722,23 @@ function peg$parse(input, options) {
       if (s2 !== peg$FAILED) {
         s3 = [];
         s4 = input.charAt(peg$currPos);
-        if (peg$r6.test(s4)) {
+        if (peg$r8.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e14);
+            peg$fail(peg$e16);
           }
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
           s4 = input.charAt(peg$currPos);
-          if (peg$r6.test(s4)) {
+          if (peg$r8.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e14);
+              peg$fail(peg$e16);
             }
           }
         }
@@ -1612,23 +1754,23 @@ function peg$parse(input, options) {
         if (s4 !== peg$FAILED) {
           s5 = [];
           s6 = input.charAt(peg$currPos);
-          if (peg$r6.test(s6)) {
+          if (peg$r8.test(s6)) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e14);
+              peg$fail(peg$e16);
             }
           }
           while (s6 !== peg$FAILED) {
             s5.push(s6);
             s6 = input.charAt(peg$currPos);
-            if (peg$r6.test(s6)) {
+            if (peg$r8.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e14);
+                peg$fail(peg$e16);
               }
             }
           }
@@ -1646,12 +1788,12 @@ function peg$parse(input, options) {
     while (s1 !== peg$FAILED) {
       s0.push(s1);
       s1 = input.charAt(peg$currPos);
-      if (peg$r6.test(s1)) {
+      if (peg$r8.test(s1)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e14);
+          peg$fail(peg$e16);
         }
       }
       if (s1 === peg$FAILED) {
@@ -1668,23 +1810,23 @@ function peg$parse(input, options) {
         if (s2 !== peg$FAILED) {
           s3 = [];
           s4 = input.charAt(peg$currPos);
-          if (peg$r6.test(s4)) {
+          if (peg$r8.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e14);
+              peg$fail(peg$e16);
             }
           }
           while (s4 !== peg$FAILED) {
             s3.push(s4);
             s4 = input.charAt(peg$currPos);
-            if (peg$r6.test(s4)) {
+            if (peg$r8.test(s4)) {
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e14);
+                peg$fail(peg$e16);
               }
             }
           }
@@ -1700,23 +1842,23 @@ function peg$parse(input, options) {
           if (s4 !== peg$FAILED) {
             s5 = [];
             s6 = input.charAt(peg$currPos);
-            if (peg$r6.test(s6)) {
+            if (peg$r8.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e14);
+                peg$fail(peg$e16);
               }
             }
             while (s6 !== peg$FAILED) {
               s5.push(s6);
               s6 = input.charAt(peg$currPos);
-              if (peg$r6.test(s6)) {
+              if (peg$r8.test(s6)) {
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e14);
+                  peg$fail(peg$e16);
                 }
               }
             }
@@ -1743,7 +1885,7 @@ function peg$parse(input, options) {
       s2 = peg$parseFunctionArgs();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f11(s1, s2);
+        s0 = peg$f12(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1760,34 +1902,34 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     s2 = input.charAt(peg$currPos);
-    if (peg$r3.test(s2)) {
+    if (peg$r5.test(s2)) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e8);
+        peg$fail(peg$e10);
       }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r7.test(s4)) {
+      if (peg$r9.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e15);
+          peg$fail(peg$e17);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r7.test(s4)) {
+        if (peg$r9.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e15);
+            peg$fail(peg$e17);
           }
         }
       }
@@ -1814,7 +1956,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e10);
+        peg$fail(peg$e12);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -1837,7 +1979,7 @@ function peg$parse(input, options) {
           s8 = peg$parseFunctionArgValue();
           if (s8 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f12(s6, s8);
+            s5 = peg$f13(s6, s8);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -1864,7 +2006,7 @@ function peg$parse(input, options) {
         } else {
           s8 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e13);
           }
         }
         if (s8 !== peg$FAILED) {
@@ -1892,7 +2034,7 @@ function peg$parse(input, options) {
               s9 = peg$parseFunctionArgValue();
               if (s9 !== peg$FAILED) {
                 peg$savedPos = s6;
-                s6 = peg$f12(s7, s9);
+                s6 = peg$f13(s7, s9);
               } else {
                 peg$currPos = s6;
                 s6 = peg$FAILED;
@@ -1935,7 +2077,7 @@ function peg$parse(input, options) {
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e13);
         }
       }
       if (s6 !== peg$FAILED) {
@@ -1955,12 +2097,12 @@ function peg$parse(input, options) {
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e12);
+          peg$fail(peg$e14);
         }
       }
       if (s6 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f13(s3);
+        s0 = peg$f14(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1977,34 +2119,34 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = peg$currPos;
     s2 = input.charAt(peg$currPos);
-    if (peg$r3.test(s2)) {
+    if (peg$r5.test(s2)) {
       peg$currPos++;
     } else {
       s2 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e8);
+        peg$fail(peg$e10);
       }
     }
     if (s2 !== peg$FAILED) {
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r7.test(s4)) {
+      if (peg$r9.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e15);
+          peg$fail(peg$e17);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r7.test(s4)) {
+        if (peg$r9.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e15);
+            peg$fail(peg$e17);
           }
         }
       }
@@ -2032,24 +2174,24 @@ function peg$parse(input, options) {
         s1 = peg$currPos;
         s2 = [];
         s3 = input.charAt(peg$currPos);
-        if (peg$r5.test(s3)) {
+        if (peg$r7.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e13);
+            peg$fail(peg$e15);
           }
         }
         if (s3 !== peg$FAILED) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
             s3 = input.charAt(peg$currPos);
-            if (peg$r5.test(s3)) {
+            if (peg$r7.test(s3)) {
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e13);
+                peg$fail(peg$e15);
               }
             }
           }
@@ -2063,7 +2205,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f14();
+          s1 = peg$f15();
         }
         s0 = s1;
       }
@@ -2075,23 +2217,23 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r8.test(s1)) {
+    if (peg$r10.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e16);
+        peg$fail(peg$e18);
       }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
       s1 = input.charAt(peg$currPos);
-      if (peg$r8.test(s1)) {
+      if (peg$r10.test(s1)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e16);
+          peg$fail(peg$e18);
         }
       }
     }
@@ -2119,23 +2261,23 @@ function peg$parse(input, options) {
       s5 = peg$currPos;
       s6 = [];
       s7 = input.charAt(peg$currPos);
-      if (peg$r9.test(s7)) {
+      if (peg$r11.test(s7)) {
         peg$currPos++;
       } else {
         s7 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e17);
+          peg$fail(peg$e19);
         }
       }
       while (s7 !== peg$FAILED) {
         s6.push(s7);
         s7 = input.charAt(peg$currPos);
-        if (peg$r9.test(s7)) {
+        if (peg$r11.test(s7)) {
           peg$currPos++;
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e17);
+            peg$fail(peg$e19);
           }
         }
       }
@@ -2183,7 +2325,7 @@ function peg$parse(input, options) {
         s4 = peg$parse_n();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f15(s2, s3);
+          s0 = peg$f16(s2, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2208,12 +2350,12 @@ function peg$parse(input, options) {
     s4 = peg$currPos;
     peg$silentFails++;
     s5 = input.charAt(peg$currPos);
-    if (peg$r10.test(s5)) {
+    if (peg$r12.test(s5)) {
       peg$currPos++;
     } else {
       s5 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e18);
+        peg$fail(peg$e20);
       }
     }
     peg$silentFails--;
@@ -2226,24 +2368,24 @@ function peg$parse(input, options) {
     if (s4 !== peg$FAILED) {
       s5 = [];
       s6 = input.charAt(peg$currPos);
-      if (peg$r11.test(s6)) {
+      if (peg$r13.test(s6)) {
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e19);
+          peg$fail(peg$e21);
         }
       }
       if (s6 !== peg$FAILED) {
         while (s6 !== peg$FAILED) {
           s5.push(s6);
           s6 = input.charAt(peg$currPos);
-          if (peg$r11.test(s6)) {
+          if (peg$r13.test(s6)) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e19);
+              peg$fail(peg$e21);
             }
           }
         }
@@ -2268,7 +2410,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16();
+      s1 = peg$f17();
     }
     s0 = s1;
     return s0;
@@ -2282,12 +2424,12 @@ function peg$parse(input, options) {
     s3 = peg$currPos;
     peg$silentFails++;
     s4 = input.charAt(peg$currPos);
-    if (peg$r10.test(s4)) {
+    if (peg$r12.test(s4)) {
       peg$currPos++;
     } else {
       s4 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e18);
+        peg$fail(peg$e20);
       }
     }
     peg$silentFails--;
@@ -2300,24 +2442,24 @@ function peg$parse(input, options) {
     if (s3 !== peg$FAILED) {
       s4 = [];
       s5 = input.charAt(peg$currPos);
-      if (peg$r12.test(s5)) {
+      if (peg$r14.test(s5)) {
         peg$currPos++;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e20);
+          peg$fail(peg$e22);
         }
       }
       if (s5 !== peg$FAILED) {
         while (s5 !== peg$FAILED) {
           s4.push(s5);
           s5 = input.charAt(peg$currPos);
-          if (peg$r12.test(s5)) {
+          if (peg$r14.test(s5)) {
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e20);
+              peg$fail(peg$e22);
             }
           }
         }
@@ -2342,7 +2484,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17();
+      s1 = peg$f18();
     }
     s0 = s1;
     return s0;
@@ -2364,12 +2506,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
-    if (peg$r13.test(s1)) {
+    if (peg$r15.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e21);
+        peg$fail(peg$e23);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2380,17 +2522,17 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e22);
+          peg$fail(peg$e24);
         }
       }
       if (s3 === peg$FAILED) {
         s3 = input.charAt(peg$currPos);
-        if (peg$r14.test(s3)) {
+        if (peg$r16.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            peg$fail(peg$e25);
           }
         }
       }
@@ -2402,33 +2544,33 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e22);
+            peg$fail(peg$e24);
           }
         }
         if (s3 === peg$FAILED) {
           s3 = input.charAt(peg$currPos);
-          if (peg$r14.test(s3)) {
+          if (peg$r16.test(s3)) {
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e23);
+              peg$fail(peg$e25);
             }
           }
         }
       }
       s3 = input.charAt(peg$currPos);
-      if (peg$r13.test(s3)) {
+      if (peg$r15.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e21);
+          peg$fail(peg$e23);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f18(s1);
+        s0 = peg$f19(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2444,12 +2586,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
-    if (peg$r15.test(s1)) {
+    if (peg$r17.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e24);
+        peg$fail(peg$e26);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2460,17 +2602,17 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e25);
+          peg$fail(peg$e27);
         }
       }
       if (s3 === peg$FAILED) {
         s3 = input.charAt(peg$currPos);
-        if (peg$r16.test(s3)) {
+        if (peg$r18.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e26);
+            peg$fail(peg$e28);
           }
         }
       }
@@ -2482,33 +2624,33 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e25);
+            peg$fail(peg$e27);
           }
         }
         if (s3 === peg$FAILED) {
           s3 = input.charAt(peg$currPos);
-          if (peg$r16.test(s3)) {
+          if (peg$r18.test(s3)) {
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e26);
+              peg$fail(peg$e28);
             }
           }
         }
       }
       s3 = input.charAt(peg$currPos);
-      if (peg$r15.test(s3)) {
+      if (peg$r17.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e24);
+          peg$fail(peg$e26);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f19(s1);
+        s0 = peg$f20(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2524,12 +2666,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3;
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
-    if (peg$r17.test(s1)) {
+    if (peg$r19.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e27);
+        peg$fail(peg$e29);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2540,17 +2682,17 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e28);
+          peg$fail(peg$e30);
         }
       }
       if (s3 === peg$FAILED) {
         s3 = input.charAt(peg$currPos);
-        if (peg$r18.test(s3)) {
+        if (peg$r20.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e29);
+            peg$fail(peg$e31);
           }
         }
       }
@@ -2562,33 +2704,33 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e28);
+            peg$fail(peg$e30);
           }
         }
         if (s3 === peg$FAILED) {
           s3 = input.charAt(peg$currPos);
-          if (peg$r18.test(s3)) {
+          if (peg$r20.test(s3)) {
             peg$currPos++;
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e29);
+              peg$fail(peg$e31);
             }
           }
         }
       }
       s3 = input.charAt(peg$currPos);
-      if (peg$r17.test(s3)) {
+      if (peg$r19.test(s3)) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e27);
+          peg$fail(peg$e29);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f20(s1);
+        s0 = peg$f21(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2619,12 +2761,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
-    if (peg$r15.test(s1)) {
+    if (peg$r17.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e24);
+        peg$fail(peg$e26);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2637,17 +2779,17 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e25);
+          peg$fail(peg$e27);
         }
       }
       if (s5 === peg$FAILED) {
         s5 = input.charAt(peg$currPos);
-        if (peg$r16.test(s5)) {
+        if (peg$r18.test(s5)) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e26);
+            peg$fail(peg$e28);
           }
         }
       }
@@ -2659,17 +2801,17 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e25);
+            peg$fail(peg$e27);
           }
         }
         if (s5 === peg$FAILED) {
           s5 = input.charAt(peg$currPos);
-          if (peg$r16.test(s5)) {
+          if (peg$r18.test(s5)) {
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e26);
+              peg$fail(peg$e28);
             }
           }
         }
@@ -2701,17 +2843,17 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e25);
+              peg$fail(peg$e27);
             }
           }
           if (s5 === peg$FAILED) {
             s5 = input.charAt(peg$currPos);
-            if (peg$r16.test(s5)) {
+            if (peg$r18.test(s5)) {
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e26);
+                peg$fail(peg$e28);
               }
             }
           }
@@ -2723,17 +2865,17 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e25);
+                peg$fail(peg$e27);
               }
             }
             if (s5 === peg$FAILED) {
               s5 = input.charAt(peg$currPos);
-              if (peg$r16.test(s5)) {
+              if (peg$r18.test(s5)) {
                 peg$currPos++;
               } else {
                 s5 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e26);
+                  peg$fail(peg$e28);
                 }
               }
             }
@@ -2766,17 +2908,17 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e25);
+            peg$fail(peg$e27);
           }
         }
         if (s4 === peg$FAILED) {
           s4 = input.charAt(peg$currPos);
-          if (peg$r16.test(s4)) {
+          if (peg$r18.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e26);
+              peg$fail(peg$e28);
             }
           }
         }
@@ -2788,33 +2930,33 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e25);
+              peg$fail(peg$e27);
             }
           }
           if (s4 === peg$FAILED) {
             s4 = input.charAt(peg$currPos);
-            if (peg$r16.test(s4)) {
+            if (peg$r18.test(s4)) {
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e26);
+                peg$fail(peg$e28);
               }
             }
           }
         }
         s4 = input.charAt(peg$currPos);
-        if (peg$r15.test(s4)) {
+        if (peg$r17.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e24);
+            peg$fail(peg$e26);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f21(s1);
+          s0 = peg$f22(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2834,12 +2976,12 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
     s1 = input.charAt(peg$currPos);
-    if (peg$r13.test(s1)) {
+    if (peg$r15.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e21);
+        peg$fail(peg$e23);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -2852,17 +2994,17 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e22);
+          peg$fail(peg$e24);
         }
       }
       if (s5 === peg$FAILED) {
         s5 = input.charAt(peg$currPos);
-        if (peg$r14.test(s5)) {
+        if (peg$r16.test(s5)) {
           peg$currPos++;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            peg$fail(peg$e25);
           }
         }
       }
@@ -2874,17 +3016,17 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e22);
+            peg$fail(peg$e24);
           }
         }
         if (s5 === peg$FAILED) {
           s5 = input.charAt(peg$currPos);
-          if (peg$r14.test(s5)) {
+          if (peg$r16.test(s5)) {
             peg$currPos++;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e23);
+              peg$fail(peg$e25);
             }
           }
         }
@@ -2916,17 +3058,17 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e22);
+              peg$fail(peg$e24);
             }
           }
           if (s5 === peg$FAILED) {
             s5 = input.charAt(peg$currPos);
-            if (peg$r14.test(s5)) {
+            if (peg$r16.test(s5)) {
               peg$currPos++;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e23);
+                peg$fail(peg$e25);
               }
             }
           }
@@ -2938,17 +3080,17 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e22);
+                peg$fail(peg$e24);
               }
             }
             if (s5 === peg$FAILED) {
               s5 = input.charAt(peg$currPos);
-              if (peg$r14.test(s5)) {
+              if (peg$r16.test(s5)) {
                 peg$currPos++;
               } else {
                 s5 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e23);
+                  peg$fail(peg$e25);
                 }
               }
             }
@@ -2981,17 +3123,17 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e22);
+            peg$fail(peg$e24);
           }
         }
         if (s4 === peg$FAILED) {
           s4 = input.charAt(peg$currPos);
-          if (peg$r14.test(s4)) {
+          if (peg$r16.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e23);
+              peg$fail(peg$e25);
             }
           }
         }
@@ -3003,33 +3145,33 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e22);
+              peg$fail(peg$e24);
             }
           }
           if (s4 === peg$FAILED) {
             s4 = input.charAt(peg$currPos);
-            if (peg$r14.test(s4)) {
+            if (peg$r16.test(s4)) {
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e23);
+                peg$fail(peg$e25);
               }
             }
           }
         }
         s4 = input.charAt(peg$currPos);
-        if (peg$r13.test(s4)) {
+        if (peg$r15.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e21);
+            peg$fail(peg$e23);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f22(s1);
+          s0 = peg$f23(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3054,7 +3196,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e30);
+        peg$fail(peg$e32);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -3067,7 +3209,7 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e31);
+          peg$fail(peg$e33);
         }
       }
       if (s5 === peg$FAILED) {
@@ -3080,7 +3222,7 @@ function peg$parse(input, options) {
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e30);
+            peg$fail(peg$e32);
           }
         }
         peg$silentFails--;
@@ -3120,7 +3262,7 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e31);
+            peg$fail(peg$e33);
           }
         }
         if (s5 === peg$FAILED) {
@@ -3133,7 +3275,7 @@ function peg$parse(input, options) {
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e30);
+              peg$fail(peg$e32);
             }
           }
           peg$silentFails--;
@@ -3193,7 +3335,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e31);
+              peg$fail(peg$e33);
             }
           }
           if (s5 === peg$FAILED) {
@@ -3206,7 +3348,7 @@ function peg$parse(input, options) {
             } else {
               s7 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e30);
+                peg$fail(peg$e32);
               }
             }
             peg$silentFails--;
@@ -3246,7 +3388,7 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e31);
+                peg$fail(peg$e33);
               }
             }
             if (s5 === peg$FAILED) {
@@ -3259,7 +3401,7 @@ function peg$parse(input, options) {
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e30);
+                  peg$fail(peg$e32);
                 }
               }
               peg$silentFails--;
@@ -3320,7 +3462,7 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e31);
+            peg$fail(peg$e33);
           }
         }
         if (s4 === peg$FAILED) {
@@ -3333,7 +3475,7 @@ function peg$parse(input, options) {
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e30);
+              peg$fail(peg$e32);
             }
           }
           peg$silentFails--;
@@ -3373,7 +3515,7 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e31);
+              peg$fail(peg$e33);
             }
           }
           if (s4 === peg$FAILED) {
@@ -3386,7 +3528,7 @@ function peg$parse(input, options) {
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e30);
+                peg$fail(peg$e32);
               }
             }
             peg$silentFails--;
@@ -3425,12 +3567,12 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e30);
+            peg$fail(peg$e32);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f23(s1);
+          s0 = peg$f24(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3455,7 +3597,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e32);
+        peg$fail(peg$e34);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -3468,7 +3610,7 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e33);
+          peg$fail(peg$e35);
         }
       }
       if (s5 === peg$FAILED) {
@@ -3481,7 +3623,7 @@ function peg$parse(input, options) {
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e32);
+            peg$fail(peg$e34);
           }
         }
         peg$silentFails--;
@@ -3521,7 +3663,7 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e33);
+            peg$fail(peg$e35);
           }
         }
         if (s5 === peg$FAILED) {
@@ -3534,7 +3676,7 @@ function peg$parse(input, options) {
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e32);
+              peg$fail(peg$e34);
             }
           }
           peg$silentFails--;
@@ -3594,7 +3736,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e33);
+              peg$fail(peg$e35);
             }
           }
           if (s5 === peg$FAILED) {
@@ -3607,7 +3749,7 @@ function peg$parse(input, options) {
             } else {
               s7 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e32);
+                peg$fail(peg$e34);
               }
             }
             peg$silentFails--;
@@ -3647,7 +3789,7 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e33);
+                peg$fail(peg$e35);
               }
             }
             if (s5 === peg$FAILED) {
@@ -3660,7 +3802,7 @@ function peg$parse(input, options) {
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e32);
+                  peg$fail(peg$e34);
                 }
               }
               peg$silentFails--;
@@ -3721,7 +3863,7 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e33);
+            peg$fail(peg$e35);
           }
         }
         if (s4 === peg$FAILED) {
@@ -3734,7 +3876,7 @@ function peg$parse(input, options) {
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e32);
+              peg$fail(peg$e34);
             }
           }
           peg$silentFails--;
@@ -3774,7 +3916,7 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e33);
+              peg$fail(peg$e35);
             }
           }
           if (s4 === peg$FAILED) {
@@ -3787,7 +3929,7 @@ function peg$parse(input, options) {
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e32);
+                peg$fail(peg$e34);
               }
             }
             peg$silentFails--;
@@ -3826,12 +3968,12 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e32);
+            peg$fail(peg$e34);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f24(s1);
+          s0 = peg$f25(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3867,7 +4009,7 @@ function peg$parse(input, options) {
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e34);
+          peg$fail(peg$e36);
         }
       }
       peg$silentFails--;
@@ -3885,23 +4027,23 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r6.test(s1)) {
+    if (peg$r8.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e14);
+        peg$fail(peg$e16);
       }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
       s1 = input.charAt(peg$currPos);
-      if (peg$r6.test(s1)) {
+      if (peg$r8.test(s1)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e14);
+          peg$fail(peg$e16);
         }
       }
     }
@@ -3912,24 +4054,24 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r6.test(s1)) {
+    if (peg$r8.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e14);
+        peg$fail(peg$e16);
       }
     }
     if (s1 !== peg$FAILED) {
       while (s1 !== peg$FAILED) {
         s0.push(s1);
         s1 = input.charAt(peg$currPos);
-        if (peg$r6.test(s1)) {
+        if (peg$r8.test(s1)) {
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e14);
+            peg$fail(peg$e16);
           }
         }
       }