varlock 0.7.4 → 0.8.0

package/dist/{chunk-5LNYCOEO.js → chunk-XYBJ2DUJ.js}

@@ -4,7 +4,7 @@ import path2, { join } from 'path';
 import fs2, { access } from 'fs/promises';
 import os from 'os';
 import fs4, { accessSync, existsSync } from 'fs';
-import { exec } from 'child_process';
+import { exec, spawn } from 'child_process';
 import { styleText, promisify } from 'util';
 import { createRequire } from 'module';
 import { pathToFileURL } from 'url';
@@ -2038,7 +2038,7 @@ var require_src = __commonJS({
   }
 });
 
-// ../env-spec-parser/dist/chunk-XRNR4FE7.mjs
+// ../env-spec-parser/dist/chunk-RRVAHNIY.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]+)?$/;
@@ -2114,6 +2114,27 @@ var ParsedEnvSpecStaticValue = class {
     return `${this.data.quote || ""}${strVal}${this.data.quote || ""}`;
   }
 };
+var ParsedEnvSpecRegexLiteral = class {
+  static {
+    __name(this, "ParsedEnvSpecRegexLiteral");
+  }
+  constructor(data) {
+    this.data = data;
+    this.pattern = data.pattern;
+    this.flags = data.flags;
+  }
+  static {
+    __name2(this, "ParsedEnvSpecRegexLiteral");
+  }
+  pattern;
+  flags;
+  get value() {
+    return new RegExp(this.pattern, this.flags);
+  }
+  toString() {
+    return this.data.rawValue;
+  }
+};
 var ParsedEnvSpecKeyValuePair = class {
   static {
     __name(this, "ParsedEnvSpecKeyValuePair");
@@ -2150,13 +2171,20 @@ var ParsedEnvSpecFunctionArgs = class {
   get simplifiedValues() {
     if (this.data.values.length === 0) return [];
     const vals = this.data.values;
-    if (vals.every((i) => i instanceof ParsedEnvSpecStaticValue)) {
+    if (vals.every((i) => i instanceof ParsedEnvSpecStaticValue || i instanceof ParsedEnvSpecRegexLiteral)) {
       return vals.map((val) => val.value);
     } else if (vals.every((i) => i instanceof ParsedEnvSpecKeyValuePair)) {
       const obj = {};
       vals.forEach((val) => {
-        if (val.value instanceof ParsedEnvSpecStaticValue) {
+        if (val.value instanceof ParsedEnvSpecRegexLiteral) {
           obj[val.key] = val.value.value;
+        } else if (val.value instanceof ParsedEnvSpecStaticValue) {
+          obj[val.key] = val.value.value;
+        } else if (val.value instanceof ParsedEnvSpecFunctionCall && val.value.name === "regex") {
+          const args = val.value.simplifiedArgs;
+          if (typeof args[0] === "string") {
+            obj[val.key] = new RegExp(args[0]);
+          }
         }
       });
       return obj;
@@ -2199,6 +2227,8 @@ var ParsedEnvSpecDecorator = class {
     this.data = data;
     if (!this.data.value) {
       this.value = new ParsedEnvSpecStaticValue({ rawValue: true, isImplicit: true });
+    } else if (this.data.value instanceof ParsedEnvSpecRegexLiteral) {
+      this.value = this.data.value;
     } else {
       const expanded = expand(this.data.value);
       if (expanded instanceof ParsedEnvSpecKeyValuePair) {
@@ -2350,13 +2380,17 @@ var ParsedEnvSpecConfigItem = class {
   constructor(data) {
     this.data = data;
     if (this.data.value) {
-      const expanded = expand(this.data.value);
-      if (expanded instanceof ParsedEnvSpecKeyValuePair) {
-        throw new Error("Nested key-value pair found in config item");
-      } else if (expanded instanceof ParsedEnvSpecFunctionArgs) {
-        throw new Error("Top-level config item cannot be a bare function args");
+      if (this.data.value instanceof ParsedEnvSpecRegexLiteral) {
+        this.value = this.data.value;
+      } else {
+        const expanded = expand(this.data.value);
+        if (expanded instanceof ParsedEnvSpecKeyValuePair) {
+          throw new Error("Nested key-value pair found in config item");
+        } else if (expanded instanceof ParsedEnvSpecFunctionArgs) {
+          throw new Error("Top-level config item cannot be a bare function args");
+        }
+        this.value = expanded;
       }
-      this.value = expanded;
     }
   }
   static {
@@ -2587,6 +2621,8 @@ function expandHelper(val, expandStaticFn) {
       key: val.key,
       val: expandedVal
     });
+  } else if (val instanceof ParsedEnvSpecRegexLiteral) {
+    return val;
   } else if (val instanceof ParsedEnvSpecStaticValue) {
     if (typeof val.value !== "string") return val;
     if (val.data.quote === "'") return val;
@@ -2869,13 +2905,15 @@ function peg$parse(input, options) {
   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$c9 = "/";
+  const peg$c10 = "\\/";
+  const peg$c11 = '\\"';
+  const peg$c12 = "\\'";
+  const peg$c13 = "\\`";
+  const peg$c14 = '"""';
+  const peg$c15 = '\\"""';
+  const peg$c16 = "```";
+  const peg$c17 = "\\```";
   const peg$r0 = /^[a-zA-Z_]/;
   const peg$r1 = /^[a-zA-Z0-9_.\-]/;
   const peg$r2 = /^[^\n]/;
@@ -2886,15 +2924,17 @@ function peg$parse(input, options) {
   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$r10 = /^[^\/\n]/;
+  const peg$r11 = /^[gimsuy]/;
+  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);
@@ -2914,23 +2954,27 @@ function peg$parse(input, options) {
   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$e19 = peg$literalExpectation("/", false);
+  const peg$e20 = peg$literalExpectation("\\/", false);
+  const peg$e21 = peg$classExpectation(["/", "\n"], true, false, false);
+  const peg$e22 = peg$classExpectation(["g", "i", "m", "s", "u", "y"], false, false, false);
+  const peg$e23 = peg$classExpectation(["'", '"', "`"], false, false, false);
+  const peg$e24 = peg$classExpectation(["#", "\n"], true, false, 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$classExpectation(["`"], false, false, false);
+  const peg$e33 = peg$literalExpectation("\\`", false);
+  const peg$e34 = peg$classExpectation(["`", "\n"], true, false, false);
+  const peg$e35 = peg$literalExpectation('"""', false);
+  const peg$e36 = peg$literalExpectation('\\"""', false);
+  const peg$e37 = peg$literalExpectation("```", false);
+  const peg$e38 = peg$literalExpectation("\\```", false);
+  const peg$e39 = peg$anyExpectation();
   function peg$f0() {
     return new ParsedEnvSpecBlankLine({ _location: location() });
   }
@@ -3058,8 +3102,13 @@ function peg$parse(input, options) {
   }
   __name(peg$f16, "peg$f16");
   __name2(peg$f16, "peg$f16");
-  function peg$f17() {
-    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
+  function peg$f17(pattern, flags) {
+    return new ParsedEnvSpecRegexLiteral({
+      rawValue: text(),
+      pattern: pattern.replaceAll("\\/", "/"),
+      flags,
+      _location: location()
+    });
   }
   __name(peg$f17, "peg$f17");
   __name2(peg$f17, "peg$f17");
@@ -3068,8 +3117,8 @@ function peg$parse(input, options) {
   }
   __name(peg$f18, "peg$f18");
   __name2(peg$f18, "peg$f18");
-  function peg$f19(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
+  function peg$f19() {
+    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
   __name(peg$f19, "peg$f19");
   __name2(peg$f19, "peg$f19");
@@ -3084,7 +3133,7 @@ function peg$parse(input, options) {
   __name(peg$f21, "peg$f21");
   __name2(peg$f21, "peg$f21");
   function peg$f22(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
+    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
   }
   __name(peg$f22, "peg$f22");
   __name2(peg$f22, "peg$f22");
@@ -3103,6 +3152,11 @@ function peg$parse(input, options) {
   }
   __name(peg$f25, "peg$f25");
   __name2(peg$f25, "peg$f25");
+  function peg$f26(quote) {
+    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
+  }
+  __name(peg$f26, "peg$f26");
+  __name2(peg$f26, "peg$f26");
   let peg$currPos = options.peg$currPos | 0;
   let peg$savedPos = peg$currPos;
   const peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -3532,11 +3586,14 @@ function peg$parse(input, options) {
     let s0;
     s0 = peg$parseFunctionCall();
     if (s0 === peg$FAILED) {
-      s0 = peg$parsemultiLineString();
+      s0 = peg$parseRegexLiteral();
       if (s0 === peg$FAILED) {
-        s0 = peg$parsequotedString();
+        s0 = peg$parsemultiLineString();
         if (s0 === peg$FAILED) {
-          s0 = peg$parseunquotedString();
+          s0 = peg$parsequotedString();
+          if (s0 === peg$FAILED) {
+            s0 = peg$parseunquotedString();
+          }
         }
       }
     }
@@ -4155,9 +4212,12 @@ function peg$parse(input, options) {
     let s0;
     s0 = peg$parseDecoratorFunctionCall();
     if (s0 === peg$FAILED) {
-      s0 = peg$parsequotedString();
+      s0 = peg$parseRegexLiteral();
       if (s0 === peg$FAILED) {
-        s0 = peg$parseunquotedStringWithoutSpaces();
+        s0 = peg$parsequotedString();
+        if (s0 === peg$FAILED) {
+          s0 = peg$parseunquotedStringWithoutSpaces();
+        }
       }
     }
     return s0;
@@ -4357,46 +4417,49 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3;
     s0 = peg$parseDecoratorFunctionCall();
     if (s0 === peg$FAILED) {
-      s0 = peg$parsequotedString();
+      s0 = peg$parseRegexLiteral();
       if (s0 === peg$FAILED) {
-        s0 = peg$currPos;
-        s1 = peg$currPos;
-        s2 = [];
-        s3 = input.charAt(peg$currPos);
-        if (peg$r6.test(s3)) {
-          peg$currPos++;
-        } else {
-          s3 = peg$FAILED;
-          if (peg$silentFails === 0) {
-            peg$fail(peg$e15);
+        s0 = peg$parsequotedString();
+        if (s0 === peg$FAILED) {
+          s0 = peg$currPos;
+          s1 = peg$currPos;
+          s2 = [];
+          s3 = input.charAt(peg$currPos);
+          if (peg$r6.test(s3)) {
+            peg$currPos++;
+          } else {
+            s3 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e15);
+            }
           }
-        }
-        if (s3 !== peg$FAILED) {
-          while (s3 !== peg$FAILED) {
-            s2.push(s3);
-            s3 = input.charAt(peg$currPos);
-            if (peg$r6.test(s3)) {
-              peg$currPos++;
-            } else {
-              s3 = peg$FAILED;
-              if (peg$silentFails === 0) {
-                peg$fail(peg$e15);
+          if (s3 !== peg$FAILED) {
+            while (s3 !== peg$FAILED) {
+              s2.push(s3);
+              s3 = input.charAt(peg$currPos);
+              if (peg$r6.test(s3)) {
+                peg$currPos++;
+              } else {
+                s3 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$e15);
+                }
               }
             }
+          } else {
+            s2 = peg$FAILED;
           }
-        } else {
-          s2 = peg$FAILED;
-        }
-        if (s2 !== peg$FAILED) {
-          s1 = input.substring(s1, peg$currPos);
-        } else {
-          s1 = s2;
-        }
-        if (s1 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$f11();
+          if (s2 !== peg$FAILED) {
+            s1 = input.substring(s1, peg$currPos);
+          } else {
+            s1 = s2;
+          }
+          if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$f11();
+          }
+          s0 = s1;
         }
-        s0 = s1;
       }
     }
     return s0;
@@ -4880,46 +4943,49 @@ function peg$parse(input, options) {
     let s0, s1, s2, s3;
     s0 = peg$parseFunctionCall();
     if (s0 === peg$FAILED) {
-      s0 = peg$parsequotedString();
+      s0 = peg$parseRegexLiteral();
       if (s0 === peg$FAILED) {
-        s0 = peg$currPos;
-        s1 = peg$currPos;
-        s2 = [];
-        s3 = input.charAt(peg$currPos);
-        if (peg$r6.test(s3)) {
-          peg$currPos++;
-        } else {
-          s3 = peg$FAILED;
-          if (peg$silentFails === 0) {
-            peg$fail(peg$e15);
+        s0 = peg$parsequotedString();
+        if (s0 === peg$FAILED) {
+          s0 = peg$currPos;
+          s1 = peg$currPos;
+          s2 = [];
+          s3 = input.charAt(peg$currPos);
+          if (peg$r6.test(s3)) {
+            peg$currPos++;
+          } else {
+            s3 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e15);
+            }
           }
-        }
-        if (s3 !== peg$FAILED) {
-          while (s3 !== peg$FAILED) {
-            s2.push(s3);
-            s3 = input.charAt(peg$currPos);
-            if (peg$r6.test(s3)) {
-              peg$currPos++;
-            } else {
-              s3 = peg$FAILED;
-              if (peg$silentFails === 0) {
-                peg$fail(peg$e15);
+          if (s3 !== peg$FAILED) {
+            while (s3 !== peg$FAILED) {
+              s2.push(s3);
+              s3 = input.charAt(peg$currPos);
+              if (peg$r6.test(s3)) {
+                peg$currPos++;
+              } else {
+                s3 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$e15);
+                }
               }
             }
+          } else {
+            s2 = peg$FAILED;
           }
-        } else {
-          s2 = peg$FAILED;
-        }
-        if (s2 !== peg$FAILED) {
-          s1 = input.substring(s1, peg$currPos);
-        } else {
-          s1 = s2;
-        }
-        if (s1 !== peg$FAILED) {
-          peg$savedPos = s0;
-          s1 = peg$f15();
+          if (s2 !== peg$FAILED) {
+            s1 = input.substring(s1, peg$currPos);
+          } else {
+            s1 = s2;
+          }
+          if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$f15();
+          }
+          s0 = s1;
         }
-        s0 = s1;
       }
     }
     return s0;
@@ -5056,6 +5122,113 @@ function peg$parse(input, options) {
   }
   __name(peg$parseDivider, "peg$parseDivider");
   __name2(peg$parseDivider, "peg$parseDivider");
+  function peg$parseRegexLiteral() {
+    let s0, s1, s2, s3, s4, s5, s6;
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 47) {
+      s1 = peg$c9;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) {
+        peg$fail(peg$e19);
+      }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$currPos;
+      s3 = [];
+      if (input.substr(peg$currPos, 2) === peg$c10) {
+        s4 = peg$c10;
+        peg$currPos += 2;
+      } else {
+        s4 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e20);
+        }
+      }
+      if (s4 === peg$FAILED) {
+        s4 = input.charAt(peg$currPos);
+        if (peg$r10.test(s4)) {
+          peg$currPos++;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e21);
+          }
+        }
+      }
+      while (s4 !== peg$FAILED) {
+        s3.push(s4);
+        if (input.substr(peg$currPos, 2) === peg$c10) {
+          s4 = peg$c10;
+          peg$currPos += 2;
+        } else {
+          s4 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e20);
+          }
+        }
+        if (s4 === peg$FAILED) {
+          s4 = input.charAt(peg$currPos);
+          if (peg$r10.test(s4)) {
+            peg$currPos++;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e21);
+            }
+          }
+        }
+      }
+      s2 = input.substring(s2, peg$currPos);
+      if (input.charCodeAt(peg$currPos) === 47) {
+        s3 = peg$c9;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) {
+          peg$fail(peg$e19);
+        }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$currPos;
+        s5 = [];
+        s6 = input.charAt(peg$currPos);
+        if (peg$r11.test(s6)) {
+          peg$currPos++;
+        } else {
+          s6 = peg$FAILED;
+          if (peg$silentFails === 0) {
+            peg$fail(peg$e22);
+          }
+        }
+        while (s6 !== peg$FAILED) {
+          s5.push(s6);
+          s6 = input.charAt(peg$currPos);
+          if (peg$r11.test(s6)) {
+            peg$currPos++;
+          } else {
+            s6 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e22);
+            }
+          }
+        }
+        s4 = input.substring(s4, peg$currPos);
+        peg$savedPos = s0;
+        s0 = peg$f17(s2, s4);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    return s0;
+  }
+  __name(peg$parseRegexLiteral, "peg$parseRegexLiteral");
+  __name2(peg$parseRegexLiteral, "peg$parseRegexLiteral");
   function peg$parseunquotedString() {
     let s0, s1, s2, s3, s4, s5, s6;
     s0 = peg$currPos;
@@ -5065,12 +5238,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$e23);
       }
     }
     peg$silentFails--;
@@ -5083,24 +5256,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$e24);
         }
       }
       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$e24);
             }
           }
         }
@@ -5125,7 +5298,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17();
+      s1 = peg$f18();
     }
     s0 = s1;
     return s0;
@@ -5140,12 +5313,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$e23);
       }
     }
     peg$silentFails--;
@@ -5158,24 +5331,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$e25);
         }
       }
       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$e25);
             }
           }
         }
@@ -5200,7 +5373,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18();
+      s1 = peg$f19();
     }
     s0 = s1;
     return s0;
@@ -5224,71 +5397,71 @@ 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$e26);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
-      if (input.substr(peg$currPos, 2) === peg$c9) {
-        s3 = peg$c9;
+      if (input.substr(peg$currPos, 2) === peg$c11) {
+        s3 = peg$c11;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e23);
+          peg$fail(peg$e27);
         }
       }
       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$e28);
           }
         }
       }
       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$c11) {
+          s3 = peg$c11;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            peg$fail(peg$e27);
           }
         }
         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$e28);
             }
           }
         }
       }
       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$e26);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f19(s1);
+        s0 = peg$f20(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5305,71 +5478,71 @@ 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$e29);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
-      if (input.substr(peg$currPos, 2) === peg$c10) {
-        s3 = peg$c10;
+      if (input.substr(peg$currPos, 2) === peg$c12) {
+        s3 = peg$c12;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e26);
+          peg$fail(peg$e30);
         }
       }
       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$e31);
           }
         }
       }
       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$c12) {
+          s3 = peg$c12;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e26);
+            peg$fail(peg$e30);
           }
         }
         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$e31);
             }
           }
         }
       }
       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$e29);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f20(s1);
+        s0 = peg$f21(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5386,71 +5559,71 @@ 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$e32);
       }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
-      if (input.substr(peg$currPos, 2) === peg$c11) {
-        s3 = peg$c11;
+      if (input.substr(peg$currPos, 2) === peg$c13) {
+        s3 = peg$c13;
         peg$currPos += 2;
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e29);
+          peg$fail(peg$e33);
         }
       }
       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$e34);
           }
         }
       }
       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$c13) {
+          s3 = peg$c13;
           peg$currPos += 2;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e29);
+            peg$fail(peg$e33);
           }
         }
         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$e34);
             }
           }
         }
       }
       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$e32);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f21(s1);
+        s0 = peg$f22(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5483,57 +5656,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$e29);
       }
     }
     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$c12) {
+        s5 = peg$c12;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e26);
+          peg$fail(peg$e30);
         }
       }
       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$e31);
           }
         }
       }
       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$c12) {
+          s5 = peg$c12;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e26);
+            peg$fail(peg$e30);
           }
         }
         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$e31);
             }
           }
         }
@@ -5559,45 +5732,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$c12) {
+            s5 = peg$c12;
             peg$currPos += 2;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e26);
+              peg$fail(peg$e30);
             }
           }
           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$e31);
               }
             }
           }
           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$c12) {
+              s5 = peg$c12;
               peg$currPos += 2;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e26);
+                peg$fail(peg$e30);
               }
             }
             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$e31);
                 }
               }
             }
@@ -5624,61 +5797,61 @@ 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$c12) {
+          s4 = peg$c12;
           peg$currPos += 2;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e26);
+            peg$fail(peg$e30);
           }
         }
         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$e31);
             }
           }
         }
         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$c12) {
+            s4 = peg$c12;
             peg$currPos += 2;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e26);
+              peg$fail(peg$e30);
             }
           }
           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$e31);
               }
             }
           }
         }
         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$e29);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f22(s1);
+          s0 = peg$f23(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5699,57 +5872,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$e26);
       }
     }
     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$c11) {
+        s5 = peg$c11;
         peg$currPos += 2;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e23);
+          peg$fail(peg$e27);
         }
       }
       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$e28);
           }
         }
       }
       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$c11) {
+          s5 = peg$c11;
           peg$currPos += 2;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            peg$fail(peg$e27);
           }
         }
         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$e28);
             }
           }
         }
@@ -5775,45 +5948,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$c11) {
+            s5 = peg$c11;
             peg$currPos += 2;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e23);
+              peg$fail(peg$e27);
             }
           }
           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$e28);
               }
             }
           }
           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$c11) {
+              s5 = peg$c11;
               peg$currPos += 2;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e23);
+                peg$fail(peg$e27);
               }
             }
             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$e28);
                 }
               }
             }
@@ -5840,61 +6013,61 @@ 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$c11) {
+          s4 = peg$c11;
           peg$currPos += 2;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e23);
+            peg$fail(peg$e27);
           }
         }
         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$e28);
             }
           }
         }
         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$c11) {
+            s4 = peg$c11;
             peg$currPos += 2;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e23);
+              peg$fail(peg$e27);
             }
           }
           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$e28);
               }
             }
           }
         }
         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$e26);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f23(s1);
+          s0 = peg$f24(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5914,39 +6087,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$c14) {
+      s1 = peg$c14;
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e31);
+        peg$fail(peg$e35);
       }
     }
     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$c15) {
+        s5 = peg$c15;
         peg$currPos += 4;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e32);
+          peg$fail(peg$e36);
         }
       }
       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$c14) {
+          s7 = peg$c14;
           peg$currPos += 3;
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e31);
+            peg$fail(peg$e35);
           }
         }
         peg$silentFails--;
@@ -5980,26 +6153,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$c15) {
+          s5 = peg$c15;
           peg$currPos += 4;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e32);
+            peg$fail(peg$e36);
           }
         }
         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$c14) {
+            s7 = peg$c14;
             peg$currPos += 3;
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e31);
+              peg$fail(peg$e35);
             }
           }
           peg$silentFails--;
@@ -6053,26 +6226,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$c15) {
+            s5 = peg$c15;
             peg$currPos += 4;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e32);
+              peg$fail(peg$e36);
             }
           }
           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$c14) {
+              s7 = peg$c14;
               peg$currPos += 3;
             } else {
               s7 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e31);
+                peg$fail(peg$e35);
               }
             }
             peg$silentFails--;
@@ -6106,26 +6279,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$c15) {
+              s5 = peg$c15;
               peg$currPos += 4;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e32);
+                peg$fail(peg$e36);
               }
             }
             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$c14) {
+                s7 = peg$c14;
                 peg$currPos += 3;
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e31);
+                  peg$fail(peg$e35);
                 }
               }
               peg$silentFails--;
@@ -6180,26 +6353,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$c15) {
+          s4 = peg$c15;
           peg$currPos += 4;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e32);
+            peg$fail(peg$e36);
           }
         }
         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$c14) {
+            s6 = peg$c14;
             peg$currPos += 3;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e31);
+              peg$fail(peg$e35);
             }
           }
           peg$silentFails--;
@@ -6233,26 +6406,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$c15) {
+            s4 = peg$c15;
             peg$currPos += 4;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e32);
+              peg$fail(peg$e36);
             }
           }
           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$c14) {
+              s6 = peg$c14;
               peg$currPos += 3;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e31);
+                peg$fail(peg$e35);
               }
             }
             peg$silentFails--;
@@ -6285,18 +6458,18 @@ function peg$parse(input, options) {
             }
           }
         }
-        if (input.substr(peg$currPos, 3) === peg$c12) {
-          s4 = peg$c12;
+        if (input.substr(peg$currPos, 3) === peg$c14) {
+          s4 = peg$c14;
           peg$currPos += 3;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e31);
+            peg$fail(peg$e35);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f24(s1);
+          s0 = peg$f25(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -6316,39 +6489,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$c16) {
+      s1 = peg$c16;
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e33);
+        peg$fail(peg$e37);
       }
     }
     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$c17) {
+        s5 = peg$c17;
         peg$currPos += 4;
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e34);
+          peg$fail(peg$e38);
         }
       }
       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$c16) {
+          s7 = peg$c16;
           peg$currPos += 3;
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e33);
+            peg$fail(peg$e37);
           }
         }
         peg$silentFails--;
@@ -6382,26 +6555,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$c17) {
+          s5 = peg$c17;
           peg$currPos += 4;
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e34);
+            peg$fail(peg$e38);
           }
         }
         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$c16) {
+            s7 = peg$c16;
             peg$currPos += 3;
           } else {
             s7 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e33);
+              peg$fail(peg$e37);
             }
           }
           peg$silentFails--;
@@ -6455,26 +6628,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$c17) {
+            s5 = peg$c17;
             peg$currPos += 4;
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e34);
+              peg$fail(peg$e38);
             }
           }
           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$c16) {
+              s7 = peg$c16;
               peg$currPos += 3;
             } else {
               s7 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e33);
+                peg$fail(peg$e37);
               }
             }
             peg$silentFails--;
@@ -6508,26 +6681,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$c17) {
+              s5 = peg$c17;
               peg$currPos += 4;
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e34);
+                peg$fail(peg$e38);
               }
             }
             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$c16) {
+                s7 = peg$c16;
                 peg$currPos += 3;
               } else {
                 s7 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e33);
+                  peg$fail(peg$e37);
                 }
               }
               peg$silentFails--;
@@ -6582,26 +6755,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$c17) {
+          s4 = peg$c17;
           peg$currPos += 4;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e34);
+            peg$fail(peg$e38);
           }
         }
         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$c16) {
+            s6 = peg$c16;
             peg$currPos += 3;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e33);
+              peg$fail(peg$e37);
             }
           }
           peg$silentFails--;
@@ -6635,26 +6808,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$c17) {
+            s4 = peg$c17;
             peg$currPos += 4;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e34);
+              peg$fail(peg$e38);
             }
           }
           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$c16) {
+              s6 = peg$c16;
               peg$currPos += 3;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e33);
+                peg$fail(peg$e37);
               }
             }
             peg$silentFails--;
@@ -6687,18 +6860,18 @@ function peg$parse(input, options) {
             }
           }
         }
-        if (input.substr(peg$currPos, 3) === peg$c14) {
-          s4 = peg$c14;
+        if (input.substr(peg$currPos, 3) === peg$c16) {
+          s4 = peg$c16;
           peg$currPos += 3;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e33);
+            peg$fail(peg$e37);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f25(s1);
+          s0 = peg$f26(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -6735,7 +6908,7 @@ function peg$parse(input, options) {
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e35);
+          peg$fail(peg$e39);
         }
       }
       peg$silentFails--;
@@ -7038,10 +7211,20 @@ var UrlDataType = createEnvGraphDataType(
       } catch (err) {
         throw new ValidationError("Invalid URL");
       }
+      const errors = [];
       if (settings?.allowedDomains && !settings.allowedDomains.includes(url.host.toLowerCase())) {
-        return new ValidationError(`Domain (${url.host}) is not in allowed list: ${settings.allowedDomains.join(",")}`);
+        errors.push(new ValidationError(`Domain (${url.host}) is not in allowed list: ${settings.allowedDomains.join(",")}`));
       }
-      return true;
+      if (settings?.noTrailingSlash && url.pathname.endsWith("/") && url.pathname !== "/") {
+        errors.push(new ValidationError("URL must not have a trailing slash"));
+      }
+      if (settings?.matches) {
+        const regex = my_dash_default.isString(settings.matches) ? new RegExp(settings.matches) : settings.matches;
+        if (!regex.test(val)) {
+          errors.push(new ValidationError(`URL must match regex "${settings.matches}"`));
+        }
+      }
+      return errors.length ? errors : true;
     }
   })
 );
@@ -8617,7 +8800,7 @@ var builtInRootDecorators = [
         dataSource._loadingError = err instanceof SchemaError ? err : new SchemaError(err);
         return;
       }
-      const { ConfigItem: ConfigItem2 } = await import('./config-item-IYYV4PO6.js');
+      const { ConfigItem: ConfigItem2 } = await import('./config-item-YZNLESF2.js');
       for (const [key, entry] of Object.entries(entries)) {
         const existsInSchema = key in graph.configSchema;
         if (!existsInSchema && !createMissing) {
@@ -8677,6 +8860,61 @@ var builtInItemDecorators = [
   // test-only decorators — dropped in release builds
   ...[]
 ];
+var ExecError = class extends Error {
+  constructor(exitCode, signal, data = "command gave no output") {
+    super(data);
+    this.exitCode = exitCode;
+    this.signal = signal;
+    this.data = data;
+  }
+  static {
+    __name(this, "ExecError");
+  }
+};
+function spawnAsyncHelper(command, args, spawnOptions) {
+  const childProcess = spawn(command, args, spawnOptions || {});
+  const deferred = new Promise((resolve, reject) => {
+    let stdoutData = "";
+    let stderrData = "";
+    childProcess.stdout?.on("data", (data) => {
+      stdoutData += data.toString();
+    });
+    childProcess.stderr?.on("data", (data) => {
+      stderrData += data.toString();
+    });
+    childProcess.stdout?.on("error", (err) => {
+      reject(err);
+    });
+    childProcess.stderr?.on("error", (err) => {
+      reject(err);
+    });
+    childProcess.on("error", (err) => {
+      reject(err);
+    });
+    childProcess.on("exit", (exitCode, signal) => {
+      if (!exitCode) {
+        resolve(stdoutData);
+      } else {
+        reject(
+          new ExecError(exitCode, signal, stderrData)
+        );
+      }
+    });
+  });
+  return { childProcess, execResult: deferred };
+}
+__name(spawnAsyncHelper, "spawnAsyncHelper");
+async function spawnAsync(command, args, opts) {
+  const { input, ...spawnOpts } = opts ?? {};
+  const { childProcess, execResult } = spawnAsyncHelper(command, args, spawnOpts);
+  if (input !== void 0 && childProcess.stdin) {
+    childProcess.stdin.write(input);
+    childProcess.stdin.end();
+  }
+  return execResult;
+}
+__name(spawnAsync, "spawnAsync");
+var asyncExec = promisify(exec);
 
 // ../ci-env-info/dist/index.js
 function refToBranch(ref) {
@@ -9220,6 +9458,16 @@ function inferFromBranch(branch) {
   return "preview";
 }
 __name(inferFromBranch, "inferFromBranch");
+async function getGitBranch() {
+  try {
+    const { stdout } = await asyncExec("git branch --show-current", { timeout: 3e3 });
+    const branch = stdout.trim();
+    return branch || void 0;
+  } catch {
+    return void 0;
+  }
+}
+__name(getGitBranch, "getGitBranch");
 function inferVarlockEnv(ciEnv, processEnv) {
   if (detectTestEnvironment(processEnv)) return "test";
   if (ciEnv.environment) return ciEnv.environment;
@@ -9242,8 +9490,8 @@ var BUILTIN_VARS = {
   },
   VARLOCK_BRANCH: {
     name: "VARLOCK_BRANCH",
-    description: "Current git branch name",
-    resolver: /* @__PURE__ */ __name((ciEnv) => ciEnv.branch, "resolver")
+    description: "Current git branch name. In CI, sourced from platform environment variables. Locally (non-CI), auto-detected via `git branch --show-current`.",
+    resolver: /* @__PURE__ */ __name((ciEnv) => ciEnv.branch ?? (!ciEnv.isCI ? getGitBranch() : void 0), "resolver")
   },
   VARLOCK_PR_NUMBER: {
     name: "VARLOCK_PR_NUMBER",
@@ -9463,7 +9711,7 @@ var StaticValueResolver = class extends Resolver {
   constructor(_staticValue) {
     super([]);
     this._staticValue = _staticValue;
-    if (_staticValue !== void 0) {
+    if (_staticValue !== void 0 && !(_staticValue instanceof RegExp)) {
       this.inferredType = typeof _staticValue;
     }
   }
@@ -9854,6 +10102,8 @@ var BaseResolvers = [
 function convertParsedValueToResolvers(value, dataSource, registeredResolvers) {
   if (value === void 0) {
     return void 0;
+  } else if (value instanceof ParsedEnvSpecRegexLiteral) {
+    return new StaticValueResolver(value.value);
   } else if (value instanceof ParsedEnvSpecStaticValue) {
     return new StaticValueResolver(value.unescapedValue);
   } else if (value instanceof ParsedEnvSpecFunctionCall || value instanceof ParsedEnvSpecFunctionArgs) {
@@ -10192,7 +10442,16 @@ var VarlockPlugin = class {
         dataType
       };
     });
-    const detected = resolved.filter((v) => v.matchedKey);
+    const initDecName = initDecorator.replace(/^@/, "");
+    const wiredVarNames = /* @__PURE__ */ new Set();
+    for (const source of graph.sortedDataSources) {
+      for (const rootDec of source.rootDecorators) {
+        if (rootDec.name === initDecName && rootDec.isFunctionCall && rootDec.decValueResolver) {
+          for (const dep of rootDec.decValueResolver.deps) wiredVarNames.add(dep);
+        }
+      }
+    }
+    const detected = resolved.filter((v) => v.matchedKey && !wiredVarNames.has(v.matchedKey));
     if (detected.length === 0) return;
     const detectedKeys = detected.map((v) => v.matchedKey);
     const needsSchemaSet = new Set(
@@ -10363,7 +10622,7 @@ async function isPluginCached(url) {
 }
 __name(isPluginCached, "isPluginCached");
 async function downloadPlugin(url) {
-  const exec2 = promisify(exec);
+  const exec3 = promisify(exec);
   const cacheDir = path2.join(getUserVarlockDir(), "plugins-cache");
   const indexPath = path2.join(cacheDir, "index.json");
   await fs2.mkdir(cacheDir, { recursive: true });
@@ -10394,7 +10653,7 @@ async function downloadPlugin(url) {
   });
   const tmpExtractDir = path2.join(cacheDir, `tmp-extract-${crypto.randomBytes(8).toString("hex")}`);
   await fs2.mkdir(tmpExtractDir);
-  await exec2(`tar -xzf ${tmpTgz} -C ${tmpExtractDir}`);
+  await exec3(`tar -xzf ${tmpTgz} -C ${tmpExtractDir}`);
   let pkgJsonPath = path2.join(tmpExtractDir, "package", "package.json");
   let pluginRoot = path2.join(tmpExtractDir, "package");
   if (!await fs2.stat(pkgJsonPath).then(() => true, () => false)) {
@@ -11390,6 +11649,22 @@ async function fetchIconSvg(iconifyName, color = "808080", iconCacheFolder = "/t
   return colorizedSvg;
 }
 __name(fetchIconSvg, "fetchIconSvg");
+function getItemTsType(info) {
+  const dataType = info.dataType;
+  const dataTypeName = dataType?.name;
+  if (dataType) {
+    if (dataTypeName === "number" || dataTypeName === "port") return "number";
+    if (dataTypeName === "boolean") return "boolean";
+    if (dataTypeName === "simple-object") return "Record<string, any>";
+    if (dataTypeName === "enum") {
+      const rawEnumOptions = dataType._rawDef._rawEnumOptions;
+      if (!rawEnumOptions?.length) return "never";
+      return my_dash_default.map(rawEnumOptions, JSON.stringify).join(" | ");
+    }
+  }
+  return "string";
+}
+__name(getItemTsType, "getItemTsType");
 async function getTsDefinitionForItem(info, indentLevel = 0) {
   const i = my_dash_default.times(indentLevel, () => "  ").join("");
   const itemSrc = [];
@@ -11419,27 +11694,7 @@ async function getTsDefinitionForItem(info, indentLevel = 0) {
       " */"
     ]);
   }
-  const dataType = info.dataType;
-  const dataTypeName = dataType?.name;
-  let itemTsType = "string";
-  if (dataType) {
-    if (dataTypeName === "number" || dataTypeName === "port") {
-      itemTsType = "number";
-    } else if (dataTypeName === "boolean") {
-      itemTsType = "boolean";
-    } else if (dataTypeName === "simple-object") {
-      itemTsType = "Record<string, any>";
-    } else if (dataTypeName === "enum") {
-      const rawEnumOptions = dataType._rawDef._rawEnumOptions;
-      let enumOptions = [];
-      enumOptions = rawEnumOptions;
-      if (!enumOptions.length) {
-        itemTsType = "never";
-      } else {
-        itemTsType = my_dash_default.map(enumOptions, JSON.stringify).join(" | ");
-      }
-    }
-  }
+  const itemTsType = getItemTsType(info);
   const isRequired = info.isRequired && !info.isRequiredDynamic;
   itemSrc.push(`${info.key}${isRequired ? "" : "?"}: ${itemTsType};`);
   itemSrc.push("");
@@ -11454,18 +11709,22 @@ async function generateTsTypesSrc(items) {
     "/* eslint-disable */",
     "export type CoercedEnvSchema = {"
   ];
-  const exposedKeys = [];
-  const exposedNonSensitiveKeys = [];
   for (const info of items) {
     tsSrc.push(...await getTsDefinitionForItem(info, 1));
-    exposedKeys.push(info.key);
-    if (!info.isSensitive) exposedNonSensitiveKeys.push(info.key);
   }
   tsSrc.push("};\n");
+  const schemaHash = crypto.createHash("md5").update(items.map((i) => i.key).sort().join(",")).digest("hex").slice(0, 8);
+  const schemaAlias = `_CoercedEnvSchema_${schemaHash}`;
+  const stringsAlias = `_EnvSchemaAsStrings_${schemaHash}`;
+  tsSrc.push(`type ${schemaAlias} = CoercedEnvSchema;`);
+  const exposedNonSensitiveKeys = [];
+  for (const info of items) {
+    if (!info.isSensitive) exposedNonSensitiveKeys.push(info.key);
+  }
   tsSrc.push(`
 declare module 'varlock/env' {
-  export interface TypedEnvSchema extends Readonly<CoercedEnvSchema> {}
-  export interface PublicTypedEnvSchema extends Readonly<Pick<CoercedEnvSchema, '${exposedNonSensitiveKeys.join("' | '")}'>> {}
+  export interface TypedEnvSchema extends Readonly<${schemaAlias}> {}
+  export interface PublicTypedEnvSchema extends Readonly<Pick<${schemaAlias}, '${exposedNonSensitiveKeys.join("' | '")}'>> {}
 }
 `);
   tsSrc.push(`
@@ -11475,16 +11734,17 @@ export type EnvSchemaAsStrings = {
       : (CoercedEnvSchema[Property] extends boolean ? ('true' | 'false') : string)
 };
 `);
+  tsSrc.push(`type ${stringsAlias} = EnvSchemaAsStrings;`);
   const IMPORT_META_AUGMENTATION = `
   // add types for global import.meta.env
-  interface ImportMetaEnv extends EnvSchemaAsStrings {}
+  interface ImportMetaEnv extends ${stringsAlias} {}
   interface ImportMeta {
     readonly env: ImportMetaEnv;
   }`;
   const PROCESS_ENV_AUGMENTATION = `
   // add types for global process.env
   namespace NodeJS {
-    interface ProcessEnv extends EnvSchemaAsStrings {}
+    interface ProcessEnv extends ${stringsAlias} {}
   }`;
   tsSrc.push(...[
     "declare global {",
@@ -11727,9 +11987,6 @@ var EnvGraph2 = class {
     for (const plugin of this.plugins) {
       if (plugin.loadingError) return;
     }
-    for (const plugin of this.plugins) {
-      plugin._checkStandardVars(this);
-    }
     for (const key in this.configSchema) {
       if (isBuiltinVar(key)) this.registerBuiltinVar(key);
     }
@@ -11741,6 +11998,9 @@ var EnvGraph2 = class {
         if (decInstance.schemaErrors.some((e) => !e.isWarning)) processingError = true;
       }
     }
+    for (const plugin of this.plugins) {
+      plugin._checkStandardVars(this);
+    }
     for (const itemKey in this.configSchema) {
       const item = this.configSchema[itemKey];
       await item.process();
@@ -12365,7 +12625,7 @@ var ConfigItem = class {
       }
     }
     if (this.resolvedRawValue instanceof RegExp) {
-      this.resolutionError = new ResolutionError("regex() is meant to be used within function args, not as a final resolved value");
+      this.resolutionError = new ResolutionError("Regex values are meant to be used within function args (e.g., remap()), not as a final resolved value");
     }
     if (this.resolutionError) return;
     this.isResolved = true;
@@ -12582,6 +12842,6 @@ var ConfigItem = class {
   }
 };
 
-export { ConfigItem, Ct, DirectoryDataSource, DotEnvFileDataSource, EnvGraph2 as EnvGraph, FileBasedDataSource, Jt, MultiplePathsContainerDataSource, ParsedEnvSpecStaticValue, StaticValueResolver, ansis_default, detectWorkspaceInfo, downloadPluginToCache, envSpecUpdater, getUserVarlockDir, parseEnvSpecDotEnvFile, pathExists, prompts_default, require_semver2 as require_semver, runWithWorkspaceInfo, tryCatch };
-//# sourceMappingURL=chunk-5LNYCOEO.js.map
-//# sourceMappingURL=chunk-5LNYCOEO.js.map
+export { ConfigItem, Ct, DirectoryDataSource, DotEnvFileDataSource, EnvGraph2 as EnvGraph, FileBasedDataSource, Jt, MultiplePathsContainerDataSource, ParsedEnvSpecStaticValue, StaticValueResolver, ansis_default, detectWorkspaceInfo, downloadPluginToCache, envSpecUpdater, getUserVarlockDir, parseEnvSpecDotEnvFile, pathExists, prompts_default, require_semver2 as require_semver, runWithWorkspaceInfo, spawnAsync, tryCatch };
+//# sourceMappingURL=chunk-XYBJ2DUJ.js.map
+//# sourceMappingURL=chunk-XYBJ2DUJ.js.map