varlock 1.1.0 → 1.3.0

package/dist/{chunk-XWYFSG46.js → chunk-GKN3UJNE.js}

@@ -1,6 +1,6 @@
 import { getUserVarlockDir, isWSL } from './chunk-O3WTD6L4.js';
-import { q, Q, nt, it, rt } from './chunk-HDKXXS2X.js';
-import { my_dash_default, SchemaError, createDebug, ResolutionError, CoercionError, ValidationError, activatePlugin, deactivatePlugin, VarlockError, EmptyRequiredValueError, ParseError, pluginProxy } from './chunk-2PFIYNFA.js';
+import { q, X, ut, nt, ot } from './chunk-IRXBCLL2.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';
@@ -18,7 +18,7 @@ import { AsyncLocalStorage } from 'async_hooks';
 
 // ../../node_modules/.bun/ansis@4.2.0/node_modules/ansis/index.cjs
 var require_ansis = __commonJS({
-  "../../node_modules/.bun/ansis@4.2.0/node_modules/ansis/index.cjs"(exports$1, module) {
+  "../../node_modules/.bun/ansis@4.2.0/node_modules/ansis/index.cjs"(exports, module) {
     var e;
     var t;
     var r;
@@ -89,7 +89,7 @@ var require_ansis = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/constants.js
 var require_constants = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/constants.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/constants.js"(exports, module) {
     var SEMVER_SPEC_VERSION = "2.0.0";
     var MAX_LENGTH = 256;
     var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || /* istanbul ignore next */
@@ -120,7 +120,7 @@ var require_constants = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/debug.js
 var require_debug = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/debug.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/debug.js"(exports, module) {
     var debug2 = typeof process === "object" && process.env && process.env.NODE_DEBUG && /\bsemver\b/i.test(process.env.NODE_DEBUG) ? (...args) => console.error("SEMVER", ...args) : () => {
     };
     module.exports = debug2;
@@ -129,19 +129,19 @@ var require_debug = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/re.js
 var require_re = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/re.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/re.js"(exports, module) {
     var {
       MAX_SAFE_COMPONENT_LENGTH,
       MAX_SAFE_BUILD_LENGTH,
       MAX_LENGTH
     } = require_constants();
     var debug2 = require_debug();
-    exports$1 = module.exports = {};
-    var re = exports$1.re = [];
-    var safeRe = exports$1.safeRe = [];
-    var src = exports$1.src = [];
-    var safeSrc = exports$1.safeSrc = [];
-    var t = exports$1.t = {};
+    exports = module.exports = {};
+    var re = exports.re = [];
+    var safeRe = exports.safeRe = [];
+    var src = exports.src = [];
+    var safeSrc = exports.safeSrc = [];
+    var t = exports.t = {};
     var R = 0;
     var LETTERDASHNUMBER = "[a-zA-Z0-9-]";
     var safeRegexReplacements = [
@@ -194,18 +194,18 @@ var require_re = __commonJS({
     createToken("COERCERTLFULL", src[t.COERCEFULL], true);
     createToken("LONETILDE", "(?:~>?)");
     createToken("TILDETRIM", `(\\s*)${src[t.LONETILDE]}\\s+`, true);
-    exports$1.tildeTrimReplace = "$1~";
+    exports.tildeTrimReplace = "$1~";
     createToken("TILDE", `^${src[t.LONETILDE]}${src[t.XRANGEPLAIN]}$`);
     createToken("TILDELOOSE", `^${src[t.LONETILDE]}${src[t.XRANGEPLAINLOOSE]}$`);
     createToken("LONECARET", "(?:\\^)");
     createToken("CARETTRIM", `(\\s*)${src[t.LONECARET]}\\s+`, true);
-    exports$1.caretTrimReplace = "$1^";
+    exports.caretTrimReplace = "$1^";
     createToken("CARET", `^${src[t.LONECARET]}${src[t.XRANGEPLAIN]}$`);
     createToken("CARETLOOSE", `^${src[t.LONECARET]}${src[t.XRANGEPLAINLOOSE]}$`);
     createToken("COMPARATORLOOSE", `^${src[t.GTLT]}\\s*(${src[t.LOOSEPLAIN]})$|^$`);
     createToken("COMPARATOR", `^${src[t.GTLT]}\\s*(${src[t.FULLPLAIN]})$|^$`);
     createToken("COMPARATORTRIM", `(\\s*)${src[t.GTLT]}\\s*(${src[t.LOOSEPLAIN]}|${src[t.XRANGEPLAIN]})`, true);
-    exports$1.comparatorTrimReplace = "$1$2$3";
+    exports.comparatorTrimReplace = "$1$2$3";
     createToken("HYPHENRANGE", `^\\s*(${src[t.XRANGEPLAIN]})\\s+-\\s+(${src[t.XRANGEPLAIN]})\\s*$`);
     createToken("HYPHENRANGELOOSE", `^\\s*(${src[t.XRANGEPLAINLOOSE]})\\s+-\\s+(${src[t.XRANGEPLAINLOOSE]})\\s*$`);
     createToken("STAR", "(<|>)?=?\\s*\\*");
@@ -216,7 +216,7 @@ var require_re = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/parse-options.js
 var require_parse_options = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/parse-options.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/parse-options.js"(exports, module) {
     var looseOption = Object.freeze({ loose: true });
     var emptyOpts = Object.freeze({});
     var parseOptions = /* @__PURE__ */ __name((options) => {
@@ -234,7 +234,7 @@ var require_parse_options = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/identifiers.js
 var require_identifiers = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/identifiers.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/identifiers.js"(exports, module) {
     var numeric = /^[0-9]+$/;
     var compareIdentifiers = /* @__PURE__ */ __name((a2, b) => {
       if (typeof a2 === "number" && typeof b === "number") {
@@ -258,7 +258,7 @@ var require_identifiers = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/classes/semver.js
 var require_semver = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/classes/semver.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/classes/semver.js"(exports, module) {
     var debug2 = require_debug();
     var { MAX_LENGTH, MAX_SAFE_INTEGER } = require_constants();
     var { safeRe: re, t } = require_re();
@@ -539,7 +539,7 @@ var require_semver = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/parse.js
 var require_parse = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/parse.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/parse.js"(exports, module) {
     var SemVer = require_semver();
     var parse = /* @__PURE__ */ __name((version, options, throwErrors = false) => {
       if (version instanceof SemVer) {
@@ -560,7 +560,7 @@ var require_parse = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/valid.js
 var require_valid = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/valid.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/valid.js"(exports, module) {
     var parse = require_parse();
     var valid = /* @__PURE__ */ __name((version, options) => {
       const v = parse(version, options);
@@ -572,7 +572,7 @@ var require_valid = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/clean.js
 var require_clean = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/clean.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/clean.js"(exports, module) {
     var parse = require_parse();
     var clean = /* @__PURE__ */ __name((version, options) => {
       const s = parse(version.trim().replace(/^[=v]+/, ""), options);
@@ -584,7 +584,7 @@ var require_clean = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/inc.js
 var require_inc = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/inc.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/inc.js"(exports, module) {
     var SemVer = require_semver();
     var inc = /* @__PURE__ */ __name((version, release, options, identifier, identifierBase) => {
       if (typeof options === "string") {
@@ -607,7 +607,7 @@ var require_inc = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/diff.js
 var require_diff = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/diff.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/diff.js"(exports, module) {
     var parse = require_parse();
     var diff = /* @__PURE__ */ __name((version1, version2) => {
       const v1 = parse(version1, null, true);
@@ -650,7 +650,7 @@ var require_diff = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/major.js
 var require_major = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/major.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/major.js"(exports, module) {
     var SemVer = require_semver();
     var major = /* @__PURE__ */ __name((a2, loose) => new SemVer(a2, loose).major, "major");
     module.exports = major;
@@ -659,7 +659,7 @@ var require_major = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/minor.js
 var require_minor = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/minor.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/minor.js"(exports, module) {
     var SemVer = require_semver();
     var minor = /* @__PURE__ */ __name((a2, loose) => new SemVer(a2, loose).minor, "minor");
     module.exports = minor;
@@ -668,7 +668,7 @@ var require_minor = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/patch.js
 var require_patch = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/patch.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/patch.js"(exports, module) {
     var SemVer = require_semver();
     var patch = /* @__PURE__ */ __name((a2, loose) => new SemVer(a2, loose).patch, "patch");
     module.exports = patch;
@@ -677,7 +677,7 @@ var require_patch = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/prerelease.js
 var require_prerelease = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/prerelease.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/prerelease.js"(exports, module) {
     var parse = require_parse();
     var prerelease = /* @__PURE__ */ __name((version, options) => {
       const parsed = parse(version, options);
@@ -689,7 +689,7 @@ var require_prerelease = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/compare.js
 var require_compare = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/compare.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/compare.js"(exports, module) {
     var SemVer = require_semver();
     var compare = /* @__PURE__ */ __name((a2, b, loose) => new SemVer(a2, loose).compare(new SemVer(b, loose)), "compare");
     module.exports = compare;
@@ -698,7 +698,7 @@ var require_compare = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/rcompare.js
 var require_rcompare = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/rcompare.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/rcompare.js"(exports, module) {
     var compare = require_compare();
     var rcompare = /* @__PURE__ */ __name((a2, b, loose) => compare(b, a2, loose), "rcompare");
     module.exports = rcompare;
@@ -707,7 +707,7 @@ var require_rcompare = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/compare-loose.js
 var require_compare_loose = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/compare-loose.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/compare-loose.js"(exports, module) {
     var compare = require_compare();
     var compareLoose = /* @__PURE__ */ __name((a2, b) => compare(a2, b, true), "compareLoose");
     module.exports = compareLoose;
@@ -716,7 +716,7 @@ var require_compare_loose = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/compare-build.js
 var require_compare_build = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/compare-build.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/compare-build.js"(exports, module) {
     var SemVer = require_semver();
     var compareBuild = /* @__PURE__ */ __name((a2, b, loose) => {
       const versionA = new SemVer(a2, loose);
@@ -729,7 +729,7 @@ var require_compare_build = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/sort.js
 var require_sort = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/sort.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/sort.js"(exports, module) {
     var compareBuild = require_compare_build();
     var sort = /* @__PURE__ */ __name((list, loose) => list.sort((a2, b) => compareBuild(a2, b, loose)), "sort");
     module.exports = sort;
@@ -738,7 +738,7 @@ var require_sort = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/rsort.js
 var require_rsort = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/rsort.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/rsort.js"(exports, module) {
     var compareBuild = require_compare_build();
     var rsort = /* @__PURE__ */ __name((list, loose) => list.sort((a2, b) => compareBuild(b, a2, loose)), "rsort");
     module.exports = rsort;
@@ -747,7 +747,7 @@ var require_rsort = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/gt.js
 var require_gt = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/gt.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/gt.js"(exports, module) {
     var compare = require_compare();
     var gt = /* @__PURE__ */ __name((a2, b, loose) => compare(a2, b, loose) > 0, "gt");
     module.exports = gt;
@@ -756,7 +756,7 @@ var require_gt = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/lt.js
 var require_lt = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/lt.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/lt.js"(exports, module) {
     var compare = require_compare();
     var lt = /* @__PURE__ */ __name((a2, b, loose) => compare(a2, b, loose) < 0, "lt");
     module.exports = lt;
@@ -765,7 +765,7 @@ var require_lt = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/eq.js
 var require_eq = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/eq.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/eq.js"(exports, module) {
     var compare = require_compare();
     var eq = /* @__PURE__ */ __name((a2, b, loose) => compare(a2, b, loose) === 0, "eq");
     module.exports = eq;
@@ -774,7 +774,7 @@ var require_eq = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/neq.js
 var require_neq = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/neq.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/neq.js"(exports, module) {
     var compare = require_compare();
     var neq = /* @__PURE__ */ __name((a2, b, loose) => compare(a2, b, loose) !== 0, "neq");
     module.exports = neq;
@@ -783,7 +783,7 @@ var require_neq = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/gte.js
 var require_gte = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/gte.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/gte.js"(exports, module) {
     var compare = require_compare();
     var gte = /* @__PURE__ */ __name((a2, b, loose) => compare(a2, b, loose) >= 0, "gte");
     module.exports = gte;
@@ -792,7 +792,7 @@ var require_gte = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/lte.js
 var require_lte = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/lte.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/lte.js"(exports, module) {
     var compare = require_compare();
     var lte = /* @__PURE__ */ __name((a2, b, loose) => compare(a2, b, loose) <= 0, "lte");
     module.exports = lte;
@@ -801,7 +801,7 @@ var require_lte = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/cmp.js
 var require_cmp = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/cmp.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/cmp.js"(exports, module) {
     var eq = require_eq();
     var neq = require_neq();
     var gt = require_gt();
@@ -850,7 +850,7 @@ var require_cmp = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/coerce.js
 var require_coerce = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/coerce.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/coerce.js"(exports, module) {
     var SemVer = require_semver();
     var parse = require_parse();
     var { safeRe: re, t } = require_re();
@@ -895,7 +895,7 @@ var require_coerce = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/lrucache.js
 var require_lrucache = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/lrucache.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/internal/lrucache.js"(exports, module) {
     var LRUCache = class {
       static {
         __name(this, "LRUCache");
@@ -935,7 +935,7 @@ var require_lrucache = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/classes/range.js
 var require_range = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/classes/range.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/classes/range.js"(exports, module) {
     var SPACE_CHARACTERS = /\s+/g;
     var Range = class _Range {
       static {
@@ -1314,7 +1314,7 @@ var require_range = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/classes/comparator.js
 var require_comparator = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/classes/comparator.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/classes/comparator.js"(exports, module) {
     var ANY = /* @__PURE__ */ Symbol("SemVer ANY");
     var Comparator = class _Comparator {
       static {
@@ -1429,7 +1429,7 @@ var require_comparator = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/satisfies.js
 var require_satisfies = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/satisfies.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/functions/satisfies.js"(exports, module) {
     var Range = require_range();
     var satisfies = /* @__PURE__ */ __name((version, range, options) => {
       try {
@@ -1445,7 +1445,7 @@ var require_satisfies = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/to-comparators.js
 var require_to_comparators = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/to-comparators.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/to-comparators.js"(exports, module) {
     var Range = require_range();
     var toComparators = /* @__PURE__ */ __name((range, options) => new Range(range, options).set.map((comp) => comp.map((c) => c.value).join(" ").trim().split(" ")), "toComparators");
     module.exports = toComparators;
@@ -1454,7 +1454,7 @@ var require_to_comparators = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/max-satisfying.js
 var require_max_satisfying = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/max-satisfying.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/max-satisfying.js"(exports, module) {
     var SemVer = require_semver();
     var Range = require_range();
     var maxSatisfying = /* @__PURE__ */ __name((versions, range, options) => {
@@ -1482,7 +1482,7 @@ var require_max_satisfying = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/min-satisfying.js
 var require_min_satisfying = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/min-satisfying.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/min-satisfying.js"(exports, module) {
     var SemVer = require_semver();
     var Range = require_range();
     var minSatisfying = /* @__PURE__ */ __name((versions, range, options) => {
@@ -1510,7 +1510,7 @@ var require_min_satisfying = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/min-version.js
 var require_min_version = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/min-version.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/min-version.js"(exports, module) {
     var SemVer = require_semver();
     var Range = require_range();
     var gt = require_gt();
@@ -1568,7 +1568,7 @@ var require_min_version = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/valid.js
 var require_valid2 = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/valid.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/valid.js"(exports, module) {
     var Range = require_range();
     var validRange = /* @__PURE__ */ __name((range, options) => {
       try {
@@ -1583,7 +1583,7 @@ var require_valid2 = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/outside.js
 var require_outside = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/outside.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/outside.js"(exports, module) {
     var SemVer = require_semver();
     var Comparator = require_comparator();
     var { ANY } = Comparator;
@@ -1651,7 +1651,7 @@ var require_outside = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/gtr.js
 var require_gtr = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/gtr.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/gtr.js"(exports, module) {
     var outside = require_outside();
     var gtr = /* @__PURE__ */ __name((version, range, options) => outside(version, range, ">", options), "gtr");
     module.exports = gtr;
@@ -1660,7 +1660,7 @@ var require_gtr = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/ltr.js
 var require_ltr = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/ltr.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/ltr.js"(exports, module) {
     var outside = require_outside();
     var ltr = /* @__PURE__ */ __name((version, range, options) => outside(version, range, "<", options), "ltr");
     module.exports = ltr;
@@ -1669,7 +1669,7 @@ var require_ltr = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/intersects.js
 var require_intersects = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/intersects.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/intersects.js"(exports, module) {
     var Range = require_range();
     var intersects = /* @__PURE__ */ __name((r1, r2, options) => {
       r1 = new Range(r1, options);
@@ -1682,7 +1682,7 @@ var require_intersects = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/simplify.js
 var require_simplify = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/simplify.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/simplify.js"(exports, module) {
     var satisfies = require_satisfies();
     var compare = require_compare();
     module.exports = (versions, range, options) => {
@@ -1731,7 +1731,7 @@ var require_simplify = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/subset.js
 var require_subset = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/subset.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/ranges/subset.js"(exports, module) {
     var Range = require_range();
     var Comparator = require_comparator();
     var { ANY } = Comparator;
@@ -1892,7 +1892,7 @@ var require_subset = __commonJS({
 
 // ../../node_modules/.bun/semver@7.7.4/node_modules/semver/index.js
 var require_semver2 = __commonJS({
-  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/index.js"(exports$1, module) {
+  "../../node_modules/.bun/semver@7.7.4/node_modules/semver/index.js"(exports, module) {
     var internalRe = require_re();
     var constants = require_constants();
     var SemVer = require_semver();
@@ -1984,7 +1984,7 @@ var require_semver2 = __commonJS({
   }
 });
 
-// ../env-spec-parser/dist/chunk-JOUVRUWD.mjs
+// ../env-spec-parser/dist/chunk-N4D6RSUR.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]+)?$/;
@@ -2011,7 +2011,6 @@ var ParsedEnvSpecDivider = class {
   constructor(data) {
     this.data = data;
   }
-  data;
   static {
     __name2(this, "ParsedEnvSpecDivider");
   }
@@ -2038,7 +2037,6 @@ var ParsedEnvSpecStaticValue = class {
       this.value = data.rawValue.slice(data.quote.length, -1 * data.quote.length).replaceAll(`\\${quoteChar}`, quoteChar);
     }
   }
-  data;
   static {
     __name2(this, "ParsedEnvSpecStaticValue");
   }
@@ -2069,7 +2067,6 @@ var ParsedEnvSpecKeyValuePair = class {
   constructor(data) {
     this.data = data;
   }
-  data;
   static {
     __name2(this, "ParsedEnvSpecKeyValuePair");
   }
@@ -2090,7 +2087,6 @@ var ParsedEnvSpecFunctionArgs = class {
   constructor(data) {
     this.data = data;
   }
-  data;
   static {
     __name2(this, "ParsedEnvSpecFunctionArgs");
   }
@@ -2133,7 +2129,6 @@ var ParsedEnvSpecFunctionCall = class {
   constructor(data) {
     this.data = data;
   }
-  data;
   static {
     __name2(this, "ParsedEnvSpecFunctionCall");
   }
@@ -2147,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;
@@ -2163,14 +2158,20 @@ var ParsedEnvSpecDecorator = class {
       this.value = expanded;
     }
   }
-  data;
   static {
     __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 warning() {
+    return this.data.warning;
+  }
   get isBareFnCall() {
     return !!this.data.isBareFnCall;
   }
@@ -2199,7 +2200,6 @@ var ParsedEnvSpecComment = class {
   constructor(data) {
     this.data = data;
   }
-  data;
   static {
     __name2(this, "ParsedEnvSpecComment");
   }
@@ -2217,7 +2217,6 @@ var ParsedEnvSpecDecoratorComment = class {
   constructor(data) {
     this.data = data;
   }
-  data;
   static {
     __name2(this, "ParsedEnvSpecDecoratorComment");
   }
@@ -2266,7 +2265,6 @@ var ParsedEnvSpecCommentBlock = class {
   constructor(data) {
     this.data = data;
   }
-  data;
   static {
     __name2(this, "ParsedEnvSpecCommentBlock");
   }
@@ -2296,7 +2294,6 @@ var ParsedEnvSpecBlankLine = class {
   constructor(data) {
     this.data = data;
   }
-  data;
   static {
     __name2(this, "ParsedEnvSpecBlankLine");
   }
@@ -2320,7 +2317,6 @@ var ParsedEnvSpecConfigItem = class {
       this.value = expanded;
     }
   }
-  data;
   static {
     __name2(this, "ParsedEnvSpecConfigItem");
   }
@@ -2827,25 +2823,24 @@ 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$r4 = /^[^ \t\n=()#@]/;
+  const peg$r5 = /^[^ \n,)]/;
+  const peg$r6 = /^[ \t]/;
+  const peg$r7 = /^[a-zA-Z0-9_]/;
   const peg$r8 = /^[ \t\n]/;
   const peg$r9 = /^[\-=*#]/;
   const peg$r10 = /^['"`]/;
@@ -2866,33 +2861,32 @@ function peg$parse(input, options) {
   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$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$e9 = peg$classExpectation([" ", "	", "\n", "=", "(", ")", "#", "@"], true, false, false);
+  const peg$e10 = peg$literalExpectation("(", false);
+  const peg$e11 = peg$literalExpectation(",", false);
+  const peg$e12 = peg$literalExpectation(")", false);
+  const peg$e13 = peg$classExpectation([" ", "\n", ",", ")"], true, false, false);
+  const peg$e14 = peg$classExpectation([" ", "	"], false, false, false);
+  const peg$e15 = peg$classExpectation([["a", "z"], ["A", "Z"], ["0", "9"], "_"], false, false, false);
+  const peg$e16 = peg$classExpectation([" ", "	", "\n"], false, false, false);
+  const peg$e17 = peg$classExpectation(["-", "=", "*", "#"], false, false, false);
+  const peg$e18 = peg$classExpectation(["'", '"', "`"], false, false, false);
+  const peg$e19 = peg$classExpectation(["#", "\n"], true, false, false);
+  const peg$e20 = peg$classExpectation(["#", " ", "\n"], true, false, false);
+  const peg$e21 = peg$classExpectation(['"'], false, false, false);
+  const peg$e22 = peg$literalExpectation('\\"', false);
+  const peg$e23 = peg$classExpectation(['"', "\n"], true, false, false);
+  const peg$e24 = peg$classExpectation(["'"], false, false, false);
+  const peg$e25 = peg$literalExpectation("\\'", false);
+  const peg$e26 = peg$classExpectation(["'", "\n"], true, false, false);
+  const peg$e27 = peg$classExpectation(["`"], false, false, false);
+  const peg$e28 = peg$literalExpectation("\\`", false);
+  const peg$e29 = peg$classExpectation(["`", "\n"], true, false, false);
+  const peg$e30 = peg$literalExpectation('"""', false);
+  const peg$e31 = peg$literalExpectation('\\"""', false);
+  const peg$e32 = peg$literalExpectation("```", false);
+  const peg$e33 = peg$literalExpectation("\\```", false);
+  const peg$e34 = peg$anyExpectation();
   function peg$f0() {
     return new ParsedEnvSpecBlankLine({ _location: location() });
   }
@@ -2932,22 +2926,28 @@ 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, trailingText) {
+    const allDecorators = [first, ...rest];
+    let postComment;
+    if (trailingText) {
+      if (trailingText.startsWith("#")) {
+        postComment = trailingText;
+      } else {
+        const lastDec = allDecorators[allDecorators.length - 1];
+        lastDec.data.warning = `Unexpected trailing text after @${lastDec.name}`;
+        postComment = trailingText;
+      }
+    }
     return new ParsedEnvSpecDecoratorComment({
-      decorators: [first, ...rest],
+      decorators: allDecorators,
       leadingSpace,
       postComment,
       _location: location()
     });
   }
-  __name(peg$f6, "peg$f6");
-  __name2(peg$f6, "peg$f6");
-  function peg$f7(name, val) {
+  __name(peg$f5, "peg$f5");
+  __name2(peg$f5, "peg$f5");
+  function peg$f6(name, val) {
     return new ParsedEnvSpecDecorator({
       name,
       value: Array.isArray(val) ? val[1] : val,
@@ -2955,69 +2955,74 @@ function peg$parse(input, options) {
       _location: location()
     });
   }
-  __name(peg$f7, "peg$f7");
-  __name2(peg$f7, "peg$f7");
-  function peg$f8(name, args) {
+  __name(peg$f6, "peg$f6");
+  __name2(peg$f6, "peg$f6");
+  function peg$f7(name, args) {
     return new ParsedEnvSpecFunctionCall({
       name,
       args,
       _location: location()
     });
   }
-  __name(peg$f8, "peg$f8");
-  __name2(peg$f8, "peg$f8");
-  function peg$f9(key, val) {
+  __name(peg$f7, "peg$f7");
+  __name2(peg$f7, "peg$f7");
+  function peg$f8(key, val) {
     return new ParsedEnvSpecKeyValuePair({ key, val });
   }
-  __name(peg$f9, "peg$f9");
-  __name2(peg$f9, "peg$f9");
-  function peg$f10(values) {
+  __name(peg$f8, "peg$f8");
+  __name2(peg$f8, "peg$f8");
+  function peg$f9(values) {
     return new ParsedEnvSpecFunctionArgs({
       values: values || [],
       _location: location()
     });
   }
-  __name(peg$f10, "peg$f10");
-  __name2(peg$f10, "peg$f10");
-  function peg$f11() {
+  __name(peg$f9, "peg$f9");
+  __name2(peg$f9, "peg$f9");
+  function peg$f10() {
     return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
-  __name(peg$f11, "peg$f11");
-  __name2(peg$f11, "peg$f11");
-  function peg$f12(name, args) {
+  __name(peg$f10, "peg$f10");
+  __name2(peg$f10, "peg$f10");
+  function peg$f11(name, args) {
     return new ParsedEnvSpecFunctionCall({
       name,
       args,
       _location: location()
     });
   }
-  __name(peg$f12, "peg$f12");
-  __name2(peg$f12, "peg$f12");
-  function peg$f13(key, val) {
+  __name(peg$f11, "peg$f11");
+  __name2(peg$f11, "peg$f11");
+  function peg$f12(key, val) {
     return new ParsedEnvSpecKeyValuePair({ key, val });
   }
-  __name(peg$f13, "peg$f13");
-  __name2(peg$f13, "peg$f13");
-  function peg$f14(values) {
+  __name(peg$f12, "peg$f12");
+  __name2(peg$f12, "peg$f12");
+  function peg$f13(values) {
     return new ParsedEnvSpecFunctionArgs({
       values: values || [],
       _location: location()
     });
   }
-  __name(peg$f14, "peg$f14");
-  __name2(peg$f14, "peg$f14");
-  function peg$f15() {
+  __name(peg$f13, "peg$f13");
+  __name2(peg$f13, "peg$f13");
+  function peg$f14() {
     return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
   }
-  __name(peg$f15, "peg$f15");
-  __name2(peg$f15, "peg$f15");
-  function peg$f16(leadingSpace, contents) {
+  __name(peg$f14, "peg$f14");
+  __name2(peg$f14, "peg$f14");
+  function peg$f15(leadingSpace, contents) {
     return new ParsedEnvSpecDivider({
       contents,
       leadingSpace,
       _location: location()
     });
   }
+  __name(peg$f15, "peg$f15");
+  __name2(peg$f15, "peg$f15");
+  function peg$f16() {
+    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
+  }
   __name(peg$f16, "peg$f16");
   __name2(peg$f16, "peg$f16");
   function peg$f17() {
@@ -3025,8 +3030,8 @@ function peg$parse(input, options) {
   }
   __name(peg$f17, "peg$f17");
   __name2(peg$f17, "peg$f17");
-  function peg$f18() {
-    return new ParsedEnvSpecStaticValue({ rawValue: text(), _location: location() });
+  function peg$f18(quote) {
+    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
   }
   __name(peg$f18, "peg$f18");
   __name2(peg$f18, "peg$f18");
@@ -3041,7 +3046,7 @@ function peg$parse(input, options) {
   __name(peg$f20, "peg$f20");
   __name2(peg$f20, "peg$f20");
   function peg$f21(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, rawValue: text(), _location: location() });
+    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
   }
   __name(peg$f21, "peg$f21");
   __name2(peg$f21, "peg$f21");
@@ -3060,11 +3065,6 @@ function peg$parse(input, options) {
   }
   __name(peg$f24, "peg$f24");
   __name2(peg$f24, "peg$f24");
-  function peg$f25(quote) {
-    return new ParsedEnvSpecStaticValue({ quote, isMultiLine: true, rawValue: text(), _location: location() });
-  }
-  __name(peg$f25, "peg$f25");
-  __name2(peg$f25, "peg$f25");
   let peg$currPos = options.peg$currPos | 0;
   let peg$savedPos = peg$currPos;
   const peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -3303,12 +3303,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) {
@@ -3333,12 +3330,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) {
@@ -3403,12 +3397,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;
@@ -3511,12 +3502,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();
@@ -3534,12 +3522,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();
@@ -3673,7 +3658,7 @@ function peg$parse(input, options) {
   }
   __name(peg$parseComment, "peg$parseComment");
   __name2(peg$parseComment, "peg$parseComment");
-  function 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) {
@@ -3689,65 +3674,55 @@ 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$parseDecorator();
+          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$parseDecorator();
+            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;
           }
-        } else {
-          s6 = peg$FAILED;
         }
+        s5 = peg$currPos;
+        s6 = peg$parse__();
         if (s6 !== peg$FAILED) {
-          if (input.charCodeAt(peg$currPos) === 58) {
-            s7 = peg$c5;
+          s7 = peg$currPos;
+          s8 = [];
+          s9 = input.charAt(peg$currPos);
+          if (peg$r2.test(s9)) {
             peg$currPos++;
           } else {
-            s7 = peg$FAILED;
+            s9 = 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)) {
-              peg$currPos++;
-            } else {
-              s9 = peg$FAILED;
-              if (peg$silentFails === 0) {
-                peg$fail(peg$e7);
-              }
-            }
+          if (s9 !== peg$FAILED) {
             while (s9 !== peg$FAILED) {
               s8.push(s9);
               s9 = input.charAt(peg$currPos);
@@ -3760,164 +3735,14 @@ function peg$parse(input, options) {
                 }
               }
             }
-            s5 = [s5, s6, s7, s8];
-            s4 = s5;
           } else {
-            peg$currPos = s4;
-            s4 = peg$FAILED;
+            s8 = peg$FAILED;
           }
-        } else {
-          peg$currPos = s4;
-          s4 = peg$FAILED;
-        }
-      } else {
-        peg$currPos = s4;
-        s4 = peg$FAILED;
-      }
-      if (s4 === peg$FAILED) {
-        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++;
+          if (s8 !== peg$FAILED) {
+            s7 = input.substring(s7, peg$currPos);
           } else {
-            s7 = peg$FAILED;
-            if (peg$silentFails === 0) {
-              peg$fail(peg$e8);
-            }
+            s7 = s8;
           }
-          if (s7 !== peg$FAILED) {
-            while (s7 !== peg$FAILED) {
-              s6.push(s7);
-              s7 = input.charAt(peg$currPos);
-              if (peg$r3.test(s7)) {
-                peg$currPos++;
-              } else {
-                s7 = peg$FAILED;
-                if (peg$silentFails === 0) {
-                  peg$fail(peg$e8);
-                }
-              }
-            }
-          } else {
-            s6 = peg$FAILED;
-          }
-          if (s6 !== peg$FAILED) {
-            s7 = peg$parse__();
-            if (s7 !== peg$FAILED) {
-              s8 = peg$currPos;
-              peg$silentFails++;
-              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$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)) {
-                  peg$currPos++;
-                } else {
-                  s10 = peg$FAILED;
-                  if (peg$silentFails === 0) {
-                    peg$fail(peg$e7);
-                  }
-                }
-                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;
-              }
-            } else {
-              peg$currPos = s4;
-              s4 = 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 {
@@ -3928,48 +3753,21 @@ function peg$parse(input, options) {
           peg$currPos = s5;
           s5 = peg$FAILED;
         }
-        while (s5 !== peg$FAILED) {
-          s4.push(s5);
+        if (s5 === peg$FAILED) {
           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;
-          }
-        }
-        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)) {
+          s6 = peg$currPos;
+          s7 = peg$currPos;
+          if (input.charCodeAt(peg$currPos) === 35) {
+            s8 = peg$c3;
             peg$currPos++;
           } else {
-            s10 = peg$FAILED;
+            s8 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e7);
+              peg$fail(peg$e5);
             }
           }
-          while (s10 !== peg$FAILED) {
-            s9.push(s10);
+          if (s8 !== peg$FAILED) {
+            s9 = [];
             s10 = input.charAt(peg$currPos);
             if (peg$r2.test(s10)) {
               peg$currPos++;
@@ -3979,19 +3777,42 @@ function peg$parse(input, options) {
                 peg$fail(peg$e7);
               }
             }
+            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);
+                }
+              }
+            }
+            s8 = [s8, s9];
+            s7 = s8;
+          } else {
+            peg$currPos = s7;
+            s7 = peg$FAILED;
+          }
+          if (s7 !== peg$FAILED) {
+            s6 = input.substring(s6, peg$currPos);
+          } else {
+            s6 = s7;
+          }
+          if (s6 !== peg$FAILED) {
+            s5 = s6;
+          } else {
+            peg$currPos = s5;
+            s5 = peg$FAILED;
           }
-          s8 = [s8, s9];
-          s7 = s8;
-        } else {
-          peg$currPos = s7;
-          s7 = peg$FAILED;
         }
-        if (s7 === peg$FAILED) {
-          s7 = null;
+        if (s5 === peg$FAILED) {
+          s5 = null;
         }
-        s6 = input.substring(s6, peg$currPos);
+        s6 = peg$parse_();
         peg$savedPos = s0;
-        s0 = peg$f6(s2, s3, s4, s6);
+        s0 = peg$f5(s2, s3, s4, s5);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4049,7 +3870,7 @@ function peg$parse(input, options) {
           s3 = null;
         }
         peg$savedPos = s0;
-        s0 = peg$f7(s2, s3);
+        s0 = peg$f6(s2, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4078,23 +3899,23 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r5.test(s4)) {
+      if (peg$r4.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e9);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r5.test(s4)) {
+        if (peg$r4.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e9);
           }
         }
       }
@@ -4134,7 +3955,7 @@ function peg$parse(input, options) {
       s2 = peg$parseDecoratorFunctionArgs();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f8(s1, s2);
+        s0 = peg$f7(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4151,12 +3972,12 @@ 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;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e12);
+        peg$fail(peg$e10);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -4179,7 +4000,7 @@ function peg$parse(input, options) {
           s8 = peg$parseDecoratorFunctionArgValue();
           if (s8 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f9(s6, s8);
+            s5 = peg$f8(s6, s8);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -4201,12 +4022,12 @@ 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;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e13);
+            peg$fail(peg$e11);
           }
         }
         if (s8 !== peg$FAILED) {
@@ -4234,7 +4055,7 @@ function peg$parse(input, options) {
               s9 = peg$parseDecoratorFunctionArgValue();
               if (s9 !== peg$FAILED) {
                 peg$savedPos = s6;
-                s6 = peg$f9(s7, s9);
+                s6 = peg$f8(s7, s9);
               } else {
                 peg$currPos = s6;
                 s6 = peg$FAILED;
@@ -4272,12 +4093,12 @@ 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;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e13);
+          peg$fail(peg$e11);
         }
       }
       if (s6 !== peg$FAILED) {
@@ -4292,17 +4113,17 @@ 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;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e14);
+          peg$fail(peg$e12);
         }
       }
       if (s6 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f10(s3);
+        s0 = peg$f9(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4325,24 +4146,24 @@ function peg$parse(input, options) {
         s1 = peg$currPos;
         s2 = [];
         s3 = input.charAt(peg$currPos);
-        if (peg$r6.test(s3)) {
+        if (peg$r5.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e15);
+            peg$fail(peg$e13);
           }
         }
         if (s3 !== peg$FAILED) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
             s3 = input.charAt(peg$currPos);
-            if (peg$r6.test(s3)) {
+            if (peg$r5.test(s3)) {
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e15);
+                peg$fail(peg$e13);
               }
             }
           }
@@ -4356,7 +4177,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f11();
+          s1 = peg$f10();
         }
         s0 = s1;
       }
@@ -4369,12 +4190,12 @@ 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$r6.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e16);
+        peg$fail(peg$e14);
       }
     }
     if (s1 === peg$FAILED) {
@@ -4391,23 +4212,23 @@ function peg$parse(input, options) {
       if (s2 !== peg$FAILED) {
         s3 = [];
         s4 = input.charAt(peg$currPos);
-        if (peg$r7.test(s4)) {
+        if (peg$r6.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e16);
+            peg$fail(peg$e14);
           }
         }
         while (s4 !== peg$FAILED) {
           s3.push(s4);
           s4 = input.charAt(peg$currPos);
-          if (peg$r7.test(s4)) {
+          if (peg$r6.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e16);
+              peg$fail(peg$e14);
             }
           }
         }
@@ -4423,23 +4244,23 @@ function peg$parse(input, options) {
         if (s4 !== peg$FAILED) {
           s5 = [];
           s6 = input.charAt(peg$currPos);
-          if (peg$r7.test(s6)) {
+          if (peg$r6.test(s6)) {
             peg$currPos++;
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e16);
+              peg$fail(peg$e14);
             }
           }
           while (s6 !== peg$FAILED) {
             s5.push(s6);
             s6 = input.charAt(peg$currPos);
-            if (peg$r7.test(s6)) {
+            if (peg$r6.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e16);
+                peg$fail(peg$e14);
               }
             }
           }
@@ -4457,12 +4278,12 @@ function peg$parse(input, options) {
     while (s1 !== peg$FAILED) {
       s0.push(s1);
       s1 = input.charAt(peg$currPos);
-      if (peg$r7.test(s1)) {
+      if (peg$r6.test(s1)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e16);
+          peg$fail(peg$e14);
         }
       }
       if (s1 === peg$FAILED) {
@@ -4479,23 +4300,23 @@ function peg$parse(input, options) {
         if (s2 !== peg$FAILED) {
           s3 = [];
           s4 = input.charAt(peg$currPos);
-          if (peg$r7.test(s4)) {
+          if (peg$r6.test(s4)) {
             peg$currPos++;
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e16);
+              peg$fail(peg$e14);
             }
           }
           while (s4 !== peg$FAILED) {
             s3.push(s4);
             s4 = input.charAt(peg$currPos);
-            if (peg$r7.test(s4)) {
+            if (peg$r6.test(s4)) {
               peg$currPos++;
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e16);
+                peg$fail(peg$e14);
               }
             }
           }
@@ -4511,23 +4332,23 @@ function peg$parse(input, options) {
           if (s4 !== peg$FAILED) {
             s5 = [];
             s6 = input.charAt(peg$currPos);
-            if (peg$r7.test(s6)) {
+            if (peg$r6.test(s6)) {
               peg$currPos++;
             } else {
               s6 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e16);
+                peg$fail(peg$e14);
               }
             }
             while (s6 !== peg$FAILED) {
               s5.push(s6);
               s6 = input.charAt(peg$currPos);
-              if (peg$r7.test(s6)) {
+              if (peg$r6.test(s6)) {
                 peg$currPos++;
               } else {
                 s6 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e16);
+                  peg$fail(peg$e14);
                 }
               }
             }
@@ -4555,7 +4376,7 @@ function peg$parse(input, options) {
       s2 = peg$parseFunctionArgs();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f12(s1, s2);
+        s0 = peg$f11(s1, s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4584,23 +4405,23 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r5.test(s4)) {
+      if (peg$r7.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e15);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r5.test(s4)) {
+        if (peg$r7.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e15);
           }
         }
       }
@@ -4623,12 +4444,12 @@ 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;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e12);
+        peg$fail(peg$e10);
       }
     }
     if (s1 !== peg$FAILED) {
@@ -4651,7 +4472,7 @@ function peg$parse(input, options) {
           s8 = peg$parseFunctionArgValue();
           if (s8 !== peg$FAILED) {
             peg$savedPos = s5;
-            s5 = peg$f13(s6, s8);
+            s5 = peg$f12(s6, s8);
           } else {
             peg$currPos = s5;
             s5 = peg$FAILED;
@@ -4673,12 +4494,12 @@ 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;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e13);
+            peg$fail(peg$e11);
           }
         }
         if (s8 !== peg$FAILED) {
@@ -4706,7 +4527,7 @@ function peg$parse(input, options) {
               s9 = peg$parseFunctionArgValue();
               if (s9 !== peg$FAILED) {
                 peg$savedPos = s6;
-                s6 = peg$f13(s7, s9);
+                s6 = peg$f12(s7, s9);
               } else {
                 peg$currPos = s6;
                 s6 = peg$FAILED;
@@ -4744,12 +4565,12 @@ 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;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e13);
+          peg$fail(peg$e11);
         }
       }
       if (s6 !== peg$FAILED) {
@@ -4764,17 +4585,17 @@ 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;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e14);
+          peg$fail(peg$e12);
         }
       }
       if (s6 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f14(s3);
+        s0 = peg$f13(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -4803,23 +4624,23 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = [];
       s4 = input.charAt(peg$currPos);
-      if (peg$r5.test(s4)) {
+      if (peg$r7.test(s4)) {
         peg$currPos++;
       } else {
         s4 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e11);
+          peg$fail(peg$e15);
         }
       }
       while (s4 !== peg$FAILED) {
         s3.push(s4);
         s4 = input.charAt(peg$currPos);
-        if (peg$r5.test(s4)) {
+        if (peg$r7.test(s4)) {
           peg$currPos++;
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e11);
+            peg$fail(peg$e15);
           }
         }
       }
@@ -4848,24 +4669,24 @@ function peg$parse(input, options) {
         s1 = peg$currPos;
         s2 = [];
         s3 = input.charAt(peg$currPos);
-        if (peg$r6.test(s3)) {
+        if (peg$r5.test(s3)) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e15);
+            peg$fail(peg$e13);
           }
         }
         if (s3 !== peg$FAILED) {
           while (s3 !== peg$FAILED) {
             s2.push(s3);
             s3 = input.charAt(peg$currPos);
-            if (peg$r6.test(s3)) {
+            if (peg$r5.test(s3)) {
               peg$currPos++;
             } else {
               s3 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e15);
+                peg$fail(peg$e13);
               }
             }
           }
@@ -4879,7 +4700,7 @@ function peg$parse(input, options) {
         }
         if (s1 !== peg$FAILED) {
           peg$savedPos = s0;
-          s1 = peg$f15();
+          s1 = peg$f14();
         }
         s0 = s1;
       }
@@ -4897,7 +4718,7 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e17);
+        peg$fail(peg$e16);
       }
     }
     while (s1 !== peg$FAILED) {
@@ -4908,7 +4729,7 @@ function peg$parse(input, options) {
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e17);
+          peg$fail(peg$e16);
         }
       }
     }
@@ -4942,7 +4763,7 @@ function peg$parse(input, options) {
       } else {
         s7 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e18);
+          peg$fail(peg$e17);
         }
       }
       while (s7 !== peg$FAILED) {
@@ -4953,7 +4774,7 @@ function peg$parse(input, options) {
         } else {
           s7 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e18);
+            peg$fail(peg$e17);
           }
         }
       }
@@ -5001,7 +4822,7 @@ function peg$parse(input, options) {
         s4 = peg$parse_n();
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f16(s2, s3);
+          s0 = peg$f15(s2, s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5032,7 +4853,7 @@ function peg$parse(input, options) {
     } else {
       s5 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e19);
+        peg$fail(peg$e18);
       }
     }
     peg$silentFails--;
@@ -5050,7 +4871,7 @@ function peg$parse(input, options) {
       } else {
         s6 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e20);
+          peg$fail(peg$e19);
         }
       }
       if (s6 !== peg$FAILED) {
@@ -5062,7 +4883,7 @@ function peg$parse(input, options) {
           } else {
             s6 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e20);
+              peg$fail(peg$e19);
             }
           }
         }
@@ -5087,7 +4908,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17();
+      s1 = peg$f16();
     }
     s0 = s1;
     return s0;
@@ -5107,7 +4928,7 @@ function peg$parse(input, options) {
     } else {
       s4 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e19);
+        peg$fail(peg$e18);
       }
     }
     peg$silentFails--;
@@ -5125,7 +4946,7 @@ function peg$parse(input, options) {
       } else {
         s5 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e21);
+          peg$fail(peg$e20);
         }
       }
       if (s5 !== peg$FAILED) {
@@ -5137,7 +4958,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e21);
+              peg$fail(peg$e20);
             }
           }
         }
@@ -5162,7 +4983,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18();
+      s1 = peg$f17();
     }
     s0 = s1;
     return s0;
@@ -5191,18 +5012,18 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e22);
+        peg$fail(peg$e21);
       }
     }
     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$e22);
         }
       }
       if (s3 === peg$FAILED) {
@@ -5212,19 +5033,19 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e24);
+            peg$fail(peg$e23);
           }
         }
       }
       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$e22);
           }
         }
         if (s3 === peg$FAILED) {
@@ -5234,7 +5055,7 @@ function peg$parse(input, options) {
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e24);
+              peg$fail(peg$e23);
             }
           }
         }
@@ -5245,12 +5066,12 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e22);
+          peg$fail(peg$e21);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f19(s1);
+        s0 = peg$f18(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5272,18 +5093,18 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e25);
+        peg$fail(peg$e24);
       }
     }
     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$e25);
         }
       }
       if (s3 === peg$FAILED) {
@@ -5293,19 +5114,19 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e27);
+            peg$fail(peg$e26);
           }
         }
       }
       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$e25);
           }
         }
         if (s3 === peg$FAILED) {
@@ -5315,7 +5136,7 @@ function peg$parse(input, options) {
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e27);
+              peg$fail(peg$e26);
             }
           }
         }
@@ -5326,12 +5147,12 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e25);
+          peg$fail(peg$e24);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f20(s1);
+        s0 = peg$f19(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5353,18 +5174,18 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e28);
+        peg$fail(peg$e27);
       }
     }
     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$e28);
         }
       }
       if (s3 === peg$FAILED) {
@@ -5374,19 +5195,19 @@ function peg$parse(input, options) {
         } else {
           s3 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e30);
+            peg$fail(peg$e29);
           }
         }
       }
       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$e28);
           }
         }
         if (s3 === peg$FAILED) {
@@ -5396,7 +5217,7 @@ function peg$parse(input, options) {
           } else {
             s3 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e30);
+              peg$fail(peg$e29);
             }
           }
         }
@@ -5407,12 +5228,12 @@ function peg$parse(input, options) {
       } else {
         s3 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e28);
+          peg$fail(peg$e27);
         }
       }
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f21(s1);
+        s0 = peg$f20(s1);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -5450,20 +5271,20 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e25);
+        peg$fail(peg$e24);
       }
     }
     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$e25);
         }
       }
       if (s5 === peg$FAILED) {
@@ -5473,19 +5294,19 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e27);
+            peg$fail(peg$e26);
           }
         }
       }
       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$e25);
           }
         }
         if (s5 === peg$FAILED) {
@@ -5495,7 +5316,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e27);
+              peg$fail(peg$e26);
             }
           }
         }
@@ -5521,13 +5342,13 @@ 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$e25);
             }
           }
           if (s5 === peg$FAILED) {
@@ -5537,19 +5358,19 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e27);
+                peg$fail(peg$e26);
               }
             }
           }
           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$e25);
               }
             }
             if (s5 === peg$FAILED) {
@@ -5559,7 +5380,7 @@ function peg$parse(input, options) {
               } else {
                 s5 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e27);
+                  peg$fail(peg$e26);
                 }
               }
             }
@@ -5586,13 +5407,13 @@ 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$e25);
           }
         }
         if (s4 === peg$FAILED) {
@@ -5602,19 +5423,19 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e27);
+              peg$fail(peg$e26);
             }
           }
         }
         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$e25);
             }
           }
           if (s4 === peg$FAILED) {
@@ -5624,7 +5445,7 @@ function peg$parse(input, options) {
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e27);
+                peg$fail(peg$e26);
               }
             }
           }
@@ -5635,12 +5456,12 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e25);
+            peg$fail(peg$e24);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f22(s1);
+          s0 = peg$f21(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5666,20 +5487,20 @@ function peg$parse(input, options) {
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e22);
+        peg$fail(peg$e21);
       }
     }
     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$e22);
         }
       }
       if (s5 === peg$FAILED) {
@@ -5689,19 +5510,19 @@ function peg$parse(input, options) {
         } else {
           s5 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e24);
+            peg$fail(peg$e23);
           }
         }
       }
       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$e22);
           }
         }
         if (s5 === peg$FAILED) {
@@ -5711,7 +5532,7 @@ function peg$parse(input, options) {
           } else {
             s5 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e24);
+              peg$fail(peg$e23);
             }
           }
         }
@@ -5737,13 +5558,13 @@ 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$e22);
             }
           }
           if (s5 === peg$FAILED) {
@@ -5753,19 +5574,19 @@ function peg$parse(input, options) {
             } else {
               s5 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e24);
+                peg$fail(peg$e23);
               }
             }
           }
           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$e22);
               }
             }
             if (s5 === peg$FAILED) {
@@ -5775,7 +5596,7 @@ function peg$parse(input, options) {
               } else {
                 s5 = peg$FAILED;
                 if (peg$silentFails === 0) {
-                  peg$fail(peg$e24);
+                  peg$fail(peg$e23);
                 }
               }
             }
@@ -5802,13 +5623,13 @@ 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$e22);
           }
         }
         if (s4 === peg$FAILED) {
@@ -5818,19 +5639,19 @@ function peg$parse(input, options) {
           } else {
             s4 = peg$FAILED;
             if (peg$silentFails === 0) {
-              peg$fail(peg$e24);
+              peg$fail(peg$e23);
             }
           }
         }
         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$e22);
             }
           }
           if (s4 === peg$FAILED) {
@@ -5840,7 +5661,7 @@ function peg$parse(input, options) {
             } else {
               s4 = peg$FAILED;
               if (peg$silentFails === 0) {
-                peg$fail(peg$e24);
+                peg$fail(peg$e23);
               }
             }
           }
@@ -5851,12 +5672,12 @@ function peg$parse(input, options) {
         } else {
           s4 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e22);
+            peg$fail(peg$e21);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f23(s1);
+          s0 = peg$f22(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -5876,39 +5697,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$e30);
       }
     }
     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$e31);
         }
       }
       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$e30);
           }
         }
         peg$silentFails--;
@@ -5942,26 +5763,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$e31);
           }
         }
         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$e30);
             }
           }
           peg$silentFails--;
@@ -6015,26 +5836,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$e31);
             }
           }
           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$e30);
               }
             }
             peg$silentFails--;
@@ -6068,26 +5889,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$e31);
               }
             }
             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$e30);
                 }
               }
               peg$silentFails--;
@@ -6142,26 +5963,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$e31);
           }
         }
         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$e30);
             }
           }
           peg$silentFails--;
@@ -6195,26 +6016,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$e31);
             }
           }
           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$e30);
               }
             }
             peg$silentFails--;
@@ -6247,18 +6068,18 @@ 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$e30);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f24(s1);
+          s0 = peg$f23(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -6278,39 +6099,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$e32);
       }
     }
     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$e33);
         }
       }
       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$e32);
           }
         }
         peg$silentFails--;
@@ -6344,26 +6165,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$e33);
           }
         }
         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$e32);
             }
           }
           peg$silentFails--;
@@ -6417,26 +6238,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$e33);
             }
           }
           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$e32);
               }
             }
             peg$silentFails--;
@@ -6470,26 +6291,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$e33);
               }
             }
             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$e32);
                 }
               }
               peg$silentFails--;
@@ -6544,26 +6365,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$e33);
           }
         }
         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$e32);
             }
           }
           peg$silentFails--;
@@ -6597,26 +6418,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$e33);
             }
           }
           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$e32);
               }
             }
             peg$silentFails--;
@@ -6649,18 +6470,18 @@ 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$e32);
           }
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f25(s1);
+          s0 = peg$f24(s1);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -6697,7 +6518,7 @@ function peg$parse(input, options) {
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e35);
+          peg$fail(peg$e34);
         }
       }
       peg$silentFails--;
@@ -6716,23 +6537,23 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r7.test(s1)) {
+    if (peg$r6.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e16);
+        peg$fail(peg$e14);
       }
     }
     while (s1 !== peg$FAILED) {
       s0.push(s1);
       s1 = input.charAt(peg$currPos);
-      if (peg$r7.test(s1)) {
+      if (peg$r6.test(s1)) {
         peg$currPos++;
       } else {
         s1 = peg$FAILED;
         if (peg$silentFails === 0) {
-          peg$fail(peg$e16);
+          peg$fail(peg$e14);
         }
       }
     }
@@ -6744,24 +6565,24 @@ function peg$parse(input, options) {
     let s0, s1;
     s0 = [];
     s1 = input.charAt(peg$currPos);
-    if (peg$r7.test(s1)) {
+    if (peg$r6.test(s1)) {
       peg$currPos++;
     } else {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) {
-        peg$fail(peg$e16);
+        peg$fail(peg$e14);
       }
     }
     if (s1 !== peg$FAILED) {
       while (s1 !== peg$FAILED) {
         s0.push(s1);
         s1 = input.charAt(peg$currPos);
-        if (peg$r7.test(s1)) {
+        if (peg$r6.test(s1)) {
           peg$currPos++;
         } else {
           s1 = peg$FAILED;
           if (peg$silentFails === 0) {
-            peg$fail(peg$e16);
+            peg$fail(peg$e14);
           }
         }
       }
@@ -7631,9 +7452,6 @@ var ExecError = class extends Error {
     this.signal = signal;
     this.data = data;
   }
-  exitCode;
-  signal;
-  data;
   static {
     __name(this, "ExecError");
   }
@@ -7878,7 +7696,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;
   }
@@ -7886,7 +7704,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;
   }
@@ -7894,7 +7712,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;
   }
@@ -7902,7 +7720,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;
   }
@@ -7990,12 +7808,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) {
@@ -8004,9 +7822,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) {
@@ -8021,19 +7839,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 }
             }
-          );
+          ));
         }
       }
     }
@@ -8145,13 +7964,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}`);
       }
     }
@@ -8325,7 +8138,7 @@ var limitOptions = /* @__PURE__ */ __name((params) => {
 var confirm = /* @__PURE__ */ __name((opts) => {
   const active = opts.active ?? "Yes";
   const inactive = opts.inactive ?? "No";
-  return new Q({
+  return new X({
     active,
     inactive,
     input: opts.input,
@@ -8366,7 +8179,7 @@ var select = /* @__PURE__ */ __name((opts) => {
         return `${ansis_default.dim(S_RADIO_INACTIVE)} ${ansis_default.dim(label)}`;
     }
   }, "opt");
-  return new nt({
+  return new ut({
     options: opts.options,
     input: opts.input,
     output: opts.output,
@@ -8420,7 +8233,7 @@ var multiselect = /* @__PURE__ */ __name((opts) => {
     }
     return `${ansis_default.dim(S_CHECKBOX_INACTIVE)} ${ansis_default.dim(label)}`;
   }, "opt");
-  return new it({
+  return new nt({
     options: opts.options,
     input: opts.input,
     output: opts.output,
@@ -8516,11 +8329,11 @@ var password = /* @__PURE__ */ __name(async (opts) => {
   return enqueuePasswordPrompt(async () => {
     const mask = opts.mask ?? S_PASSWORD_MASK;
     if (process.platform === "win32" || isWSL()) {
-      const { password: clackPassword, isCancel } = await import('./dist-WGIHRGBZ.js');
+      const { password: clackPassword, isCancel } = await import('./dist-ZBZ52DPW.js');
       const result = await clackPassword({ message: opts.message, mask });
       return isCancel(result) ? /* @__PURE__ */ Symbol("cancel") : result;
     }
-    return new rt({
+    return new ot({
       mask,
       input: opts.input,
       output: opts.output,
@@ -8751,7 +8564,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");
@@ -8922,7 +8738,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", {
@@ -8983,12 +8799,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;
         }
       }
@@ -9111,7 +8927,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);
@@ -9234,7 +9050,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;
       }
     }
@@ -9397,7 +9213,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;
@@ -9413,7 +9229,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;
@@ -9424,7 +9240,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;
@@ -9458,7 +9274,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)) {
@@ -9542,7 +9358,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);
@@ -9556,7 +9372,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, {
@@ -9570,7 +9386,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("/")) {
@@ -9583,15 +9399,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);
@@ -9604,17 +9420,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;
         }
       }
@@ -9633,10 +9449,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) {
@@ -9650,18 +9467,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 = [];
@@ -9687,7 +9516,6 @@ var ImportAliasSource = class extends EnvGraphDataSource2 {
     super();
     this.original = original;
   }
-  original;
   static {
     __name(this, "ImportAliasSource");
   }
@@ -9758,7 +9586,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");
@@ -9779,7 +9607,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,
@@ -9787,7 +9615,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;
@@ -9807,13 +9636,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) }
           ));
@@ -9825,7 +9654,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) }
             ));
@@ -9850,7 +9679,6 @@ var DirectoryDataSource = class extends EnvGraphDataSource2 {
     super();
     this.basePath = basePath;
   }
-  basePath;
   static {
     __name(this, "DirectoryDataSource");
   }
@@ -9887,9 +9715,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];
@@ -9918,7 +9746,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);
     }
@@ -9927,7 +9755,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) {
@@ -9942,7 +9770,6 @@ var MultiplePathsContainerDataSource = class extends EnvGraphDataSource2 {
     super();
     this.paths = paths;
   }
-  paths;
   static {
     __name(this, "MultiplePathsContainerDataSource");
   }
@@ -9992,15 +9819,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;
@@ -10015,6 +9850,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) {
@@ -10023,7 +9867,10 @@ 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.warning) {
+        this._errors.push(new SchemaError(this.parsedDecorator.warning, { isWarning: true }));
       }
       if (this.decoratorDef.isFunction && !this.isFunctionCall) {
         throw new SchemaError(
@@ -10053,7 +9900,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() {
@@ -10065,13 +9912,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;
@@ -10085,9 +9932,6 @@ var ItemDecoratorInstance = class extends DecoratorInstance {
     this.dataSource = dataSource;
     this.parsedDecorator = parsedDecorator;
   }
-  configItem;
-  dataSource;
-  parsedDecorator;
   static {
     __name(this, "ItemDecoratorInstance");
   }
@@ -10102,8 +9946,6 @@ var RootDecoratorInstance2 = class extends DecoratorInstance {
     this.dataSource = dataSource;
     this.parsedDecorator = parsedDecorator;
   }
-  dataSource;
-  parsedDecorator;
   static {
     __name(this, "RootDecoratorInstance");
   }
@@ -10217,6 +10059,10 @@ var builtInRootDecorators = [
   {
     name: "preventLeaks"
   },
+  {
+    name: "auditIgnorePaths",
+    isFunction: true
+  },
   {
     name: "setValuesBulk",
     isFunction: true,
@@ -10261,8 +10107,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;
       }
@@ -10274,22 +10119,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-6LTV4PNH.js');
+      const { ConfigItem: ConfigItem2 } = await import('./config-item-SQFJ2BJ2.js');
       for (const [key, entry] of Object.entries(entries)) {
         const existsInSchema = key in graph.configSchema;
         if (!existsInSchema && !createMissing) {
@@ -10349,6 +10188,9 @@ var builtInItemDecorators = [
   {
     name: "deprecated"
   },
+  {
+    name: "auditIgnore"
+  },
   // test-only decorators — dropped in release builds
   ...[]
 ];
@@ -10374,9 +10216,6 @@ var Resolver = class {
     this.dataSource = dataSource;
     if (this.def.inferredType) this.inferredType = this.def.inferredType;
   }
-  arrArgs;
-  objArgs;
-  dataSource;
   static {
     __name(this, "Resolver");
   }
@@ -10405,7 +10244,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 [
@@ -10415,13 +10254,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));
@@ -10436,13 +10272,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" : ""}`
           )
@@ -10451,7 +10287,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" : ""}`
           )
@@ -10460,7 +10296,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" : ""}`)
         );
       }
@@ -10468,28 +10304,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}`;
       }
     }
@@ -10553,7 +10389,6 @@ var StaticValueResolver = class extends Resolver {
       this.inferredType = typeof _staticValue;
     }
   }
-  _staticValue;
   static {
     __name(this, "StaticValueResolver");
   }
@@ -10610,9 +10445,8 @@ var ErrorResolver = class extends Resolver {
   constructor(err) {
     super([]);
     this.err = err;
-    this._schemaErrors.push(err);
+    this._errors.push(err);
   }
-  err;
   static {
     __name(this, "ErrorResolver");
   }
@@ -10758,7 +10592,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, ...)"
       }));
@@ -11004,8 +10838,6 @@ var EnvGraphDataType = class {
     this.def = def;
     this.factory = factory;
   }
-  def;
-  factory;
   static {
     __name(this, "EnvGraphDataType");
   }
@@ -11387,8 +11219,6 @@ var ConfigItem = class {
     this.envGraph = envGraph;
     this.key = key;
   }
-  envGraph;
-  key;
   static {
     __name(this, "ConfigItem");
   }
@@ -11554,14 +11384,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;
               }
             }
@@ -11638,7 +11468,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;
         }
@@ -11695,7 +11525,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");
       }
@@ -11889,7 +11719,7 @@ var ConfigItem = class {
             break;
           }
           const requiredDecoratorVal = await requiredDec.resolve();
-          if (requiredDec.schemaErrors.length) {
+          if (requiredDec.schemaErrors.some((e) => !e.isWarning)) {
             isRequired = false;
             break;
           }
@@ -11932,7 +11762,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;
@@ -12025,5 +11855,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-XWYFSG46.js.map
-//# sourceMappingURL=chunk-XWYFSG46.js.map
+//# sourceMappingURL=chunk-GKN3UJNE.js.map
+//# sourceMappingURL=chunk-GKN3UJNE.js.map