@sap/ux-ui5-tooling 1.9.4 → 1.9.6

package/dist/tasks/cf-deploy/index.js

@@ -280,13 +280,8 @@ var require_EventName = __commonJS({
       EventName3["APP_INFO_COMMAND_STARTED"] = "APP_INFO_COMMAND_STARTED";
       EventName3["APP_INFO_LINK_CLICKED"] = "APP_INFO_LINK_CLICKED";
       EventName3["APP_INFO_STARTUP_TIME"] = "APP_INFO_STARTUP_TIME";
-      EventName3["SRV_MODELLER_SETTINGS_CHANGED"] = "SRV_MODELER_SETTINGS_CHANGED";
-      EventName3["SRV_MODELER_ACTIVATED"] = "SRV_MODELER_ACTIVATED";
-      EventName3["SRV_MODELER_PANEL_LOAD"] = "SRV_MODELER_PANEL_LOAD";
-      EventName3["SRV_MODELER_BACKEND_LOAD"] = "SRV_MODELER_BACKEND_LOAD";
-      EventName3["SRV_MODELER_ODATA_VERSION"] = "SRV_MODELER_ODATA_VERSION";
-      EventName3["ANNOTATION_FILE_PANEL_LOAD"] = "ANNOTATION_FILE_PANEL_LOAD";
-      EventName3["ANNOTATION_FILE_BACKEND_LOAD"] = "ANNOTATION_FILE_BACKEND_LOAD";
+      EventName3["SERVICE_MODELER_EVENT"] = "SERVICE_MODELER_EVENT";
+      EventName3["ANNOTATION_FILE_MANAGER_EVENT"] = "ANNOTATION_FILE_MANAGER_EVENT";
       EventName3["ANNOTATION_LSP_XML_LOAD"] = "ANNOTATION_LSP_XML_LOAD";
       EventName3["ANNOTATION_LSP_USAGE_TERM"] = "ANNOTATION_LSP_USAGE_TERM";
       EventName3["ANNOTATION_LSP_CODE_COMPLETION"] = "ANNOTATION_LSP_CODE_COMPLETION";
@@ -4621,9 +4616,9 @@ var require_async_hook = __commonJS({
   }
 });
 
-// ../../node_modules/stack-chain/package.json
+// ../../node_modules/async-hook-jl/node_modules/stack-chain/package.json
 var require_package3 = __commonJS({
-  "../../node_modules/stack-chain/package.json"(exports2, module2) {
+  "../../node_modules/async-hook-jl/node_modules/stack-chain/package.json"(exports2, module2) {
     module2.exports = {
       name: "stack-chain",
       description: "API for combining call site modifiers",
@@ -4653,9 +4648,9 @@ var require_package3 = __commonJS({
   }
 });
 
-// ../../node_modules/stack-chain/format.js
+// ../../node_modules/async-hook-jl/node_modules/stack-chain/format.js
 var require_format = __commonJS({
-  "../../node_modules/stack-chain/format.js"(exports2, module2) {
+  "../../node_modules/async-hook-jl/node_modules/stack-chain/format.js"(exports2, module2) {
     function FormatErrorString(error3) {
       try {
         return Error.prototype.toString.call(error3);
@@ -4689,9 +4684,9 @@ var require_format = __commonJS({
   }
 });
 
-// ../../node_modules/stack-chain/stack-chain.js
+// ../../node_modules/async-hook-jl/node_modules/stack-chain/stack-chain.js
 var require_stack_chain = __commonJS({
-  "../../node_modules/stack-chain/stack-chain.js"(exports2, module2) {
+  "../../node_modules/async-hook-jl/node_modules/stack-chain/stack-chain.js"(exports2, module2) {
     var defaultFormater = require_format();
     function stackChain() {
       this.extend = new TraceModifier();
@@ -4817,9 +4812,9 @@ var require_stack_chain = __commonJS({
   }
 });
 
-// ../../node_modules/stack-chain/index.js
+// ../../node_modules/async-hook-jl/node_modules/stack-chain/index.js
 var require_stack_chain2 = __commonJS({
-  "../../node_modules/stack-chain/index.js"(exports2, module2) {
+  "../../node_modules/async-hook-jl/node_modules/stack-chain/index.js"(exports2, module2) {
     if (global._stackChain) {
       if (global._stackChain.version === require_package3().version) {
         module2.exports = global._stackChain;
@@ -4856,6 +4851,210 @@ var require_async_hook_jl = __commonJS({
   }
 });
 
+// ../../node_modules/stack-chain/package.json
+var require_package4 = __commonJS({
+  "../../node_modules/stack-chain/package.json"(exports2, module2) {
+    module2.exports = {
+      name: "stack-chain",
+      description: "API for combining call site modifiers",
+      version: "2.0.0",
+      author: "Andreas Madsen <amwebdk@gmail.com>",
+      scripts: {
+        test: "tap ./test/simple/*"
+      },
+      repository: {
+        type: "git",
+        url: "git://github.com/AndreasMadsen/stack-chain.git"
+      },
+      keywords: [
+        "stack",
+        "chain",
+        "trace",
+        "call site",
+        "concat",
+        "format"
+      ],
+      devDependencies: {
+        tap: "2.x.x",
+        "uglify-js": "2.5.x"
+      },
+      license: "MIT"
+    };
+  }
+});
+
+// ../../node_modules/stack-chain/format.js
+var require_format2 = __commonJS({
+  "../../node_modules/stack-chain/format.js"(exports2, module2) {
+    function FormatErrorString(error3) {
+      try {
+        return Error.prototype.toString.call(error3);
+      } catch (e) {
+        try {
+          return "<error: " + e + ">";
+        } catch (ee) {
+          return "<error>";
+        }
+      }
+    }
+    module2.exports = function FormatStackTrace(error3, frames) {
+      var lines = [];
+      lines.push(FormatErrorString(error3));
+      for (var i = 0; i < frames.length; i++) {
+        var frame = frames[i];
+        var line;
+        try {
+          line = frame.toString();
+        } catch (e) {
+          try {
+            line = "<error: " + e + ">";
+          } catch (ee) {
+            line = "<error>";
+          }
+        }
+        lines.push("    at " + line);
+      }
+      return lines.join("\n");
+    };
+  }
+});
+
+// ../../node_modules/stack-chain/stack-chain.js
+var require_stack_chain3 = __commonJS({
+  "../../node_modules/stack-chain/stack-chain.js"(exports2, module2) {
+    var defaultFormater = require_format2();
+    var originalCallSiteSymbol = Symbol("originalCallSite");
+    var mutatedCallSiteSymbol = Symbol("mutatedCallSite");
+    function stackChain() {
+      this.extend = new TraceModifier();
+      this.filter = new TraceModifier();
+      this.format = new StackFormater();
+      this.version = require_package4().version;
+    }
+    var SHORTCIRCUIT_CALLSITE = false;
+    stackChain.prototype.callSite = function collectCallSites(options2) {
+      if (!options2)
+        options2 = {};
+      SHORTCIRCUIT_CALLSITE = true;
+      var obj = {};
+      Error.captureStackTrace(obj, collectCallSites);
+      var callSites = obj.stack;
+      SHORTCIRCUIT_CALLSITE = false;
+      callSites = callSites.slice(options2.slice || 0);
+      if (options2.extend)
+        callSites = this.extend._modify(obj, callSites);
+      if (options2.filter)
+        callSites = this.filter._modify(obj, callSites);
+      return callSites;
+    };
+    stackChain.prototype.originalCallSite = function(error3) {
+      error3.stack;
+      return error3[originalCallSiteSymbol];
+    };
+    stackChain.prototype.mutatedCallSite = function(error3) {
+      error3.stack;
+      return error3[mutatedCallSiteSymbol];
+    };
+    var chain = new stackChain();
+    function TraceModifier() {
+      this._modifiers = [];
+    }
+    TraceModifier.prototype._modify = function(error3, frames) {
+      for (var i = 0, l = this._modifiers.length; i < l; i++) {
+        frames = this._modifiers[i](error3, frames);
+      }
+      return frames;
+    };
+    TraceModifier.prototype.attach = function(modifier) {
+      this._modifiers.push(modifier);
+    };
+    TraceModifier.prototype.deattach = function(modifier) {
+      var index = this._modifiers.indexOf(modifier);
+      if (index === -1)
+        return false;
+      this._modifiers.splice(index, 1);
+      return true;
+    };
+    function StackFormater() {
+      this._formater = defaultFormater;
+      this._previous = void 0;
+    }
+    StackFormater.prototype.replace = function(formater) {
+      if (formater) {
+        this._formater = formater;
+      } else {
+        this.restore();
+      }
+    };
+    StackFormater.prototype.restore = function() {
+      this._formater = defaultFormater;
+      this._previous = void 0;
+    };
+    StackFormater.prototype._backup = function() {
+      this._previous = this._formater;
+    };
+    StackFormater.prototype._roolback = function() {
+      if (this._previous === defaultFormater) {
+        this.replace(void 0);
+      } else {
+        this.replace(this._previous);
+      }
+      this._previous = void 0;
+    };
+    if (Error.prepareStackTrace) {
+      chain.format.replace(Error.prepareStackTrace);
+    }
+    var SHORTCIRCUIT_FORMATER = false;
+    function prepareStackTrace(error3, originalFrames) {
+      if (SHORTCIRCUIT_CALLSITE)
+        return originalFrames;
+      if (SHORTCIRCUIT_FORMATER)
+        return defaultFormater(error3, originalFrames);
+      var frames = originalFrames.concat();
+      frames = chain.extend._modify(error3, frames);
+      frames = chain.filter._modify(error3, frames);
+      frames = frames.slice(0, Error.stackTraceLimit);
+      if (Object.isExtensible(error3)) {
+        error3[originalCallSiteSymbol] = originalFrames;
+        error3[mutatedCallSiteSymbol] = frames;
+      }
+      SHORTCIRCUIT_FORMATER = true;
+      var format2 = chain.format._formater(error3, frames);
+      SHORTCIRCUIT_FORMATER = false;
+      return format2;
+    }
+    Object.defineProperty(Error, "prepareStackTrace", {
+      "get": function() {
+        return prepareStackTrace;
+      },
+      "set": function(formater) {
+        if (formater === prepareStackTrace) {
+          chain.format._roolback();
+        } else {
+          chain.format._backup();
+          chain.format.replace(formater);
+        }
+      }
+    });
+    module2.exports = chain;
+  }
+});
+
+// ../../node_modules/stack-chain/index.js
+var require_stack_chain4 = __commonJS({
+  "../../node_modules/stack-chain/index.js"(exports2, module2) {
+    if (global._stackChain) {
+      if (global._stackChain.version === require_package4().version) {
+        module2.exports = global._stackChain;
+      } else {
+        throw new Error("Conflicting version of stack-chain found");
+      }
+    } else {
+      module2.exports = global._stackChain = require_stack_chain3();
+    }
+  }
+});
+
 // ../../node_modules/cls-hooked/context-legacy.js
 var require_context_legacy = __commonJS({
   "../../node_modules/cls-hooked/context-legacy.js"(exports2, module2) {
@@ -5159,7 +5358,7 @@ var require_context_legacy = __commonJS({
       }
     }
     if (DEBUG_CLS_HOOKED) {
-      stackChain = require_stack_chain2();
+      stackChain = require_stack_chain4();
       for (modifier in stackChain.filter._modifiers) {
         stackChain.filter.deattach(modifier);
       }
@@ -11949,11 +12148,11 @@ var require_applicationinsights = __commonJS({
 });
 
 // ../lib/telemetry/dist/package.json
-var require_package4 = __commonJS({
+var require_package5 = __commonJS({
   "../lib/telemetry/dist/package.json"(exports2, module2) {
     module2.exports = {
       name: "@sap/ux-telemetry",
-      version: "1.9.4",
+      version: "1.9.6",
       description: "SAP Fiori tools telemetry library",
       main: "dist/src/index.js",
       author: "SAP SE",
@@ -11978,20 +12177,20 @@ var require_package4 = __commonJS({
       },
       dependencies: {
         "@sap-ux/store": "0.3.8",
-        "@sap/ux-cds": "1.9.4",
-        "@sap/ux-common-utils": "1.9.4",
-        "@sap/ux-feature-toggle": "1.9.4",
-        "@sap/ux-project-access": "1.9.4",
+        "@sap/ux-cds": "1.9.6",
+        "@sap/ux-common-utils": "1.9.6",
+        "@sap/ux-feature-toggle": "1.9.6",
+        "@sap/ux-project-access": "1.9.6",
         applicationinsights: "1.4.1",
         axios: "0.26.0",
         "performance-now": "2.1.0",
-        yaml: "2.0.0-10"
+        yaml: "2.2.2"
       },
       devDependencies: {
         memfs: "3.4.13",
         "ts-jest": "29.0.5",
         "ts-node": "8.5.2",
-        typescript: "4.9.4",
+        typescript: "4.9.5",
         unionfs: "4.4.0"
       },
       files: [
@@ -12083,7 +12282,7 @@ var require_reporting = __commonJS({
     exports2.reportEnableTelemetryOnOff = exports2.reportRuntimeError = void 0;
     var EventName_1 = require_EventName();
     var appInsights = __importStar(require_applicationinsights());
-    var telemetryPackageJSON = __importStar(require_package4());
+    var telemetryPackageJSON = __importStar(require_package5());
     var telemetryClientConfig_1 = require_telemetryClientConfig();
     var parseErrorStack = (errorStack) => {
       const regexps = [/sap-ux.+/gi, /[a-zA-Z-]+\/ide-extension\/.+/gi, /(\/telemetry\/.+)/gi];
@@ -15268,73 +15467,76 @@ var require_visit = __commonJS({
     var SKIP = Symbol("skip children");
     var REMOVE = Symbol("remove node");
     function visit(node, visitor) {
-      if (typeof visitor === "object" && (visitor.Collection || visitor.Node || visitor.Value)) {
-        visitor = Object.assign({
-          Alias: visitor.Node,
-          Map: visitor.Node,
-          Scalar: visitor.Node,
-          Seq: visitor.Node
-        }, visitor.Value && {
-          Map: visitor.Value,
-          Scalar: visitor.Value,
-          Seq: visitor.Value
-        }, visitor.Collection && {
-          Map: visitor.Collection,
-          Seq: visitor.Collection
-        }, visitor);
-      }
+      const visitor_ = initVisitor(visitor);
       if (Node.isDocument(node)) {
-        const cd = _visit(null, node.contents, visitor, Object.freeze([node]));
+        const cd = visit_(null, node.contents, visitor_, Object.freeze([node]));
         if (cd === REMOVE)
           node.contents = null;
       } else
-        _visit(null, node, visitor, Object.freeze([]));
+        visit_(null, node, visitor_, Object.freeze([]));
     }
     visit.BREAK = BREAK;
     visit.SKIP = SKIP;
     visit.REMOVE = REMOVE;
-    function _visit(key, node, visitor, path) {
-      let ctrl = void 0;
-      if (typeof visitor === "function")
-        ctrl = visitor(key, node, path);
-      else if (Node.isMap(node)) {
-        if (visitor.Map)
-          ctrl = visitor.Map(key, node, path);
-      } else if (Node.isSeq(node)) {
-        if (visitor.Seq)
-          ctrl = visitor.Seq(key, node, path);
-      } else if (Node.isPair(node)) {
-        if (visitor.Pair)
-          ctrl = visitor.Pair(key, node, path);
-      } else if (Node.isScalar(node)) {
-        if (visitor.Scalar)
-          ctrl = visitor.Scalar(key, node, path);
-      } else if (Node.isAlias(node)) {
-        if (visitor.Alias)
-          ctrl = visitor.Alias(key, node, path);
-      }
+    function visit_(key, node, visitor, path) {
+      const ctrl = callVisitor(key, node, visitor, path);
       if (Node.isNode(ctrl) || Node.isPair(ctrl)) {
-        const parent = path[path.length - 1];
-        if (Node.isCollection(parent)) {
-          parent.items[key] = ctrl;
-        } else if (Node.isPair(parent)) {
-          if (key === "key")
-            parent.key = ctrl;
-          else
-            parent.value = ctrl;
-        } else if (Node.isDocument(parent)) {
-          parent.contents = ctrl;
-        } else {
-          const pt = Node.isAlias(parent) ? "alias" : "scalar";
-          throw new Error(`Cannot replace node with ${pt} parent`);
+        replaceNode(key, path, ctrl);
+        return visit_(key, ctrl, visitor, path);
+      }
+      if (typeof ctrl !== "symbol") {
+        if (Node.isCollection(node)) {
+          path = Object.freeze(path.concat(node));
+          for (let i = 0; i < node.items.length; ++i) {
+            const ci = visit_(i, node.items[i], visitor, path);
+            if (typeof ci === "number")
+              i = ci - 1;
+            else if (ci === BREAK)
+              return BREAK;
+            else if (ci === REMOVE) {
+              node.items.splice(i, 1);
+              i -= 1;
+            }
+          }
+        } else if (Node.isPair(node)) {
+          path = Object.freeze(path.concat(node));
+          const ck = visit_("key", node.key, visitor, path);
+          if (ck === BREAK)
+            return BREAK;
+          else if (ck === REMOVE)
+            node.key = null;
+          const cv = visit_("value", node.value, visitor, path);
+          if (cv === BREAK)
+            return BREAK;
+          else if (cv === REMOVE)
+            node.value = null;
         }
-        return _visit(key, ctrl, visitor, path);
+      }
+      return ctrl;
+    }
+    async function visitAsync(node, visitor) {
+      const visitor_ = initVisitor(visitor);
+      if (Node.isDocument(node)) {
+        const cd = await visitAsync_(null, node.contents, visitor_, Object.freeze([node]));
+        if (cd === REMOVE)
+          node.contents = null;
+      } else
+        await visitAsync_(null, node, visitor_, Object.freeze([]));
+    }
+    visitAsync.BREAK = BREAK;
+    visitAsync.SKIP = SKIP;
+    visitAsync.REMOVE = REMOVE;
+    async function visitAsync_(key, node, visitor, path) {
+      const ctrl = await callVisitor(key, node, visitor, path);
+      if (Node.isNode(ctrl) || Node.isPair(ctrl)) {
+        replaceNode(key, path, ctrl);
+        return visitAsync_(key, ctrl, visitor, path);
       }
       if (typeof ctrl !== "symbol") {
         if (Node.isCollection(node)) {
           path = Object.freeze(path.concat(node));
           for (let i = 0; i < node.items.length; ++i) {
-            const ci = _visit(i, node.items[i], visitor, path);
+            const ci = await visitAsync_(i, node.items[i], visitor, path);
             if (typeof ci === "number")
               i = ci - 1;
             else if (ci === BREAK)
@@ -15346,12 +15548,12 @@ var require_visit = __commonJS({
           }
         } else if (Node.isPair(node)) {
           path = Object.freeze(path.concat(node));
-          const ck = _visit("key", node.key, visitor, path);
+          const ck = await visitAsync_("key", node.key, visitor, path);
           if (ck === BREAK)
             return BREAK;
           else if (ck === REMOVE)
             node.key = null;
-          const cv = _visit("value", node.value, visitor, path);
+          const cv = await visitAsync_("value", node.value, visitor, path);
           if (cv === BREAK)
             return BREAK;
           else if (cv === REMOVE)
@@ -15360,7 +15562,58 @@ var require_visit = __commonJS({
       }
       return ctrl;
     }
+    function initVisitor(visitor) {
+      if (typeof visitor === "object" && (visitor.Collection || visitor.Node || visitor.Value)) {
+        return Object.assign({
+          Alias: visitor.Node,
+          Map: visitor.Node,
+          Scalar: visitor.Node,
+          Seq: visitor.Node
+        }, visitor.Value && {
+          Map: visitor.Value,
+          Scalar: visitor.Value,
+          Seq: visitor.Value
+        }, visitor.Collection && {
+          Map: visitor.Collection,
+          Seq: visitor.Collection
+        }, visitor);
+      }
+      return visitor;
+    }
+    function callVisitor(key, node, visitor, path) {
+      var _a2, _b, _c, _d, _e;
+      if (typeof visitor === "function")
+        return visitor(key, node, path);
+      if (Node.isMap(node))
+        return (_a2 = visitor.Map) == null ? void 0 : _a2.call(visitor, key, node, path);
+      if (Node.isSeq(node))
+        return (_b = visitor.Seq) == null ? void 0 : _b.call(visitor, key, node, path);
+      if (Node.isPair(node))
+        return (_c = visitor.Pair) == null ? void 0 : _c.call(visitor, key, node, path);
+      if (Node.isScalar(node))
+        return (_d = visitor.Scalar) == null ? void 0 : _d.call(visitor, key, node, path);
+      if (Node.isAlias(node))
+        return (_e = visitor.Alias) == null ? void 0 : _e.call(visitor, key, node, path);
+      return void 0;
+    }
+    function replaceNode(key, path, node) {
+      const parent = path[path.length - 1];
+      if (Node.isCollection(parent)) {
+        parent.items[key] = node;
+      } else if (Node.isPair(parent)) {
+        if (key === "key")
+          parent.key = node;
+        else
+          parent.value = node;
+      } else if (Node.isDocument(parent)) {
+        parent.contents = node;
+      } else {
+        const pt = Node.isAlias(parent) ? "alias" : "scalar";
+        throw new Error(`Cannot replace node with ${pt} parent`);
+      }
+    }
     exports2.visit = visit;
+    exports2.visitAsync = visitAsync;
   }
 });
 
@@ -15381,13 +15634,14 @@ var require_directives = __commonJS({
     var escapeTagName = (tn) => tn.replace(/[!,[\]{}]/g, (ch) => escapeChars[ch]);
     var Directives = class {
       constructor(yaml, tags) {
-        this.marker = null;
+        this.docStart = null;
+        this.docEnd = false;
         this.yaml = Object.assign({}, Directives.defaultYaml, yaml);
         this.tags = Object.assign({}, Directives.defaultTags, tags);
       }
       clone() {
         const copy3 = new Directives(this.yaml, this.tags);
-        copy3.marker = this.marker;
+        copy3.docStart = this.docStart;
         return copy3;
       }
       atDocument() {
@@ -15428,7 +15682,7 @@ var require_directives = __commonJS({
           }
           case "%YAML": {
             this.yaml.explicit = true;
-            if (parts.length < 1) {
+            if (parts.length !== 1) {
               onError(0, "%YAML directive should contain exactly one part");
               return false;
             }
@@ -15437,7 +15691,8 @@ var require_directives = __commonJS({
               this.yaml.version = version;
               return true;
             } else {
-              onError(6, `Unsupported YAML version ${version}`, true);
+              const isValid = /^\d+\.\d+$/.test(version);
+              onError(6, `Unsupported YAML version ${version}`, isValid);
               return false;
             }
           }
@@ -15545,7 +15800,7 @@ var require_anchors = __commonJS({
       const sourceObjects = /* @__PURE__ */ new Map();
       let prevAnchors = null;
       return {
-        onAnchor(source) {
+        onAnchor: (source) => {
           aliasObjects.push(source);
           if (!prevAnchors)
             prevAnchors = anchorNames(doc);
@@ -15553,7 +15808,7 @@ var require_anchors = __commonJS({
           prevAnchors.add(anchor);
           return anchor;
         },
-        setAnchors() {
+        setAnchors: () => {
           for (const source of aliasObjects) {
             const ref = sourceObjects.get(source);
             if (typeof ref === "object" && ref.anchor && (Node.isScalar(ref.node) || Node.isCollection(ref.node))) {
@@ -15689,7 +15944,7 @@ var require_toJS = __commonJS({
           ctx.onCreate(res);
         return res;
       }
-      if (typeof value === "bigint" && !(ctx && ctx.keep))
+      if (typeof value === "bigint" && !(ctx == null ? void 0 : ctx.keep))
         return Number(value);
       return value;
     }
@@ -15710,7 +15965,7 @@ var require_Scalar = __commonJS({
         this.value = value;
       }
       toJSON(arg, ctx) {
-        return ctx && ctx.keep ? this.value : toJS.toJS(this.value, arg, ctx);
+        return (ctx == null ? void 0 : ctx.keep) ? this.value : toJS.toJS(this.value, arg, ctx);
       }
       toString() {
         return String(this.value);
@@ -15737,12 +15992,15 @@ var require_createNode = __commonJS({
     function findTagObject(value, tagName, tags) {
       if (tagName) {
         const match = tags.filter((t) => t.tag === tagName);
-        const tagObj = match.find((t) => !t.format) || match[0];
+        const tagObj = match.find((t) => !t.format) ?? match[0];
         if (!tagObj)
           throw new Error(`Tag ${tagName} not found`);
         return tagObj;
       }
-      return tags.find((t) => t.identify && t.identify(value) && !t.format);
+      return tags.find((t) => {
+        var _a2;
+        return ((_a2 = t.identify) == null ? void 0 : _a2.call(t, value)) && !t.format;
+      });
     }
     function createNode(value, tagName, ctx) {
       var _a2, _b;
@@ -15751,11 +16009,11 @@ var require_createNode = __commonJS({
       if (Node.isNode(value))
         return value;
       if (Node.isPair(value)) {
-        const map = (_b = (_a2 = ctx.schema[Node.MAP]).createNode) === null || _b === void 0 ? void 0 : _b.call(_a2, ctx.schema, null, ctx);
+        const map = (_b = (_a2 = ctx.schema[Node.MAP]).createNode) == null ? void 0 : _b.call(_a2, ctx.schema, null, ctx);
         map.items.push(value);
         return map;
       }
-      if (value instanceof String || value instanceof Number || value instanceof Boolean || typeof BigInt === "function" && value instanceof BigInt) {
+      if (value instanceof String || value instanceof Number || value instanceof Boolean || typeof BigInt !== "undefined" && value instanceof BigInt) {
         value = value.valueOf();
       }
       const { aliasDuplicateObjects, onAnchor, onTagObj, schema, sourceObjects } = ctx;
@@ -15771,12 +16029,13 @@ var require_createNode = __commonJS({
           sourceObjects.set(value, ref);
         }
       }
-      if (tagName && tagName.startsWith("!!"))
+      if (tagName == null ? void 0 : tagName.startsWith("!!"))
         tagName = defaultTagPrefix + tagName.slice(2);
       let tagObj = findTagObject(value, tagName, schema.tags);
       if (!tagObj) {
-        if (value && typeof value.toJSON === "function")
+        if (value && typeof value.toJSON === "function") {
           value = value.toJSON();
+        }
         if (!value || typeof value !== "object") {
           const node2 = new Scalar.Scalar(value);
           if (ref)
@@ -15789,7 +16048,7 @@ var require_createNode = __commonJS({
         onTagObj(tagObj);
         delete ctx.onTagObj;
       }
-      const node = (tagObj === null || tagObj === void 0 ? void 0 : tagObj.createNode) ? tagObj.createNode(ctx.schema, value, ctx) : new Scalar.Scalar(value);
+      const node = (tagObj == null ? void 0 : tagObj.createNode) ? tagObj.createNode(ctx.schema, value, ctx) : new Scalar.Scalar(value);
       if (tagName)
         node.tag = tagName;
       if (ref)
@@ -15927,7 +16186,7 @@ var require_stringifyComment = __commonJS({
         return comment.substring(1);
       return indent ? comment.replace(/^(?! *$)/gm, indent) : comment;
     }
-    var lineComment = (str, indent, comment) => comment.includes("\n") ? "\n" + indentComment(comment, indent) : (str.endsWith(" ") ? "" : " ") + comment;
+    var lineComment = (str, indent, comment) => str.endsWith("\n") ? indentComment(comment, indent) : comment.includes("\n") ? "\n" + indentComment(comment, indent) : (str.endsWith(" ") ? "" : " ") + comment;
     exports2.indentComment = indentComment;
     exports2.lineComment = lineComment;
     exports2.stringifyComment = stringifyComment;
@@ -16066,8 +16325,8 @@ var require_stringifyString = __commonJS({
     "use strict";
     var Scalar = require_Scalar();
     var foldFlowLines = require_foldFlowLines();
-    var getFoldOptions = (ctx) => ({
-      indentAtStart: ctx.indentAtStart,
+    var getFoldOptions = (ctx, isBlock) => ({
+      indentAtStart: isBlock ? ctx.indent.length : ctx.indentAtStart,
       lineWidth: ctx.options.lineWidth,
       minContentWidth: ctx.options.minContentWidth
     });
@@ -16168,7 +16427,7 @@ var require_stringifyString = __commonJS({
           }
       }
       str = start ? str + json.slice(start) : json;
-      return implicitKey ? str : foldFlowLines.foldFlowLines(str, indent, foldFlowLines.FOLD_QUOTED, getFoldOptions(ctx));
+      return implicitKey ? str : foldFlowLines.foldFlowLines(str, indent, foldFlowLines.FOLD_QUOTED, getFoldOptions(ctx, false));
     }
     function singleQuotedString(value, ctx) {
       if (ctx.options.singleQuote === false || ctx.implicitKey && value.includes("\n") || /[ \t]\n|\n[ \t]/.test(value))
@@ -16176,7 +16435,7 @@ var require_stringifyString = __commonJS({
       const indent = ctx.indent || (containsDocumentMarker(value) ? "  " : "");
       const res = "'" + value.replace(/'/g, "''").replace(/\n+/g, `$&
 ${indent}`) + "'";
-      return ctx.implicitKey ? res : foldFlowLines.foldFlowLines(res, indent, foldFlowLines.FOLD_FLOW, getFoldOptions(ctx));
+      return ctx.implicitKey ? res : foldFlowLines.foldFlowLines(res, indent, foldFlowLines.FOLD_FLOW, getFoldOptions(ctx, false));
     }
     function quotedString(value, ctx) {
       const { singleQuote } = ctx.options;
@@ -16258,38 +16517,42 @@ ${indent}`) + "'";
 ${indent}${start}${value}${end}`;
       }
       value = value.replace(/\n+/g, "\n$&").replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g, "$1$2").replace(/\n+/g, `$&${indent}`);
-      const body = foldFlowLines.foldFlowLines(`${start}${value}${end}`, indent, foldFlowLines.FOLD_BLOCK, getFoldOptions(ctx));
+      const body = foldFlowLines.foldFlowLines(`${start}${value}${end}`, indent, foldFlowLines.FOLD_BLOCK, getFoldOptions(ctx, true));
       return `${header}
 ${indent}${body}`;
     }
     function plainString(item, ctx, onComment, onChompKeep) {
       const { type, value } = item;
-      const { actualString, implicitKey, indent, inFlow } = ctx;
+      const { actualString, implicitKey, indent, indentStep, inFlow } = ctx;
       if (implicitKey && /[\n[\]{},]/.test(value) || inFlow && /[[\]{},]/.test(value)) {
         return quotedString(value, ctx);
       }
       if (!value || /^[\n\t ,[\]{}#&*!|>'"%@`]|^[?-]$|^[?-][ \t]|[\n:][ \t]|[ \t]\n|[\n\t ]#|[\n\t :]$/.test(value)) {
-        return implicitKey || inFlow || value.indexOf("\n") === -1 ? quotedString(value, ctx) : blockString(item, ctx, onComment, onChompKeep);
+        return implicitKey || inFlow || !value.includes("\n") ? quotedString(value, ctx) : blockString(item, ctx, onComment, onChompKeep);
       }
-      if (!implicitKey && !inFlow && type !== Scalar.Scalar.PLAIN && value.indexOf("\n") !== -1) {
+      if (!implicitKey && !inFlow && type !== Scalar.Scalar.PLAIN && value.includes("\n")) {
         return blockString(item, ctx, onComment, onChompKeep);
       }
-      if (indent === "" && containsDocumentMarker(value)) {
-        ctx.forceBlockIndent = true;
-        return blockString(item, ctx, onComment, onChompKeep);
+      if (containsDocumentMarker(value)) {
+        if (indent === "") {
+          ctx.forceBlockIndent = true;
+          return blockString(item, ctx, onComment, onChompKeep);
+        } else if (implicitKey && indent === indentStep) {
+          return quotedString(value, ctx);
+        }
       }
       const str = value.replace(/\n+/g, `$&
 ${indent}`);
       if (actualString) {
         const test = (tag) => {
           var _a2;
-          return tag.default && tag.tag !== "tag:yaml.org,2002:str" && ((_a2 = tag.test) === null || _a2 === void 0 ? void 0 : _a2.test(str));
+          return tag.default && tag.tag !== "tag:yaml.org,2002:str" && ((_a2 = tag.test) == null ? void 0 : _a2.test(str));
         };
         const { compat, tags } = ctx.doc.schema;
-        if (tags.some(test) || (compat === null || compat === void 0 ? void 0 : compat.some(test)))
+        if (tags.some(test) || (compat == null ? void 0 : compat.some(test)))
           return quotedString(value, ctx);
       }
-      return implicitKey ? str : foldFlowLines.foldFlowLines(str, indent, foldFlowLines.FOLD_FLOW, getFoldOptions(ctx));
+      return implicitKey ? str : foldFlowLines.foldFlowLines(str, indent, foldFlowLines.FOLD_FLOW, getFoldOptions(ctx, false));
     }
     function stringifyString(item, ctx, onComment, onChompKeep) {
       const { implicitKey, inFlow } = ctx;
@@ -16346,6 +16609,7 @@ var require_stringify = __commonJS({
         doubleQuotedAsJSON: false,
         doubleQuotedMinMultiLineLength: 40,
         falseStr: "false",
+        flowCollectionPadding: true,
         indentSeq: true,
         lineWidth: 80,
         minContentWidth: 20,
@@ -16369,6 +16633,7 @@ var require_stringify = __commonJS({
       return {
         anchors: /* @__PURE__ */ new Set(),
         doc,
+        flowCollectionPadding: opt.flowCollectionPadding ? " " : "",
         indent: "",
         indentStep: typeof opt.indent === "number" ? " ".repeat(opt.indent) : "  ",
         inFlow,
@@ -16376,23 +16641,27 @@ var require_stringify = __commonJS({
       };
     }
     function getTagObject(tags, item) {
+      var _a2;
       if (item.tag) {
         const match = tags.filter((t) => t.tag === item.tag);
         if (match.length > 0)
-          return match.find((t) => t.format === item.format) || match[0];
+          return match.find((t) => t.format === item.format) ?? match[0];
       }
       let tagObj = void 0;
       let obj;
       if (Node.isScalar(item)) {
         obj = item.value;
-        const match = tags.filter((t) => t.identify && t.identify(obj));
-        tagObj = match.find((t) => t.format === item.format) || match.find((t) => !t.format);
+        const match = tags.filter((t) => {
+          var _a3;
+          return (_a3 = t.identify) == null ? void 0 : _a3.call(t, obj);
+        });
+        tagObj = match.find((t) => t.format === item.format) ?? match.find((t) => !t.format);
       } else {
         obj = item;
         tagObj = tags.find((t) => t.nodeClass && obj instanceof t.nodeClass);
       }
       if (!tagObj) {
-        const name = obj && obj.constructor ? obj.constructor.name : typeof obj;
+        const name = ((_a2 = obj == null ? void 0 : obj.constructor) == null ? void 0 : _a2.name) ?? typeof obj;
         throw new Error(`Tag not resolved for ${name} value`);
       }
       return tagObj;
@@ -16406,7 +16675,7 @@ var require_stringify = __commonJS({
         anchors$1.add(anchor);
         props.push(`&${anchor}`);
       }
-      const tag = node.tag || (tagObj.default ? null : tagObj.tag);
+      const tag = node.tag ? node.tag : tagObj.default ? null : tagObj.tag;
       if (tag)
         props.push(doc.directives.tagString(tag));
       return props.join(" ");
@@ -16418,7 +16687,7 @@ var require_stringify = __commonJS({
       if (Node.isAlias(item)) {
         if (ctx.doc.directives)
           return item.toString(ctx);
-        if ((_a2 = ctx.resolvedAliases) === null || _a2 === void 0 ? void 0 : _a2.has(item)) {
+        if ((_a2 = ctx.resolvedAliases) == null ? void 0 : _a2.has(item)) {
           throw new TypeError(`Cannot stringify circular structure without alias nodes`);
         } else {
           if (ctx.resolvedAliases)
@@ -16434,7 +16703,7 @@ var require_stringify = __commonJS({
         tagObj = getTagObject(ctx.doc.schema.tags, node);
       const props = stringifyProps(node, tagObj, ctx);
       if (props.length > 0)
-        ctx.indentAtStart = (ctx.indentAtStart || 0) + props.length + 1;
+        ctx.indentAtStart = (ctx.indentAtStart ?? 0) + props.length + 1;
       const str = typeof tagObj.stringify === "function" ? tagObj.stringify(node, ctx, onComment, onChompKeep) : Node.isScalar(node) ? stringifyString.stringifyString(node, ctx, onComment, onChompKeep) : node.toString(ctx, onComment, onChompKeep);
       if (!props)
         return str;
@@ -16484,7 +16753,7 @@ var require_stringifyPair = __commonJS({
         if (allNullValues || value == null) {
           if (keyCommentDone && onComment)
             onComment();
-          return explicitKey ? `? ${str}` : str;
+          return str === "" ? "?" : explicitKey ? `? ${str}` : str;
         }
       } else if (allNullValues && !simpleKeys || value == null && explicitKey) {
         str = `? ${str}`;
@@ -16506,40 +16775,64 @@ ${indent}:`;
         if (keyComment)
           str += stringifyComment.lineComment(str, ctx.indent, commentString(keyComment));
       }
-      let vcb = "";
-      let valueComment = null;
+      let vsb, vcb, valueComment;
       if (Node.isNode(value)) {
-        if (value.spaceBefore)
-          vcb = "\n";
-        if (value.commentBefore) {
-          const cs = commentString(value.commentBefore);
-          vcb += `
-${stringifyComment.indentComment(cs, ctx.indent)}`;
-        }
+        vsb = !!value.spaceBefore;
+        vcb = value.commentBefore;
         valueComment = value.comment;
-      } else if (value && typeof value === "object") {
-        value = doc.createNode(value);
+      } else {
+        vsb = false;
+        vcb = null;
+        valueComment = null;
+        if (value && typeof value === "object")
+          value = doc.createNode(value);
       }
       ctx.implicitKey = false;
       if (!explicitKey && !keyComment && Node.isScalar(value))
         ctx.indentAtStart = str.length + 1;
       chompKeep = false;
       if (!indentSeq && indentStep.length >= 2 && !ctx.inFlow && !explicitKey && Node.isSeq(value) && !value.flow && !value.tag && !value.anchor) {
-        ctx.indent = ctx.indent.substr(2);
+        ctx.indent = ctx.indent.substring(2);
       }
       let valueCommentDone = false;
       const valueStr = stringify.stringify(value, ctx, () => valueCommentDone = true, () => chompKeep = true);
       let ws = " ";
-      if (vcb || keyComment) {
-        ws = valueStr === "" && !ctx.inFlow ? vcb : `${vcb}
+      if (keyComment || vsb || vcb) {
+        ws = vsb ? "\n" : "";
+        if (vcb) {
+          const cs = commentString(vcb);
+          ws += `
+${stringifyComment.indentComment(cs, ctx.indent)}`;
+        }
+        if (valueStr === "" && !ctx.inFlow) {
+          if (ws === "\n")
+            ws = "\n\n";
+        } else {
+          ws += `
 ${ctx.indent}`;
+        }
       } else if (!explicitKey && Node.isCollection(value)) {
-        const flow = valueStr[0] === "[" || valueStr[0] === "{";
-        if (!flow || valueStr.includes("\n"))
-          ws = `
+        const vs0 = valueStr[0];
+        const nl0 = valueStr.indexOf("\n");
+        const hasNewline = nl0 !== -1;
+        const flow = ctx.inFlow ?? value.flow ?? value.items.length === 0;
+        if (hasNewline || !flow) {
+          let hasPropsLine = false;
+          if (hasNewline && (vs0 === "&" || vs0 === "!")) {
+            let sp0 = valueStr.indexOf(" ");
+            if (vs0 === "&" && sp0 !== -1 && sp0 < nl0 && valueStr[sp0 + 1] === "!") {
+              sp0 = valueStr.indexOf(" ", sp0 + 1);
+            }
+            if (sp0 === -1 || nl0 < sp0)
+              hasPropsLine = true;
+          }
+          if (!hasPropsLine)
+            ws = `
 ${ctx.indent}`;
-      } else if (valueStr === "" || valueStr[0] === "\n")
+        }
+      } else if (valueStr === "" || valueStr[0] === "\n") {
         ws = "";
+      }
       str += ws + valueStr;
       if (ctx.inFlow) {
         if (valueCommentDone && onComment)
@@ -16587,7 +16880,7 @@ var require_addPairToJSMap = __commonJS({
     var toJS = require_toJS();
     var MERGE_KEY = "<<";
     function addPairToJSMap(ctx, map, { key, value }) {
-      if (ctx && ctx.doc.schema.merge && isMergeKey(key)) {
+      if ((ctx == null ? void 0 : ctx.doc.schema.merge) && isMergeKey(key)) {
         value = Node.isAlias(value) ? value.resolve(ctx.doc) : value;
         if (Node.isSeq(value))
           for (const it of value.items)
@@ -16698,11 +16991,11 @@ var require_Pair = __commonJS({
         return new Pair(key, value);
       }
       toJSON(_45, ctx) {
-        const pair = ctx && ctx.mapAsMap ? /* @__PURE__ */ new Map() : {};
+        const pair = (ctx == null ? void 0 : ctx.mapAsMap) ? /* @__PURE__ */ new Map() : {};
         return addPairToJSMap.addPairToJSMap(ctx, pair, this);
       }
       toString(ctx, onComment, onChompKeep) {
-        return ctx && ctx.doc ? stringifyPair.stringifyPair(this, ctx, onComment, onChompKeep) : JSON.stringify(this);
+        return (ctx == null ? void 0 : ctx.doc) ? stringifyPair.stringifyPair(this, ctx, onComment, onChompKeep) : JSON.stringify(this);
       }
     };
     exports2.Pair = Pair;
@@ -16710,23 +17003,6 @@ var require_Pair = __commonJS({
   }
 });
 
-// ../../node_modules/yaml/dist/options.js
-var require_options = __commonJS({
-  "../../node_modules/yaml/dist/options.js"(exports2) {
-    "use strict";
-    var defaultOptions = {
-      intAsBigInt: false,
-      keepSourceTokens: false,
-      logLevel: "warn",
-      prettyErrors: true,
-      strict: true,
-      uniqueKeys: true,
-      version: "1.2"
-    };
-    exports2.defaultOptions = defaultOptions;
-  }
-});
-
 // ../../node_modules/yaml/dist/stringify/stringifyCollection.js
 var require_stringifyCollection = __commonJS({
   "../../node_modules/yaml/dist/stringify/stringifyCollection.js"(exports2) {
@@ -16736,8 +17012,7 @@ var require_stringifyCollection = __commonJS({
     var stringify = require_stringify();
     var stringifyComment = require_stringifyComment();
     function stringifyCollection(collection, ctx, options2) {
-      var _a2;
-      const flow = (_a2 = ctx.inFlow) !== null && _a2 !== void 0 ? _a2 : collection.flow;
+      const flow = ctx.inFlow ?? collection.flow;
       const stringify2 = flow ? stringifyFlowCollection : stringifyBlockCollection;
       return stringify2(collection, ctx, options2);
     }
@@ -16791,7 +17066,7 @@ ${indent}${line}` : "\n";
       return str;
     }
     function stringifyFlowCollection({ comment, items }, ctx, { flowChars, itemIndent, onComment }) {
-      const { indent, indentStep, options: { commentString } } = ctx;
+      const { indent, indentStep, flowCollectionPadding: fcPadding, options: { commentString } } = ctx;
       itemIndent += indentStep;
       const itemCtx = Object.assign({}, ctx, {
         indent: itemIndent,
@@ -16858,11 +17133,11 @@ ${indentStep}${indent}${line}` : "\n";
           str += `
 ${indent}${end}`;
         } else {
-          str = `${start} ${lines.join(" ")} ${end}`;
+          str = `${start}${fcPadding}${lines.join(" ")}${fcPadding}${end}`;
         }
       }
       if (comment) {
-        str += stringifyComment.lineComment(str, commentString(comment), indent);
+        str += stringifyComment.lineComment(str, indent, commentString(comment));
         if (onComment)
           onComment();
       }
@@ -16903,23 +17178,24 @@ var require_YAMLMap = __commonJS({
       return void 0;
     }
     var YAMLMap = class extends Collection.Collection {
+      static get tagName() {
+        return "tag:yaml.org,2002:map";
+      }
       constructor(schema) {
         super(Node.MAP, schema);
         this.items = [];
       }
-      static get tagName() {
-        return "tag:yaml.org,2002:map";
-      }
       add(pair, overwrite) {
+        var _a2;
         let _pair;
         if (Node.isPair(pair))
           _pair = pair;
         else if (!pair || typeof pair !== "object" || !("key" in pair)) {
-          _pair = new Pair.Pair(pair, pair.value);
+          _pair = new Pair.Pair(pair, pair == null ? void 0 : pair.value);
         } else
           _pair = new Pair.Pair(pair.key, pair.value);
         const prev = findPair(this.items, _pair.key);
-        const sortEntries = this.schema && this.schema.sortMapEntries;
+        const sortEntries = (_a2 = this.schema) == null ? void 0 : _a2.sortMapEntries;
         if (prev) {
           if (!overwrite)
             throw new Error(`Key ${_pair.key} already set`);
@@ -16946,8 +17222,8 @@ var require_YAMLMap = __commonJS({
       }
       get(key, keepScalar) {
         const it = findPair(this.items, key);
-        const node = it && it.value;
-        return !keepScalar && Node.isScalar(node) ? node.value : node;
+        const node = it == null ? void 0 : it.value;
+        return (!keepScalar && Node.isScalar(node) ? node.value : node) ?? void 0;
       }
       has(key) {
         return !!findPair(this.items, key);
@@ -16956,8 +17232,8 @@ var require_YAMLMap = __commonJS({
         this.add(new Pair.Pair(key, value), true);
       }
       toJSON(_45, ctx, Type) {
-        const map = Type ? new Type() : ctx && ctx.mapAsMap ? /* @__PURE__ */ new Map() : {};
-        if (ctx && ctx.onCreate)
+        const map = Type ? new Type() : (ctx == null ? void 0 : ctx.mapAsMap) ? /* @__PURE__ */ new Map() : {};
+        if (ctx == null ? void 0 : ctx.onCreate)
           ctx.onCreate(map);
         for (const item of this.items)
           addPairToJSMap.addPairToJSMap(ctx, map, item);
@@ -17042,13 +17318,13 @@ var require_YAMLSeq = __commonJS({
     var Scalar = require_Scalar();
     var toJS = require_toJS();
     var YAMLSeq = class extends Collection.Collection {
+      static get tagName() {
+        return "tag:yaml.org,2002:seq";
+      }
       constructor(schema) {
         super(Node.SEQ, schema);
         this.items = [];
       }
-      static get tagName() {
-        return "tag:yaml.org,2002:seq";
-      }
       add(value) {
         this.items.push(value);
       }
@@ -17082,7 +17358,7 @@ var require_YAMLSeq = __commonJS({
       }
       toJSON(_45, ctx) {
         const seq = [];
-        if (ctx && ctx.onCreate)
+        if (ctx == null ? void 0 : ctx.onCreate)
           ctx.onCreate(seq);
         let i = 0;
         for (const item of this.items)
@@ -17180,7 +17456,7 @@ var require_null = __commonJS({
       tag: "tag:yaml.org,2002:null",
       test: /^(?:~|[Nn]ull|NULL)?$/,
       resolve: () => new Scalar.Scalar(null),
-      stringify: ({ source }, ctx) => source && nullTag.test.test(source) ? source : ctx.options.nullStr
+      stringify: ({ source }, ctx) => typeof source === "string" && nullTag.test.test(source) ? source : ctx.options.nullStr
     };
     exports2.nullTag = nullTag;
   }
@@ -17500,7 +17776,7 @@ var require_pairs = __commonJS({
               pair.key.commentBefore = pair.key.commentBefore ? `${item.commentBefore}
 ${pair.key.commentBefore}` : item.commentBefore;
             if (item.comment) {
-              const cn = pair.value || pair.key;
+              const cn = pair.value ?? pair.key;
               cn.comment = cn.comment ? `${item.comment}
 ${cn.comment}` : item.comment;
             }
@@ -17578,7 +17854,7 @@ var require_omap = __commonJS({
         if (!ctx)
           return super.toJSON(_45);
         const map = /* @__PURE__ */ new Map();
-        if (ctx && ctx.onCreate)
+        if (ctx == null ? void 0 : ctx.onCreate)
           ctx.onCreate(map);
         for (const pair of this.items) {
           let key, value;
@@ -17804,7 +18080,7 @@ var require_set = __commonJS({
         let pair;
         if (Node.isPair(key))
           pair = key;
-        else if (typeof key === "object" && "key" in key && "value" in key && key.value === null)
+        else if (key && typeof key === "object" && "key" in key && "value" in key && key.value === null)
           pair = new Pair.Pair(key.key, null);
         else
           pair = new Pair.Pair(key, null);
@@ -18099,11 +18375,11 @@ var require_Schema = __commonJS({
         this.name = typeof schema === "string" && schema || "core";
         this.knownTags = resolveKnownTags ? tags.coreKnownTags : {};
         this.tags = tags.getTags(customTags, this.name);
-        this.toStringOptions = toStringDefaults || null;
+        this.toStringOptions = toStringDefaults ?? null;
         Object.defineProperty(this, Node.MAP, { value: map.map });
         Object.defineProperty(this, Node.SCALAR, { value: string.string });
         Object.defineProperty(this, Node.SEQ, { value: seq.seq });
-        this.sortMapEntries = sortMapEntries === true ? sortMapEntriesByKey : sortMapEntries || null;
+        this.sortMapEntries = typeof sortMapEntries === "function" ? sortMapEntries : sortMapEntries === true ? sortMapEntriesByKey : null;
       }
       clone() {
         const copy3 = Object.create(Schema.prototype, Object.getOwnPropertyDescriptors(this));
@@ -18123,6 +18399,7 @@ var require_stringifyDocument = __commonJS({
     var stringify = require_stringify();
     var stringifyComment = require_stringifyComment();
     function stringifyDocument(doc, options2) {
+      var _a2;
       const lines = [];
       let hasDirectives = options2.directives === true;
       if (options2.directives !== false && doc.directives) {
@@ -18130,7 +18407,7 @@ var require_stringifyDocument = __commonJS({
         if (dir) {
           lines.push(dir);
           hasDirectives = true;
-        } else if (doc.directives.marker)
+        } else if (doc.directives.docStart)
           hasDirectives = true;
       }
       if (hasDirectives)
@@ -18167,13 +18444,27 @@ var require_stringifyDocument = __commonJS({
       } else {
         lines.push(stringify.stringify(doc.contents, ctx));
       }
-      let dc = doc.comment;
-      if (dc && chompKeep)
-        dc = dc.replace(/^\n+/, "");
-      if (dc) {
-        if ((!chompKeep || contentComment) && lines[lines.length - 1] !== "")
-          lines.push("");
-        lines.push(stringifyComment.indentComment(commentString(dc), ""));
+      if ((_a2 = doc.directives) == null ? void 0 : _a2.docEnd) {
+        if (doc.comment) {
+          const cs = commentString(doc.comment);
+          if (cs.includes("\n")) {
+            lines.push("...");
+            lines.push(stringifyComment.indentComment(cs, ""));
+          } else {
+            lines.push(`... ${cs}`);
+          }
+        } else {
+          lines.push("...");
+        }
+      } else {
+        let dc = doc.comment;
+        if (dc && chompKeep)
+          dc = dc.replace(/^\n+/, "");
+        if (dc) {
+          if ((!chompKeep || contentComment) && lines[lines.length - 1] !== "")
+            lines.push("");
+          lines.push(stringifyComment.indentComment(commentString(dc), ""));
+        }
       }
       return lines.join("\n") + "\n";
     }
@@ -18240,7 +18531,6 @@ var require_Document = __commonJS({
     var Node = require_Node();
     var Pair = require_Pair();
     var toJS = require_toJS();
-    var options2 = require_options();
     var Schema = require_Schema();
     var stringify = require_stringify();
     var stringifyDocument = require_stringifyDocument();
@@ -18249,7 +18539,7 @@ var require_Document = __commonJS({
     var createNode = require_createNode();
     var directives = require_directives();
     var Document = class {
-      constructor(value, replacer, options$1) {
+      constructor(value, replacer, options2) {
         this.commentBefore = null;
         this.comment = null;
         this.errors = [];
@@ -18258,24 +18548,32 @@ var require_Document = __commonJS({
         let _replacer = null;
         if (typeof replacer === "function" || Array.isArray(replacer)) {
           _replacer = replacer;
-        } else if (options$1 === void 0 && replacer) {
-          options$1 = replacer;
+        } else if (options2 === void 0 && replacer) {
+          options2 = replacer;
           replacer = void 0;
         }
-        const opt = Object.assign({}, options2.defaultOptions, options$1);
+        const opt = Object.assign({
+          intAsBigInt: false,
+          keepSourceTokens: false,
+          logLevel: "warn",
+          prettyErrors: true,
+          strict: true,
+          uniqueKeys: true,
+          version: "1.2"
+        }, options2);
         this.options = opt;
         let { version } = opt;
-        if (options$1 === null || options$1 === void 0 ? void 0 : options$1.directives) {
-          this.directives = options$1.directives.atDocument();
+        if (options2 == null ? void 0 : options2._directives) {
+          this.directives = options2._directives.atDocument();
           if (this.directives.yaml.explicit)
             version = this.directives.yaml.version;
         } else
           this.directives = new directives.Directives({ version });
-        this.setSchema(version, options$1);
+        this.setSchema(version, options2);
         if (value === void 0)
           this.contents = null;
         else {
-          this.contents = this.createNode(value, _replacer, options$1);
+          this.contents = this.createNode(value, _replacer, options2);
         }
       }
       clone() {
@@ -18310,7 +18608,7 @@ var require_Document = __commonJS({
         }
         return new Alias.Alias(node.anchor);
       }
-      createNode(value, replacer, options3) {
+      createNode(value, replacer, options2) {
         let _replacer = void 0;
         if (typeof replacer === "function") {
           value = replacer.call({ "": value }, "", value);
@@ -18321,15 +18619,15 @@ var require_Document = __commonJS({
           if (asStr.length > 0)
             replacer = replacer.concat(asStr);
           _replacer = replacer;
-        } else if (options3 === void 0 && replacer) {
-          options3 = replacer;
+        } else if (options2 === void 0 && replacer) {
+          options2 = replacer;
           replacer = void 0;
         }
-        const { aliasDuplicateObjects, anchorPrefix, flow, keepUndefined, onTagObj, tag } = options3 || {};
+        const { aliasDuplicateObjects, anchorPrefix, flow, keepUndefined, onTagObj, tag } = options2 ?? {};
         const { onAnchor, setAnchors, sourceObjects } = anchors.createNodeAnchors(this, anchorPrefix || "a");
         const ctx = {
-          aliasDuplicateObjects: aliasDuplicateObjects !== null && aliasDuplicateObjects !== void 0 ? aliasDuplicateObjects : true,
-          keepUndefined: keepUndefined !== null && keepUndefined !== void 0 ? keepUndefined : false,
+          aliasDuplicateObjects: aliasDuplicateObjects ?? true,
+          keepUndefined: keepUndefined ?? false,
           onAnchor,
           onTagObj,
           replacer: _replacer,
@@ -18342,9 +18640,9 @@ var require_Document = __commonJS({
         setAnchors();
         return node;
       }
-      createPair(key, value, options3 = {}) {
-        const k = this.createNode(key, null, options3);
-        const v = this.createNode(value, null, options3);
+      createPair(key, value, options2 = {}) {
+        const k = this.createNode(key, null, options2);
+        const v = this.createNode(value, null, options2);
         return new Pair.Pair(k, v);
       }
       delete(key) {
@@ -18391,7 +18689,7 @@ var require_Document = __commonJS({
           this.contents.setIn(path, value);
         }
       }
-      setSchema(version, options3 = {}) {
+      setSchema(version, options2 = {}) {
         if (typeof version === "number")
           version = String(version);
         let opt;
@@ -18404,10 +18702,11 @@ var require_Document = __commonJS({
             opt = { merge: true, resolveKnownTags: false, schema: "yaml-1.1" };
             break;
           case "1.2":
+          case "next":
             if (this.directives)
-              this.directives.yaml.version = "1.2";
+              this.directives.yaml.version = version;
             else
-              this.directives = new directives.Directives({ version: "1.2" });
+              this.directives = new directives.Directives({ version });
             opt = { merge: false, resolveKnownTags: true, schema: "core" };
             break;
           case null:
@@ -18420,10 +18719,10 @@ var require_Document = __commonJS({
             throw new Error(`Expected '1.1', '1.2' or null as first argument, but found: ${sv}`);
           }
         }
-        if (options3.schema instanceof Object)
-          this.schema = options3.schema;
+        if (options2.schema instanceof Object)
+          this.schema = options2.schema;
         else if (opt)
-          this.schema = new Schema.Schema(Object.assign(opt, options3));
+          this.schema = new Schema.Schema(Object.assign(opt, options2));
         else
           throw new Error(`With a null YAML version, the { schema: Schema } option is required`);
       }
@@ -18437,7 +18736,7 @@ var require_Document = __commonJS({
           maxAliasCount: typeof maxAliasCount === "number" ? maxAliasCount : 100,
           stringify: stringify.stringify
         };
-        const res = toJS.toJS(this.contents, jsonArg || "", ctx);
+        const res = toJS.toJS(this.contents, jsonArg ?? "", ctx);
         if (typeof onAnchor === "function")
           for (const { count, res: res2 } of ctx.anchors.values())
             onAnchor(res2, count);
@@ -18446,14 +18745,14 @@ var require_Document = __commonJS({
       toJSON(jsonArg, onAnchor) {
         return this.toJS({ json: true, jsonArg, mapAsMap: false, onAnchor });
       }
-      toString(options3 = {}) {
+      toString(options2 = {}) {
         if (this.errors.length > 0)
           throw new Error("Document with errors cannot be stringified");
-        if ("indent" in options3 && (!Number.isInteger(options3.indent) || Number(options3.indent) <= 0)) {
-          const s = JSON.stringify(options3.indent);
+        if ("indent" in options2 && (!Number.isInteger(options2.indent) || Number(options2.indent) <= 0)) {
+          const s = JSON.stringify(options2.indent);
           throw new Error(`"indent" option must be a positive integer, not ${s}`);
         }
-        return stringifyDocument.stringifyDocument(this, options3);
+        return stringifyDocument.stringifyDocument(this, options2);
       }
     };
     function assertCollection(contents) {
@@ -18513,7 +18812,7 @@ var require_errors = __commonJS({
         let count = 1;
         const end = error3.linePos[1];
         if (end && end.line === line && end.col > col) {
-          count = Math.min(end.col - col, 80 - ci);
+          count = Math.max(1, Math.min(end.col - col, 80 - ci));
         }
         const pointer = " ".repeat(ci) + "^".repeat(count);
         error3.message += `:
@@ -18541,6 +18840,7 @@ var require_resolve_props = __commonJS({
       let comment = "";
       let commentSep = "";
       let hasNewline = false;
+      let hasNewlineAfterProp = false;
       let reqSpace = false;
       let anchor = null;
       let tag = null;
@@ -18581,11 +18881,15 @@ var require_resolve_props = __commonJS({
               commentSep += token2.source;
             atNewline = true;
             hasNewline = true;
+            if (anchor || tag)
+              hasNewlineAfterProp = true;
             hasSpace = true;
             break;
           case "anchor":
             if (anchor)
               onError(token2, "MULTIPLE_ANCHORS", "A node can have at most one anchor");
+            if (token2.source.endsWith(":"))
+              onError(token2.offset + token2.source.length - 1, "BAD_ALIAS", "Anchor ending in : is ambiguous", true);
             anchor = token2;
             if (start === null)
               start = token2.offset;
@@ -18608,7 +18912,7 @@ var require_resolve_props = __commonJS({
             if (anchor || tag)
               onError(token2, "BAD_PROP_ORDER", `Anchors and tags must be after the ${token2.source} indicator`);
             if (found)
-              onError(token2, "UNEXPECTED_TOKEN", `Unexpected ${token2.source} in ${flow || "collection"}`);
+              onError(token2, "UNEXPECTED_TOKEN", `Unexpected ${token2.source} in ${flow ?? "collection"}`);
             found = token2;
             atNewline = false;
             hasSpace = false;
@@ -18638,10 +18942,11 @@ var require_resolve_props = __commonJS({
         spaceBefore,
         comment,
         hasNewline,
+        hasNewlineAfterProp,
         anchor,
         tag,
         end,
-        start: start !== null && start !== void 0 ? start : end
+        start: start ?? end
       };
     }
     exports2.resolveProps = resolveProps;
@@ -18696,7 +19001,7 @@ var require_util_flow_indent_check = __commonJS({
     "use strict";
     var utilContainsNewline = require_util_contains_newline();
     function flowIndentCheck(indent, fc, onError) {
-      if ((fc === null || fc === void 0 ? void 0 : fc.type) === "flow-collection") {
+      if ((fc == null ? void 0 : fc.type) === "flow-collection") {
         const end = fc.end[0];
         if (end.indent === indent && (end.source === "]" || end.source === "}") && utilContainsNewline.containsNewline(fc)) {
           const msg = "Flow end indicator should be more indented than parent";
@@ -18741,11 +19046,12 @@ var require_resolve_block_map = __commonJS({
       if (ctx.atRoot)
         ctx.atRoot = false;
       let offset = bm.offset;
+      let commentEnd = null;
       for (const collItem of bm.items) {
         const { start, key, sep, value } = collItem;
         const keyProps = resolveProps.resolveProps(start, {
           indicator: "explicit-key-ind",
-          next: key || (sep === null || sep === void 0 ? void 0 : sep[0]),
+          next: key ?? (sep == null ? void 0 : sep[0]),
           offset,
           onError,
           startOnNewline: true
@@ -18759,6 +19065,7 @@ var require_resolve_block_map = __commonJS({
               onError(offset, "BAD_INDENT", startColMsg);
           }
           if (!keyProps.anchor && !keyProps.tag && !sep) {
+            commentEnd = keyProps.end;
             if (keyProps.comment) {
               if (map.comment)
                 map.comment += "\n" + keyProps.comment;
@@ -18767,17 +19074,19 @@ var require_resolve_block_map = __commonJS({
             }
             continue;
           }
-        } else if (((_a2 = keyProps.found) === null || _a2 === void 0 ? void 0 : _a2.indent) !== bm.indent)
+          if (keyProps.hasNewlineAfterProp || utilContainsNewline.containsNewline(key)) {
+            onError(key ?? start[start.length - 1], "MULTILINE_IMPLICIT_KEY", "Implicit keys need to be on a single line");
+          }
+        } else if (((_a2 = keyProps.found) == null ? void 0 : _a2.indent) !== bm.indent) {
           onError(offset, "BAD_INDENT", startColMsg);
-        if (implicitKey && utilContainsNewline.containsNewline(key))
-          onError(key, "MULTILINE_IMPLICIT_KEY", "Implicit keys need to be on a single line");
+        }
         const keyStart = keyProps.end;
         const keyNode = key ? composeNode(ctx, key, keyProps, onError) : composeEmptyNode(ctx, keyStart, start, null, keyProps, onError);
         if (ctx.schema.compat)
           utilFlowIndentCheck.flowIndentCheck(bm.indent, key, onError);
         if (utilMapIncludes.mapIncludes(ctx, map.items, keyNode))
           onError(keyStart, "DUPLICATE_KEY", "Map keys must be unique");
-        const valueProps = resolveProps.resolveProps(sep || [], {
+        const valueProps = resolveProps.resolveProps(sep ?? [], {
           indicator: "map-value-ind",
           next: value,
           offset: keyNode.range[2],
@@ -18787,7 +19096,7 @@ var require_resolve_block_map = __commonJS({
         offset = valueProps.end;
         if (valueProps.found) {
           if (implicitKey) {
-            if ((value === null || value === void 0 ? void 0 : value.type) === "block-map" && !valueProps.hasNewline)
+            if ((value == null ? void 0 : value.type) === "block-map" && !valueProps.hasNewline)
               onError(offset, "BLOCK_AS_IMPLICIT_KEY", "Nested mappings are not allowed in compact mappings");
             if (ctx.options.strict && keyProps.start < valueProps.found.offset - 1024)
               onError(keyNode.range, "KEY_OVER_1024_CHARS", "The : indicator must be at most 1024 chars after the start of an implicit block mapping key");
@@ -18815,7 +19124,9 @@ var require_resolve_block_map = __commonJS({
           map.items.push(pair);
         }
       }
-      map.range = [bm.offset, offset, offset];
+      if (commentEnd && commentEnd < offset)
+        onError(commentEnd, "IMPOSSIBLE", "Map comment with trailing content");
+      map.range = [bm.offset, offset, commentEnd ?? offset];
       return map;
     }
     exports2.resolveBlockMap = resolveBlockMap;
@@ -18834,6 +19145,7 @@ var require_resolve_block_seq = __commonJS({
       if (ctx.atRoot)
         ctx.atRoot = false;
       let offset = bs.offset;
+      let commentEnd = null;
       for (const { start, value } of bs.items) {
         const props = resolveProps.resolveProps(start, {
           indicator: "seq-item-ind",
@@ -18842,26 +19154,26 @@ var require_resolve_block_seq = __commonJS({
           onError,
           startOnNewline: true
         });
-        offset = props.end;
         if (!props.found) {
           if (props.anchor || props.tag || value) {
             if (value && value.type === "block-seq")
-              onError(offset, "BAD_INDENT", "All sequence items must start at the same column");
+              onError(props.end, "BAD_INDENT", "All sequence items must start at the same column");
             else
               onError(offset, "MISSING_CHAR", "Sequence item without - indicator");
           } else {
+            commentEnd = props.end;
             if (props.comment)
               seq.comment = props.comment;
             continue;
           }
         }
-        const node = value ? composeNode(ctx, value, props, onError) : composeEmptyNode(ctx, offset, start, null, props, onError);
+        const node = value ? composeNode(ctx, value, props, onError) : composeEmptyNode(ctx, props.end, start, null, props, onError);
         if (ctx.schema.compat)
           utilFlowIndentCheck.flowIndentCheck(bs.indent, value, onError);
         offset = node.range[2];
         seq.items.push(node);
       }
-      seq.range = [bs.offset, offset, offset];
+      seq.range = [bs.offset, offset, commentEnd ?? offset];
       return seq;
     }
     exports2.resolveBlockSeq = resolveBlockSeq;
@@ -18940,7 +19252,7 @@ var require_resolve_flow_collection = __commonJS({
         const props = resolveProps.resolveProps(start, {
           flow: fcName,
           indicator: "explicit-key-ind",
-          next: key || (sep === null || sep === void 0 ? void 0 : sep[0]),
+          next: key ?? (sep == null ? void 0 : sep[0]),
           offset,
           onError,
           startOnNewline: false
@@ -18987,7 +19299,7 @@ var require_resolve_flow_collection = __commonJS({
             if (prevItemComment) {
               let prev = coll.items[coll.items.length - 1];
               if (Node.isPair(prev))
-                prev = prev.value || prev.key;
+                prev = prev.value ?? prev.key;
               if (prev.comment)
                 prev.comment += "\n" + prevItemComment;
               else
@@ -19007,7 +19319,7 @@ var require_resolve_flow_collection = __commonJS({
           const keyNode = key ? composeNode(ctx, key, props, onError) : composeEmptyNode(ctx, keyStart, start, null, props, onError);
           if (isBlock(key))
             onError(keyNode.range, "BLOCK_IN_FLOW", blockMsg);
-          const valueProps = resolveProps.resolveProps(sep || [], {
+          const valueProps = resolveProps.resolveProps(sep ?? [], {
             flow: fcName,
             indicator: "map-value-ind",
             next: value,
@@ -19144,7 +19456,7 @@ var require_compose_collection = __commonJS({
       const node = Node.isNode(res) ? res : new Scalar.Scalar(res);
       node.range = coll.range;
       node.tag = tagName;
-      if (tag === null || tag === void 0 ? void 0 : tag.format)
+      if (tag == null ? void 0 : tag.format)
         node.format = tag.format;
       return node;
     }
@@ -19172,8 +19484,8 @@ var require_resolve_block_scalar = __commonJS({
         else
           break;
       }
-      if (!scalar.source || chompStart === 0) {
-        const value2 = header.chomp === "+" ? "\n".repeat(Math.max(0, lines.length - 1)) : "";
+      if (chompStart === 0) {
+        const value2 = header.chomp === "+" && lines.length > 0 ? "\n".repeat(Math.max(1, lines.length - 1)) : "";
         let end2 = start + header.length;
         if (scalar.source)
           end2 += scalar.source.length;
@@ -19199,6 +19511,10 @@ var require_resolve_block_scalar = __commonJS({
         }
         offset += indent.length + content.length + 1;
       }
+      for (let i = lines.length - 1; i >= chompStart; --i) {
+        if (lines[i][0].length > trimIndent)
+          chompStart = i + 1;
+      }
       let value = "";
       let sep = "";
       let prevMoreIndented = false;
@@ -19315,7 +19631,7 @@ var require_resolve_block_scalar = __commonJS({
       const split = source.split(/\n( *)/);
       const first = split[0];
       const m = first.match(/^( *)/);
-      const line0 = m && m[1] ? [m[1], first.slice(m[1].length)] : ["", first];
+      const line0 = (m == null ? void 0 : m[1]) ? [m[1], first.slice(m[1].length)] : ["", first];
       const lines = [line0];
       for (let i = 1; i < split.length; i += 2)
         lines.push([split[i], split[i + 1]]);
@@ -19430,7 +19746,7 @@ var require_resolve_flow_scalar = __commonJS({
       const last = /[ \t]*(.*)/sy;
       last.lastIndex = pos;
       match = last.exec(source);
-      return res + sep + (match && match[1] || "");
+      return res + sep + ((match == null ? void 0 : match[1]) ?? "");
     }
     function doubleQuotedValue(source, onError) {
       let res = "";
@@ -19543,11 +19859,11 @@ var require_compose_scalar = __commonJS({
       const tag = tagToken && tagName ? findScalarTagByName(ctx.schema, value, tagName, tagToken, onError) : token2.type === "scalar" ? findScalarTagByTest(ctx, value, token2, onError) : ctx.schema[Node.SCALAR];
       let scalar;
       try {
-        const res = tag.resolve(value, (msg) => onError(tagToken || token2, "TAG_RESOLVE_FAILED", msg), ctx.options);
+        const res = tag.resolve(value, (msg) => onError(tagToken ?? token2, "TAG_RESOLVE_FAILED", msg), ctx.options);
         scalar = Node.isScalar(res) ? res : new Scalar.Scalar(res);
       } catch (error3) {
         const msg = error3 instanceof Error ? error3.message : String(error3);
-        onError(tagToken || token2, "TAG_RESOLVE_FAILED", msg);
+        onError(tagToken ?? token2, "TAG_RESOLVE_FAILED", msg);
         scalar = new Scalar.Scalar(value);
       }
       scalar.range = range;
@@ -19576,7 +19892,7 @@ var require_compose_scalar = __commonJS({
         }
       }
       for (const tag of matchWithTest)
-        if ((_a2 = tag.test) === null || _a2 === void 0 ? void 0 : _a2.test(value))
+        if ((_a2 = tag.test) == null ? void 0 : _a2.test(value))
           return tag;
       const kt = schema.knownTags[tagName];
       if (kt && !kt.collection) {
@@ -19589,13 +19905,13 @@ var require_compose_scalar = __commonJS({
     function findScalarTagByTest({ directives, schema }, value, token2, onError) {
       const tag = schema.tags.find((tag2) => {
         var _a2;
-        return tag2.default && ((_a2 = tag2.test) === null || _a2 === void 0 ? void 0 : _a2.test(value));
+        return tag2.default && ((_a2 = tag2.test) == null ? void 0 : _a2.test(value));
       }) || schema[Node.SCALAR];
       if (schema.compat) {
         const compat = schema.compat.find((tag2) => {
           var _a2;
-          return tag2.default && ((_a2 = tag2.test) === null || _a2 === void 0 ? void 0 : _a2.test(value));
-        }) || schema[Node.SCALAR];
+          return tag2.default && ((_a2 = tag2.test) == null ? void 0 : _a2.test(value));
+        }) ?? schema[Node.SCALAR];
         if (tag.tag !== compat.tag) {
           const ts = directives.tagString(tag.tag);
           const cs = directives.tagString(compat.tag);
@@ -19627,7 +19943,7 @@ var require_util_empty_scalar_position = __commonJS({
               continue;
           }
           st = before[++i];
-          while ((st === null || st === void 0 ? void 0 : st.type) === "space") {
+          while ((st == null ? void 0 : st.type) === "space") {
             offset += st.source.length;
             st = before[++i];
           }
@@ -19653,6 +19969,7 @@ var require_compose_node = __commonJS({
     function composeNode(ctx, token2, props, onError) {
       const { spaceBefore, comment, anchor, tag } = props;
       let node;
+      let isSrcToken = true;
       switch (token2.type) {
         case "alias":
           node = composeAlias(ctx, token2, onError);
@@ -19674,9 +19991,12 @@ var require_compose_node = __commonJS({
           if (anchor)
             node.anchor = anchor.source.substring(1);
           break;
-        default:
-          console.log(token2);
-          throw new Error(`Unsupporten token type: ${token2.type}`);
+        default: {
+          const message = token2.type === "error" ? token2.message : `Unsupported token (type: ${token2.type})`;
+          onError(token2, "UNEXPECTED_TOKEN", message);
+          node = composeEmptyNode(ctx, token2.offset, void 0, null, props, onError);
+          isSrcToken = false;
+        }
       }
       if (anchor && node.anchor === "")
         onError(anchor, "BAD_ALIAS", "Anchor cannot be an empty string");
@@ -19688,11 +20008,11 @@ var require_compose_node = __commonJS({
         else
           node.commentBefore = comment;
       }
-      if (ctx.options.keepSourceTokens)
+      if (ctx.options.keepSourceTokens && isSrcToken)
         node.srcToken = token2;
       return node;
     }
-    function composeEmptyNode(ctx, offset, before, pos, { spaceBefore, comment, anchor, tag }, onError) {
+    function composeEmptyNode(ctx, offset, before, pos, { spaceBefore, comment, anchor, tag, end }, onError) {
       const token2 = {
         type: "scalar",
         offset: utilEmptyScalarPosition.emptyScalarPosition(offset, before, pos),
@@ -19707,14 +20027,18 @@ var require_compose_node = __commonJS({
       }
       if (spaceBefore)
         node.spaceBefore = true;
-      if (comment)
+      if (comment) {
         node.comment = comment;
+        node.range[2] = end;
+      }
       return node;
     }
     function composeAlias({ options: options2 }, { offset, source, end }, onError) {
       const alias = new Alias.Alias(source.substring(1));
       if (alias.source === "")
         onError(offset, "BAD_ALIAS", "Alias cannot be an empty string");
+      if (alias.source.endsWith(":"))
+        onError(offset + source.length - 1, "BAD_ALIAS", "Alias ending in : is ambiguous", true);
       const valueEnd = offset + source.length;
       const re = resolveEnd.resolveEnd(end, valueEnd, options2.strict, onError);
       alias.range = [offset, valueEnd, re.offset];
@@ -19736,7 +20060,7 @@ var require_compose_doc = __commonJS({
     var resolveEnd = require_resolve_end();
     var resolveProps = require_resolve_props();
     function composeDoc(options2, directives, { offset, start, value, end }, onError) {
-      const opts = Object.assign({ directives }, options2);
+      const opts = Object.assign({ _directives: directives }, options2);
       const doc = new Document.Document(void 0, opts);
       const ctx = {
         atRoot: true,
@@ -19746,13 +20070,13 @@ var require_compose_doc = __commonJS({
       };
       const props = resolveProps.resolveProps(start, {
         indicator: "doc-start",
-        next: value || (end === null || end === void 0 ? void 0 : end[0]),
+        next: value ?? (end == null ? void 0 : end[0]),
         offset,
         onError,
         startOnNewline: true
       });
       if (props.found) {
-        doc.directives.marker = true;
+        doc.directives.docStart = true;
         if (value && (value.type === "block-map" || value.type === "block-seq") && !props.hasNewline)
           onError(props.end, "MISSING_CHAR", "Block collection cannot start on same line with directives-end marker");
       }
@@ -19776,7 +20100,6 @@ var require_composer = __commonJS({
     var Document = require_Document();
     var errors = require_errors();
     var Node = require_Node();
-    var options2 = require_options();
     var composeDoc = require_compose_doc();
     var resolveEnd = require_resolve_end();
     function getErrorPos(src) {
@@ -19801,7 +20124,7 @@ var require_composer = __commonJS({
             afterEmptyLine = false;
             break;
           case "%":
-            if (((_a2 = prelude[i + 1]) === null || _a2 === void 0 ? void 0 : _a2[0]) !== "#")
+            if (((_a2 = prelude[i + 1]) == null ? void 0 : _a2[0]) !== "#")
               i += 1;
             atComment = false;
             break;
@@ -19814,7 +20137,7 @@ var require_composer = __commonJS({
       return { comment, afterEmptyLine };
     }
     var Composer = class {
-      constructor(options$1 = {}) {
+      constructor(options2 = {}) {
         this.doc = null;
         this.atDirectives = false;
         this.prelude = [];
@@ -19827,10 +20150,8 @@ var require_composer = __commonJS({
           else
             this.errors.push(new errors.YAMLParseError(pos, code, message));
         };
-        this.directives = new directives.Directives({
-          version: options$1.version || options2.defaultOptions.version
-        });
-        this.options = options$1;
+        this.directives = new directives.Directives({ version: options2.version || "1.2" });
+        this.options = options2;
       }
       decorate(doc, afterDoc) {
         const { comment, afterEmptyLine } = parsePrelude(this.prelude);
@@ -19839,7 +20160,7 @@ var require_composer = __commonJS({
           if (afterDoc) {
             doc.comment = doc.comment ? `${doc.comment}
 ${comment}` : comment;
-          } else if (afterEmptyLine || doc.directives.marker || !dc) {
+          } else if (afterEmptyLine || doc.directives.docStart || !dc) {
             doc.commentBefore = comment;
           } else if (Node.isCollection(dc) && !dc.flow && dc.items.length > 0) {
             let it = dc.items[0];
@@ -19893,8 +20214,8 @@ ${cb}` : comment;
             break;
           case "document": {
             const doc = composeDoc.composeDoc(this.options, this.directives, token2, this.onError);
-            if (this.atDirectives && !doc.directives.marker)
-              this.onError(token2, "MISSING_CHAR", "Missing directives-end indicator line");
+            if (this.atDirectives && !doc.directives.docStart)
+              this.onError(token2, "MISSING_CHAR", "Missing directives-end/doc-start indicator line");
             this.decorate(doc, false);
             if (this.doc)
               yield this.doc;
@@ -19924,6 +20245,7 @@ ${cb}` : comment;
               this.errors.push(new errors.YAMLParseError(getErrorPos(token2), "UNEXPECTED_TOKEN", msg));
               break;
             }
+            this.doc.directives.docEnd = true;
             const end = resolveEnd.resolveEnd(token2.end, token2.offset + token2.source.length, this.doc.options.strict, this.onError);
             this.decorate(this.doc, true);
             if (end.comment) {
@@ -19944,7 +20266,7 @@ ${end.comment}` : end.comment;
           yield this.doc;
           this.doc = null;
         } else if (forceDoc) {
-          const opts = Object.assign({ directives: this.directives }, this.options);
+          const opts = Object.assign({ _directives: this.directives }, this.options);
           const doc = new Document.Document(void 0, opts);
           if (this.atDirectives)
             this.onError(endOffset, "MISSING_CHAR", "Missing directives-end indicator line");
@@ -19987,7 +20309,6 @@ var require_cst_scalar = __commonJS({
       return null;
     }
     function createScalarToken(value, context) {
-      var _a2;
       const { implicitKey = false, indent, inFlow = false, offset = -1, type = "PLAIN" } = context;
       const source = stringifyString.stringifyString({ type, value }, {
         implicitKey,
@@ -19995,7 +20316,7 @@ var require_cst_scalar = __commonJS({
         inFlow,
         options: { blockQuote: true, lineWidth: -1 }
       });
-      const end = (_a2 = context.end) !== null && _a2 !== void 0 ? _a2 : [
+      const end = context.end ?? [
         { type: "newline", offset: -1, indent, source: "\n" }
       ];
       switch (source[0]) {
@@ -20223,7 +20544,7 @@ var require_cst_visit = __commonJS({
     visit.itemAtPath = (cst, path) => {
       let item = cst;
       for (const [field, index] of path) {
-        const tok = item && item[field];
+        const tok = item == null ? void 0 : item[field];
         if (tok && "items" in tok) {
           item = tok.items[index];
         } else
@@ -20234,7 +20555,7 @@ var require_cst_visit = __commonJS({
     visit.parentCollection = (cst, path) => {
       const parent = visit.itemAtPath(cst, path.slice(0, -1));
       const field = path[path.length - 1][0];
-      const coll = parent && parent[field];
+      const coll = parent == null ? void 0 : parent[field];
       if (coll && "items" in coll)
         return coll;
       throw new Error("Parent collection not found");
@@ -20411,7 +20732,7 @@ var require_lexer = __commonJS({
           this.lineEndPos = null;
         }
         this.atEnd = !incomplete;
-        let next = this.next || "stream";
+        let next = this.next ?? "stream";
         while (next && (incomplete || this.hasChars(1)))
           next = yield* this.parseNext(next);
       }
@@ -20610,9 +20931,13 @@ var require_lexer = __commonJS({
         let indent = -1;
         do {
           nl = yield* this.pushNewline();
-          sp = yield* this.pushSpaces(true);
-          if (nl > 0)
+          if (nl > 0) {
+            sp = yield* this.pushSpaces(false);
             this.indentValue = indent = sp;
+          } else {
+            sp = 0;
+          }
+          sp += yield* this.pushSpaces(true);
         } while (nl + sp > 0);
         const line = this.getLine();
         if (line === null)
@@ -20773,9 +21098,10 @@ var require_lexer = __commonJS({
             let ch2 = this.buffer[i];
             if (ch2 === "\r")
               ch2 = this.buffer[--i];
+            const lastChar = i;
             while (ch2 === " " || ch2 === "	")
               ch2 = this.buffer[--i];
-            if (ch2 === "\n" && i >= this.pos)
+            if (ch2 === "\n" && i >= this.pos && i + 1 + indent > lastChar)
               nl = i;
             else
               break;
@@ -20850,16 +21176,19 @@ var require_lexer = __commonJS({
             return (yield* this.pushTag()) + (yield* this.pushSpaces(true)) + (yield* this.pushIndicators());
           case "&":
             return (yield* this.pushUntil(isNotAnchorChar)) + (yield* this.pushSpaces(true)) + (yield* this.pushIndicators());
-          case ":":
-          case "?":
           case "-":
-            if (isEmpty(this.charAt(1))) {
-              if (this.flowLevel === 0)
+          case "?":
+          case ":": {
+            const inFlow = this.flowLevel > 0;
+            const ch1 = this.charAt(1);
+            if (isEmpty(ch1) || inFlow && invalidFlowScalarChars.includes(ch1)) {
+              if (!inFlow)
                 this.indentNext = this.indentValue + 1;
               else if (this.flowKey)
                 this.flowKey = false;
               return (yield* this.pushCount(1)) + (yield* this.pushSpaces(true)) + (yield* this.pushIndicators());
             }
+          }
         }
         return 0;
       }
@@ -20961,7 +21290,7 @@ var require_parser = __commonJS({
           return true;
       return false;
     }
-    function includesNonEmpty(list) {
+    function findNonEmptyIndex(list) {
       for (let i = 0; i < list.length; ++i) {
         switch (list[i].type) {
           case "space":
@@ -20969,13 +21298,13 @@ var require_parser = __commonJS({
           case "newline":
             break;
           default:
-            return true;
+            return i;
         }
       }
-      return false;
+      return -1;
     }
     function isFlowToken(token2) {
-      switch (token2 === null || token2 === void 0 ? void 0 : token2.type) {
+      switch (token2 == null ? void 0 : token2.type) {
         case "alias":
         case "scalar":
         case "single-quoted-scalar":
@@ -20992,7 +21321,7 @@ var require_parser = __commonJS({
           return parent.start;
         case "block-map": {
           const it = parent.items[parent.items.length - 1];
-          return it.sep || it.start;
+          return it.sep ?? it.start;
         }
         case "block-seq":
           return parent.items[parent.items.length - 1].start;
@@ -21016,7 +21345,7 @@ var require_parser = __commonJS({
               break loop;
           }
         }
-      while (((_a2 = prev[++i]) === null || _a2 === void 0 ? void 0 : _a2.type) === "space") {
+      while (((_a2 = prev[++i]) == null ? void 0 : _a2.type) === "space") {
       }
       return prev.splice(i, prev.length);
     }
@@ -21160,7 +21489,7 @@ var require_parser = __commonJS({
         return this.stack[this.stack.length - n];
       }
       *pop(error3) {
-        const token2 = error3 || this.stack.pop();
+        const token2 = error3 ?? this.stack.pop();
         if (!token2) {
           const message = "Tried to pop an empty stack";
           yield { type: "error", offset: this.offset, source: "", message };
@@ -21221,7 +21550,7 @@ var require_parser = __commonJS({
           }
           if ((top.type === "document" || top.type === "block-map" || top.type === "block-seq") && (token2.type === "block-map" || token2.type === "block-seq")) {
             const last = token2.items[token2.items.length - 1];
-            if (last && !last.sep && !last.value && last.start.length > 0 && !includesNonEmpty(last.start) && (token2.indent === 0 || last.start.every((st) => st.type !== "comment" || st.indent < token2.indent))) {
+            if (last && !last.sep && !last.value && last.start.length > 0 && findNonEmptyIndex(last.start) === -1 && (token2.indent === 0 || last.start.every((st) => st.type !== "comment" || st.indent < token2.indent))) {
               if (top.type === "document")
                 top.end = last.start;
               else
@@ -21267,7 +21596,7 @@ var require_parser = __commonJS({
           return yield* this.lineEnd(doc);
         switch (this.type) {
           case "doc-start": {
-            if (includesNonEmpty(doc.start)) {
+            if (findNonEmptyIndex(doc.start) !== -1) {
               yield* this.pop();
               yield* this.step();
             } else
@@ -21350,25 +21679,26 @@ var require_parser = __commonJS({
             if (it.value) {
               const end = "end" in it.value ? it.value.end : void 0;
               const last = Array.isArray(end) ? end[end.length - 1] : void 0;
-              if ((last === null || last === void 0 ? void 0 : last.type) === "comment")
-                end === null || end === void 0 ? void 0 : end.push(this.sourceToken);
+              if ((last == null ? void 0 : last.type) === "comment")
+                end == null ? void 0 : end.push(this.sourceToken);
               else
                 map.items.push({ start: [this.sourceToken] });
-            } else if (it.sep)
+            } else if (it.sep) {
               it.sep.push(this.sourceToken);
-            else
+            } else {
               it.start.push(this.sourceToken);
+            }
             return;
           case "space":
           case "comment":
-            if (it.value)
+            if (it.value) {
               map.items.push({ start: [this.sourceToken] });
-            else if (it.sep)
+            } else if (it.sep) {
               it.sep.push(this.sourceToken);
-            else {
+            } else {
               if (this.atIndentedComment(it.start, map.indent)) {
                 const prev = map.items[map.items.length - 2];
-                const end = (_a2 = prev === null || prev === void 0 ? void 0 : prev.value) === null || _a2 === void 0 ? void 0 : _a2.end;
+                const end = (_a2 = prev == null ? void 0 : prev.value) == null ? void 0 : _a2.end;
                 if (Array.isArray(end)) {
                   Array.prototype.push.apply(end, it.start);
                   end.push(this.sourceToken);
@@ -21381,58 +21711,114 @@ var require_parser = __commonJS({
             return;
         }
         if (this.indent >= map.indent) {
-          const atNextItem = !this.onKeyLine && this.indent === map.indent && (it.sep || includesNonEmpty(it.start));
+          const atNextItem = !this.onKeyLine && this.indent === map.indent && it.sep;
+          let start = [];
+          if (atNextItem && it.sep && !it.value) {
+            const nl = [];
+            for (let i = 0; i < it.sep.length; ++i) {
+              const st = it.sep[i];
+              switch (st.type) {
+                case "newline":
+                  nl.push(i);
+                  break;
+                case "space":
+                  break;
+                case "comment":
+                  if (st.indent > map.indent)
+                    nl.length = 0;
+                  break;
+                default:
+                  nl.length = 0;
+              }
+            }
+            if (nl.length >= 2)
+              start = it.sep.splice(nl[1]);
+          }
           switch (this.type) {
             case "anchor":
             case "tag":
               if (atNextItem || it.value) {
-                map.items.push({ start: [this.sourceToken] });
+                start.push(this.sourceToken);
+                map.items.push({ start });
                 this.onKeyLine = true;
-              } else if (it.sep)
+              } else if (it.sep) {
                 it.sep.push(this.sourceToken);
-              else
+              } else {
                 it.start.push(this.sourceToken);
+              }
               return;
             case "explicit-key-ind":
-              if (!it.sep && !includesToken(it.start, "explicit-key-ind"))
+              if (!it.sep && !includesToken(it.start, "explicit-key-ind")) {
                 it.start.push(this.sourceToken);
-              else if (atNextItem || it.value)
-                map.items.push({ start: [this.sourceToken] });
-              else
+              } else if (atNextItem || it.value) {
+                start.push(this.sourceToken);
+                map.items.push({ start });
+              } else {
                 this.stack.push({
                   type: "block-map",
                   offset: this.offset,
                   indent: this.indent,
                   items: [{ start: [this.sourceToken] }]
                 });
+              }
               this.onKeyLine = true;
               return;
             case "map-value-ind":
-              if (!it.sep)
-                Object.assign(it, { key: null, sep: [this.sourceToken] });
-              else if (it.value || atNextItem && !includesToken(it.start, "explicit-key-ind"))
-                map.items.push({ start: [], key: null, sep: [this.sourceToken] });
-              else if (includesToken(it.sep, "map-value-ind"))
-                this.stack.push({
-                  type: "block-map",
-                  offset: this.offset,
-                  indent: this.indent,
-                  items: [{ start: [], key: null, sep: [this.sourceToken] }]
-                });
-              else if (includesToken(it.start, "explicit-key-ind") && isFlowToken(it.key) && !includesToken(it.sep, "newline")) {
-                const start = getFirstKeyStartProps(it.start);
-                const key = it.key;
-                const sep = it.sep;
-                sep.push(this.sourceToken);
-                delete it.key, delete it.sep;
-                this.stack.push({
-                  type: "block-map",
-                  offset: this.offset,
-                  indent: this.indent,
-                  items: [{ start, key, sep }]
-                });
-              } else
-                it.sep.push(this.sourceToken);
+              if (includesToken(it.start, "explicit-key-ind")) {
+                if (!it.sep) {
+                  if (includesToken(it.start, "newline")) {
+                    Object.assign(it, { key: null, sep: [this.sourceToken] });
+                  } else {
+                    const start2 = getFirstKeyStartProps(it.start);
+                    this.stack.push({
+                      type: "block-map",
+                      offset: this.offset,
+                      indent: this.indent,
+                      items: [{ start: start2, key: null, sep: [this.sourceToken] }]
+                    });
+                  }
+                } else if (it.value) {
+                  map.items.push({ start: [], key: null, sep: [this.sourceToken] });
+                } else if (includesToken(it.sep, "map-value-ind")) {
+                  this.stack.push({
+                    type: "block-map",
+                    offset: this.offset,
+                    indent: this.indent,
+                    items: [{ start, key: null, sep: [this.sourceToken] }]
+                  });
+                } else if (isFlowToken(it.key) && !includesToken(it.sep, "newline")) {
+                  const start2 = getFirstKeyStartProps(it.start);
+                  const key = it.key;
+                  const sep = it.sep;
+                  sep.push(this.sourceToken);
+                  delete it.key, delete it.sep;
+                  this.stack.push({
+                    type: "block-map",
+                    offset: this.offset,
+                    indent: this.indent,
+                    items: [{ start: start2, key, sep }]
+                  });
+                } else if (start.length > 0) {
+                  it.sep = it.sep.concat(start, this.sourceToken);
+                } else {
+                  it.sep.push(this.sourceToken);
+                }
+              } else {
+                if (!it.sep) {
+                  Object.assign(it, { key: null, sep: [this.sourceToken] });
+                } else if (it.value || atNextItem) {
+                  map.items.push({ start, key: null, sep: [this.sourceToken] });
+                } else if (includesToken(it.sep, "map-value-ind")) {
+                  this.stack.push({
+                    type: "block-map",
+                    offset: this.offset,
+                    indent: this.indent,
+                    items: [{ start: [], key: null, sep: [this.sourceToken] }]
+                  });
+                } else {
+                  it.sep.push(this.sourceToken);
+                }
+              }
               this.onKeyLine = true;
               return;
             case "alias":
@@ -21441,7 +21827,7 @@ var require_parser = __commonJS({
             case "double-quoted-scalar": {
               const fs2 = this.flowScalar(this.type);
               if (atNextItem || it.value) {
-                map.items.push({ start: [], key: fs2, sep: [] });
+                map.items.push({ start, key: fs2, sep: [] });
                 this.onKeyLine = true;
               } else if (it.sep) {
                 this.stack.push(fs2);
@@ -21454,8 +21840,9 @@ var require_parser = __commonJS({
             default: {
               const bv = this.startBlockValue(map);
               if (bv) {
-                if (atNextItem && bv.type !== "block-seq" && includesToken(it.start, "explicit-key-ind"))
-                  map.items.push({ start: [] });
+                if (atNextItem && bv.type !== "block-seq" && includesToken(it.start, "explicit-key-ind")) {
+                  map.items.push({ start });
+                }
                 this.stack.push(bv);
                 return;
               }
@@ -21473,8 +21860,8 @@ var require_parser = __commonJS({
             if (it.value) {
               const end = "end" in it.value ? it.value.end : void 0;
               const last = Array.isArray(end) ? end[end.length - 1] : void 0;
-              if ((last === null || last === void 0 ? void 0 : last.type) === "comment")
-                end === null || end === void 0 ? void 0 : end.push(this.sourceToken);
+              if ((last == null ? void 0 : last.type) === "comment")
+                end == null ? void 0 : end.push(this.sourceToken);
               else
                 seq.items.push({ start: [this.sourceToken] });
             } else
@@ -21487,7 +21874,7 @@ var require_parser = __commonJS({
             else {
               if (this.atIndentedComment(it.start, seq.indent)) {
                 const prev = seq.items[seq.items.length - 2];
-                const end = (_a2 = prev === null || prev === void 0 ? void 0 : prev.value) === null || _a2 === void 0 ? void 0 : _a2.end;
+                const end = (_a2 = prev == null ? void 0 : prev.value) == null ? void 0 : _a2.end;
                 if (Array.isArray(end)) {
                   Array.prototype.push.apply(end, it.start);
                   end.push(this.sourceToken);
@@ -21587,7 +21974,7 @@ var require_parser = __commonJS({
           }
         } else {
           const parent = this.peek(2);
-          if (parent.type === "block-map" && (this.type === "map-value-ind" || this.type === "newline" && !parent.items[parent.items.length - 1].sep)) {
+          if (parent.type === "block-map" && (this.type === "map-value-ind" && parent.indent === fc.indent || this.type === "newline" && !parent.items[parent.items.length - 1].sep)) {
             yield* this.pop();
             yield* this.step();
           } else if (this.type === "map-value-ind" && parent.type !== "flow-collection") {
@@ -21745,7 +22132,7 @@ var require_public_api = __commonJS({
     }
     function parseAllDocuments(source, options2 = {}) {
       const { lineCounter: lineCounter2, prettyErrors } = parseOptions(options2);
-      const parser$1 = new parser.Parser(lineCounter2 === null || lineCounter2 === void 0 ? void 0 : lineCounter2.addNewLine);
+      const parser$1 = new parser.Parser(lineCounter2 == null ? void 0 : lineCounter2.addNewLine);
       const composer$1 = new composer.Composer(options2);
       const docs = Array.from(composer$1.compose(parser$1.parse(source)));
       if (prettyErrors && lineCounter2)
@@ -21759,7 +22146,7 @@ var require_public_api = __commonJS({
     }
     function parseDocument(source, options2 = {}) {
       const { lineCounter: lineCounter2, prettyErrors } = parseOptions(options2);
-      const parser$1 = new parser.Parser(lineCounter2 === null || lineCounter2 === void 0 ? void 0 : lineCounter2.addNewLine);
+      const parser$1 = new parser.Parser(lineCounter2 == null ? void 0 : lineCounter2.addNewLine);
       const composer$1 = new composer.Composer(options2);
       let doc = null;
       for (const _doc of composer$1.compose(parser$1.parse(source), true, source.length)) {
@@ -21809,7 +22196,7 @@ var require_public_api = __commonJS({
         options2 = indent < 1 ? void 0 : indent > 8 ? { indent: 8 } : { indent };
       }
       if (value === void 0) {
-        const { keepUndefined } = options2 || replacer || {};
+        const { keepUndefined } = options2 ?? replacer ?? {};
         if (!keepUndefined)
           return void 0;
       }
@@ -21836,7 +22223,6 @@ var require_dist2 = __commonJS({
     var Scalar = require_Scalar();
     var YAMLMap = require_YAMLMap();
     var YAMLSeq = require_YAMLSeq();
-    var options2 = require_options();
     var cst = require_cst();
     var lexer = require_lexer();
     var lineCounter = require_line_counter();
@@ -21862,7 +22248,6 @@ var require_dist2 = __commonJS({
     exports2.Scalar = Scalar.Scalar;
     exports2.YAMLMap = YAMLMap.YAMLMap;
     exports2.YAMLSeq = YAMLSeq.YAMLSeq;
-    exports2.defaultOptions = options2.defaultOptions;
     exports2.CST = cst;
     exports2.Lexer = lexer.Lexer;
     exports2.LineCounter = lineCounter.LineCounter;
@@ -21872,6 +22257,7 @@ var require_dist2 = __commonJS({
     exports2.parseDocument = publicApi.parseDocument;
     exports2.stringify = publicApi.stringify;
     exports2.visit = visit.visit;
+    exports2.visitAsync = visit.visitAsync;
   }
 });
 
@@ -23113,15 +23499,15 @@ var require_common2 = __commonJS({
     };
     var Je = (c, n, t, o) => {
       if (n && typeof n == "object" || typeof n == "function")
-        for (let p of Ne(n))
-          !O.call(c, p) && (t || p !== "default") && P(c, p, { get: () => n[p], enumerable: !(o = Ye(n, p)) || o.enumerable });
+        for (let s of Ne(n))
+          !O.call(c, s) && (t || s !== "default") && P(c, s, { get: () => n[s], enumerable: !(o = Ye(n, s)) || o.enumerable });
       return c;
     };
     var $e = ((c) => (n, t) => c && c.get(n) || (t = Je(qe({}), n, 1), c && c.set(n, t), t))(typeof WeakMap != "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
     var Ht = {};
     A(Ht, { ALPViewType: () => I, ActionTitlePrefix: () => tt, ArtifactType: () => w, BindingPropertyRegexAsString: () => ot, ControlType: () => M, CustomExtensionType: () => oe, DATESETTINGSPATH: () => mt, DataSourceType: () => $, DefinitionName: () => W, DirName: () => k, DraftDiscardEnabledSettings: () => N, ExportArtifacts: () => v, FIORI_FCL_ROOT_ID: () => ut, FIORI_FCL_ROOT_VIEW_NAME: () => xt, FRAGMENTNAMEPART: () => bt, FacetBase: () => G, FacetTitlePrefix: () => et, Features: () => ae, FileName: () => B, FioriElementsVersion: () => L, FlexChangeLayer: () => h, FlexibleColumnLayoutAggregations: () => J, FlexibleColumnLayoutType: () => F, GENERICAPPSETTINGS: () => St, LogSeverity: () => ee, LogSeverityLabel: () => At, MANIFESTPATH: () => nt, METADATAPATH: () => at, MacrosPropertyType: () => Y, ManifestSection: () => Z, OdataVersion: () => j, PAGETYPE_VIEW_EXTENSION_TEMPLATE_MAP: () => De, PageType: () => Ze, PageTypeV2: () => T, PageTypeV4: () => C, PropertyName: () => X, QUICKVARPATH: () => lt, QUICKVARPATHX: () => gt, SAPUI5_FRAGMENT_CLASS: () => dt, SAPUI5_VIEW_CLASS: () => Pt, SchemaKeyName: () => K, SchemaTag: () => Q, SchemaType: () => R, SectionType: () => U, StatePreservationMode: () => q, TableColumnVerticalAlignment: () => z, TemplateType: () => te, UIVOCABULARY: () => st, UIVOCABULARYALPHADOT: () => ct, UIVOCABULARYDOT: () => pt, VOCWITHCOLONS: () => rt, VOCWITHSLASH: () => it, ViewTemplateType: () => H, ViewTypes: () => D, Visualization: () => _45, v2: () => f, v4: () => E });
-    var T = ((i) => (i.ObjectPage = "ObjectPage", i.ListReport = "ListReport", i.OverviewPage = "OverviewPage", i.CustomPage = "CustomPage", i.AnalyticalListPage = "AnalyticalListPage", i))(T || {});
-    var C = ((i) => (i.ObjectPage = "ObjectPage", i.ListReport = "ListReport", i.CustomPage = "CustomPage", i.FPMCustomPage = "FPMCustomPage", i.AnalyticalListPage = "AnalyticalListPage", i))(C || {});
+    var T = ((r) => (r.ObjectPage = "ObjectPage", r.ListReport = "ListReport", r.OverviewPage = "OverviewPage", r.CustomPage = "CustomPage", r.AnalyticalListPage = "AnalyticalListPage", r))(T || {});
+    var C = ((r) => (r.ObjectPage = "ObjectPage", r.ListReport = "ListReport", r.CustomPage = "CustomPage", r.FPMCustomPage = "FPMCustomPage", r.AnalyticalListPage = "AnalyticalListPage", r))(C || {});
     var Ze = d(d({}, T), C);
     var De = /* @__PURE__ */ new Map([["ListReport", "sap.suite.ui.generic.template.ListReport.view.ListReport"], ["AnalyticalListPage", "sap.suite.ui.generic.template.AnalyticalListPage.view.AnalyticalListPage"], ["ObjectPage", "sap.suite.ui.generic.template.ObjectPage.view.Details"]]);
     var L = ((t) => (t.v2 = "v2", t.v4 = "v4", t))(L || {});
@@ -23132,20 +23518,20 @@ var require_common2 = __commonJS({
     var v = ((t) => (t.flex = "flex", t.manifest = "manifest", t))(v || {});
     var I = ((t) => (t.Primary = "primary", t.Secondary = "secondary", t))(I || {});
     var U = ((o) => (o.Section = "Section", o.SubSection = "SubSection", o.HeaderSection = "HeaderSection", o))(U || {});
-    var w = ((i) => (i.Manifest = "Manifest", i.FlexChange = "FlexChange", i.Annotation = "Annotation", i.Fragment = "Fragment", i.View = "View", i))(w || {});
+    var w = ((s) => (s.Manifest = "Manifest", s.FlexChange = "FlexChange", s.Annotation = "Annotation", s.XMLProperty = "XMLProperty", s))(w || {});
     var M = ((g) => (g.Table = "sap.m.Table", g.TableColumn = "sap.m.Column", g.SmartTable = "sap.ui.comp.smarttable.SmartTable", g.SmartFilterBar = "sap.ui.comp.smartfilterbar.SmartFilterBar", g.SmartChart = "sap.ui.comp.smartchart.SmartChart", g.Group = "sap.ui.comp.smartform.Group", g.GroupElement = "sap.ui.comp.smartform.GroupElement", g.Button = "sap.m.Button", g.ToolbarButton = "sap.m.OverflowToolbarButton", g.Avatar = "sap.f.Avatar", g.ObjectPageDynamicHeaderTitle = "sap.uxap.ObjectPageDynamicHeaderTitle", g.ObjectPageGridProperties = "sap.ui.layout.GridData", g.ObjectPageHeader = "sap.uxap.ObjectPageHeader", g.ObjectPageLayout = "sap.uxap.ObjectPageLayout", g.HeaderAction = "sap.uxap.ObjectPageHeaderActionButton", g.DynamicPage = "sap.f.DynamicPage", g.Form = "sap.ui.layout.form", g.Chart = "sap.suite.ui.microchart", g.Section = "sap.uxap.ObjectPageSection", g.SubSection = "sap.uxap.ObjectPageSubSection", g))(M || {});
     var _45 = ((t) => (t.LineItem = "LineItem", t.Chart = "Chart", t))(_45 || {});
-    var k = ((r) => (r.Sapux = "src", r.Schemas = ".schemas", r.Pages = "pages", r.Webapp = "webapp", r.Temp = ".tmp", r.Changes = "changes", r.LocalService = "localService", r.Controller = "controller", r.View = "view", r.Fragment = "fragment", r.Ext = "ext", r.VSCode = ".vscode", r))(k || {});
+    var k = ((i) => (i.Sapux = "src", i.Schemas = ".schemas", i.Pages = "pages", i.Webapp = "webapp", i.Temp = ".tmp", i.Changes = "changes", i.LocalService = "localService", i.Controller = "controller", i.View = "view", i.Fragment = "fragment", i.Ext = "ext", i.VSCode = ".vscode", i))(k || {});
     var B = ((n) => (n.App = "app.json", n))(B || {});
     var et = "Facet ID: ";
     var tt = "Action ID: ";
     var G = ((S) => (S.LineItem = "LineItem", S.CollectionFacet = "CollectionFacet", S.Chart = "Chart", S.Form = "Form", S.Identification = "Identification", S.DataPoint = "DataPoint", S.Address = "Address", S.Contact = "Contact", S.PresentationVariant = "PresentationVariant", S.Unknown = "", S))(G || {});
     var ot = "^{[A-Za-z0-9{}&$!@#%? _|,<>'()[\\]\\/:=.]+}$";
-    var H = ((i) => (i.ResponsiveTableColumnsExtension = "ResponsiveTableColumnsExtension", i.AnalyticalTableColumnsExtension = "AnalyticalTableColumnsExtension", i.TreeTableColumnsExtension = "TreeTableColumnsExtension", i.GridTableColumnsExtension = "GridTableColumnsExtension", i.ResponsiveTableCellsExtension = "ResponsiveTableCellsExtension", i))(H || {});
+    var H = ((r) => (r.ResponsiveTableColumnsExtension = "ResponsiveTableColumnsExtension", r.AnalyticalTableColumnsExtension = "AnalyticalTableColumnsExtension", r.TreeTableColumnsExtension = "TreeTableColumnsExtension", r.GridTableColumnsExtension = "GridTableColumnsExtension", r.ResponsiveTableCellsExtension = "ResponsiveTableCellsExtension", r))(H || {});
     var W = ((e) => (e.Action = "Action", e.Actions = "Actions", e.ActionsLR = "Actions<LineItems>", e.ALPChart = "ALPChart", e.ALPChartView = "ALPChartView", e.ALPTable = "ALPTable", e.ALPTableView = "ALPTableView", e.AnalyticalListPageFilterBar = "AnalyticalListPageFilterBar", e.AnnotationPathAsObject = "AnnotationPathAsObject", e.ChartToolBarAction = "ChartToolBarAction", e.CommonHeaderFacetSettings = "CommonHeaderFacetSettings", e.CompactFilters = "CompactFilters", e.CustomFooterActionOP = "CustomFooterActionOP", e.CustomHeaderAction = "CustomHeaderAction", e.CustomHeaderActionOP = "CustomHeaderActionOP", e.CustomFormActionOP = "CustomFormActionOP", e.CustomTableAction = "CustomTableAction", e.CustomTableActionOP = "CustomTableActionOP", e.CustomColumn = "TableCustomColumn", e.CustomColumnOP = "TableCustomColumnOP", e.CustomColumns = "TableCustomColumns", e.CustomSections = "CustomSections", e.FieldPath = "FieldPath", e.Field = "Field", e.Fields = "Fields", e.Fields4Dialog = "Fields4Dialog", e.FilterBar = "FilterBar", e.FilterBarVisualFilters = "FilterBarVisualFilters", e.Footer = "Footer", e.FooterAction = "FooterAction", e.FooterActionV4 = "FooterActionV4", e.FooterActions = "FooterActions", e.FooterActionsLR = "FooterActions<LineItems>", e.Form = "Form", e.FormAction = "FormAction", e.GenericActions = "GenericActions", e.GenericColumnsOP = "GenericColumnsOP", e.GenericFooter = "GenericFooter", e.GenericSections = "GenericSections", e.Header = "Header", e.HeaderActions = "HeaderActions", e.ObjectPageHeaderAction = "ObjectPageHeaderAction", e.ObjectPageHeaderActions = "ObjectPageHeaderActions", e.HeaderSections = "HeaderSections", e.LineItems = "LineItems", e.LineItemsOfView = "LineItemsOfView", e.ListReportFilterBar = "ListReportFilterBar", e.LRTableView = "LRTableView", e.LRChartView = "LRChartView", e.MultiEditV2 = "MultiEdit", e.MultiTableModeV4 = "MultiTableModeV4", e.ObjectPageChart = "ObjectPageChart", e.ObjectPageCustomSectionFragment = "ObjectPageCustomSectionFragment", e.ObjectPageForm = "ObjectPageForm", e.ObjectPageFooter = "ObjectPageFooter", e.ObjectPageFooterAction = "ObjectPageFooterAction", e.ObjectPageFooterActions = "ObjectPageFooterActions", e.ObjectPageHeader = "ObjectPageHeader", e.ObjectPageHeaderSectionForm = "ObjectPageHeaderSectionForm", e.ObjectPageHeaderSectionChart = "ObjectPageHeaderSectionChart", e.ObjectPageHeaderSectionDataPoint = "ObjectPageHeaderSectionDataPoint", e.ObjectPageHeaderSectionContact = "ObjectPageHeaderSectionContact", e.ObjectPageHeaderSectionAddress = "ObjectPageHeaderSectionAddress", e.ObjectPageLayout = "ObjectPageLayout", e.ObjectPagePresentationVariant = "ObjectPagePresentationVariant", e.ObjectPageSectionAddress = "ObjectPageSectionAddress", e.ObjectPageSectionChart = "ObjectPageSectionChart", e.ObjectPageSectionContact = "ObjectPageSectionContact", e.ObjectPageSectionDataPoint = "ObjectPageSectionDataPoint", e.ObjectPageSectionForm = "ObjectPageSectionForm", e.ObjectPageSectionPresentationVariant = "ObjectPageSectionPresentationVariant", e.ObjectPageSectionTableV4 = "ObjectPageSectionTableV4", e.ObjectPageSubSections = "ObjectPageSubSections", e.ObjectPageTable = "ObjectPageTable", e.ObjectPageTableColumn = "ObjectPageTableColumn", e.ObjectPageToolBar = "ObjectPageToolBar", e.ObjectPageToolBarAction = "ObjectPageToolBarAction", e.ObjectPageToolBarActions = "ObjectPageToolBarActions", e.Position = "Position", e.PositionOP = "PositionOP", e.QuickVariant = "QuickVariant", e.QuickVariantSelectionOP = "QuickVariantSelectionOP", e.QuickVariantSelectionV4OP = "QuickVariantSelectionV4OP", e.RelatedFacetKeys = "RelatedFacetKeys", e.Sections = "Sections", e.SectionActions = "SectionActions", e.SelectionFields = "SelectionFields", e.Table = "Table", e.TableSPV = "TableSPV", e.TableColumn = "TableColumn", e.TableViewExtension = "TableViewExtension", e.ToolBarAction = "ToolBarAction", e.ToolBarLR = "ToolBar<LineItems>", e.ToolBar = "ToolBar", e.ViewTableColumn = "ViewTableColumn", e.ViewCustomColumn = "ViewTableCustomColumn", e.ViewCustomAction = "ViewTableCustomAction", e.ViewChartToolBar = "ViewChartToolBar", e.ViewToolBarAction = "ViewToolBarAction", e.ViewPosition = "ViewPosition", e.ViewCustomActionPosition = "ViewCustomActionPosition", e.VisualFilters = "VisualFilters", e.VisualFilter = "VisualFilter", e.CustomActionPosition = "CustomActionPosition", e.CustomActionPositionOP = "CustomActionPositionOP", e.CustomHeaderActionPosition = "CustomHeaderActionPosition", e.CustomHeaderActionPositionOP = "CustomHeaderActionPositionOP", e.CustomFooterActionPositionOP = "CustomFooterActionPositionOP", e))(W || {});
-    var X = ((r) => (r.actions = "actions", r.annotationPath = "annotationPath", r.chart = "chart", r.columns = "columns", r.defaultPath = "defaultPath", r.defaultTemplateAnnotationPath = "defaultTemplateAnnotationPath", r.footer = "footer", r.header = "header", r.sections = "sections", r.table = "table", r.views = "views", r.visualFilters = "visualFilters", r))(X || {});
-    var Q = ((r) => (r.annotationPath = "annotationPath", r.annotationType = "annotationType", r.artifactType = "artifactType", r.controlType = "controlType", r.dataType = "dataType", r.fullyQualifiedName = "fullyQualifiedName", r.hidden = "hidden", r.isViewNode = "isViewNode", r.key = "key", r.keys = "keys", r.target = "target", r.propertyIndex = "propertyIndex", r))(Q || {});
-    var K = ((i) => (i.id = "ID", i.value = "Value", i.action = "Action", i.target = "Target", i.key = "Key", i))(K || {});
+    var X = ((i) => (i.actions = "actions", i.annotationPath = "annotationPath", i.chart = "chart", i.columns = "columns", i.defaultPath = "defaultPath", i.defaultTemplateAnnotationPath = "defaultTemplateAnnotationPath", i.footer = "footer", i.header = "header", i.sections = "sections", i.table = "table", i.views = "views", i.visualFilters = "visualFilters", i))(X || {});
+    var Q = ((i) => (i.annotationPath = "annotationPath", i.annotationType = "annotationType", i.artifactType = "artifactType", i.controlType = "controlType", i.dataType = "dataType", i.fullyQualifiedName = "fullyQualifiedName", i.hidden = "hidden", i.isViewNode = "isViewNode", i.key = "key", i.keys = "keys", i.target = "target", i.propertyIndex = "propertyIndex", i))(Q || {});
+    var K = ((r) => (r.id = "ID", r.value = "Value", r.action = "Action", r.target = "Target", r.key = "Key", r))(K || {});
     var at = "webapp/localService/metadata.xml";
     var nt = "webapp/manifest.json";
     var it = "/@com.sap.vocabularies";
@@ -23157,13 +23543,13 @@ var require_common2 = __commonJS({
     var gt = "/quickVariantSelectionX";
     var mt = "/filterSettings/dateSettings";
     var bt = ".fragment.";
-    var Y = ((p) => (p.Control = "Control", p.Property = "Property", p.Aggregation = "Aggregation", p.Event = "Event", p))(Y || {});
+    var Y = ((s) => (s.Control = "Control", s.Property = "Property", s.Aggregation = "Aggregation", s.Event = "Event", s))(Y || {});
     var N = ((n) => (n.restricted = "restricted", n))(N || {});
     var z = ((o) => (o.Top = "Top", o.Middle = "Middle", o.Bottom = "Bottom", o))(z || {});
     var q = ((t) => (t.persistence = "persistence", t.discovery = "discovery", t))(q || {});
     var J = ((o) => (o.BeginColumnPages = "beginColumnPages", o.MidColumnPages = "midColumnPages", o.EndColumnPages = "endColumnPages", o))(J || {});
     var $ = ((t) => (t.OData = "OData", t.ODataAnnotation = "ODataAnnotation", t))($ || {});
-    var Z = ((i) => (i.ui = "sap.ui", i.app = "sap.app", i.generic = "sap.ui.generic.app", i.ovp = "sap.ovp", i.ui5 = "sap.ui5", i))(Z || {});
+    var Z = ((r) => (r.ui = "sap.ui", r.app = "sap.app", r.generic = "sap.ui.generic.app", r.ovp = "sap.ovp", r.ui5 = "sap.ui5", r))(Z || {});
     var St = `${"sap.ui.generic.app"}/settings`;
     var xt = "sap.fe.templates.RootContainer.view.Fcl";
     var ut = "appRootView";
@@ -23181,7 +23567,7 @@ var require_common2 = __commonJS({
     var ie = ((m) => (m.analytical = "sap.ovp.cards.charts.analytical", m.analyticalv4 = "sap.ovp.cards.v4.charts.analytical", m.list = "sap.ovp.cards.list", m.listv4 = "sap.ovp.cards.v4.list", m.linklist = "sap.ovp.cards.linklist", m.linklistv4 = "sap.ovp.cards.v4.linklist", m.table = "sap.ovp.cards.table", m.tablev4 = "sap.ovp.cards.v4.table", m.stack = "sap.ovp.cards.stack", m))(ie || {});
     var Tt = { "sap.ovp.cards.charts.analytical": "AnalyticalCard", "sap.ovp.cards.v4.charts.analytical": "AnalyticalCard", "sap.ovp.cards.list": "ListCard", "sap.ovp.cards.v4.list": "ListCard", "sap.ovp.cards.linklist": "LinklistCard", "sap.ovp.cards.v4.linklist": "LinklistCard", "sap.ovp.cards.table": "TableCard", "sap.ovp.cards.v4.table": "TableCard", "sap.ovp.cards.stack": "StackCard" };
     var re = ((b) => (b.analyticalCardSettings = "analyticalCardSettings", b.analyticalCardSettingsv4 = "analyticalCardSettingsv4", b.listCardSettings = "listCardSettings", b.listCardSettingsv4 = "listCardSettingsv4", b.stackCardSettings = "stackCardSettings", b.linkListCardSettings = "linkListCardSettings", b.tableCardSettings = "tableCardSettings", b.tableCardSettingsv4 = "tableCardSettingsv4", b))(re || {});
-    var se = ((i) => (i.average = "average", i.max = "max", i.min = "min", i.sum = "sum", i.count = "$count", i))(se || {});
+    var se = ((r) => (r.average = "average", r.max = "max", r.min = "min", r.sum = "sum", r.count = "$count", r))(se || {});
     var pe = ((o) => (o.standard = "standard", o.bar = "bar", o.carousel = "carousel", o))(pe || {});
     var ce = ((t) => (t.extended = "extended", t.condensed = "condensed", t))(ce || {});
     var le = ((t) => (t.ascending = "ascending", t.descending = "descending", t))(le || {});
@@ -23189,17 +23575,17 @@ var require_common2 = __commonJS({
     var me = ((a) => (a.DATERANGE = "DATERANGE", a.DATE = "DATE", a.FROM = "FROM", a.TO = "TO", a.DAYS = "DAYS", a.LASTDAYS = "LASTDAYS", a.LASTWEEKS = "LASTWEEKS", a.WEEK = "WEEK", a.LASTMONTHS = "LASTMONTHS", a.MONTH = "MONTH", a.QUARTER = "QUARTER", a.LASTQUARTERS = "LASTQUARTERS", a.LASTYEARS = "LASTYEARS", a.LASTYEAR = "LASTYEAR", a.YEAR = "YEAR", a.NEXTDAYS = "NEXTDAYS", a.NEXTWEEKS = "NEXTWEEKS", a.NEXTMONTHS = "NEXTMONTHS", a.NEXTQUARTERS = "NEXTQUARTERS", a.NEXTYEARS = "NEXTYEARS", a.NEXT = "NEXT", a.SPECIFICMONTH = "SPECIFICMONTH", a.YESTERDAY = "YESTERDAY", a.YEARTODATE = "YEARTODATE", a.TODAY = "TODAY", a.TOMORROW = "TOMORROW", a.THISWEEK = "THISWEEK", a.LASTWEEK = "LASTWEEK", a.LAST2WEEKS = "LAST2WEEKS", a.LAST3WEEKS = "LAST3WEEKS", a.LAST4WEEKS = "LAST4WEEKS", a.LAST5WEEKS = "LAST5WEEKS", a.NEXTWEEK = "NEXTWEEK", a.NEXT2WEEKS = "NEXT2WEEKS", a.NEXT3WEEKS = "NEXT3WEEKS", a.NEXT4WEEKS = "NEXT4WEEKS", a.NEXT5WEEKS = "NEXT5WEEKS", a.THISMONTH = "THISMONTH", a.LASTMONTH = "LASTMONTH", a.NEXTMONTH = "NEXTMONTH", a.THISQUARTER = "THISQUARTER", a.LASTQUARTER = "LASTQUARTER", a.NEXTQUARTER = "NEXTQUARTER", a.QUARTER1 = "QUARTER1", a.QUARTER2 = "QUARTER2", a.QUARTER3 = "QUARTER3", a.QUARTER4 = "QUARTER4", a.TODAYFROMTO = "TODAYFROMTO", a))(me || {});
     var be = ((l) => (l.YESTERDAY = "YESTERDAY", l.TODAY = "TODAY", l.THISWEEK = "THISWEEK", l.LASTWEEK = "LASTWEEK", l.THISMONTH = "THISMONTH", l.TOMORROW = "TOMORROW", l.LASTMONTH = "LASTMONTH", l.THISQUARTER = "THISQUARTER", l.LASTQUARTER = "LASTQUARTER", l.THISYEAR = "THISYEAR", l.LASTYEAR = "LASTYEAR", l.LAST2WEEKS = "LAST2WEEKS", l.LAST3WEEKS = "LAST3WEEKS", l.LAST4WEEKS = "LAST4WEEKS", l.LAST5WEEKS = "LAST5WEEKS", l.YEARTODATE = "YEARTODATE", l.QUARTER1 = "QUARTER1", l.QUARTER2 = "QUARTER2", l.QUARTER3 = "QUARTER3", l.QUARTER4 = "QUARTER4", l.DATETOYEAR = "DATETOYEAR", l))(be || {});
     var Se = ((n) => (n.XML = "XML", n))(Se || {});
-    var xe = ((p) => (p.ResponsiveTable = "ResponsiveTable", p.GridTable = "GridTable", p.AnalyticalTable = "AnalyticalTable", p.TreeTable = "TreeTable", p))(xe || {});
-    var ue = ((p) => (p.ResponsiveTableColumnsExtension = "ResponsiveTableColumnsExtension", p.AnalyticalTableColumnsExtension = "AnalyticalTableColumnsExtension", p.TreeTableColumnsExtension = "TreeTableColumnsExtension", p.GridTableColumnsExtension = "GridTableColumnsExtension", p))(ue || {});
+    var xe = ((s) => (s.ResponsiveTable = "ResponsiveTable", s.GridTable = "GridTable", s.AnalyticalTable = "AnalyticalTable", s.TreeTable = "TreeTable", s))(xe || {});
+    var ue = ((s) => (s.ResponsiveTableColumnsExtension = "ResponsiveTableColumnsExtension", s.AnalyticalTableColumnsExtension = "AnalyticalTableColumnsExtension", s.TreeTableColumnsExtension = "TreeTableColumnsExtension", s.GridTableColumnsExtension = "GridTableColumnsExtension", s))(ue || {});
     var Pe = ((n) => (n.extension = "extension", n))(Pe || {});
     var de = ((n) => (n.GENERICPROPERTY = "GENERICPROPERTY", n))(de || {});
     var Ae = ((o) => (o.charttable = "charttable", o.chart = "chart", o.table = "table", o))(Ae || {});
     var Te = ((t) => (t.visual = "visual", t.compact = "compact", t))(Te || {});
     var Ce = ((o) => (o.always = "always", o.never = "never", o.ifAnyFilterExist = "ifAnyFilterExist", o))(Ce || {});
-    var fe = ((s) => (s.bar = "bar", s.column = "column", s.line = "line", s.combination = "combination", s.pie = "pie", s.donut = "donut", s.scatter = "scatter", s.bubble = "bubble", s.heatmap = "heatmap", s.bullet = "bullet", s.verticalBullet = "vertical_bullet", s.stackedBar = "stacked_bar", s.stackedColumn = "stacked_column", s.stackedCombination = "stacked_combination", s.horizontalStackedCombination = "horizontal_stacked_combination", s.dualBar = "dual_bar", s.dualColumn = "dual_column", s.dualLine = "dual_line", s.dualStackedBar = "dual_stacked_bar", s.dualStackedColumn = "dual_stacked_column", s.dualCombination = "dual_combination", s.dualStackedCombination = "dual_stacked_combination", s.dualHorizontalCombination = "dual_horizontal_combination", s.dualHorizontalStackedCombination = "dual_horizontal_stacked_combination", s.hundredStackedBar = "100_stacked_bar", s.hundredStackedColumn = "100_stacked_column", s.hundredDualStackedBar = "100_dual_stacked_bar", s.hundredDualStackedColumn = "100_dual_stacked_column", s.waterfall = "waterfall", s.horizontalWaterfall = "horizontal_waterfall", s))(fe || {});
+    var fe = ((p) => (p.bar = "bar", p.column = "column", p.line = "line", p.combination = "combination", p.pie = "pie", p.donut = "donut", p.scatter = "scatter", p.bubble = "bubble", p.heatmap = "heatmap", p.bullet = "bullet", p.verticalBullet = "vertical_bullet", p.stackedBar = "stacked_bar", p.stackedColumn = "stacked_column", p.stackedCombination = "stacked_combination", p.horizontalStackedCombination = "horizontal_stacked_combination", p.dualBar = "dual_bar", p.dualColumn = "dual_column", p.dualLine = "dual_line", p.dualStackedBar = "dual_stacked_bar", p.dualStackedColumn = "dual_stacked_column", p.dualCombination = "dual_combination", p.dualStackedCombination = "dual_stacked_combination", p.dualHorizontalCombination = "dual_horizontal_combination", p.dualHorizontalStackedCombination = "dual_horizontal_stacked_combination", p.hundredStackedBar = "100_stacked_bar", p.hundredStackedColumn = "100_stacked_column", p.hundredDualStackedBar = "100_dual_stacked_bar", p.hundredDualStackedColumn = "100_dual_stacked_column", p.waterfall = "waterfall", p.horizontalWaterfall = "horizontal_waterfall", p))(fe || {});
     var Ee = ((o) => (o.AfterFacet = "AfterFacet", o.BeforeFacet = "BeforeFacet", o.ReplaceFacet = "ReplaceFacet", o))(Ee || {});
     var ye = ((n) => (n.XML = "XML", n))(ye || {});
-    var Ve = ((n) => (n.inline = "inline", n))(Ve || {});
+    var Ve = ((o) => (o.inline = "inline", o.creationRows = "creationRows", o.creationRowsHiddenInEditMode = "creationRowsHiddenInEditMode", o))(Ve || {});
     var Ct = "sap.suite.ui.generic.template";
     var ft = "sap.suite.ui.generic.template.ObjectPage";
     var Et = "sap.suite.ui.generic.template.ListReport";
@@ -23213,7 +23599,7 @@ var require_common2 = __commonJS({
     var E = {};
     A(E, { ActionPlacement: () => Le, Availability: () => We, CustomSectionViewTypesV4: () => Be, DefaultPathType: () => ve, DesigntimeValues: () => Me, FE_TEMPLATE_V4: () => ht, FE_TEMPLATE_V4_ALP: () => Ut, FE_TEMPLATE_V4_CUSTOM_PAGE: () => Rt, FE_TEMPLATE_V4_LIST_REPORT: () => It, FE_TEMPLATE_V4_OBJECT_PAGE: () => vt, FIORI_FCL_ROUTER_CLASS: () => Mt, HorizontalAlign: () => Xe, InitialLayoutType: () => Ue, InitialLoadType: () => Re, LayoutType: () => Ie, Placement: () => He, SAPUI5_CONTROLLER_EXTENSION: () => kt, SAPUI5_DEPENDENCY_LIB_SAP_F: () => _t, SAPUI5_FRAGMENT_TYPE_V4: () => wt, SAPUI5_VIEW_EXTENSION_LIST_REPORT: () => Gt, SAPUI5_VIEW_EXTENSION_OBJECT_PAGE: () => Bt, SectionLayoutType: () => _e, SectionPosition: () => ke, SectionPositionV4: () => Ge, SelectType: () => we, SelectionMode: () => je, TableCreationModeType: () => he, TableTypeV4: () => Fe, VariantManagementTypeListReport: () => Ke, VariantManagementTypeObjectPage: () => Qe });
     var Le = ((t) => (t.After = "After", t.Before = "Before", t))(Le || {});
-    var je = ((p) => (p.Multi = "Multi", p.None = "None", p.Single = "Single", p.Auto = "Auto", p))(je || {});
+    var je = ((s) => (s.Multi = "Multi", s.None = "None", s.Single = "Single", s.Auto = "Auto", s))(je || {});
     var Fe = ((o) => (o.ResponsiveTable = "ResponsiveTable", o.GridTable = "GridTable", o.AnalyticalTable = "AnalyticalTable", o))(Fe || {});
     var he = ((o) => (o.NewPage = "NewPage", o.Inline = "Inline", o.CreationRow = "CreationRow", o))(he || {});
     var Re = ((o) => (o.Disabled = "Disabled", o.Enabled = "Enabled", o.Auto = "Auto", o))(Re || {});
@@ -23297,46 +23683,46 @@ var require_v2 = __commonJS({
     var F = Object.getOwnPropertyNames;
     var j = Object.prototype.hasOwnProperty;
     var W = (s) => p(s, "__esModule", { value: true });
-    var w = (s, n) => {
-      for (var a in n)
-        p(s, a, { get: n[a], enumerable: true });
-    };
-    var M = (s, n, a, i) => {
-      if (n && typeof n == "object" || typeof n == "function")
-        for (let r of F(n))
-          !j.call(s, r) && (a || r !== "default") && p(s, r, { get: () => n[r], enumerable: !(i = h(n, r)) || i.enumerable });
+    var w = (s, i) => {
+      for (var a in i)
+        p(s, a, { get: i[a], enumerable: true });
+    };
+    var M = (s, i, a, n) => {
+      if (i && typeof i == "object" || typeof i == "function")
+        for (let r of F(i))
+          !j.call(s, r) && (a || r !== "default") && p(s, r, { get: () => i[r], enumerable: !(n = h(i, r)) || n.enumerable });
       return s;
     };
-    var B = ((s) => (n, a) => s && s.get(n) || (a = M(W({}), n, 1), s && s.set(n, a), a))(typeof WeakMap != "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
+    var B = ((s) => (i, a) => s && s.get(i) || (a = M(W({}), i, 1), s && s.set(i, a), a))(typeof WeakMap != "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
     var Z = {};
-    w(Z, { CardSettingsType: () => d, CardTemplateType: () => m, ChartCardType: () => b, ChartType: () => V, ContainerLayoutType: () => k, CreateMode: () => N, DateRangeType: () => u, DefaultContentView: () => y, DefaultDateRangeValueType: () => P, DefaultFilterMode: () => v, ExtensionFragmentTypes: () => _45, FE_TEMPLATE_V2: () => X, FE_TEMPLATE_V2_ALP: () => H, FE_TEMPLATE_V2_LIST_REPORT: () => G, FE_TEMPLATE_V2_OBJECT_PAGE: () => K, IgnoredFieldsType: () => R, LinkListFlavorType: () => A, ListFlavorType: () => T, ListTypeType: () => x, LoadDataOnAppLaunchSettings: () => U, MeasureAggregateValues: () => g, SAPUI5_CONTROLLER_EXTENSION: () => z, SAPUI5_VIEW_EXTENSION: () => Y, SAPUI5_VIEW_EXTENSION_ANALYTICAL_LIST_PAGE: () => $, SAPUI5_VIEW_EXTENSION_LIST_REPORT: () => J, SAPUI5_VIEW_EXTENSION_OBJECT_PAGE: () => q, SectionPosition: () => I, SortOrderType: () => E, Strategy: () => L, TableColumnExtensionTypeV2: () => O, TableTypeV2: () => C, cardTemplateTypeMap: () => Q, customColumnViewTypes: () => f });
-    var b = ((i) => (i.cardBubble = "cardBubble", i.cardchartsline = "cardchartsline", i.cardchartsdonut = "cardchartsdonut", i))(b || {});
-    var m = ((l) => (l.analytical = "sap.ovp.cards.charts.analytical", l.analyticalv4 = "sap.ovp.cards.v4.charts.analytical", l.list = "sap.ovp.cards.list", l.listv4 = "sap.ovp.cards.v4.list", l.linklist = "sap.ovp.cards.linklist", l.linklistv4 = "sap.ovp.cards.v4.linklist", l.table = "sap.ovp.cards.table", l.tablev4 = "sap.ovp.cards.v4.table", l.stack = "sap.ovp.cards.stack", l))(m || {});
+    w(Z, { CardSettingsType: () => m, CardTemplateType: () => d, ChartCardType: () => b, ChartType: () => I, ContainerLayoutType: () => k, CreateMode: () => N, DateRangeType: () => u, DefaultContentView: () => y, DefaultDateRangeValueType: () => P, DefaultFilterMode: () => v, ExtensionFragmentTypes: () => _45, FE_TEMPLATE_V2: () => X, FE_TEMPLATE_V2_ALP: () => G, FE_TEMPLATE_V2_LIST_REPORT: () => K, FE_TEMPLATE_V2_OBJECT_PAGE: () => H, IgnoredFieldsType: () => L, LinkListFlavorType: () => A, ListFlavorType: () => T, ListTypeType: () => x, LoadDataOnAppLaunchSettings: () => U, MeasureAggregateValues: () => g, SAPUI5_CONTROLLER_EXTENSION: () => z, SAPUI5_VIEW_EXTENSION: () => Y, SAPUI5_VIEW_EXTENSION_ANALYTICAL_LIST_PAGE: () => $, SAPUI5_VIEW_EXTENSION_LIST_REPORT: () => J, SAPUI5_VIEW_EXTENSION_OBJECT_PAGE: () => q, SectionPosition: () => V, SortOrderType: () => E, Strategy: () => R, TableColumnExtensionTypeV2: () => O, TableTypeV2: () => C, cardTemplateTypeMap: () => Q, customColumnViewTypes: () => f });
+    var b = ((n) => (n.cardBubble = "cardBubble", n.cardchartsline = "cardchartsline", n.cardchartsdonut = "cardchartsdonut", n))(b || {});
+    var d = ((l) => (l.analytical = "sap.ovp.cards.charts.analytical", l.analyticalv4 = "sap.ovp.cards.v4.charts.analytical", l.list = "sap.ovp.cards.list", l.listv4 = "sap.ovp.cards.v4.list", l.linklist = "sap.ovp.cards.linklist", l.linklistv4 = "sap.ovp.cards.v4.linklist", l.table = "sap.ovp.cards.table", l.tablev4 = "sap.ovp.cards.v4.table", l.stack = "sap.ovp.cards.stack", l))(d || {});
     var Q = { "sap.ovp.cards.charts.analytical": "AnalyticalCard", "sap.ovp.cards.v4.charts.analytical": "AnalyticalCard", "sap.ovp.cards.list": "ListCard", "sap.ovp.cards.v4.list": "ListCard", "sap.ovp.cards.linklist": "LinklistCard", "sap.ovp.cards.v4.linklist": "LinklistCard", "sap.ovp.cards.table": "TableCard", "sap.ovp.cards.v4.table": "TableCard", "sap.ovp.cards.stack": "StackCard" };
-    var d = ((c) => (c.analyticalCardSettings = "analyticalCardSettings", c.analyticalCardSettingsv4 = "analyticalCardSettingsv4", c.listCardSettings = "listCardSettings", c.listCardSettingsv4 = "listCardSettingsv4", c.stackCardSettings = "stackCardSettings", c.linkListCardSettings = "linkListCardSettings", c.tableCardSettings = "tableCardSettings", c.tableCardSettingsv4 = "tableCardSettingsv4", c))(d || {});
+    var m = ((c) => (c.analyticalCardSettings = "analyticalCardSettings", c.analyticalCardSettingsv4 = "analyticalCardSettingsv4", c.listCardSettings = "listCardSettings", c.listCardSettingsv4 = "listCardSettingsv4", c.stackCardSettings = "stackCardSettings", c.linkListCardSettings = "linkListCardSettings", c.tableCardSettings = "tableCardSettings", c.tableCardSettingsv4 = "tableCardSettingsv4", c))(m || {});
     var g = ((S) => (S.average = "average", S.max = "max", S.min = "min", S.sum = "sum", S.count = "$count", S))(g || {});
-    var T = ((i) => (i.standard = "standard", i.bar = "bar", i.carousel = "carousel", i))(T || {});
+    var T = ((n) => (n.standard = "standard", n.bar = "bar", n.carousel = "carousel", n))(T || {});
     var x = ((a) => (a.extended = "extended", a.condensed = "condensed", a))(x || {});
     var E = ((a) => (a.ascending = "ascending", a.descending = "descending", a))(E || {});
     var A = ((a) => (a.standard = "standard", a.carousel = "carousel", a))(A || {});
     var u = ((e) => (e.DATERANGE = "DATERANGE", e.DATE = "DATE", e.FROM = "FROM", e.TO = "TO", e.DAYS = "DAYS", e.LASTDAYS = "LASTDAYS", e.LASTWEEKS = "LASTWEEKS", e.WEEK = "WEEK", e.LASTMONTHS = "LASTMONTHS", e.MONTH = "MONTH", e.QUARTER = "QUARTER", e.LASTQUARTERS = "LASTQUARTERS", e.LASTYEARS = "LASTYEARS", e.LASTYEAR = "LASTYEAR", e.YEAR = "YEAR", e.NEXTDAYS = "NEXTDAYS", e.NEXTWEEKS = "NEXTWEEKS", e.NEXTMONTHS = "NEXTMONTHS", e.NEXTQUARTERS = "NEXTQUARTERS", e.NEXTYEARS = "NEXTYEARS", e.NEXT = "NEXT", e.SPECIFICMONTH = "SPECIFICMONTH", e.YESTERDAY = "YESTERDAY", e.YEARTODATE = "YEARTODATE", e.TODAY = "TODAY", e.TOMORROW = "TOMORROW", e.THISWEEK = "THISWEEK", e.LASTWEEK = "LASTWEEK", e.LAST2WEEKS = "LAST2WEEKS", e.LAST3WEEKS = "LAST3WEEKS", e.LAST4WEEKS = "LAST4WEEKS", e.LAST5WEEKS = "LAST5WEEKS", e.NEXTWEEK = "NEXTWEEK", e.NEXT2WEEKS = "NEXT2WEEKS", e.NEXT3WEEKS = "NEXT3WEEKS", e.NEXT4WEEKS = "NEXT4WEEKS", e.NEXT5WEEKS = "NEXT5WEEKS", e.THISMONTH = "THISMONTH", e.LASTMONTH = "LASTMONTH", e.NEXTMONTH = "NEXTMONTH", e.THISQUARTER = "THISQUARTER", e.LASTQUARTER = "LASTQUARTER", e.NEXTQUARTER = "NEXTQUARTER", e.QUARTER1 = "QUARTER1", e.QUARTER2 = "QUARTER2", e.QUARTER3 = "QUARTER3", e.QUARTER4 = "QUARTER4", e.TODAYFROMTO = "TODAYFROMTO", e))(u || {});
     var P = ((o) => (o.YESTERDAY = "YESTERDAY", o.TODAY = "TODAY", o.THISWEEK = "THISWEEK", o.LASTWEEK = "LASTWEEK", o.THISMONTH = "THISMONTH", o.TOMORROW = "TOMORROW", o.LASTMONTH = "LASTMONTH", o.THISQUARTER = "THISQUARTER", o.LASTQUARTER = "LASTQUARTER", o.THISYEAR = "THISYEAR", o.LASTYEAR = "LASTYEAR", o.LAST2WEEKS = "LAST2WEEKS", o.LAST3WEEKS = "LAST3WEEKS", o.LAST4WEEKS = "LAST4WEEKS", o.LAST5WEEKS = "LAST5WEEKS", o.YEARTODATE = "YEARTODATE", o.QUARTER1 = "QUARTER1", o.QUARTER2 = "QUARTER2", o.QUARTER3 = "QUARTER3", o.QUARTER4 = "QUARTER4", o.DATETOYEAR = "DATETOYEAR", o))(P || {});
-    var f = ((n) => (n.XML = "XML", n))(f || {});
+    var f = ((i) => (i.XML = "XML", i))(f || {});
     var C = ((r) => (r.ResponsiveTable = "ResponsiveTable", r.GridTable = "GridTable", r.AnalyticalTable = "AnalyticalTable", r.TreeTable = "TreeTable", r))(C || {});
     var O = ((r) => (r.ResponsiveTableColumnsExtension = "ResponsiveTableColumnsExtension", r.AnalyticalTableColumnsExtension = "AnalyticalTableColumnsExtension", r.TreeTableColumnsExtension = "TreeTableColumnsExtension", r.GridTableColumnsExtension = "GridTableColumnsExtension", r))(O || {});
-    var L = ((n) => (n.extension = "extension", n))(L || {});
-    var R = ((n) => (n.GENERICPROPERTY = "GENERICPROPERTY", n))(R || {});
-    var y = ((i) => (i.charttable = "charttable", i.chart = "chart", i.table = "table", i))(y || {});
+    var R = ((i) => (i.extension = "extension", i))(R || {});
+    var L = ((i) => (i.GENERICPROPERTY = "GENERICPROPERTY", i))(L || {});
+    var y = ((n) => (n.charttable = "charttable", n.chart = "chart", n.table = "table", n))(y || {});
     var v = ((a) => (a.visual = "visual", a.compact = "compact", a))(v || {});
-    var U = ((i) => (i.always = "always", i.never = "never", i.ifAnyFilterExist = "ifAnyFilterExist", i))(U || {});
-    var V = ((t) => (t.bar = "bar", t.column = "column", t.line = "line", t.combination = "combination", t.pie = "pie", t.donut = "donut", t.scatter = "scatter", t.bubble = "bubble", t.heatmap = "heatmap", t.bullet = "bullet", t.verticalBullet = "vertical_bullet", t.stackedBar = "stacked_bar", t.stackedColumn = "stacked_column", t.stackedCombination = "stacked_combination", t.horizontalStackedCombination = "horizontal_stacked_combination", t.dualBar = "dual_bar", t.dualColumn = "dual_column", t.dualLine = "dual_line", t.dualStackedBar = "dual_stacked_bar", t.dualStackedColumn = "dual_stacked_column", t.dualCombination = "dual_combination", t.dualStackedCombination = "dual_stacked_combination", t.dualHorizontalCombination = "dual_horizontal_combination", t.dualHorizontalStackedCombination = "dual_horizontal_stacked_combination", t.hundredStackedBar = "100_stacked_bar", t.hundredStackedColumn = "100_stacked_column", t.hundredDualStackedBar = "100_dual_stacked_bar", t.hundredDualStackedColumn = "100_dual_stacked_column", t.waterfall = "waterfall", t.horizontalWaterfall = "horizontal_waterfall", t))(V || {});
-    var I = ((i) => (i.AfterFacet = "AfterFacet", i.BeforeFacet = "BeforeFacet", i.ReplaceFacet = "ReplaceFacet", i))(I || {});
-    var _45 = ((n) => (n.XML = "XML", n))(_45 || {});
-    var N = ((n) => (n.inline = "inline", n))(N || {});
+    var U = ((n) => (n.always = "always", n.never = "never", n.ifAnyFilterExist = "ifAnyFilterExist", n))(U || {});
+    var I = ((t) => (t.bar = "bar", t.column = "column", t.line = "line", t.combination = "combination", t.pie = "pie", t.donut = "donut", t.scatter = "scatter", t.bubble = "bubble", t.heatmap = "heatmap", t.bullet = "bullet", t.verticalBullet = "vertical_bullet", t.stackedBar = "stacked_bar", t.stackedColumn = "stacked_column", t.stackedCombination = "stacked_combination", t.horizontalStackedCombination = "horizontal_stacked_combination", t.dualBar = "dual_bar", t.dualColumn = "dual_column", t.dualLine = "dual_line", t.dualStackedBar = "dual_stacked_bar", t.dualStackedColumn = "dual_stacked_column", t.dualCombination = "dual_combination", t.dualStackedCombination = "dual_stacked_combination", t.dualHorizontalCombination = "dual_horizontal_combination", t.dualHorizontalStackedCombination = "dual_horizontal_stacked_combination", t.hundredStackedBar = "100_stacked_bar", t.hundredStackedColumn = "100_stacked_column", t.hundredDualStackedBar = "100_dual_stacked_bar", t.hundredDualStackedColumn = "100_dual_stacked_column", t.waterfall = "waterfall", t.horizontalWaterfall = "horizontal_waterfall", t))(I || {});
+    var V = ((n) => (n.AfterFacet = "AfterFacet", n.BeforeFacet = "BeforeFacet", n.ReplaceFacet = "ReplaceFacet", n))(V || {});
+    var _45 = ((i) => (i.XML = "XML", i))(_45 || {});
+    var N = ((n) => (n.inline = "inline", n.creationRows = "creationRows", n.creationRowsHiddenInEditMode = "creationRowsHiddenInEditMode", n))(N || {});
     var X = "sap.suite.ui.generic.template";
-    var K = "sap.suite.ui.generic.template.ObjectPage";
-    var G = "sap.suite.ui.generic.template.ListReport";
-    var H = "sap.suite.ui.generic.template.AnalyticalListPage";
+    var H = "sap.suite.ui.generic.template.ObjectPage";
+    var K = "sap.suite.ui.generic.template.ListReport";
+    var G = "sap.suite.ui.generic.template.AnalyticalListPage";
     var Y = "sap.ui.viewExtensions";
     var z = "sap.ui.controllerExtensions";
     var q = "sap.suite.ui.generic.template.ObjectPage.view.Details";
@@ -23409,9 +23795,13 @@ var require_dist3 = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -23700,7 +24090,7 @@ var require_constants = __commonJS({
 });
 
 // ../lib/sapux-spec/dist/package.js
-var require_package5 = __commonJS({
+var require_package6 = __commonJS({
   "../lib/sapux-spec/dist/package.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -23764,7 +24154,7 @@ var require_dist4 = __commonJS({
     __exportStar(require_pages(), exports2);
     __exportStar(require_webapp(), exports2);
     __exportStar(require_constants(), exports2);
-    __exportStar(require_package5(), exports2);
+    __exportStar(require_package6(), exports2);
     __exportStar(require_project(), exports2);
     var location = () => {
       return __dirname.replace(/\\/g, "/");
@@ -28920,11 +29310,11 @@ var require_webapp2 = __commonJS({
     var yaml = __importStar(require_Yaml());
     var project_spec_1 = require_dist4();
     async function getUi5CustomWebappPath(root) {
-      var _a2, _b, _c, _d, _e;
+      var _a2, _b, _c, _d;
       let webappPath = project_spec_1.DirName.Webapp;
       try {
         const yamlContent = await (0, file_1.readFile)((0, path_1.join)(root, project_spec_1.FileName.Ui5Yaml));
-        webappPath = (_e = (_d = (_c = (_b = (_a2 = yaml.parse(yamlContent)) == null ? void 0 : _a2.resources) == null ? void 0 : _b.configuration) == null ? void 0 : _c.paths) == null ? void 0 : _d.webapp) != null ? _e : project_spec_1.DirName.Webapp;
+        webappPath = ((_d = (_c = (_b = (_a2 = yaml.parse(yamlContent)) == null ? void 0 : _a2.resources) == null ? void 0 : _b.configuration) == null ? void 0 : _c.paths) == null ? void 0 : _d.webapp) ?? project_spec_1.DirName.Webapp;
       } catch {
       }
       return webappPath;
@@ -38595,18 +38985,17 @@ var require_config = __commonJS({
     };
     exports2.destinationPropertyId = Object.keys(exports2.DestinationAttributeProperty);
     function hasDestinationAttrib(destinationProperty, destinationAttributeProperty, destinationAttribs = {}) {
-      var _a2, _b;
-      return (_b = destinationAttribs && ((_a2 = destinationAttribs[destinationProperty]) == null ? void 0 : _a2.includes(destinationAttributeProperty))) != null ? _b : false;
+      var _a2;
+      return (destinationAttribs && ((_a2 = destinationAttribs[destinationProperty]) == null ? void 0 : _a2.includes(destinationAttributeProperty))) ?? false;
     }
     exports2.hasDestinationAttrib = hasDestinationAttrib;
     function hasFullUrlDestAttribute(destinationAttribs) {
-      var _a2, _b;
-      return (_b = destinationAttribs && ((_a2 = destinationAttribs["WebIDEAdditionalData"]) == null ? void 0 : _a2.includes(exports2.DestinationAttributeProperty.FULL_URL))) != null ? _b : false;
+      var _a2;
+      return (destinationAttribs && ((_a2 = destinationAttribs["WebIDEAdditionalData"]) == null ? void 0 : _a2.includes(exports2.DestinationAttributeProperty.FULL_URL))) ?? false;
     }
     exports2.hasFullUrlDestAttribute = hasFullUrlDestAttribute;
     function hasHTML5DynamicDestinationAttrib(destinationAttribs) {
-      var _a2;
-      return (_a2 = destinationAttribs && destinationAttribs["HTML5.DynamicDestination"] === "true") != null ? _a2 : false;
+      return (destinationAttribs && destinationAttribs["HTML5.DynamicDestination"] === "true") ?? false;
     }
     exports2.hasHTML5DynamicDestinationAttrib = hasHTML5DynamicDestinationAttrib;
   }
@@ -54605,14 +54994,14 @@ var require_destination = __commonJS({
     }
     exports2.listDestinations = listDestinations;
     async function replaceUrlForAppStudio(systemConfig, destinationName, destinationInstance) {
-      var _a2, _b;
+      var _a2;
       systemConfig.originalUrl = systemConfig.url;
       if (destinationName && destinationInstance) {
         systemConfig.url = `https://${destinationName}${DEST}`;
         systemConfig.basDestinationInstanceCred = await getAuthHeaderForInstanceBasedDest(destinationInstance);
       } else {
         systemConfig.url = (0, ux_common_utils_1.getAppStudioBaseURL)();
-        systemConfig.service = `/destinations/${destinationName != null ? destinationName : systemConfig.destination}${(_b = (_a2 = systemConfig.service) == null ? void 0 : _a2.replace(/^\/?/, "/")) != null ? _b : ""}`;
+        systemConfig.service = `/destinations/${destinationName ?? systemConfig.destination}${((_a2 = systemConfig.service) == null ? void 0 : _a2.replace(/^\/?/, "/")) ?? ""}`;
       }
       delete systemConfig.scp;
       delete systemConfig.client;
@@ -54764,11 +55153,11 @@ var require_connection = __commonJS({
       return isHtmlResponse(response) && typeof response.data === "string" && !!response.data.match(/log[io]n/i);
     }
     function getContentType(contentTypeHeader, responseData) {
-      var _a2, _b;
+      var _a2;
       if (contentTypeHeader) {
         return contentTypeHeader.toLowerCase();
       } else if (typeof responseData === "string") {
-        return (_b = (_a2 = (0, detect_content_type_1.default)(Buffer.from(responseData))) == null ? void 0 : _a2.toLowerCase()) != null ? _b : "";
+        return ((_a2 = (0, detect_content_type_1.default)(Buffer.from(responseData))) == null ? void 0 : _a2.toLowerCase()) ?? "";
       } else {
         return "";
       }
@@ -56810,6 +57199,7 @@ var require_message = __commonJS({
     }
     exports2.prettyPrintMessage = prettyPrintMessage;
     function printUrl(longtextUrl, frontendUrl, log4) {
+      log4.info("Click this link for more information:");
       const fullLongTextUrl = frontendUrl.concat(longtextUrl).replace(/'/g, "%27");
       log4.info(fullLongTextUrl);
     }
@@ -57127,8 +57517,8 @@ var require_oDataClient = __commonJS({
               debug(res);
             },
             error: (debug, error3) => {
-              var _a2, _b, _c, _d, _e, _f;
-              debug(`Error ${(_c = (_b = (_a2 = error3.response) == null ? void 0 : _a2.config) == null ? void 0 : _b.method) == null ? void 0 : _c.toUpperCase()} ${(_d = error3.response) == null ? void 0 : _d.status} ${this.buildFullUrl((_f = (_e = error3.response) == null ? void 0 : _e.config) != null ? _f : {})}
+              var _a2, _b, _c, _d, _e;
+              debug(`Error ${(_c = (_b = (_a2 = error3.response) == null ? void 0 : _a2.config) == null ? void 0 : _b.method) == null ? void 0 : _c.toUpperCase()} ${(_d = error3.response) == null ? void 0 : _d.status} ${this.buildFullUrl(((_e = error3.response) == null ? void 0 : _e.config) ?? {})}
 `);
               debug(error3.response);
               debug(error3);
@@ -57258,8 +57648,7 @@ var require_ui5AbapRepository = __commonJS({
     }
     var Ui5AbapRepository = class extends oDataClient_1.ODataClient {
       constructor({ system, credentials = void 0, log: log4 = console, connection = void 0, ignoreCertError, postConnectionCallback }) {
-        var _a2;
-        system.service = (_a2 = system.service) != null ? _a2 : constants_1.DEFAULT_SERVICE_PATH;
+        system.service = system.service ?? constants_1.DEFAULT_SERVICE_PATH;
         super({ system, credentials, log: log4, connection, ignoreCertError, postConnectionCallback });
       }
       async getInfo(app) {
@@ -57355,7 +57744,7 @@ var require_ui5AbapRepository = __commonJS({
           }
           return isExisting ? await httpClient.put(`/Repositories('${encodeURIComponent(appName)}')`, payload, config) : await httpClient.post("/Repositories", payload, config);
         } catch (error3) {
-          if (((_a2 = error3 == null ? void 0 : error3.response) == null ? void 0 : _a2.status) === 504) {
+          if ([504, 408].includes((_a2 = error3 == null ? void 0 : error3.response) == null ? void 0 : _a2.status)) {
             if (tryCount >= 3) {
               throw error3;
             }
@@ -58157,12 +58546,12 @@ var require_system3 = __commonJS({
         const systems = {};
         const destinations = await (0, connection_1.listDestinations)();
         Object.values(destinations).sort((a, b) => a.Name.localeCompare(b.Name, void 0, { numeric: true, caseFirst: "lower" })).forEach((destination) => {
-          var _a2, _b;
+          var _a2;
           systems[destination.Name] = new sapSystem_1.SapSystem(destination.Name, {
             url: destination.Host,
             destination: destination.Name,
             destinationAuthType: destination.Authentication,
-            scp: (_b = (_a2 = destination.WebIDEUsage) == null ? void 0 : _a2.includes("abap_cloud")) != null ? _b : false,
+            scp: ((_a2 = destination.WebIDEUsage) == null ? void 0 : _a2.includes("abap_cloud")) ?? false,
             destinationAttributes: Object.assign({}, destination),
             client: destination["sap-client"]
           });
@@ -59693,7 +60082,8 @@ var require_constants5 = __commonJS({
       Tsconfig: "tsconfig.json",
       Ui5Yaml: "ui5.yaml",
       Ui5LocalYaml: "ui5-local.yaml",
-      Ui5MockYaml: "ui5-mock.yaml"
+      Ui5MockYaml: "ui5-mock.yaml",
+      UI5DeployYaml: "ui5-deploy.yaml"
     };
   }
 });
@@ -61666,9 +62056,9 @@ var require_merge = __commonJS({
   }
 });
 
-// ../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/yaml/dist/errors/yaml-error.js
+// ../../node_modules/@sap-ux/yaml/dist/errors/yaml-error.js
 var require_yaml_error = __commonJS({
-  "../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/yaml/dist/errors/yaml-error.js"(exports2) {
+  "../../node_modules/@sap-ux/yaml/dist/errors/yaml-error.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.YAMLError = void 0;
@@ -61683,9 +62073,9 @@ var require_yaml_error = __commonJS({
   }
 });
 
-// ../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/yaml/dist/errors/index.js
+// ../../node_modules/@sap-ux/yaml/dist/errors/index.js
 var require_errors2 = __commonJS({
-  "../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/yaml/dist/errors/index.js"(exports2) {
+  "../../node_modules/@sap-ux/yaml/dist/errors/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.YAMLError = exports2.errorTemplate = exports2.errorCode = void 0;
@@ -61722,9 +62112,9 @@ var require_errors2 = __commonJS({
   }
 });
 
-// ../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/yaml/dist/texts/index.js
+// ../../node_modules/@sap-ux/yaml/dist/texts/index.js
 var require_texts = __commonJS({
-  "../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/yaml/dist/texts/index.js"(exports2) {
+  "../../node_modules/@sap-ux/yaml/dist/texts/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.interpolate = void 0;
@@ -61743,9 +62133,9 @@ var require_texts = __commonJS({
   }
 });
 
-// ../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/yaml/dist/yaml-document.js
+// ../../node_modules/@sap-ux/yaml/dist/yaml-document.js
 var require_yaml_document = __commonJS({
-  "../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/yaml/dist/yaml-document.js"(exports2) {
+  "../../node_modules/@sap-ux/yaml/dist/yaml-document.js"(exports2) {
     "use strict";
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
@@ -61979,9 +62369,9 @@ var require_yaml_document = __commonJS({
   }
 });
 
-// ../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/yaml/dist/index.js
+// ../../node_modules/@sap-ux/yaml/dist/index.js
 var require_dist8 = __commonJS({
-  "../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/yaml/dist/index.js"(exports2) {
+  "../../node_modules/@sap-ux/yaml/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.YAMLError = exports2.errorCode = exports2.YAMLMap = exports2.YAMLSeq = exports2.YamlDocument = void 0;
@@ -62006,9 +62396,9 @@ var require_dist8 = __commonJS({
   }
 });
 
-// ../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/ui5-config/dist/middlewares.js
+// ../../node_modules/@sap-ux/ui5-config/dist/middlewares.js
 var require_middlewares = __commonJS({
-  "../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/ui5-config/dist/middlewares.js"(exports2) {
+  "../../node_modules/@sap-ux/ui5-config/dist/middlewares.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.getMockServerMiddlewareConfig = exports2.getFioriToolsProxyMiddlewareConfig = exports2.getAppReloadMiddlewareConfig = void 0;
@@ -62082,9 +62472,9 @@ var require_middlewares = __commonJS({
   }
 });
 
-// ../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/ui5-config/dist/ui5config.js
+// ../../node_modules/@sap-ux/ui5-config/dist/ui5config.js
 var require_ui5config = __commonJS({
-  "../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/ui5-config/dist/ui5config.js"(exports2) {
+  "../../node_modules/@sap-ux/ui5-config/dist/ui5config.js"(exports2) {
     "use strict";
     var __awaiter = exports2 && exports2.__awaiter || function(thisArg, _arguments, P, generator) {
       function adopt(value) {
@@ -62286,9 +62676,9 @@ var require_ui5config = __commonJS({
   }
 });
 
-// ../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/ui5-config/dist/index.js
+// ../../node_modules/@sap-ux/ui5-config/dist/index.js
 var require_dist9 = __commonJS({
-  "../../node_modules/@sap-ux/project-access/node_modules/@sap-ux/ui5-config/dist/index.js"(exports2) {
+  "../../node_modules/@sap-ux/ui5-config/dist/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.YAMLError = exports2.yamlErrorCode = exports2.UI5Config = void 0;
@@ -62338,7 +62728,7 @@ var require_ui5_config = __commonJS({
       });
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.getWebappPath = void 0;
+    exports2.readUi5Yaml = exports2.getWebappPath = void 0;
     var path_1 = require("path");
     var ui5_config_1 = require_dist9();
     var constants_1 = require_constants5();
@@ -62360,6 +62750,17 @@ var require_ui5_config = __commonJS({
       });
     }
     exports2.getWebappPath = getWebappPath;
+    function readUi5Yaml(basePath, fileName) {
+      return __awaiter(this, void 0, void 0, function* () {
+        const ui5YamlPath = (0, path_1.join)(basePath, fileName);
+        if (yield (0, file_1.fileExists)(ui5YamlPath)) {
+          const yamlString = yield (0, file_1.readFile)(ui5YamlPath);
+          return yield ui5_config_1.UI5Config.newInstance(yamlString);
+        }
+        throw Error(`File '${fileName}' not found in project '${basePath}'`);
+      });
+    }
+    exports2.readUi5Yaml = readUi5Yaml;
   }
 });
 
@@ -62623,7 +63024,7 @@ var require_project2 = __commonJS({
   "../../node_modules/@sap-ux/project-access/dist/project/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.getWebappPath = exports2.getAppRootFromWebappPath = exports2.findProjectRoot = exports2.findAllApps = exports2.loadModuleFromProject = exports2.getAppProgrammingLanguage = exports2.isCapNodeJsProject = exports2.isCapJavaProject = exports2.getCapProjectType = exports2.getCapModelAndServices = void 0;
+    exports2.readUi5Yaml = exports2.getWebappPath = exports2.getAppRootFromWebappPath = exports2.findProjectRoot = exports2.findAllApps = exports2.loadModuleFromProject = exports2.getAppProgrammingLanguage = exports2.isCapNodeJsProject = exports2.isCapJavaProject = exports2.getCapProjectType = exports2.getCapModelAndServices = void 0;
     var cap_1 = require_cap();
     Object.defineProperty(exports2, "getCapModelAndServices", { enumerable: true, get: function() {
       return cap_1.getCapModelAndServices;
@@ -62659,6 +63060,9 @@ var require_project2 = __commonJS({
     Object.defineProperty(exports2, "getWebappPath", { enumerable: true, get: function() {
       return ui5_config_1.getWebappPath;
     } });
+    Object.defineProperty(exports2, "readUi5Yaml", { enumerable: true, get: function() {
+      return ui5_config_1.readUi5Yaml;
+    } });
   }
 });
 
@@ -62687,7 +63091,7 @@ var require_info2 = __commonJS({
 });
 
 // ../../node_modules/@sap-ux/project-access/dist/types/package/index.js
-var require_package6 = __commonJS({
+var require_package7 = __commonJS({
   "../../node_modules/@sap-ux/project-access/dist/types/package/index.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -62738,7 +63142,7 @@ var require_types5 = __commonJS({
     __exportStar(require_cap2(), exports2);
     __exportStar(require_find(), exports2);
     __exportStar(require_info2(), exports2);
-    __exportStar(require_package6(), exports2);
+    __exportStar(require_package7(), exports2);
     __exportStar(require_vscode(), exports2);
     __exportStar(require_webapp3(), exports2);
   }
@@ -62769,7 +63173,7 @@ var require_dist10 = __commonJS({
           __createBinding(exports3, m, p);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.loadModuleFromProject = exports2.isCapNodeJsProject = exports2.isCapJavaProject = exports2.getWebappPath = exports2.getCapProjectType = exports2.getCapModelAndServices = exports2.getAppProgrammingLanguage = exports2.getAppRootFromWebappPath = exports2.findProjectRoot = exports2.findAllApps = exports2.FileName = void 0;
+    exports2.readUi5Yaml = exports2.loadModuleFromProject = exports2.isCapNodeJsProject = exports2.isCapJavaProject = exports2.getWebappPath = exports2.getCapProjectType = exports2.getCapModelAndServices = exports2.getAppProgrammingLanguage = exports2.getAppRootFromWebappPath = exports2.findProjectRoot = exports2.findAllApps = exports2.FileName = void 0;
     var constants_1 = require_constants5();
     Object.defineProperty(exports2, "FileName", { enumerable: true, get: function() {
       return constants_1.FileName;
@@ -62805,6 +63209,9 @@ var require_dist10 = __commonJS({
     Object.defineProperty(exports2, "loadModuleFromProject", { enumerable: true, get: function() {
       return project_1.loadModuleFromProject;
     } });
+    Object.defineProperty(exports2, "readUi5Yaml", { enumerable: true, get: function() {
+      return project_1.readUi5Yaml;
+    } });
     __exportStar(require_types5(), exports2);
   }
 });
@@ -63036,37 +63443,32 @@ var require_utils9 = __commonJS({
         try {
           await findProject(root, projects);
         } catch (error3) {
-          const errorMessage = i18n_1.i18n.t("ERROR_PROJECT_ROOT_WORKSPACE", {
-            root,
-            error: error3.message
-          });
-          if (logger) {
-            logger.error(errorMessage);
-          } else {
-            console.error(errorMessage);
-          }
+          logError(error3, "ERROR_PROJECT_ROOT_WORKSPACE", logger);
         }
       }
       return projects;
     }
-    async function findAllProjectRoots(wsFolders, sapuxRequired = true, logger) {
+    function logError(error3, i18nText, logger) {
+      const errorMessage = i18n_1.i18n.t(i18nText, {
+        error: error3.message
+      });
+      if (logger) {
+        logger.error(errorMessage);
+      } else {
+        console.error(errorMessage);
+      }
+    }
+    async function findAllProjectRoots(wsFolders, sapuxRequired = true, logger, includeAdaptationProjects) {
       const projects = await findAllPackageJsonFolders(wsFolders, logger);
       if (sapuxRequired) {
         const sapuxProjects = [];
         for (const root of projects) {
           try {
-            if ((await (0, file_1.readJSON)((0, path_1.join)(root, project_spec_1.FileName.Package))).sapux) {
+            if ((await (0, file_1.readJSON)((0, path_1.join)(root, project_spec_1.FileName.Package))).sapux || includeAdaptationProjects && await isAdaptationProject(root)) {
               sapuxProjects.push(root);
             }
           } catch (error3) {
-            const errorMessage = i18n_1.i18n.t("ERROR_INVALID_PACKAGE_JSON", {
-              error: error3.message
-            });
-            if (logger) {
-              logger.error(errorMessage);
-            } else {
-              console.error(errorMessage);
-            }
+            logError(error3, "ERROR_INVALID_PACKAGE_JSON", logger);
           }
         }
         return sapuxProjects;
@@ -63211,14 +63613,7 @@ var require_utils9 = __commonJS({
             result2.push(root);
           }
         } catch (error3) {
-          const errorMessage = i18n_1.i18n.t("ERROR_INVALIND_PACKAGE_JSON_FOR_APP", {
-            root
-          });
-          if (logger) {
-            logger.error(errorMessage);
-          } else {
-            console.error(errorMessage);
-          }
+          logError(error3, "ERROR_INVALIND_PACKAGE_JSON_FOR_APP", logger);
         }
       }
       return result2;
@@ -64018,7 +64413,7 @@ var require_toolsSuiteTelemetryDataProcessor = __commonJS({
       return (0, ux_feature_toggle_1.isInternalFeaturesSettingEnabled)() ? "internal" : "external";
     }
     async function getManifestSourceTemplate(appPath) {
-      var _a2, _b, _c, _d;
+      var _a2;
       let sourceTemplate;
       try {
         const manifestPath = path_1.default.join(appPath, "webapp", "manifest.json");
@@ -64029,10 +64424,10 @@ var require_toolsSuiteTelemetryDataProcessor = __commonJS({
       } catch (err) {
         console.log(`[Telemetry]: ${err.message}`);
       }
-      sourceTemplate = sourceTemplate != null ? sourceTemplate : {};
-      sourceTemplate.id = (_b = sourceTemplate.id) != null ? _b : "";
-      sourceTemplate.version = (_c = sourceTemplate.version) != null ? _c : "";
-      sourceTemplate.toolsId = (_d = sourceTemplate.toolsId) != null ? _d : types_1.ToolsId.NO_TOOLS_ID;
+      sourceTemplate = sourceTemplate ?? {};
+      sourceTemplate.id = sourceTemplate.id ?? "";
+      sourceTemplate.version = sourceTemplate.version ?? "";
+      sourceTemplate.toolsId = sourceTemplate.toolsId ?? types_1.ToolsId.NO_TOOLS_ID;
       return sourceTemplate;
     }
     async function getProcessVersions() {
@@ -71439,7 +71834,7 @@ var require_transports = __commonJS({
 });
 
 // ../../node_modules/logform/format.js
-var require_format2 = __commonJS({
+var require_format3 = __commonJS({
   "../../node_modules/logform/format.js"(exports2, module2) {
     "use strict";
     var InvalidFormatError = class extends Error {
@@ -72200,7 +72595,7 @@ var require_levels = __commonJS({
 var require_align = __commonJS({
   "../../node_modules/logform/align.js"(exports2, module2) {
     "use strict";
-    var format2 = require_format2();
+    var format2 = require_format3();
     module2.exports = format2((info) => {
       info.message = `	${info.message}`;
       return info;
@@ -72212,7 +72607,7 @@ var require_align = __commonJS({
 var require_errors4 = __commonJS({
   "../../node_modules/logform/errors.js"(exports2, module2) {
     "use strict";
-    var format2 = require_format2();
+    var format2 = require_format3();
     var { LEVEL, MESSAGE } = require_triple_beam();
     module2.exports = format2((einfo, { stack }) => {
       if (einfo instanceof Error) {
@@ -72310,7 +72705,7 @@ var require_cli3 = __commonJS({
 var require_combine = __commonJS({
   "../../node_modules/logform/combine.js"(exports2, module2) {
     "use strict";
-    var format2 = require_format2();
+    var format2 = require_format3();
     function cascade(formats) {
       if (!formats.every(isValidFormat)) {
         return;
@@ -73009,7 +73404,7 @@ ${originalIndentation}`;
 var require_json = __commonJS({
   "../../node_modules/logform/json.js"(exports2, module2) {
     "use strict";
-    var format2 = require_format2();
+    var format2 = require_format3();
     var { MESSAGE } = require_triple_beam();
     var stringify = require_safe_stable_stringify();
     function replacer(key, value) {
@@ -73029,7 +73424,7 @@ var require_json = __commonJS({
 var require_label = __commonJS({
   "../../node_modules/logform/label.js"(exports2, module2) {
     "use strict";
-    var format2 = require_format2();
+    var format2 = require_format3();
     module2.exports = format2((info, opts) => {
       if (opts.message) {
         info.message = `[${opts.label}] ${info.message}`;
@@ -73045,7 +73440,7 @@ var require_label = __commonJS({
 var require_logstash = __commonJS({
   "../../node_modules/logform/logstash.js"(exports2, module2) {
     "use strict";
-    var format2 = require_format2();
+    var format2 = require_format3();
     var { MESSAGE } = require_triple_beam();
     var jsonStringify = require_safe_stable_stringify();
     module2.exports = format2((info) => {
@@ -73069,7 +73464,7 @@ var require_logstash = __commonJS({
 var require_metadata2 = __commonJS({
   "../../node_modules/logform/metadata.js"(exports2, module2) {
     "use strict";
-    var format2 = require_format2();
+    var format2 = require_format3();
     function fillExcept(info, fillExceptKeys, metadataKey) {
       const savedKeys = fillExceptKeys.reduce((acc, key) => {
         acc[key] = info[key];
@@ -73122,7 +73517,7 @@ var require_metadata2 = __commonJS({
 var require_ms2 = __commonJS({
   "../../node_modules/logform/ms.js"(exports2, module2) {
     "use strict";
-    var format2 = require_format2();
+    var format2 = require_format3();
     var ms = require_ms();
     module2.exports = format2((info) => {
       const curr = +new Date();
@@ -73139,7 +73534,7 @@ var require_pretty_print = __commonJS({
   "../../node_modules/logform/pretty-print.js"(exports2, module2) {
     "use strict";
     var inspect = require("util").inspect;
-    var format2 = require_format2();
+    var format2 = require_format3();
     var { LEVEL, MESSAGE, SPLAT } = require_triple_beam();
     module2.exports = format2((info, opts = {}) => {
       const stripped = Object.assign({}, info);
@@ -73175,7 +73570,7 @@ var require_printf = __commonJS({
 var require_simple = __commonJS({
   "../../node_modules/logform/simple.js"(exports2, module2) {
     "use strict";
-    var format2 = require_format2();
+    var format2 = require_format3();
     var { MESSAGE } = require_triple_beam();
     var jsonStringify = require_safe_stable_stringify();
     module2.exports = format2((info) => {
@@ -73664,7 +74059,7 @@ var require_timestamp2 = __commonJS({
   "../../node_modules/logform/timestamp.js"(exports2, module2) {
     "use strict";
     var fecha2 = (init_fecha(), __toCommonJS(fecha_exports));
-    var format2 = require_format2();
+    var format2 = require_format3();
     module2.exports = format2((info, opts = {}) => {
       if (opts.format) {
         info.timestamp = typeof opts.format === "function" ? opts.format() : fecha2.format(new Date(), opts.format);
@@ -73685,7 +74080,7 @@ var require_uncolorize = __commonJS({
   "../../node_modules/logform/uncolorize.js"(exports2, module2) {
     "use strict";
     var colors = require_safe();
-    var format2 = require_format2();
+    var format2 = require_format3();
     var { MESSAGE } = require_triple_beam();
     module2.exports = format2((info, opts) => {
       if (opts.level !== false) {
@@ -73706,7 +74101,7 @@ var require_uncolorize = __commonJS({
 var require_logform = __commonJS({
   "../../node_modules/logform/index.js"(exports2) {
     "use strict";
-    var format2 = exports2.format = require_format2();
+    var format2 = exports2.format = require_format3();
     exports2.levels = require_levels();
     function exposeFormat(name, requireFormat) {
       Object.defineProperty(format2, name, {
@@ -73822,7 +74217,7 @@ var require_common8 = __commonJS({
 });
 
 // ../../node_modules/winston/package.json
-var require_package7 = __commonJS({
+var require_package8 = __commonJS({
   "../../node_modules/winston/package.json"(exports2, module2) {
     module2.exports = {
       name: "winston",
@@ -81002,7 +81397,7 @@ var require_winston = __commonJS({
     "use strict";
     var logform = require_logform();
     var { warn: warn3 } = require_common8();
-    exports2.version = require_package7().version;
+    exports2.version = require_package8().version;
     exports2.transports = require_transports2();
     exports2.config = require_config3();
     exports2.addColors = logform.levels;
@@ -82008,10 +82403,7 @@ var require_toolsSuiteTelemetrySettings = __commonJS({
           try {
             content = await fs_1.default.promises.readFile(deprecatedSettingPath, "utf-8");
             const deprecatedSetting = JSON.parse(content);
-            const propValues = deprecatedExtensionPropKeys.map((propKey) => {
-              var _a2;
-              return (_a2 = deprecatedSetting[propKey]) != null ? _a2 : true;
-            });
+            const propValues = deprecatedExtensionPropKeys.map((propKey) => deprecatedSetting[propKey] ?? true);
             const deprecatedEnableTelemetrySetting = propValues.reduce((prevValue, currentValue) => prevValue && currentValue);
             (0, exports2.setEnableTelemetry)(deprecatedEnableTelemetrySetting);
           } catch {
@@ -82132,7 +82524,7 @@ var require_client3 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.ClientFactory = void 0;
     var system_1 = require_system2();
-    var telemetryPackageJSON = __importStar(require_package4());
+    var telemetryPackageJSON = __importStar(require_package5());
     var toolsSuiteTelemetry_1 = require_toolsSuiteTelemetry();
     var ClientFactory2 = class {
       static getTelemetryClient() {