varlock 1.2.0 → 1.4.0

package/dist/{chunk-6CRDPEUT.js → chunk-PBWMMYWL.js}

@@ -1,6 +1,6 @@
 import { getUserVarlockDir, isWSL } from './chunk-O3WTD6L4.js';
 import { q, X, ut, nt, ot } from './chunk-IRXBCLL2.js';
-import { my_dash_default, SchemaError, createDebug, ResolutionError, CoercionError, ValidationError, activatePlugin, deactivatePlugin, VarlockError, EmptyRequiredValueError, ParseError, pluginProxy } from './chunk-6CCHLM3U.js';
+import { my_dash_default, SchemaError, ResolutionError, createDebug, CoercionError, ValidationError, activatePlugin, LoadingError, VarlockError, deactivatePlugin, ParseError, EmptyRequiredValueError, pluginProxy } from './chunk-FA5SNEKN.js';
 import { __commonJS, __name, __toESM } from './chunk-6PEHRAEP.js';
 import { exec, spawn } from 'child_process';
 import { promisify } from 'util';
@@ -1984,7 +1984,7 @@ var require_semver2 = __commonJS({
   }
 });
 
-// ../env-spec-parser/dist/chunk-AVMDB47P.mjs
+// ../env-spec-parser/dist/chunk-5ODZC3GU.mjs
 var __defProp = Object.defineProperty;
 var __name2 = /* @__PURE__ */ __name((target, value) => __defProp(target, "name", { value, configurable: true }), "__name");
 var VALID_NUMBER_REGEX = /^-?(0|([1-9][0-9]*))?(\.[0-9]+)?$/;
@@ -2142,9 +2142,9 @@ var ParsedEnvSpecFunctionCall = class {
     return this.data.name + this.data.args.toString();
   }
 };
-var ParsedEnvSpecDecorator = class {
+var ParsedEnvSpecDecorator = class _ParsedEnvSpecDecorator {
   static {
-    __name(this, "ParsedEnvSpecDecorator");
+    __name(this, "_ParsedEnvSpecDecorator");
   }
   constructor(data) {
     this.data = data;
@@ -2162,9 +2162,16 @@ var ParsedEnvSpecDecorator = class {
     __name2(this, "ParsedEnvSpecDecorator");
   }
   value;
+  static VALID_NAME_RE = /^[a-zA-Z][a-zA-Z0-9_]*$/;
   get name() {
     return this.data.name;
   }
+  get hasInvalidName() {
+    return !_ParsedEnvSpecDecorator.VALID_NAME_RE.test(this.data.name);
+  }
+  get strayText() {
+    return this.data.strayText;
+  }
   get isBareFnCall() {
     return !!this.data.isBareFnCall;
   }
@@ -2816,36 +2823,37 @@ function peg$parse(input, options) {
   const peg$c2 = "=";
   const peg$c3 = "#";
   const peg$c4 = "@";
-  const peg$c5 = ":";
-  const peg$c6 = "(";
-  const peg$c7 = ",";
-  const peg$c8 = ")";
-  const peg$c9 = '\\"';
-  const peg$c10 = "\\'";
-  const peg$c11 = "\\`";
-  const peg$c12 = '"""';
-  const peg$c13 = '\\"""';
-  const peg$c14 = "```";
-  const peg$c15 = "\\```";
+  const peg$c5 = "(";
+  const peg$c6 = ",";
+  const peg$c7 = ")";
+  const peg$c8 = '\\"';
+  const peg$c9 = "\\'";
+  const peg$c10 = "\\`";
+  const peg$c11 = '"""';
+  const peg$c12 = '\\"""';
+  const peg$c13 = "```";
+  const peg$c14 = "\\```";
   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 = /^[@#]/;
-  const peg$r5 = /^[a-zA-Z0-9_]/;
-  const peg$r6 = /^[^ \n,)]/;
-  const peg$r7 = /^[ \t]/;
-  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);
@@ -2854,34 +2862,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$literalExpectation(":", false);
-  const peg$e10 = peg$classExpectation(["@", "#"], false, false, false);
-  const peg$e11 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_"], false, false, false);
+  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([" ", "	", "\n"], false, false, false);
-  const peg$e18 = peg$classExpectation(["-", "=", "*", "#"], false, false, false);
-  const peg$e19 = peg$classExpectation(["'", '"', "`"], false, false, false);
-  const peg$e20 = peg$classExpectation(["#", "\n"], true, false, false);
-  const peg$e21 = peg$classExpectation(["#", " ", "\n"], true, false, false);
-  const peg$e22 = peg$classExpectation(['"'], false, false, false);
-  const peg$e23 = peg$literalExpectation('\\"', false);
-  const peg$e24 = peg$classExpectation(['"', "\n"], true, false, false);
-  const peg$e25 = peg$classExpectation(["'"], false, false, false);
-  const peg$e26 = peg$literalExpectation("\\'", false);
-  const peg$e27 = peg$classExpectation(["'", "\n"], true, false, false);
-  const peg$e28 = peg$classExpectation(["`"], false, false, false);
-  const peg$e29 = peg$literalExpectation("\\`", false);
-  const peg$e30 = peg$classExpectation(["`", "\n"], true, false, false);
-  const peg$e31 = peg$literalExpectation('"""', false);
-  const peg$e32 = peg$literalExpectation('\\"""', false);
-  const peg$e33 = peg$literalExpectation("```", false);
-  const peg$e34 = peg$literalExpectation("\\```", false);
-  const peg$e35 = peg$anyExpectation();
+  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() });
   }
@@ -2921,19 +2930,29 @@ function peg$parse(input, options) {
   }
   __name(peg$f4, "peg$f4");
   __name2(peg$f4, "peg$f4");
-  function peg$f5(leadingSpace, contents) {
-    return new ParsedEnvSpecComment({ contents, leadingSpace, _location: location() });
-  }
-  __name(peg$f5, "peg$f5");
-  __name2(peg$f5, "peg$f5");
-  function peg$f6(leadingSpace, first, rest, postComment) {
+  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 {
+        lastDecorator.data.strayText = item;
+      }
+    }
     return new ParsedEnvSpecDecoratorComment({
-      decorators: [first, ...rest],
+      decorators: allDecorators,
       leadingSpace,
       postComment,
       _location: location()
     });
   }
+  __name(peg$f5, "peg$f5");
+  __name2(peg$f5, "peg$f5");
+  function peg$f6(first, rest) {
+    return [first, ...rest].join(" ");
+  }
   __name(peg$f6, "peg$f6");
   __name2(peg$f6, "peg$f6");
   function peg$f7(name, val) {
@@ -3292,12 +3311,9 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = [];
     s2 = peg$currPos;
-    s3 = peg$parseIgnoredDecoratorComment();
+    s3 = peg$parseDecoratorComment();
     if (s3 === peg$FAILED) {
-      s3 = peg$parseDecoratorComment();
-      if (s3 === peg$FAILED) {
-        s3 = peg$parseComment();
-      }
+      s3 = peg$parseComment();
     }
     if (s3 !== peg$FAILED) {
       if (input.charCodeAt(peg$currPos) === 10) {
@@ -3322,12 +3338,9 @@ function peg$parse(input, options) {
     while (s2 !== peg$FAILED) {
       s1.push(s2);
       s2 = peg$currPos;
-      s3 = peg$parseIgnoredDecoratorComment();
+      s3 = peg$parseDecoratorComment();
       if (s3 === peg$FAILED) {
-        s3 = peg$parseDecoratorComment();
-        if (s3 === peg$FAILED) {
-          s3 = peg$parseComment();
-        }
+        s3 = peg$parseComment();
       }
       if (s3 !== peg$FAILED) {
         if (input.charCodeAt(peg$currPos) === 10) {
@@ -3392,12 +3405,9 @@ function peg$parse(input, options) {
         }
         peg$parse_();
         s9 = peg$currPos;
-        s10 = peg$parseIgnoredDecoratorComment();
+        s10 = peg$parseDecoratorComment();
         if (s10 === peg$FAILED) {
-          s10 = peg$parseDecoratorComment();
-          if (s10 === peg$FAILED) {
-            s10 = peg$parseComment();
-          }
+          s10 = peg$parseComment();
         }
         if (s10 !== peg$FAILED) {
           s9 = s10;
@@ -3500,12 +3510,9 @@ function peg$parse(input, options) {
     s0 = peg$currPos;
     s1 = [];
     s2 = peg$currPos;
-    s3 = peg$parseIgnoredDecoratorComment();
+    s3 = peg$parseDecoratorComment();
     if (s3 === peg$FAILED) {
-      s3 = peg$parseDecoratorComment();
-      if (s3 === peg$FAILED) {
-        s3 = peg$parseComment();
-      }
+      s3 = peg$parseComment();
     }
     if (s3 !== peg$FAILED) {
       s4 = peg$parse_n();
@@ -3523,12 +3530,9 @@ function peg$parse(input, options) {
       while (s2 !== peg$FAILED) {
         s1.push(s2);
         s2 = peg$currPos;
-        s3 = peg$parseIgnoredDecoratorComment();
+        s3 = peg$parseDecoratorComment();
         if (s3 === peg$FAILED) {
-          s3 = peg$parseDecoratorComment();
-          if (s3 === peg$FAILED) {
-            s3 = peg$parseComment();
-          }
+          s3 = peg$parseComment();
         }
         if (s3 !== peg$FAILED) {
           s4 = peg$parse_n();
@@ -3662,8 +3666,8 @@ function peg$parse(input, options) {
   }
   __name(peg$parseComment, "peg$parseComment");
   __name2(peg$parseComment, "peg$parseComment");
-  function peg$parseIgnoredDecoratorComment() {
-    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
+  function peg$parseDecoratorComment() {
+    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;
@@ -3678,104 +3682,168 @@ function peg$parse(input, options) {
       s2 = peg$currPos;
       s3 = peg$parse_();
       s2 = input.substring(s2, peg$currPos);
-      s3 = peg$currPos;
-      s4 = peg$currPos;
-      if (input.charCodeAt(peg$currPos) === 64) {
-        s5 = peg$c4;
-        peg$currPos++;
-      } else {
-        s5 = peg$FAILED;
-        if (peg$silentFails === 0) {
-          peg$fail(peg$e6);
-        }
-      }
-      if (s5 !== peg$FAILED) {
-        s6 = [];
-        s7 = input.charAt(peg$currPos);
-        if (peg$r3.test(s7)) {
-          peg$currPos++;
-        } else {
-          s7 = peg$FAILED;
-          if (peg$silentFails === 0) {
-            peg$fail(peg$e8);
+      s3 = peg$parseDecorator();
+      if (s3 !== peg$FAILED) {
+        s4 = [];
+        s5 = peg$currPos;
+        s6 = peg$parse__();
+        if (s6 !== peg$FAILED) {
+          s7 = peg$parseDecoratorOrText();
+          if (s7 !== peg$FAILED) {
+            s5 = s7;
+          } else {
+            peg$currPos = s5;
+            s5 = peg$FAILED;
           }
+        } else {
+          peg$currPos = s5;
+          s5 = peg$FAILED;
         }
-        if (s7 !== peg$FAILED) {
-          while (s7 !== peg$FAILED) {
-            s6.push(s7);
-            s7 = input.charAt(peg$currPos);
-            if (peg$r3.test(s7)) {
-              peg$currPos++;
+        while (s5 !== peg$FAILED) {
+          s4.push(s5);
+          s5 = peg$currPos;
+          s6 = peg$parse__();
+          if (s6 !== peg$FAILED) {
+            s7 = peg$parseDecoratorOrText();
+            if (s7 !== peg$FAILED) {
+              s5 = s7;
             } else {
-              s7 = peg$FAILED;
-              if (peg$silentFails === 0) {
-                peg$fail(peg$e8);
-              }
+              peg$currPos = s5;
+              s5 = peg$FAILED;
             }
+          } else {
+            peg$currPos = s5;
+            s5 = peg$FAILED;
           }
+        }
+        s5 = peg$currPos;
+        s6 = peg$parse_();
+        s7 = peg$currPos;
+        s8 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 35) {
+          s9 = peg$c3;
+          peg$currPos++;
         } else {
-          s6 = peg$FAILED;
+          s9 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e5);
+          }
         }
-        if (s6 !== peg$FAILED) {
-          if (input.charCodeAt(peg$currPos) === 58) {
-            s7 = peg$c5;
+        if (s9 !== peg$FAILED) {
+          s10 = [];
+          s11 = input.charAt(peg$currPos);
+          if (peg$r2.test(s11)) {
             peg$currPos++;
           } else {
-            s7 = peg$FAILED;
+            s11 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e9);
+              peg$fail(peg$e7);
             }
           }
-          if (s7 !== peg$FAILED) {
-            s8 = [];
-            s9 = input.charAt(peg$currPos);
-            if (peg$r2.test(s9)) {
+          while (s11 !== peg$FAILED) {
+            s10.push(s11);
+            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);
               }
             }
-            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);
-                }
-              }
-            }
-            s5 = [s5, s6, s7, s8];
-            s4 = s5;
-          } else {
-            peg$currPos = s4;
-            s4 = peg$FAILED;
           }
+          s9 = [s9, s10];
+          s8 = s9;
         } else {
-          peg$currPos = s4;
-          s4 = peg$FAILED;
+          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 = s4;
-        s4 = peg$FAILED;
+        peg$currPos = s0;
+        s0 = peg$FAILED;
       }
-      if (s4 === peg$FAILED) {
-        s4 = peg$currPos;
-        if (input.charCodeAt(peg$currPos) === 64) {
-          s5 = peg$c4;
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    return s0;
+  }
+  __name(peg$parseDecoratorComment, "peg$parseDecoratorComment");
+  __name2(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$e6);
+            peg$fail(peg$e9);
           }
         }
-        if (s5 !== peg$FAILED) {
-          s6 = [];
+        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 = input.charAt(peg$currPos);
           if (peg$r3.test(s7)) {
             peg$currPos++;
@@ -3786,213 +3854,121 @@ function peg$parse(input, options) {
             }
           }
           if (s7 !== peg$FAILED) {
-            while (s7 !== peg$FAILED) {
-              s6.push(s7);
-              s7 = input.charAt(peg$currPos);
-              if (peg$r3.test(s7)) {
+            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 {
-                s7 = peg$FAILED;
+                s9 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e8);
+                  peg$fail(peg$e9);
                 }
               }
             }
+            s7 = [s7, s8];
+            s6 = s7;
           } else {
+            peg$currPos = s6;
             s6 = peg$FAILED;
           }
           if (s6 !== peg$FAILED) {
-            s7 = peg$parse__();
+            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;
+        }
+        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 = peg$currPos;
-              peg$silentFails++;
+              s8 = [];
               s9 = input.charAt(peg$currPos);
               if (peg$r4.test(s9)) {
                 peg$currPos++;
               } else {
                 s9 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e10);
+                  peg$fail(peg$e9);
                 }
               }
-              peg$silentFails--;
-              if (s9 === peg$FAILED) {
-                s8 = void 0;
-              } else {
-                peg$currPos = s8;
-                s8 = peg$FAILED;
-              }
-              if (s8 !== peg$FAILED) {
-                s9 = [];
-                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);
                   }
                 }
-                while (s10 !== peg$FAILED) {
-                  s9.push(s10);
-                  s10 = input.charAt(peg$currPos);
-                  if (peg$r2.test(s10)) {
-                    peg$currPos++;
-                  } else {
-                    s10 = peg$FAILED;
-                    if (peg$silentFails === 0) {
-                      peg$fail(peg$e7);
-                    }
-                  }
-                }
-                s5 = [s5, s6, s7, s8, s9];
-                s4 = s5;
-              } else {
-                peg$currPos = s4;
-                s4 = peg$FAILED;
               }
+              s7 = [s7, s8];
+              s6 = s7;
             } else {
-              peg$currPos = s4;
-              s4 = peg$FAILED;
+              peg$currPos = s6;
+              s6 = peg$FAILED;
             }
-          } else {
-            peg$currPos = s4;
-            s4 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s4;
-          s4 = peg$FAILED;
-        }
-      }
-      if (s4 !== peg$FAILED) {
-        s3 = input.substring(s3, peg$currPos);
-      } else {
-        s3 = s4;
-      }
-      if (s3 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f5(s2, s3);
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-    return s0;
-  }
-  __name(peg$parseIgnoredDecoratorComment, "peg$parseIgnoredDecoratorComment");
-  __name2(peg$parseIgnoredDecoratorComment, "peg$parseIgnoredDecoratorComment");
-  function peg$parseDecoratorComment() {
-    let s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10;
-    s0 = peg$currPos;
-    if (input.charCodeAt(peg$currPos) === 35) {
-      s1 = peg$c3;
-      peg$currPos++;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) {
-        peg$fail(peg$e5);
-      }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$currPos;
-      s3 = peg$parse_();
-      s2 = input.substring(s2, peg$currPos);
-      s3 = peg$parseDecorator();
-      if (s3 !== peg$FAILED) {
-        s4 = [];
-        s5 = peg$currPos;
-        s6 = peg$parse__();
-        if (s6 !== peg$FAILED) {
-          s7 = peg$parseDecorator();
-          if (s7 !== peg$FAILED) {
-            s5 = s7;
-          } else {
-            peg$currPos = s5;
-            s5 = peg$FAILED;
-          }
-        } else {
-          peg$currPos = s5;
-          s5 = peg$FAILED;
-        }
-        while (s5 !== peg$FAILED) {
-          s4.push(s5);
-          s5 = peg$currPos;
-          s6 = peg$parse__();
-          if (s6 !== peg$FAILED) {
-            s7 = peg$parseDecorator();
-            if (s7 !== peg$FAILED) {
-              s5 = s7;
+            if (s6 !== peg$FAILED) {
+              s5 = input.substring(s5, peg$currPos);
             } else {
-              peg$currPos = s5;
-              s5 = peg$FAILED;
-            }
-          } else {
-            peg$currPos = s5;
-            s5 = peg$FAILED;
-          }
-        }
-        s5 = peg$parse_();
-        s6 = peg$currPos;
-        s7 = peg$currPos;
-        if (input.charCodeAt(peg$currPos) === 35) {
-          s8 = peg$c3;
-          peg$currPos++;
-        } else {
-          s8 = peg$FAILED;
-          if (peg$silentFails === 0) {
-            peg$fail(peg$e5);
-          }
-        }
-        if (s8 !== peg$FAILED) {
-          s9 = [];
-          s10 = input.charAt(peg$currPos);
-          if (peg$r2.test(s10)) {
-            peg$currPos++;
-          } else {
-            s10 = peg$FAILED;
-            if (peg$silentFails === 0) {
-              peg$fail(peg$e7);
+              s5 = s6;
             }
-          }
-          while (s10 !== peg$FAILED) {
-            s9.push(s10);
-            s10 = input.charAt(peg$currPos);
-            if (peg$r2.test(s10)) {
-              peg$currPos++;
+            if (s5 !== peg$FAILED) {
+              s3 = s5;
             } else {
-              s10 = peg$FAILED;
-              if (peg$silentFails === 0) {
-                peg$fail(peg$e7);
-              }
+              peg$currPos = s3;
+              s3 = peg$FAILED;
             }
+          } else {
+            peg$currPos = s3;
+            s3 = peg$FAILED;
           }
-          s8 = [s8, s9];
-          s7 = s8;
-        } else {
-          peg$currPos = s7;
-          s7 = peg$FAILED;
-        }
-        if (s7 === peg$FAILED) {
-          s7 = null;
         }
-        s6 = input.substring(s6, peg$currPos);
         peg$savedPos = s0;
-        s0 = peg$f6(s2, s3, s4, s6);
+        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");
-  __name2(peg$parseDecoratorComment, "peg$parseDecoratorComment");
+  __name(peg$parseDecoratorOrText, "peg$parseDecoratorOrText");
+  __name2(peg$parseDecoratorOrText, "peg$parseDecoratorOrText");
   function peg$parseDecorator() {
     let s0, s1, s2, s3, s4, s5;
     s0 = peg$currPos;
@@ -4056,18 +4032,18 @@ 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$r5.test(s4)) {
+      if (peg$r6.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
@@ -4078,7 +4054,7 @@ function peg$parse(input, options) {
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r5.test(s4)) {
+        if (peg$r6.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
@@ -4140,7 +4116,7 @@ function peg$parse(input, options) {
     let s0, s1, s3, s4, s5, s6, s7, s8, s9;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c6;
+      s1 = peg$c5;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
@@ -4190,7 +4166,7 @@ function peg$parse(input, options) {
         s6 = peg$currPos;
         s7 = peg$parse_decWs();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s8 = peg$c7;
+          s8 = peg$c6;
           peg$currPos++;
         } else {
           s8 = peg$FAILED;
@@ -4261,7 +4237,7 @@ function peg$parse(input, options) {
       s4 = peg$currPos;
       s5 = peg$parse_decWs();
       if (input.charCodeAt(peg$currPos) === 44) {
-        s6 = peg$c7;
+        s6 = peg$c6;
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
@@ -4281,7 +4257,7 @@ function peg$parse(input, options) {
       }
       s5 = peg$parse_decWs();
       if (input.charCodeAt(peg$currPos) === 41) {
-        s6 = peg$c8;
+        s6 = peg$c7;
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
@@ -4314,7 +4290,7 @@ function peg$parse(input, options) {
         s1 = peg$currPos;
         s2 = [];
         s3 = input.charAt(peg$currPos);
-        if (peg$r6.test(s3)) {
+        if (peg$r7.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
@@ -4326,7 +4302,7 @@ function peg$parse(input, options) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
             s3 = input.charAt(peg$currPos);
-            if (peg$r6.test(s3)) {
+            if (peg$r7.test(s3)) {
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
@@ -4358,7 +4334,7 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3, s4, s5, s6;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r7.test(s1)) {
+    if (peg$r8.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
@@ -4380,7 +4356,7 @@ function peg$parse(input, options) {
       if (s2 !== peg$FAILED) {
         s3 = [];
         s4 = input.charAt(peg$currPos);
-        if (peg$r7.test(s4)) {
+        if (peg$r8.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
@@ -4391,7 +4367,7 @@ function peg$parse(input, options) {
         while (s4 !== peg$FAILED) {
           s3.push(s4);
           s4 = input.charAt(peg$currPos);
-          if (peg$r7.test(s4)) {
+          if (peg$r8.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
@@ -4412,7 +4388,7 @@ function peg$parse(input, options) {
         if (s4 !== peg$FAILED) {
           s5 = [];
           s6 = input.charAt(peg$currPos);
-          if (peg$r7.test(s6)) {
+          if (peg$r8.test(s6)) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
@@ -4423,7 +4399,7 @@ function peg$parse(input, options) {
           while (s6 !== peg$FAILED) {
             s5.push(s6);
             s6 = input.charAt(peg$currPos);
-            if (peg$r7.test(s6)) {
+            if (peg$r8.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
@@ -4446,7 +4422,7 @@ function peg$parse(input, options) {
     while (s1 !== peg$FAILED) {
       s0.push(s1);
       s1 = input.charAt(peg$currPos);
-      if (peg$r7.test(s1)) {
+      if (peg$r8.test(s1)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
@@ -4468,7 +4444,7 @@ function peg$parse(input, options) {
         if (s2 !== peg$FAILED) {
           s3 = [];
           s4 = input.charAt(peg$currPos);
-          if (peg$r7.test(s4)) {
+          if (peg$r8.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
@@ -4479,7 +4455,7 @@ function peg$parse(input, options) {
           while (s4 !== peg$FAILED) {
             s3.push(s4);
             s4 = input.charAt(peg$currPos);
-            if (peg$r7.test(s4)) {
+            if (peg$r8.test(s4)) {
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
@@ -4500,7 +4476,7 @@ function peg$parse(input, options) {
           if (s4 !== peg$FAILED) {
             s5 = [];
             s6 = input.charAt(peg$currPos);
-            if (peg$r7.test(s6)) {
+            if (peg$r8.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
@@ -4511,7 +4487,7 @@ function peg$parse(input, options) {
             while (s6 !== peg$FAILED) {
               s5.push(s6);
               s6 = input.charAt(peg$currPos);
-              if (peg$r7.test(s6)) {
+              if (peg$r8.test(s6)) {
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
@@ -4562,34 +4538,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$r5.test(s4)) {
+      if (peg$r9.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e17);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r5.test(s4)) {
+        if (peg$r9.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e17);
           }
         }
       }
@@ -4612,7 +4588,7 @@ function peg$parse(input, options) {
     let s0, s1, s3, s4, s5, s6, s7, s8, s9;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 40) {
-      s1 = peg$c6;
+      s1 = peg$c5;
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
@@ -4662,7 +4638,7 @@ function peg$parse(input, options) {
         s6 = peg$currPos;
         s7 = peg$parse_valWs();
         if (input.charCodeAt(peg$currPos) === 44) {
-          s8 = peg$c7;
+          s8 = peg$c6;
           peg$currPos++;
         } else {
           s8 = peg$FAILED;
@@ -4733,7 +4709,7 @@ function peg$parse(input, options) {
       s4 = peg$currPos;
       s5 = peg$parse_valWs();
       if (input.charCodeAt(peg$currPos) === 44) {
-        s6 = peg$c7;
+        s6 = peg$c6;
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
@@ -4753,7 +4729,7 @@ function peg$parse(input, options) {
       }
       s5 = peg$parse_valWs();
       if (input.charCodeAt(peg$currPos) === 41) {
-        s6 = peg$c8;
+        s6 = peg$c7;
         peg$currPos++;
       } else {
         s6 = peg$FAILED;
@@ -4781,34 +4757,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$r5.test(s4)) {
+      if (peg$r9.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e17);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r5.test(s4)) {
+        if (peg$r9.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e17);
           }
         }
       }
@@ -4837,7 +4813,7 @@ function peg$parse(input, options) {
         s1 = peg$currPos;
         s2 = [];
         s3 = input.charAt(peg$currPos);
-        if (peg$r6.test(s3)) {
+        if (peg$r7.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
@@ -4849,7 +4825,7 @@ function peg$parse(input, options) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
             s3 = input.charAt(peg$currPos);
-            if (peg$r6.test(s3)) {
+            if (peg$r7.test(s3)) {
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
@@ -4881,23 +4857,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$e17);
+        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$e17);
+          peg$fail(peg$e18);
         }
       }
     }
@@ -4926,23 +4902,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$e18);
+          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$e18);
+            peg$fail(peg$e19);
           }
         }
       }
@@ -5016,12 +4992,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$e19);
+        peg$fail(peg$e20);
       }
     }
     peg$silentFails--;
@@ -5034,24 +5010,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$e20);
+          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$e20);
+              peg$fail(peg$e21);
             }
           }
         }
@@ -5091,12 +5067,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$e19);
+        peg$fail(peg$e20);
       }
     }
     peg$silentFails--;
@@ -5109,24 +5085,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$e21);
+          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$e21);
+              peg$fail(peg$e22);
             }
           }
         }
@@ -5175,66 +5151,66 @@ 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$e22);
+        peg$fail(peg$e23);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
-      if (input.substr(peg$currPos, 2) === peg$c9) {
-        s3 = peg$c9;
+      if (input.substr(peg$currPos, 2) === peg$c8) {
+        s3 = peg$c8;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e23);
+          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$e24);
+            peg$fail(peg$e25);
           }
         }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
-        if (input.substr(peg$currPos, 2) === peg$c9) {
-          s3 = peg$c9;
+        if (input.substr(peg$currPos, 2) === peg$c8) {
+          s3 = peg$c8;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            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$e24);
+              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$e22);
+          peg$fail(peg$e23);
         }
       }
       if (s3 !== peg$FAILED) {
@@ -5256,66 +5232,66 @@ 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$e25);
+        peg$fail(peg$e26);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
-      if (input.substr(peg$currPos, 2) === peg$c10) {
-        s3 = peg$c10;
+      if (input.substr(peg$currPos, 2) === peg$c9) {
+        s3 = peg$c9;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e26);
+          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$e27);
+            peg$fail(peg$e28);
           }
         }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
-        if (input.substr(peg$currPos, 2) === peg$c10) {
-          s3 = peg$c10;
+        if (input.substr(peg$currPos, 2) === peg$c9) {
+          s3 = peg$c9;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e26);
+            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$e27);
+              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$e25);
+          peg$fail(peg$e26);
         }
       }
       if (s3 !== peg$FAILED) {
@@ -5337,66 +5313,66 @@ 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$e28);
+        peg$fail(peg$e29);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
-      if (input.substr(peg$currPos, 2) === peg$c11) {
-        s3 = peg$c11;
+      if (input.substr(peg$currPos, 2) === peg$c10) {
+        s3 = peg$c10;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e29);
+          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$e30);
+            peg$fail(peg$e31);
           }
         }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
-        if (input.substr(peg$currPos, 2) === peg$c11) {
-          s3 = peg$c11;
+        if (input.substr(peg$currPos, 2) === peg$c10) {
+          s3 = peg$c10;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e29);
+            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$e30);
+              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$e28);
+          peg$fail(peg$e29);
         }
       }
       if (s3 !== peg$FAILED) {
@@ -5434,57 +5410,57 @@ 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$e25);
+        peg$fail(peg$e26);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
       s4 = [];
-      if (input.substr(peg$currPos, 2) === peg$c10) {
-        s5 = peg$c10;
+      if (input.substr(peg$currPos, 2) === peg$c9) {
+        s5 = peg$c9;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e26);
+          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$e27);
+            peg$fail(peg$e28);
           }
         }
       }
       while (s5 !== peg$FAILED) {
         s4.push(s5);
-        if (input.substr(peg$currPos, 2) === peg$c10) {
-          s5 = peg$c10;
+        if (input.substr(peg$currPos, 2) === peg$c9) {
+          s5 = peg$c9;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e26);
+            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$e27);
+              peg$fail(peg$e28);
             }
           }
         }
@@ -5510,45 +5486,45 @@ function peg$parse(input, options) {
           s2.push(s3);
           s3 = peg$currPos;
           s4 = [];
-          if (input.substr(peg$currPos, 2) === peg$c10) {
-            s5 = peg$c10;
+          if (input.substr(peg$currPos, 2) === peg$c9) {
+            s5 = peg$c9;
             peg$currPos += 2;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e26);
+              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$e27);
+                peg$fail(peg$e28);
               }
             }
           }
           while (s5 !== peg$FAILED) {
             s4.push(s5);
-            if (input.substr(peg$currPos, 2) === peg$c10) {
-              s5 = peg$c10;
+            if (input.substr(peg$currPos, 2) === peg$c9) {
+              s5 = peg$c9;
               peg$currPos += 2;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e26);
+                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$e27);
+                  peg$fail(peg$e28);
                 }
               }
             }
@@ -5575,56 +5551,56 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         s3 = [];
-        if (input.substr(peg$currPos, 2) === peg$c10) {
-          s4 = peg$c10;
+        if (input.substr(peg$currPos, 2) === peg$c9) {
+          s4 = peg$c9;
           peg$currPos += 2;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e26);
+            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$e27);
+              peg$fail(peg$e28);
             }
           }
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
-          if (input.substr(peg$currPos, 2) === peg$c10) {
-            s4 = peg$c10;
+          if (input.substr(peg$currPos, 2) === peg$c9) {
+            s4 = peg$c9;
             peg$currPos += 2;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e26);
+              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$e27);
+                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$e25);
+            peg$fail(peg$e26);
           }
         }
         if (s4 !== peg$FAILED) {
@@ -5650,57 +5626,57 @@ 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$e22);
+        peg$fail(peg$e23);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
       s4 = [];
-      if (input.substr(peg$currPos, 2) === peg$c9) {
-        s5 = peg$c9;
+      if (input.substr(peg$currPos, 2) === peg$c8) {
+        s5 = peg$c8;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e23);
+          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$e24);
+            peg$fail(peg$e25);
           }
         }
       }
       while (s5 !== peg$FAILED) {
         s4.push(s5);
-        if (input.substr(peg$currPos, 2) === peg$c9) {
-          s5 = peg$c9;
+        if (input.substr(peg$currPos, 2) === peg$c8) {
+          s5 = peg$c8;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            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$e24);
+              peg$fail(peg$e25);
             }
           }
         }
@@ -5726,45 +5702,45 @@ function peg$parse(input, options) {
           s2.push(s3);
           s3 = peg$currPos;
           s4 = [];
-          if (input.substr(peg$currPos, 2) === peg$c9) {
-            s5 = peg$c9;
+          if (input.substr(peg$currPos, 2) === peg$c8) {
+            s5 = peg$c8;
             peg$currPos += 2;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e23);
+              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$e24);
+                peg$fail(peg$e25);
               }
             }
           }
           while (s5 !== peg$FAILED) {
             s4.push(s5);
-            if (input.substr(peg$currPos, 2) === peg$c9) {
-              s5 = peg$c9;
+            if (input.substr(peg$currPos, 2) === peg$c8) {
+              s5 = peg$c8;
               peg$currPos += 2;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e23);
+                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$e24);
+                  peg$fail(peg$e25);
                 }
               }
             }
@@ -5791,56 +5767,56 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         s3 = [];
-        if (input.substr(peg$currPos, 2) === peg$c9) {
-          s4 = peg$c9;
+        if (input.substr(peg$currPos, 2) === peg$c8) {
+          s4 = peg$c8;
           peg$currPos += 2;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            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$e24);
+              peg$fail(peg$e25);
             }
           }
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
-          if (input.substr(peg$currPos, 2) === peg$c9) {
-            s4 = peg$c9;
+          if (input.substr(peg$currPos, 2) === peg$c8) {
+            s4 = peg$c8;
             peg$currPos += 2;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e23);
+              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$e24);
+                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$e22);
+            peg$fail(peg$e23);
           }
         }
         if (s4 !== peg$FAILED) {
@@ -5865,39 +5841,39 @@ function peg$parse(input, options) {
   function peg$parsetripleDQuotedMultiLineString() {
     let s0, s1, s2, s3, s4, s5, s6, s7;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3) === peg$c12) {
-      s1 = peg$c12;
+    if (input.substr(peg$currPos, 3) === peg$c11) {
+      s1 = peg$c11;
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e31);
+        peg$fail(peg$e32);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
       s4 = [];
-      if (input.substr(peg$currPos, 4) === peg$c13) {
-        s5 = peg$c13;
+      if (input.substr(peg$currPos, 4) === peg$c12) {
+        s5 = peg$c12;
         peg$currPos += 4;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e32);
+          peg$fail(peg$e33);
         }
       }
       if (s5 === peg$FAILED) {
         s5 = peg$currPos;
         s6 = peg$currPos;
         peg$silentFails++;
-        if (input.substr(peg$currPos, 3) === peg$c12) {
-          s7 = peg$c12;
+        if (input.substr(peg$currPos, 3) === peg$c11) {
+          s7 = peg$c11;
           peg$currPos += 3;
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e31);
+            peg$fail(peg$e32);
           }
         }
         peg$silentFails--;
@@ -5931,26 +5907,26 @@ function peg$parse(input, options) {
       }
       while (s5 !== peg$FAILED) {
         s4.push(s5);
-        if (input.substr(peg$currPos, 4) === peg$c13) {
-          s5 = peg$c13;
+        if (input.substr(peg$currPos, 4) === peg$c12) {
+          s5 = peg$c12;
           peg$currPos += 4;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e32);
+            peg$fail(peg$e33);
           }
         }
         if (s5 === peg$FAILED) {
           s5 = peg$currPos;
           s6 = peg$currPos;
           peg$silentFails++;
-          if (input.substr(peg$currPos, 3) === peg$c12) {
-            s7 = peg$c12;
+          if (input.substr(peg$currPos, 3) === peg$c11) {
+            s7 = peg$c11;
             peg$currPos += 3;
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e31);
+              peg$fail(peg$e32);
             }
           }
           peg$silentFails--;
@@ -6004,26 +5980,26 @@ function peg$parse(input, options) {
           s2.push(s3);
           s3 = peg$currPos;
           s4 = [];
-          if (input.substr(peg$currPos, 4) === peg$c13) {
-            s5 = peg$c13;
+          if (input.substr(peg$currPos, 4) === peg$c12) {
+            s5 = peg$c12;
             peg$currPos += 4;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e32);
+              peg$fail(peg$e33);
             }
           }
           if (s5 === peg$FAILED) {
             s5 = peg$currPos;
             s6 = peg$currPos;
             peg$silentFails++;
-            if (input.substr(peg$currPos, 3) === peg$c12) {
-              s7 = peg$c12;
+            if (input.substr(peg$currPos, 3) === peg$c11) {
+              s7 = peg$c11;
               peg$currPos += 3;
             } else {
               s7 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e31);
+                peg$fail(peg$e32);
               }
             }
             peg$silentFails--;
@@ -6057,26 +6033,26 @@ function peg$parse(input, options) {
           }
           while (s5 !== peg$FAILED) {
             s4.push(s5);
-            if (input.substr(peg$currPos, 4) === peg$c13) {
-              s5 = peg$c13;
+            if (input.substr(peg$currPos, 4) === peg$c12) {
+              s5 = peg$c12;
               peg$currPos += 4;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e32);
+                peg$fail(peg$e33);
               }
             }
             if (s5 === peg$FAILED) {
               s5 = peg$currPos;
               s6 = peg$currPos;
               peg$silentFails++;
-              if (input.substr(peg$currPos, 3) === peg$c12) {
-                s7 = peg$c12;
+              if (input.substr(peg$currPos, 3) === peg$c11) {
+                s7 = peg$c11;
                 peg$currPos += 3;
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e31);
+                  peg$fail(peg$e32);
                 }
               }
               peg$silentFails--;
@@ -6131,26 +6107,26 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         s3 = [];
-        if (input.substr(peg$currPos, 4) === peg$c13) {
-          s4 = peg$c13;
+        if (input.substr(peg$currPos, 4) === peg$c12) {
+          s4 = peg$c12;
           peg$currPos += 4;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e32);
+            peg$fail(peg$e33);
           }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
           s5 = peg$currPos;
           peg$silentFails++;
-          if (input.substr(peg$currPos, 3) === peg$c12) {
-            s6 = peg$c12;
+          if (input.substr(peg$currPos, 3) === peg$c11) {
+            s6 = peg$c11;
             peg$currPos += 3;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e31);
+              peg$fail(peg$e32);
             }
           }
           peg$silentFails--;
@@ -6184,26 +6160,26 @@ function peg$parse(input, options) {
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
-          if (input.substr(peg$currPos, 4) === peg$c13) {
-            s4 = peg$c13;
+          if (input.substr(peg$currPos, 4) === peg$c12) {
+            s4 = peg$c12;
             peg$currPos += 4;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e32);
+              peg$fail(peg$e33);
             }
           }
           if (s4 === peg$FAILED) {
             s4 = peg$currPos;
             s5 = peg$currPos;
             peg$silentFails++;
-            if (input.substr(peg$currPos, 3) === peg$c12) {
-              s6 = peg$c12;
+            if (input.substr(peg$currPos, 3) === peg$c11) {
+              s6 = peg$c11;
               peg$currPos += 3;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e31);
+                peg$fail(peg$e32);
               }
             }
             peg$silentFails--;
@@ -6236,13 +6212,13 @@ function peg$parse(input, options) {
             }
           }
         }
-        if (input.substr(peg$currPos, 3) === peg$c12) {
-          s4 = peg$c12;
+        if (input.substr(peg$currPos, 3) === peg$c11) {
+          s4 = peg$c11;
           peg$currPos += 3;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e31);
+            peg$fail(peg$e32);
           }
         }
         if (s4 !== peg$FAILED) {
@@ -6267,39 +6243,39 @@ function peg$parse(input, options) {
   function peg$parsetripleBQuotedMultiLineString() {
     let s0, s1, s2, s3, s4, s5, s6, s7;
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3) === peg$c14) {
-      s1 = peg$c14;
+    if (input.substr(peg$currPos, 3) === peg$c13) {
+      s1 = peg$c13;
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e33);
+        peg$fail(peg$e34);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
       s3 = peg$currPos;
       s4 = [];
-      if (input.substr(peg$currPos, 4) === peg$c15) {
-        s5 = peg$c15;
+      if (input.substr(peg$currPos, 4) === peg$c14) {
+        s5 = peg$c14;
         peg$currPos += 4;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e34);
+          peg$fail(peg$e35);
         }
       }
       if (s5 === peg$FAILED) {
         s5 = peg$currPos;
         s6 = peg$currPos;
         peg$silentFails++;
-        if (input.substr(peg$currPos, 3) === peg$c14) {
-          s7 = peg$c14;
+        if (input.substr(peg$currPos, 3) === peg$c13) {
+          s7 = peg$c13;
           peg$currPos += 3;
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e33);
+            peg$fail(peg$e34);
           }
         }
         peg$silentFails--;
@@ -6333,26 +6309,26 @@ function peg$parse(input, options) {
       }
       while (s5 !== peg$FAILED) {
         s4.push(s5);
-        if (input.substr(peg$currPos, 4) === peg$c15) {
-          s5 = peg$c15;
+        if (input.substr(peg$currPos, 4) === peg$c14) {
+          s5 = peg$c14;
           peg$currPos += 4;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e34);
+            peg$fail(peg$e35);
           }
         }
         if (s5 === peg$FAILED) {
           s5 = peg$currPos;
           s6 = peg$currPos;
           peg$silentFails++;
-          if (input.substr(peg$currPos, 3) === peg$c14) {
-            s7 = peg$c14;
+          if (input.substr(peg$currPos, 3) === peg$c13) {
+            s7 = peg$c13;
             peg$currPos += 3;
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e33);
+              peg$fail(peg$e34);
             }
           }
           peg$silentFails--;
@@ -6406,26 +6382,26 @@ function peg$parse(input, options) {
           s2.push(s3);
           s3 = peg$currPos;
           s4 = [];
-          if (input.substr(peg$currPos, 4) === peg$c15) {
-            s5 = peg$c15;
+          if (input.substr(peg$currPos, 4) === peg$c14) {
+            s5 = peg$c14;
             peg$currPos += 4;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e34);
+              peg$fail(peg$e35);
             }
           }
           if (s5 === peg$FAILED) {
             s5 = peg$currPos;
             s6 = peg$currPos;
             peg$silentFails++;
-            if (input.substr(peg$currPos, 3) === peg$c14) {
-              s7 = peg$c14;
+            if (input.substr(peg$currPos, 3) === peg$c13) {
+              s7 = peg$c13;
               peg$currPos += 3;
             } else {
               s7 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e33);
+                peg$fail(peg$e34);
               }
             }
             peg$silentFails--;
@@ -6459,26 +6435,26 @@ function peg$parse(input, options) {
           }
           while (s5 !== peg$FAILED) {
             s4.push(s5);
-            if (input.substr(peg$currPos, 4) === peg$c15) {
-              s5 = peg$c15;
+            if (input.substr(peg$currPos, 4) === peg$c14) {
+              s5 = peg$c14;
               peg$currPos += 4;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e34);
+                peg$fail(peg$e35);
               }
             }
             if (s5 === peg$FAILED) {
               s5 = peg$currPos;
               s6 = peg$currPos;
               peg$silentFails++;
-              if (input.substr(peg$currPos, 3) === peg$c14) {
-                s7 = peg$c14;
+              if (input.substr(peg$currPos, 3) === peg$c13) {
+                s7 = peg$c13;
                 peg$currPos += 3;
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e33);
+                  peg$fail(peg$e34);
                 }
               }
               peg$silentFails--;
@@ -6533,26 +6509,26 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         s3 = [];
-        if (input.substr(peg$currPos, 4) === peg$c15) {
-          s4 = peg$c15;
+        if (input.substr(peg$currPos, 4) === peg$c14) {
+          s4 = peg$c14;
           peg$currPos += 4;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e34);
+            peg$fail(peg$e35);
           }
         }
         if (s4 === peg$FAILED) {
           s4 = peg$currPos;
           s5 = peg$currPos;
           peg$silentFails++;
-          if (input.substr(peg$currPos, 3) === peg$c14) {
-            s6 = peg$c14;
+          if (input.substr(peg$currPos, 3) === peg$c13) {
+            s6 = peg$c13;
             peg$currPos += 3;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e33);
+              peg$fail(peg$e34);
             }
           }
           peg$silentFails--;
@@ -6586,26 +6562,26 @@ function peg$parse(input, options) {
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
-          if (input.substr(peg$currPos, 4) === peg$c15) {
-            s4 = peg$c15;
+          if (input.substr(peg$currPos, 4) === peg$c14) {
+            s4 = peg$c14;
             peg$currPos += 4;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e34);
+              peg$fail(peg$e35);
             }
           }
           if (s4 === peg$FAILED) {
             s4 = peg$currPos;
             s5 = peg$currPos;
             peg$silentFails++;
-            if (input.substr(peg$currPos, 3) === peg$c14) {
-              s6 = peg$c14;
+            if (input.substr(peg$currPos, 3) === peg$c13) {
+              s6 = peg$c13;
               peg$currPos += 3;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e33);
+                peg$fail(peg$e34);
               }
             }
             peg$silentFails--;
@@ -6638,13 +6614,13 @@ function peg$parse(input, options) {
             }
           }
         }
-        if (input.substr(peg$currPos, 3) === peg$c14) {
-          s4 = peg$c14;
+        if (input.substr(peg$currPos, 3) === peg$c13) {
+          s4 = peg$c13;
           peg$currPos += 3;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e33);
+            peg$fail(peg$e34);
           }
         }
         if (s4 !== peg$FAILED) {
@@ -6686,7 +6662,7 @@ function peg$parse(input, options) {
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e35);
+          peg$fail(peg$e36);
         }
       }
       peg$silentFails--;
@@ -6705,7 +6681,7 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r7.test(s1)) {
+    if (peg$r8.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
@@ -6716,7 +6692,7 @@ function peg$parse(input, options) {
     while (s1 !== peg$FAILED) {
       s0.push(s1);
       s1 = input.charAt(peg$currPos);
-      if (peg$r7.test(s1)) {
+      if (peg$r8.test(s1)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
@@ -6733,7 +6709,7 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r7.test(s1)) {
+    if (peg$r8.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
@@ -6745,7 +6721,7 @@ function peg$parse(input, options) {
       while (s1 !== peg$FAILED) {
         s0.push(s1);
         s1 = input.charAt(peg$currPos);
-        if (peg$r7.test(s1)) {
+        if (peg$r8.test(s1)) {
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
@@ -7864,7 +7840,7 @@ var EnvGraph = class {
   registerResolver(resolverClass) {
     const fnName = resolverClass.fnName;
     if (fnName in this.registeredResolverFunctions) {
-      throw new Error(`Resolver ${fnName} already registered`);
+      throw new SchemaError(`Resolver ${fnName} already registered`);
     }
     this.registeredResolverFunctions[fnName] = resolverClass;
   }
@@ -7872,7 +7848,7 @@ var EnvGraph = class {
   registerDataType(factory) {
     const name = factory.dataTypeName;
     if (name in this.dataTypesRegistry) {
-      throw new Error(`Data type "${name}" already registered`);
+      throw new SchemaError(`Data type "${name}" already registered`);
     }
     this.dataTypesRegistry[factory.dataTypeName] = factory;
   }
@@ -7880,7 +7856,7 @@ var EnvGraph = class {
   registerItemDecorator(decoratorDef) {
     const name = decoratorDef.name;
     if (name in this.itemDecoratorsRegistry) {
-      throw new Error(`Item decorator "${name}" already registered`);
+      throw new SchemaError(`Item decorator "${name}" already registered`);
     }
     this.itemDecoratorsRegistry[decoratorDef.name] = decoratorDef;
   }
@@ -7888,7 +7864,7 @@ var EnvGraph = class {
   registerRootDecorator(decoratorDef) {
     const name = decoratorDef.name;
     if (name in this.itemDecoratorsRegistry) {
-      throw new Error(`Root decorator "${name}" already registered`);
+      throw new SchemaError(`Root decorator "${name}" already registered`);
     }
     this.rootDecoratorsRegistry[decoratorDef.name] = decoratorDef;
   }
@@ -7976,12 +7952,12 @@ var EnvGraph = class {
     for (const key in this.configSchema) {
       if (isBuiltinVar(key)) this.registerBuiltinVar(key);
     }
-    let processingError = false;
+    let hasErrors = false;
     for (const source of this.sortedDataSources) {
       if (source.disabled) continue;
       for (const decInstance of source.rootDecorators) {
         await decInstance.process();
-        if (decInstance.schemaErrors.some((e) => !e.isWarning)) processingError = true;
+        if (decInstance.schemaErrors.some((e) => !e.isWarning)) hasErrors = true;
       }
     }
     for (const plugin of this.plugins) {
@@ -7990,9 +7966,9 @@ var EnvGraph = class {
     for (const itemKey in this.configSchema) {
       const item = this.configSchema[itemKey];
       await item.process();
-      if (item.errors.some((e) => !e.isWarning)) processingError = true;
+      if (item.errors.some((e) => !e.isWarning)) hasErrors = true;
     }
-    if (processingError) return;
+    if (hasErrors) return;
     const cycles = findGraphCycles(this.graphAdjacencyList);
     for (const cycleItemKeys of cycles) {
       for (const itemKey of cycleItemKeys) {
@@ -8007,19 +7983,20 @@ var EnvGraph = class {
     for (const source of this.sortedDataSources) {
       if (source.disabled) continue;
       for (const decInstance of source.rootDecorators) {
-        if (!decInstance.decValueResolver) throw new Error("expected decorator value resolver");
+        if (!decInstance.decValueResolver) continue;
         await this.resolveEnvValues(decInstance.decValueResolver.deps);
         try {
           await decInstance.execute();
         } catch (err) {
           const errLocation = err.more?.location || getErrorLocation(source, decInstance.parsedDecorator);
-          decInstance._executionError = new SchemaError(
+          decInstance._errors.push(new ResolutionError(
             err,
             {
+              severity: "fatal",
               location: errLocation,
               ...err.tip && { tip: err.tip }
             }
-          );
+          ));
         }
       }
     }
@@ -8131,13 +8108,7 @@ var EnvGraph = class {
     const errors = {};
     const rootErrors = [];
     for (const source of this.sortedDataSources) {
-      if (source.loadingError) {
-        rootErrors.push(`${source.label}: ${source.loadingError.message}`);
-      }
-      for (const err of source.schemaErrors) {
-        rootErrors.push(`${source.label}: ${err.message}`);
-      }
-      for (const err of source.resolutionErrors) {
+      for (const err of source.errors.filter((e) => !e.isWarning)) {
         rootErrors.push(`${source.label}: ${err.message}`);
       }
     }
@@ -8737,7 +8708,10 @@ __name(loadPluginModuleCJS, "loadPluginModuleCJS");
 async function loadPluginModuleESM(filePath) {
   {
     const fileUrl = pathToFileURL(filePath).href;
-    await import(`${fileUrl}?t=${Date.now()}`);
+    await import(
+      /* webpackIgnore: true */
+      `${fileUrl}?t=${Date.now()}`
+    );
   }
 }
 __name(loadPluginModuleESM, "loadPluginModuleESM");
@@ -8908,7 +8882,7 @@ var VarlockPlugin = class {
         loadPluginModuleCJS(this.pluginFilePath);
       }
     } catch (err) {
-      this.loadingError = err;
+      this.loadingError = err instanceof VarlockError ? err : new LoadingError(err);
     } finally {
       if (hadGlobalPlugin) {
         Object.defineProperty(globalThis, "plugin", {
@@ -8969,12 +8943,12 @@ async function registerPluginInGraph(graph, plugin, pluginDecorator) {
         if (possibleMatchingPlugin.version === plugin.version) {
           const installedInSources = possibleMatchingPlugin.installDecoratorInstances.map((dec) => dec.dataSource);
           if (installedInSources.includes(pluginDecorator.dataSource)) {
-            pluginDecorator._schemaErrors.push(new SchemaError(`Plugin ${plugin.name} already installed in this data source`));
+            pluginDecorator._errors.push(new SchemaError(`Plugin ${plugin.name} already installed in this data source`));
             return;
           }
           existingPlugin = possibleMatchingPlugin;
         } else {
-          pluginDecorator._schemaErrors.push(new SchemaError(`Plugin ${plugin.name} version conflict: tried to install version ${plugin.version} but version ${possibleMatchingPlugin.version} is already installed`));
+          pluginDecorator._errors.push(new SchemaError(`Plugin ${plugin.name} version conflict: tried to install version ${plugin.version} but version ${possibleMatchingPlugin.version} is already installed`));
           return;
         }
       }
@@ -9097,7 +9071,7 @@ async function processPluginInstallDecorators(dataSource) {
   const installPluginDecorators = dataSource.getRootDecFns("plugin");
   if (installPluginDecorators.length) {
     if (!(dataSource instanceof FileBasedDataSource)) {
-      dataSource._loadingError = new Error("@plugin can only be used from a file-based data source");
+      dataSource._errors.push(new SchemaError("@plugin can only be used from a file-based data source"));
       return;
     }
     const dataSourceDir = path3.dirname(dataSource.fullPath);
@@ -9220,7 +9194,7 @@ ${ansis_default.yellow("\u26A0")}  Third-party plugin download requested
         const plugin = await initPluginFromLocalPath(pluginSrcPath);
         await registerPluginInGraph(graph, plugin, pluginDecorator);
       } catch (err) {
-        pluginDecorator._schemaErrors.push(err);
+        pluginDecorator._errors.push(err instanceof SchemaError ? err : new SchemaError(err));
         continue;
       }
     }
@@ -9383,7 +9357,7 @@ var EnvGraphDataSource2 = class {
       }
       const disabledVal = await disabledDec.resolve();
       if (!my_dash_default.isBoolean(disabledVal)) {
-        this._loadingError = new Error("expected @disable to be boolean value");
+        this._errors.push(new LoadingError("expected @disable to be boolean value"));
         return;
       }
       this._disabled = disabledVal;
@@ -9399,7 +9373,7 @@ var EnvGraphDataSource2 = class {
       if (existingItem?.isResolved && itemDef.parsedValue !== void 0) {
         const isMatchingStatic = itemDef.parsedValue instanceof ParsedEnvSpecStaticValue && itemDef.parsedValue.unescapedValue === existingItem.resolvedValue;
         if (!isMatchingStatic) {
-          this._schemaErrors.push(new SchemaError(
+          this._errors.push(new SchemaError(
             `"${itemKey}" was already resolved during early initialization (used by @currentEnv, @import, or @disable) and cannot be redefined by ${this.label}`
           ));
           continue;
@@ -9410,7 +9384,7 @@ var EnvGraphDataSource2 = class {
     const currentEnvDec = this.getRootDec("currentEnv");
     const envFlagDec = this.getRootDec("envFlag");
     if (currentEnvDec && envFlagDec) {
-      this._loadingError = new Error("Cannot use both @currentEnv and @envFlag decorators");
+      this._errors.push(new LoadingError("Cannot use both @currentEnv and @envFlag decorators"));
     }
     let envFlagItemKey;
     let skipCurrentEnvProcessing = false;
@@ -9444,7 +9418,7 @@ var EnvGraphDataSource2 = class {
     }
     if (envFlagItemKey) {
       if (!this.configItemDefs[envFlagItemKey] && !isBuiltinVar(envFlagItemKey)) {
-        this._loadingError = new Error(`environment flag "${envFlagItemKey}" must be defined within this schema`);
+        this._errors.push(new LoadingError(`environment flag "${envFlagItemKey}" must be defined within this schema`));
         return;
       }
       if (isBuiltinVar(envFlagItemKey)) {
@@ -9528,7 +9502,7 @@ var EnvGraphDataSource2 = class {
                 const dirExists = Object.keys(this.graph.virtualImports).some((p) => p.startsWith(fullImportPath));
                 if (!dirExists && allowMissing) continue;
                 if (!dirExists) {
-                  this._loadingError = new Error(`Virtual directory import ${fullImportPath} not found`);
+                  this._errors.push(new LoadingError(`Virtual directory import ${fullImportPath} not found`));
                   return;
                 }
                 const dirChild = new DirectoryDataSource(fullImportPath);
@@ -9542,7 +9516,7 @@ var EnvGraphDataSource2 = class {
                 const fileExists = this.graph.virtualImports[fullImportPath];
                 if (!fileExists && allowMissing) continue;
                 if (!fileExists) {
-                  this._loadingError = new Error(`Virtual import ${fullImportPath} not found`);
+                  this._errors.push(new LoadingError(`Virtual import ${fullImportPath} not found`));
                   return;
                 }
                 const fileChild = new DotEnvFileDataSource(fullImportPath, {
@@ -9556,7 +9530,7 @@ var EnvGraphDataSource2 = class {
               });
               if (!fsStat && allowMissing) continue;
               if (!fsStat) {
-                this._loadingError = new Error(`Import path does not exist: ${fullImportPath}`);
+                this._errors.push(new LoadingError(`Import path does not exist: ${fullImportPath}`));
                 return;
               }
               if (importPath.endsWith("/")) {
@@ -9569,15 +9543,15 @@ var EnvGraphDataSource2 = class {
                   });
                   this.graph.recordLoadedImportPath(fullImportPath, dirChild);
                 } else {
-                  this._loadingError = new Error(`Imported path ending with "/" is not a directory: ${fullImportPath}`);
+                  this._errors.push(new LoadingError(`Imported path ending with "/" is not a directory: ${fullImportPath}`));
                   return;
                 }
               } else {
                 if (fsStat.isDirectory()) {
-                  this._loadingError = new Error('Imported path is a directory, add trailing "/" to import');
+                  this._errors.push(new LoadingError('Imported path is a directory, add trailing "/" to import'));
                   return;
                 } else if (!fileName.startsWith(".env.")) {
-                  this._loadingError = new Error("imported file must be a .env.* file");
+                  this._errors.push(new LoadingError("imported file must be a .env.* file"));
                   return;
                 }
                 const fileChild = new DotEnvFileDataSource(fullImportPath);
@@ -9590,17 +9564,17 @@ var EnvGraphDataSource2 = class {
               }
             }
           } else if (importPath.startsWith("http://") || importPath.startsWith("https://")) {
-            this._loadingError = new Error("http imports not supported yet");
+            this._errors.push(new LoadingError("http imports not supported yet"));
             return;
           } else if (importPath.startsWith("npm:")) {
-            this._loadingError = new Error("npm imports not supported yet");
+            this._errors.push(new LoadingError("npm imports not supported yet"));
             return;
           } else {
-            this._loadingError = new Error("unsupported import type");
+            this._errors.push(new LoadingError("unsupported import type"));
             return;
           }
         } catch (err) {
-          this._loadingError = err;
+          this._errors.push(err instanceof LoadingError ? err : new LoadingError(err));
           return;
         }
       }
@@ -9619,10 +9593,11 @@ var EnvGraphDataSource2 = class {
   get disabled() {
     return this._disabled || this.parent?._disabled;
   }
-  /** an error encountered while loading/parsing the data source */
-  _loadingError;
+  _errors = [];
+  /** first loading/parse error on this data source (including plugin loading errors) */
   get loadingError() {
-    if (this._loadingError) return this._loadingError;
+    const ownError = this._errors.find((e) => e instanceof LoadingError || e instanceof ParseError);
+    if (ownError) return ownError;
     if (this.graph) {
       for (const plugin of this.graph.plugins) {
         if (plugin.loadingError) {
@@ -9636,18 +9611,30 @@ var EnvGraphDataSource2 = class {
     }
     return void 0;
   }
-  _schemaErrors = [];
   get schemaErrors() {
-    return my_dash_default.compact([
-      ...this._schemaErrors,
+    return [
+      ...this._errors.filter((e) => e instanceof SchemaError),
       ...this.rootDecorators.flatMap((d) => d.schemaErrors)
-    ]);
+    ];
   }
   get resolutionErrors() {
     return my_dash_default.compact([...this.rootDecorators.flatMap((d) => d._executionError)]);
   }
+  /** all errors from this data source (own + decorator schema + decorator execution + plugin loading) */
+  get errors() {
+    const errs = [
+      ...this._errors,
+      ...this.rootDecorators.flatMap((d) => d.schemaErrors),
+      ...this.resolutionErrors
+    ];
+    const pluginErr = this.loadingError;
+    if (pluginErr && !errs.includes(pluginErr)) {
+      errs.push(pluginErr);
+    }
+    return errs;
+  }
   get isValid() {
-    return !this.loadingError && !this.schemaErrors.some((e) => !e.isWarning) && !this.resolutionErrors.length;
+    return this.errors.every((e) => e.isWarning);
   }
   configItemDefs = {};
   decorators = [];
@@ -9743,7 +9730,7 @@ var FileBasedDataSource = class extends EnvGraphDataSource2 {
   async _finishInit() {
     if (!this.rawContents) {
       if (!await pathExists(this.fullPath)) {
-        this._loadingError = new Error(`File does not exist: ${this.fullPath}`);
+        this._errors.push(new LoadingError(`File does not exist: ${this.fullPath}`));
         return;
       }
       this.rawContents = await fs3.readFile(this.fullPath, "utf8");
@@ -9764,7 +9751,7 @@ var DotEnvFileDataSource = class extends FileBasedDataSource {
     this.parsedFile = await tryCatch(
       () => parseEnvSpecDotEnvFile(rawContents),
       (error) => {
-        this._loadingError = new ParseError(`Parse error: ${error.message}`, {
+        const parseError = new ParseError(`Parse error: ${error.message}`, {
           location: {
             id: this.fullPath,
             lineNumber: error.location.start.line,
@@ -9772,7 +9759,8 @@ var DotEnvFileDataSource = class extends FileBasedDataSource {
             lineStr: rawContents.split("\n")[error.location.start.line - 1]
           }
         });
-        this._loadingError.cause = error;
+        parseError.cause = error;
+        this._errors.push(parseError);
       }
     );
     if (this.loadingError) return;
@@ -9792,13 +9780,13 @@ var DotEnvFileDataSource = class extends FileBasedDataSource {
     const seenRootDecs = /* @__PURE__ */ new Set();
     for (const dec of parsedFile.decoratorsArray) {
       if (dec.name in this.graph.itemDecoratorsRegistry) {
-        this._schemaErrors.push(new SchemaError(
+        this._errors.push(new SchemaError(
           `Item decorator @${dec.name} cannot be used in the file header - it must be attached to a config item`,
           { location: this._locationFromParsed(dec) }
         ));
-      } else if (!dec.isBareFnCall) {
+      } else if (!dec.isBareFnCall && !dec.hasInvalidName && dec.name in this.graph.rootDecoratorsRegistry) {
         if (seenRootDecs.has(dec.name)) {
-          this._schemaErrors.push(new SchemaError(
+          this._errors.push(new SchemaError(
             `Root decorator @${dec.name} cannot be used more than once in the same file`,
             { location: this._locationFromParsed(dec) }
           ));
@@ -9810,7 +9798,7 @@ var DotEnvFileDataSource = class extends FileBasedDataSource {
       for (const comment of block.comments) {
         if (comment instanceof ParsedEnvSpecDecoratorComment) {
           for (const dec of comment.decorators) {
-            this._schemaErrors.push(new SchemaError(
+            this._errors.push(new SchemaError(
               `Decorator @${dec.name} is in a detached comment block - decorators must be in the file header or attached directly to a config item (no blank lines between the decorator and the item)`,
               { location: this._locationFromParsed(dec) }
             ));
@@ -9871,9 +9859,9 @@ var DirectoryDataSource = class extends EnvGraphDataSource2 {
     if (this.schemaDataSource?._envFlagKey) {
       const envFlagKey = this.schemaDataSource._envFlagKey;
       if (this.isPartialImport && !this.importKeys?.includes(envFlagKey)) {
-        this._loadingError = new Error(
+        this._errors.push(new LoadingError(
           `Imported directory has @currentEnv set to $${envFlagKey}, but "${envFlagKey}" is not included in the import list. Add "${envFlagKey}" to the @import() arguments.`
-        );
+        ));
         return void 0;
       }
       const envFlagItem = this.graph.configSchema[envFlagKey];
@@ -9902,7 +9890,7 @@ var DirectoryDataSource = class extends EnvGraphDataSource2 {
     }
     await this.addAutoLoadedFile(".env.local");
     let currentEnv = await this._resolveCurrentEnv();
-    if (this._loadingError) return;
+    if (this.loadingError) return;
     if (currentEnv) {
       await this._loadEnvSpecificFiles(currentEnv);
     }
@@ -9911,7 +9899,7 @@ var DirectoryDataSource = class extends EnvGraphDataSource2 {
     }
     if (!currentEnv) {
       currentEnv = await this._resolveCurrentEnv();
-      if (this._loadingError) return;
+      if (this.loadingError) return;
       if (currentEnv) {
         const envSources = await this._loadEnvSpecificFiles(currentEnv);
         for (const source of envSources) {
@@ -9975,15 +9963,23 @@ var DecoratorInstance = class {
   get decValueResolver() {
     return this._decValueResolver;
   }
-  _schemaErrors = [];
+  _errors = [];
   get schemaErrors() {
     return [
-      ...this._schemaErrors,
+      ...this._errors.filter((e) => e instanceof SchemaError),
       ...this._decValueResolver?.schemaErrors || []
     ];
   }
   // error encountered during `execute` function
-  _executionError;
+  get _executionError() {
+    return this._errors.find((e) => e instanceof ResolutionError);
+  }
+  get errors() {
+    return [
+      ...this._errors,
+      ...this._decValueResolver?.schemaErrors || []
+    ];
+  }
   decoratorDef;
   get incompatibleWith() {
     return this.decoratorDef?.incompatibleWith;
@@ -9998,6 +9994,15 @@ var DecoratorInstance = class {
       const decRegistry = this.isRootDecorator ? this.graph.rootDecoratorsRegistry : this.graph.itemDecoratorsRegistry;
       this.decoratorDef = decRegistry[this.name];
       if (!this.decoratorDef) {
+        const commentLikeDecorators = ["todo", "see", "note"];
+        const nameLower = this.name.toLowerCase().replace(/:$/, "");
+        if (commentLikeDecorators.includes(nameLower)) {
+          const hint = nameLower === "see" ? " - use @docs() to link documentation" : " - did you mean to write a comment?";
+          throw new SchemaError(`@${this.name} is not a valid decorator${hint}`, { isWarning: true });
+        }
+        if (this.parsedDecorator.hasInvalidName) {
+          throw new SchemaError(`"@${this.name}" is not a valid decorator name - only letters, numbers, and underscores are allowed`);
+        }
         const otherRegistry = this.isRootDecorator ? this.graph.itemDecoratorsRegistry : this.graph.rootDecoratorsRegistry;
         if (otherRegistry[this.name]) {
           if (this.isRootDecorator) {
@@ -10006,7 +10011,13 @@ var DecoratorInstance = class {
             throw new SchemaError(`@${this.name} is a root decorator and cannot be attached to a config item - it must be in the file header (before the first config item)`);
           }
         }
-        throw new Error(`Unknown decorator: @${this.name}`);
+        throw new SchemaError(`Unknown decorator: @${this.name}`);
+      }
+      if (this.parsedDecorator.strayText) {
+        this._errors.push(new SchemaError(
+          `Unexpected text "${this.parsedDecorator.strayText}" after @${this.name} - use another # for trailing comments`,
+          { isWarning: true }
+        ));
       }
       if (this.decoratorDef.isFunction && !this.isFunctionCall) {
         throw new SchemaError(
@@ -10036,7 +10047,7 @@ var DecoratorInstance = class {
         this.processedData = await this.decoratorDef.process?.(this.decValueResolver);
       }
     } catch (e) {
-      this._schemaErrors.push(e instanceof SchemaError ? e : new SchemaError(e));
+      this._errors.push(e instanceof SchemaError ? e : new SchemaError(e));
     }
   }
   async execute() {
@@ -10048,13 +10059,13 @@ var DecoratorInstance = class {
     if (this.isResolved) return this.resolvedValue;
     await this.process();
     if (!this.decValueResolver) {
-      if (this._schemaErrors.some((e) => !e.isWarning)) return;
+      if (this._errors.length) return;
       throw new Error("expected decorator to have a value resolver");
     }
     try {
       this.resolvedValue = await this.decValueResolver.resolve();
     } catch (err) {
-      this._schemaErrors.push(err);
+      this._errors.push(err);
       return;
     }
     this.isResolved = true;
@@ -10243,8 +10254,7 @@ var builtInRootDecorators = [
       if (enabledResolver !== void 0) {
         const enabledValue = await enabledResolver.resolve();
         if (!my_dash_default.isBoolean(enabledValue)) {
-          dataSource._loadingError = new SchemaError("@setValuesBulk: enabled must be a boolean");
-          return;
+          throw new SchemaError("@setValuesBulk: enabled must be a boolean");
         }
         if (!enabledValue) return;
       }
@@ -10256,22 +10266,16 @@ var builtInRootDecorators = [
         return;
       }
       if (typeof dataString !== "string") {
-        dataSource._loadingError = new SchemaError("@setValuesBulk: data resolver must return a string");
-        return;
+        throw new SchemaError("@setValuesBulk: data resolver must return a string");
       }
       const effectiveFormat = format || detectBulkFormat(dataString);
       let entries;
-      try {
-        if (effectiveFormat === "json") {
-          entries = parseJsonBulkValues(dataString);
-        } else {
-          entries = parseEnvBulkValues(dataString);
-        }
-      } catch (err) {
-        dataSource._loadingError = err instanceof SchemaError ? err : new SchemaError(err);
-        return;
+      if (effectiveFormat === "json") {
+        entries = parseJsonBulkValues(dataString);
+      } else {
+        entries = parseEnvBulkValues(dataString);
       }
-      const { ConfigItem: ConfigItem2 } = await import('./config-item-7X6PUXJF.js');
+      const { ConfigItem: ConfigItem2 } = await import('./config-item-HMRJLPJY.js');
       for (const [key, entry] of Object.entries(entries)) {
         const existsInSchema = key in graph.configSchema;
         if (!existsInSchema && !createMissing) {
@@ -10387,7 +10391,7 @@ var Resolver = class {
   inferredType;
   /** reference to the parsed node that created this resolver, used for error location tracking */
   _parsedNode;
-  _schemaErrors = [];
+  _errors = [];
   _depsObj = {};
   get childResolvers() {
     return [
@@ -10397,13 +10401,10 @@ var Resolver = class {
   }
   get schemaErrors() {
     return [
-      ...this._schemaErrors,
+      ...this._errors,
       ...this.childResolvers.flatMap((r) => r.schemaErrors)
     ];
   }
-  set schemaErrors(v) {
-    throw new Error("set _schemaErrors instead");
-  }
   get depsObj() {
     const mergedDepsObj = { ...this._depsObj };
     this.childResolvers.forEach((r) => Object.assign(mergedDepsObj, r.depsObj));
@@ -10418,13 +10419,13 @@ var Resolver = class {
     this.parent = parent;
     const { argsSchema } = this.def;
     if (argsSchema?.type === "array" && this.objArgs !== void 0) {
-      this._schemaErrors.push(new SchemaError("Resolver does not support key-value args"));
+      this._errors.push(new SchemaError("Resolver does not support key-value args"));
     } else if (argsSchema?.type === "object" && this.arrArgs !== void 0) {
-      this._schemaErrors.push(new SchemaError("Resolver expects only key-value args"));
+      this._errors.push(new SchemaError("Resolver expects only key-value args"));
     }
     if (argsSchema?.arrayExactLength !== void 0) {
       if (this.arrArgs?.length !== argsSchema.arrayExactLength) {
-        this._schemaErrors.push(
+        this._errors.push(
           new SchemaError(
             `expects exactly ${argsSchema.arrayExactLength} argument${argsSchema.arrayExactLength > 1 ? "s" : ""}`
           )
@@ -10433,7 +10434,7 @@ var Resolver = class {
     }
     if (argsSchema?.arrayMinLength !== void 0) {
       if ((this.arrArgs?.length ?? 0) < argsSchema.arrayMinLength) {
-        this._schemaErrors.push(
+        this._errors.push(
           new SchemaError(
             `expects at least ${argsSchema.arrayMinLength} argument${argsSchema.arrayMinLength > 1 ? "s" : ""}`
           )
@@ -10442,7 +10443,7 @@ var Resolver = class {
     }
     if (argsSchema?.arrayMaxLength !== void 0) {
       if ((this.arrArgs?.length ?? 0) > argsSchema.arrayMaxLength) {
-        this._schemaErrors.push(
+        this._errors.push(
           new SchemaError(`expects at most ${argsSchema.arrayMaxLength} argument${argsSchema.arrayMaxLength > 1 ? "s" : ""}`)
         );
       }
@@ -10450,28 +10451,28 @@ var Resolver = class {
     if (argsSchema?.objKeyMinLength !== void 0) {
       const objKeyLengths = Object.keys(this.objArgs || {}).length;
       if (objKeyLengths < argsSchema.objKeyMinLength) {
-        this._schemaErrors.push(
+        this._errors.push(
           new SchemaError(
             `expects at least ${argsSchema.objKeyMinLength} key value arg${argsSchema.objKeyMinLength > 1 ? "s" : ""}`
           )
         );
       }
     }
-    if (this._schemaErrors.length === 0) {
+    if (this._errors.length === 0) {
       try {
         this.meta = this.def.process?.call(this);
       } catch (error) {
         if (error instanceof SchemaError) {
-          this._schemaErrors.push(error);
+          this._errors.push(error);
         } else if (error instanceof Error) {
-          this._schemaErrors.push(new SchemaError(error));
+          this._errors.push(new SchemaError(error));
         } else {
           throw new Error(`Non-error thrown while processing resolver - ${error}`);
         }
       }
     }
     if (!this.def.name.startsWith("\0")) {
-      for (const e of this._schemaErrors) {
+      for (const e of this._errors) {
         e.message = `${this.def.name}(): ${e.message}`;
       }
     }
@@ -10591,7 +10592,7 @@ var ErrorResolver = class extends Resolver {
   constructor(err) {
     super([]);
     this.err = err;
-    this._schemaErrors.push(err);
+    this._errors.push(err);
   }
   static {
     __name(this, "ErrorResolver");
@@ -10738,7 +10739,7 @@ var RemapResolver = createResolver({
       if (Object.keys(this.objArgs).length === 0) {
         throw new SchemaError("expects at least 1 key=value remapping pair");
       }
-      this._schemaErrors.push(new SchemaError("key=value syntax is deprecated", {
+      this._errors.push(new SchemaError("key=value syntax is deprecated", {
         isWarning: true,
         tip: "Use positional pairs instead: remap($VAR, match1, result1, match2, result2, ...)"
       }));
@@ -11530,14 +11531,14 @@ var ConfigItem = class {
           this.effectiveDecoratorFns[dec.name] ||= [];
           this.effectiveDecoratorFns[dec.name].push(dec);
         } else {
-          if (decKeysInThisDef.has(dec.name)) {
-            dec._schemaErrors.push(new SchemaError(`decorator @${dec.name} cannot be used twice in same definition`));
+          if (decKeysInThisDef.has(dec.name) && !dec._errors.length) {
+            dec._errors.push(new SchemaError(`decorator @${dec.name} cannot be used twice in same definition`));
             continue;
           }
           if (dec.incompatibleWith) {
             for (const otherDecName of dec.incompatibleWith) {
               if (allDecsInThisDef?.includes(otherDecName)) {
-                dec._schemaErrors.push(new SchemaError(`decorator @${dec.name} is incompatible with @${otherDecName} in the same definition`));
+                dec._errors.push(new SchemaError(`decorator @${dec.name} is incompatible with @${otherDecName} in the same definition`));
                 continue;
               }
             }
@@ -11614,7 +11615,7 @@ var ConfigItem = class {
           this._isRequiredDynamic = true;
         }
         const requiredDecoratorVal = await requiredDec.resolve();
-        if (requiredDec.schemaErrors.length) {
+        if (requiredDec.schemaErrors.some((e) => !e.isWarning)) {
           this._isRequired = false;
           return;
         }
@@ -11671,7 +11672,7 @@ var ConfigItem = class {
       if (!sensitiveDec) continue;
       const usingPublic = sensitiveDec.name === "public";
       const sensitiveDecValue = await sensitiveDec.resolve();
-      if (sensitiveDec.schemaErrors.length) return;
+      if (sensitiveDec.schemaErrors.some((e) => !e.isWarning)) return;
       if (![true, false, void 0].includes(sensitiveDecValue)) {
         throw new SchemaError("@sensitive/@public must resolve to a boolean or undefined");
       }
@@ -11865,7 +11866,7 @@ var ConfigItem = class {
             break;
           }
           const requiredDecoratorVal = await requiredDec.resolve();
-          if (requiredDec.schemaErrors.length) {
+          if (requiredDec.schemaErrors.some((e) => !e.isWarning)) {
             isRequired = false;
             break;
           }
@@ -11908,7 +11909,7 @@ var ConfigItem = class {
           const usingPublic = sensitiveDec.name === "public";
           if (sensitiveDec.decValueResolver?.fnName !== "\0static") break;
           const sensitiveDecValue = await sensitiveDec.resolve();
-          if (sensitiveDec.schemaErrors.length) break;
+          if (sensitiveDec.schemaErrors.some((e) => !e.isWarning)) break;
           if (![true, false, void 0].includes(sensitiveDecValue)) break;
           if (sensitiveDecValue !== void 0) {
             isSensitive = usingPublic ? !sensitiveDecValue : sensitiveDecValue;
@@ -12001,5 +12002,5 @@ var ConfigItem = class {
 };
 
 export { ConfigItem, DirectoryDataSource, DotEnvFileDataSource, EnvGraph, FileBasedDataSource, MultiplePathsContainerDataSource, ParsedEnvSpecFunctionCall, ParsedEnvSpecStaticValue, StaticValueResolver, ansis_default, createResolver, detectWorkspaceInfo, downloadPluginToCache, envSpecUpdater, multiselect, parseEnvSpecDotEnvFile, password, pathExists, prompts_default, require_semver2 as require_semver, runWithWorkspaceInfo, select, spawnAsync, tryCatch };
-//# sourceMappingURL=chunk-6CRDPEUT.js.map
-//# sourceMappingURL=chunk-6CRDPEUT.js.map
+//# sourceMappingURL=chunk-PBWMMYWL.js.map
+//# sourceMappingURL=chunk-PBWMMYWL.js.map