@speclynx/apidom-parser-adapter-openapi-yaml-2 2.10.3 → 2.12.0

package/dist/apidom-parser-adapter-openapi-yaml-2.browser.js

@@ -11953,6 +11953,53 @@ var both = /*#__PURE__*/(0,_internal_curry2_js__WEBPACK_IMPORTED_MODULE_0__["def
 
 /***/ },
 
+/***/ 8138
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+/* harmony import */ var _internal_clone_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8575);
+/* harmony import */ var _internal_curry1_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18938);
+
+
+
+/**
+ * Creates a deep copy of the source that can be used in place of the source
+ * object without retaining any references to it.
+ * The source object may contain (nested) `Array`s and `Object`s,
+ * `Number`s, `String`s, `Boolean`s and `Date`s.
+ * `Function`s are assigned by reference rather than copied.
+ *
+ * Dispatches to a `clone` method if present.
+ *
+ * Note that if the source object has multiple nodes that share a reference,
+ * the returned object will have the same structure, but the references will
+ * be pointed to the location within the cloned value.
+ *
+ * @func
+ * @memberOf R
+ * @since v0.1.0
+ * @category Object
+ * @sig {*} -> {*}
+ * @param {*} value The object or array to clone
+ * @return {*} A deeply cloned copy of `val`
+ * @example
+ *
+ *      const objects = [{}, {}, {}];
+ *      const objectsClone = R.clone(objects);
+ *      objects === objectsClone; //=> false
+ *      objects[0] === objectsClone[0]; //=> false
+ */
+var clone = /*#__PURE__*/(0,_internal_curry1_js__WEBPACK_IMPORTED_MODULE_1__["default"])(function clone(value) {
+  return value != null && typeof value.clone === 'function' ? value.clone() : (0,_internal_clone_js__WEBPACK_IMPORTED_MODULE_0__["default"])(value, true);
+});
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (clone);
+
+/***/ },
+
 /***/ 68199
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
@@ -13506,6 +13553,132 @@ function _checkForMethod(methodname, fn) {
 
 /***/ },
 
+/***/ 8575
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": () => (/* binding */ _clone)
+/* harmony export */ });
+/* harmony import */ var _cloneRegExp_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(31254);
+/* harmony import */ var _type_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(60963);
+
+
+
+/**
+ * Copies an object.
+ *
+ * @private
+ * @param {*} value The value to be copied
+ * @param {Boolean} deep Whether or not to perform deep cloning.
+ * @return {*} The copied value.
+ */
+function _clone(value, deep, map) {
+  map || (map = new _ObjectMap());
+
+  // this avoids the slower switch with a quick if decision removing some milliseconds in each run.
+  if (_isPrimitive(value)) {
+    return value;
+  }
+  var copy = function copy(copiedValue) {
+    // Check for circular and same references on the object graph and return its corresponding clone.
+    var cachedCopy = map.get(value);
+    if (cachedCopy) {
+      return cachedCopy;
+    }
+    map.set(value, copiedValue);
+    for (var key in value) {
+      if (Object.prototype.hasOwnProperty.call(value, key)) {
+        copiedValue[key] = deep ? _clone(value[key], true, map) : value[key];
+      }
+    }
+    return copiedValue;
+  };
+  switch ((0,_type_js__WEBPACK_IMPORTED_MODULE_1__["default"])(value)) {
+    case 'Object':
+      return copy(Object.create(Object.getPrototypeOf(value)));
+    case 'Array':
+      return copy(Array(value.length));
+    case 'Date':
+      return new Date(value.valueOf());
+    case 'RegExp':
+      return (0,_cloneRegExp_js__WEBPACK_IMPORTED_MODULE_0__["default"])(value);
+    case 'Int8Array':
+    case 'Uint8Array':
+    case 'Uint8ClampedArray':
+    case 'Int16Array':
+    case 'Uint16Array':
+    case 'Int32Array':
+    case 'Uint32Array':
+    case 'Float32Array':
+    case 'Float64Array':
+    case 'BigInt64Array':
+    case 'BigUint64Array':
+      return value.slice();
+    default:
+      return value;
+  }
+}
+function _isPrimitive(param) {
+  var type = typeof param;
+  return param == null || type != 'object' && type != 'function';
+}
+var _ObjectMap = /*#__PURE__*/function () {
+  function _ObjectMap() {
+    this.map = {};
+    this.length = 0;
+  }
+  _ObjectMap.prototype.set = function (key, value) {
+    var hashedKey = this.hash(key);
+    var bucket = this.map[hashedKey];
+    if (!bucket) {
+      this.map[hashedKey] = bucket = [];
+    }
+    bucket.push([key, value]);
+    this.length += 1;
+  };
+  _ObjectMap.prototype.hash = function (key) {
+    var hashedKey = [];
+    for (var value in key) {
+      hashedKey.push(Object.prototype.toString.call(key[value]));
+    }
+    return hashedKey.join();
+  };
+  _ObjectMap.prototype.get = function (key) {
+    /**
+     * depending on the number of objects to be cloned is faster to just iterate over the items in the map just because the hash function is so costly,
+     * on my tests this number is 180, anything above that using the hash function is faster.
+     */
+    if (this.length <= 180) {
+      for (var p in this.map) {
+        var bucket = this.map[p];
+        for (var i = 0; i < bucket.length; i += 1) {
+          var element = bucket[i];
+          if (element[0] === key) {
+            return element[1];
+          }
+        }
+      }
+      return;
+    }
+    var hashedKey = this.hash(key);
+    var bucket = this.map[hashedKey];
+    if (!bucket) {
+      return;
+    }
+    for (var i = 0; i < bucket.length; i += 1) {
+      var element = bucket[i];
+      if (element[0] === key) {
+        return element[1];
+      }
+    }
+  };
+  return _ObjectMap;
+}();
+
+/***/ },
+
 /***/ 31254
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
@@ -30508,6 +30681,7 @@ const predicates = {
   isCommentElement: _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_1__.isCommentElement,
   isParseResultElement: _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_1__.isParseResultElement,
   isSourceMapElement: _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_1__.isSourceMapElement,
+  hasElementStyle: _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_2__.hasElementStyle,
   hasElementSourceMap: _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_2__.hasElementSourceMap,
   includesSymbols: _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_2__.includesSymbols,
   includesClasses: _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_2__.includesClasses
@@ -30579,7 +30753,19 @@ const resolveSpecification = specification => {
       if ((0,ramda_adjunct__WEBPACK_IMPORTED_MODULE_5__["default"])(val) && (0,ramda__WEBPACK_IMPORTED_MODULE_0__["default"])('$ref', val) && (0,ramda__WEBPACK_IMPORTED_MODULE_3__["default"])(ramda_adjunct__WEBPACK_IMPORTED_MODULE_4__["default"], '$ref', val)) {
         const $ref = (0,ramda__WEBPACK_IMPORTED_MODULE_2__["default"])(['$ref'], val);
         const pointer = (0,ramda_adjunct__WEBPACK_IMPORTED_MODULE_6__["default"])('#/', $ref);
-        return (0,ramda__WEBPACK_IMPORTED_MODULE_2__["default"])(pointer.split('/'), root);
+        const resolved = (0,ramda__WEBPACK_IMPORTED_MODULE_2__["default"])(pointer.split('/'), root);
+        // merge extra properties (e.g. alias) from the $ref object into the resolved value
+        const {
+          $ref: _,
+          ...rest
+        } = val;
+        if (Object.keys(rest).length > 0 && (0,ramda_adjunct__WEBPACK_IMPORTED_MODULE_5__["default"])(resolved)) {
+          return {
+            ...resolved,
+            ...rest
+          };
+        }
+        return resolved;
       }
       if ((0,ramda_adjunct__WEBPACK_IMPORTED_MODULE_5__["default"])(val)) {
         return traverse(val, root, newPath);
@@ -31202,20 +31388,22 @@ class ShallowCloneError extends _CloneError_mjs__WEBPACK_IMPORTED_MODULE_0__["de
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   CloneError: () => (/* reexport safe */ _errors_CloneError_mjs__WEBPACK_IMPORTED_MODULE_7__["default"]),
-/* harmony export */   DeepCloneError: () => (/* reexport safe */ _errors_DeepCloneError_mjs__WEBPACK_IMPORTED_MODULE_5__["default"]),
-/* harmony export */   ShallowCloneError: () => (/* reexport safe */ _errors_ShallowCloneError_mjs__WEBPACK_IMPORTED_MODULE_6__["default"]),
+/* harmony export */   CloneError: () => (/* reexport safe */ _errors_CloneError_mjs__WEBPACK_IMPORTED_MODULE_8__["default"]),
+/* harmony export */   DeepCloneError: () => (/* reexport safe */ _errors_DeepCloneError_mjs__WEBPACK_IMPORTED_MODULE_6__["default"]),
+/* harmony export */   ShallowCloneError: () => (/* reexport safe */ _errors_ShallowCloneError_mjs__WEBPACK_IMPORTED_MODULE_7__["default"]),
 /* harmony export */   cloneDeep: () => (/* binding */ cloneDeep),
 /* harmony export */   cloneShallow: () => (/* binding */ cloneShallow)
 /* harmony export */ });
-/* harmony import */ var _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(38504);
-/* harmony import */ var _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(36663);
-/* harmony import */ var _predicates_index_mjs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(18252);
-/* harmony import */ var _predicates_index_mjs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(25162);
-/* harmony import */ var _elements_SourceMap_mjs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(25810);
-/* harmony import */ var _errors_DeepCloneError_mjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(95018);
-/* harmony import */ var _errors_ShallowCloneError_mjs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(3686);
-/* harmony import */ var _errors_CloneError_mjs__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(3772);
+/* harmony import */ var ramda__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8138);
+/* harmony import */ var _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(38504);
+/* harmony import */ var _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(36663);
+/* harmony import */ var _predicates_index_mjs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(18252);
+/* harmony import */ var _predicates_index_mjs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(25162);
+/* harmony import */ var _elements_SourceMap_mjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(25810);
+/* harmony import */ var _errors_DeepCloneError_mjs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(95018);
+/* harmony import */ var _errors_ShallowCloneError_mjs__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(3686);
+/* harmony import */ var _errors_CloneError_mjs__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(3772);
+
 
 
 
@@ -31248,9 +31436,9 @@ const cloneDeepElement = (element, options) => {
   } = element;
   if (Array.isArray(content)) {
     copy.content = content.map(el => cloneDeepElement(el, passThroughOptions));
-  } else if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_3__.isElement)(content)) {
+  } else if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_4__.isElement)(content)) {
     copy.content = cloneDeepElement(content, passThroughOptions);
-  } else if (content instanceof _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_1__["default"]) {
+  } else if (content instanceof _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_2__["default"]) {
     copy.content = cloneDeepKeyValuePair(content, passThroughOptions);
   } else {
     copy.content = content;
@@ -31274,7 +31462,7 @@ const cloneDeepKeyValuePair = (kvp, options) => {
   } = kvp;
   const keyCopy = key !== undefined ? cloneDeepElement(key, passThroughOptions) : undefined;
   const valueCopy = value !== undefined ? cloneDeepElement(value, passThroughOptions) : undefined;
-  const copy = new _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_1__["default"](keyCopy, valueCopy);
+  const copy = new _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_2__["default"](keyCopy, valueCopy);
   visited.set(kvp, copy);
   return copy;
 };
@@ -31290,7 +31478,7 @@ const cloneDeepObjectSlice = (slice, options) => {
     return visited.get(slice);
   }
   const items = [...slice].map(element => cloneDeepElement(element, passThroughOptions));
-  const copy = new _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_0__["default"](items);
+  const copy = new _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_1__["default"](items);
   visited.set(slice, copy);
   return copy;
 };
@@ -31301,16 +31489,16 @@ const cloneDeepObjectSlice = (slice, options) => {
  * @public
  */
 const cloneDeep = (value, options = {}) => {
-  if (value instanceof _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_1__["default"]) {
+  if (value instanceof _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_2__["default"]) {
     return cloneDeepKeyValuePair(value, options);
   }
-  if (value instanceof _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_0__["default"]) {
+  if (value instanceof _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_1__["default"]) {
     return cloneDeepObjectSlice(value, options);
   }
-  if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_3__.isElement)(value)) {
+  if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_4__.isElement)(value)) {
     return cloneDeepElement(value, options);
   }
-  throw new _errors_DeepCloneError_mjs__WEBPACK_IMPORTED_MODULE_5__["default"]("Value provided to cloneDeep function couldn't be cloned", {
+  throw new _errors_DeepCloneError_mjs__WEBPACK_IMPORTED_MODULE_6__["default"]("Value provided to cloneDeep function couldn't be cloned", {
     value
   });
 };
@@ -31326,11 +31514,11 @@ const cloneShallowKeyValuePair = keyValuePair => {
     key,
     value
   } = keyValuePair;
-  return new _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_1__["default"](key, value);
+  return new _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_2__["default"](key, value);
 };
 const cloneShallowObjectSlice = objectSlice => {
   const items = [...objectSlice];
-  return new _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_0__["default"](items);
+  return new _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_1__["default"](items);
 };
 const cloneShallowElement = element => {
   const Ctor = element.constructor;
@@ -31342,17 +31530,20 @@ const cloneShallowElement = element => {
   if (!element.isAttributesEmpty) {
     copy.attributes = cloneDeep(element.attributes);
   }
-  if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_2__.hasElementSourceMap)(element)) {
-    _elements_SourceMap_mjs__WEBPACK_IMPORTED_MODULE_4__["default"].transfer(element, copy);
+  if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_3__.hasElementSourceMap)(element)) {
+    _elements_SourceMap_mjs__WEBPACK_IMPORTED_MODULE_5__["default"].transfer(element, copy);
+  }
+  if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_3__.hasElementStyle)(element)) {
+    copy.style = (0,ramda__WEBPACK_IMPORTED_MODULE_0__["default"])(element.style);
   }
   const {
     content
   } = element;
-  if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_3__.isElement)(content)) {
+  if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_4__.isElement)(content)) {
     copy.content = cloneShallowElement(content);
   } else if (Array.isArray(content)) {
     copy.content = [...content];
-  } else if (content instanceof _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_1__["default"]) {
+  } else if (content instanceof _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_2__["default"]) {
     copy.content = cloneShallowKeyValuePair(content);
   } else {
     copy.content = content;
@@ -31367,16 +31558,16 @@ const cloneShallowElement = element => {
  * @public
  */
 const cloneShallow = value => {
-  if (value instanceof _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_1__["default"]) {
+  if (value instanceof _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_2__["default"]) {
     return cloneShallowKeyValuePair(value);
   }
-  if (value instanceof _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_0__["default"]) {
+  if (value instanceof _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_1__["default"]) {
     return cloneShallowObjectSlice(value);
   }
-  if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_3__.isElement)(value)) {
+  if ((0,_predicates_index_mjs__WEBPACK_IMPORTED_MODULE_4__.isElement)(value)) {
     return cloneShallowElement(value);
   }
-  throw new _errors_ShallowCloneError_mjs__WEBPACK_IMPORTED_MODULE_6__["default"]("Value provided to cloneShallow function couldn't be cloned", {
+  throw new _errors_ShallowCloneError_mjs__WEBPACK_IMPORTED_MODULE_7__["default"]("Value provided to cloneShallow function couldn't be cloned", {
     value
   });
 };
@@ -31803,6 +31994,66 @@ function unpackSourceMap(packed) {
 
 /***/ },
 
+/***/ 49686
+(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
+/* harmony export */ });
+/* harmony import */ var _primitives_ObjectElement_mjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(97071);
+
+/**
+ * Shape with optional style property.
+ * @public
+ */
+/**
+ * StyleElement stores format-specific style information for round-trip preservation.
+ *
+ * The style data is stored as a plain object with format-specific namespaces
+ * (e.g., `yaml`, `json`). This element exists only during serialization/deserialization
+ * (refract format) - in memory, style lives directly on `element.style`.
+ *
+ * Follows the same pattern as SourceMapElement with __mappings__.
+ *
+ * @public
+ */
+class StyleElement extends _primitives_ObjectElement_mjs__WEBPACK_IMPORTED_MODULE_0__["default"] {
+  constructor(content, meta, attributes) {
+    super(content, meta, attributes);
+    this.element = '__styles__';
+  }
+
+  /**
+   * Transfers style property from one element to another.
+   */
+  static transfer(from, to) {
+    to.style = from.style;
+  }
+
+  /**
+   * Creates a StyleElement from an element's style property.
+   * Returns undefined if the element has no style.
+   */
+  static from(source) {
+    if (!source.style) {
+      return undefined;
+    }
+    return new StyleElement(source.style);
+  }
+
+  /**
+   * Restores the style property on the target element from this StyleElement.
+   */
+  applyTo(target) {
+    target.style = this.toValue();
+  }
+}
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (StyleElement);
+
+/***/ },
+
 /***/ 96911
 (__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
@@ -31867,6 +32118,7 @@ const isSourceMapElement = element => element instanceof _elements_SourceMap_mjs
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   hasElementSourceMap: () => (/* binding */ hasElementSourceMap),
+/* harmony export */   hasElementStyle: () => (/* binding */ hasElementStyle),
 /* harmony export */   includesClasses: () => (/* binding */ includesClasses),
 /* harmony export */   includesSymbols: () => (/* binding */ includesSymbols),
 /* harmony export */   isAnnotationElement: () => (/* reexport safe */ _elements_mjs__WEBPACK_IMPORTED_MODULE_1__.isAnnotationElement),
@@ -31891,6 +32143,14 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+/**
+ * Checks if an element has format-specific style information.
+ * @public
+ */
+const hasElementStyle = element => {
+  return element.style !== undefined;
+};
+
 /**
  * Checks if an element has complete source position information.
  * Returns true only if all 6 position properties are numbers.
@@ -32432,6 +32692,12 @@ class Element {
    */
   parent;
 
+  /**
+   * Format-specific style information for round-trip preservation.
+   * Each format owns its own namespace (e.g., `yaml`, `json`).
+   */
+  style;
+
   // ============================================================================
   // Source Position (LSP-compatible, TextDocument-compatible, UTF-16 code units)
   // web-tree-sitter automatically provides position data in UTF-16 code units.
@@ -32640,7 +32906,13 @@ class Element {
 
   /** Unique identifier for this element. */
   get id() {
-    return this.getMetaProperty('id', '');
+    if (this.isFrozen) {
+      return this.getMetaProperty('id', '');
+    }
+    if (!this.hasMetaProperty('id')) {
+      this.setMetaProperty('id', '');
+    }
+    return this.meta.get('id');
   }
   set id(value) {
     this.setMetaProperty('id', value);
@@ -32648,7 +32920,13 @@ class Element {
 
   /** CSS-like class names. */
   get classes() {
-    return this.getMetaProperty('classes', []);
+    if (this.isFrozen) {
+      return this.getMetaProperty('classes', []);
+    }
+    if (!this.hasMetaProperty('classes')) {
+      this.setMetaProperty('classes', []);
+    }
+    return this.meta.get('classes');
   }
   set classes(value) {
     this.setMetaProperty('classes', value);
@@ -32656,7 +32934,13 @@ class Element {
 
   /** Hyperlinks associated with this element. */
   get links() {
-    return this.getMetaProperty('links', []);
+    if (this.isFrozen) {
+      return this.getMetaProperty('links', []);
+    }
+    if (!this.hasMetaProperty('links')) {
+      this.setMetaProperty('links', []);
+    }
+    return this.meta.get('links');
   }
   set links(value) {
     this.setMetaProperty('links', value);
@@ -32807,16 +33091,26 @@ class Element {
   }
 
   /**
-   * Gets a meta property, creating it with default value if not present.
+   * Gets a meta property.
+   *
+   * When the property doesn't exist:
+   * - With defaultValue: returns a new refracted element instance (not cached)
+   * - Without defaultValue: returns undefined
+   *
+   * Note: Each call with a default creates a new instance. Use setMetaProperty
+   * first if you need reference equality across multiple accesses.
    */
+
   getMetaProperty(name, defaultValue) {
-    if (!this.meta.hasKey(name)) {
-      if (this.isFrozen) {
-        const element = this.refract(defaultValue);
+    if (!this.hasMetaProperty(name)) {
+      if (defaultValue === undefined) {
+        return undefined;
+      }
+      const element = this.refract(defaultValue);
+      if (element && this.isFrozen) {
         element.freeze();
-        return element;
       }
-      this.meta.set(name, defaultValue);
+      return element;
     }
     return this.meta.get(name);
   }
@@ -33293,17 +33587,18 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   CollectionElement: () => (/* reexport safe */ _primitives_CollectionElement_mjs__WEBPACK_IMPORTED_MODULE_1__["default"]),
 /* harmony export */   CommentElement: () => (/* reexport safe */ _elements_Comment_mjs__WEBPACK_IMPORTED_MODULE_12__["default"]),
 /* harmony export */   Element: () => (/* reexport safe */ _primitives_Element_mjs__WEBPACK_IMPORTED_MODULE_0__["default"]),
-/* harmony export */   KeyValuePair: () => (/* reexport safe */ _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_16__["default"]),
+/* harmony export */   KeyValuePair: () => (/* reexport safe */ _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_17__["default"]),
 /* harmony export */   LinkElement: () => (/* reexport safe */ _elements_LinkElement_mjs__WEBPACK_IMPORTED_MODULE_9__["default"]),
 /* harmony export */   MemberElement: () => (/* reexport safe */ _primitives_MemberElement_mjs__WEBPACK_IMPORTED_MODULE_7__["default"]),
 /* harmony export */   NullElement: () => (/* reexport safe */ _primitives_NullElement_mjs__WEBPACK_IMPORTED_MODULE_2__["default"]),
 /* harmony export */   NumberElement: () => (/* reexport safe */ _primitives_NumberElement_mjs__WEBPACK_IMPORTED_MODULE_4__["default"]),
 /* harmony export */   ObjectElement: () => (/* reexport safe */ _primitives_ObjectElement_mjs__WEBPACK_IMPORTED_MODULE_8__["default"]),
-/* harmony export */   ObjectSlice: () => (/* reexport safe */ _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_15__["default"]),
+/* harmony export */   ObjectSlice: () => (/* reexport safe */ _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_16__["default"]),
 /* harmony export */   ParseResultElement: () => (/* reexport safe */ _elements_ParseResult_mjs__WEBPACK_IMPORTED_MODULE_13__["default"]),
 /* harmony export */   RefElement: () => (/* reexport safe */ _elements_RefElement_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]),
 /* harmony export */   SourceMapElement: () => (/* reexport safe */ _elements_SourceMap_mjs__WEBPACK_IMPORTED_MODULE_14__["default"]),
 /* harmony export */   StringElement: () => (/* reexport safe */ _primitives_StringElement_mjs__WEBPACK_IMPORTED_MODULE_3__["default"]),
+/* harmony export */   StyleElement: () => (/* reexport safe */ _elements_Style_mjs__WEBPACK_IMPORTED_MODULE_15__["default"]),
 /* harmony export */   refract: () => (/* binding */ refract)
 /* harmony export */ });
 /* harmony import */ var _primitives_Element_mjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(60728);
@@ -33321,8 +33616,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _elements_Comment_mjs__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(40094);
 /* harmony import */ var _elements_ParseResult_mjs__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(4823);
 /* harmony import */ var _elements_SourceMap_mjs__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(25810);
-/* harmony import */ var _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(38504);
-/* harmony import */ var _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(36663);
+/* harmony import */ var _elements_Style_mjs__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(49686);
+/* harmony import */ var _ObjectSlice_mjs__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(38504);
+/* harmony import */ var _KeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(36663);
+
 
 
 
@@ -33409,6 +33706,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony import */ var _elements_SourceMap_mjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(25810);
+/* harmony import */ var _elements_Style_mjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(49686);
+
 
 /**
  * Serialized representation of an Element in JSON Refract format.
@@ -33467,6 +33766,17 @@ class JSONSerialiser {
         payload.meta.__mappings__ = this.serialise(sourceMap);
       }
     }
+
+    // Serialize style as __styles__ in meta (skip for StyleElement itself)
+    if (!(element instanceof _elements_Style_mjs__WEBPACK_IMPORTED_MODULE_1__["default"])) {
+      const styleElement = _elements_Style_mjs__WEBPACK_IMPORTED_MODULE_1__["default"].from(element);
+      if (styleElement) {
+        if (!payload.meta) {
+          payload.meta = {};
+        }
+        payload.meta.__styles__ = this.serialise(styleElement);
+      }
+    }
     const content = this.serialiseContent(element.content);
     if (content !== undefined) {
       payload.content = content;
@@ -33487,15 +33797,18 @@ class JSONSerialiser {
       element.element = value.element;
     }
 
-    // Extract __mappings__ without mutating input, filter remaining meta
+    // Extract __mappings__ and __styles__ without mutating input, filter remaining meta
     let mappingsDoc;
+    let stylesDoc;
     let metaToDeserialize = value.meta;
-    if (value.meta?.__mappings__) {
+    if (value.meta?.__mappings__ || value.meta?.__styles__) {
       const {
         __mappings__,
+        __styles__,
         ...rest
       } = value.meta;
       mappingsDoc = __mappings__;
+      stylesDoc = __styles__;
       metaToDeserialize = Object.keys(rest).length > 0 ? rest : undefined;
     }
     if (metaToDeserialize) {
@@ -33507,6 +33820,12 @@ class JSONSerialiser {
       const sourceMap = this.deserialise(mappingsDoc);
       sourceMap.applyTo(element);
     }
+
+    // Restore style from __styles__
+    if (stylesDoc) {
+      const styleElement = this.deserialise(stylesDoc);
+      styleElement.applyTo(element);
+    }
     if (value.attributes) {
       this.deserialiseObject(value.attributes, element.attributes);
     }
@@ -34349,7 +34668,7 @@ const specification = {
           fixedFields: {
             // core vocabulary
             id: {
-              $visitor: _visitors_FallbackVisitor_mjs__WEBPACK_IMPORTED_MODULE_0__["default"],
+              $ref: '#/visitors/value',
               alias: 'idField'
             },
             $schema: {
@@ -34631,6 +34950,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _speclynx_apidom_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28400);
 /* harmony import */ var _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(97071);
 /* harmony import */ var _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(25810);
+/* harmony import */ var _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(49686);
 
 
 
@@ -34658,6 +34978,7 @@ class Visitor {
       to.attributes = (0,_speclynx_apidom_core__WEBPACK_IMPORTED_MODULE_0__["default"])(target, source);
     }
     _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_2__["default"].transfer(from, to);
+    _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_3__["default"].transfer(from, to);
   }
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Visitor);
@@ -39187,6 +39508,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _speclynx_apidom_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28400);
 /* harmony import */ var _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(97071);
 /* harmony import */ var _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(25810);
+/* harmony import */ var _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(49686);
 
 
 
@@ -39214,6 +39536,7 @@ class Visitor {
       to.attributes = (0,_speclynx_apidom_core__WEBPACK_IMPORTED_MODULE_0__["default"])(target, source);
     }
     _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_2__["default"].transfer(from, to);
+    _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_3__["default"].transfer(from, to);
   }
 }
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (Visitor);
@@ -41280,16 +41603,21 @@ const detect = async (source, {
  */
 const parse = async (source, {
   sourceMap = false,
+  style = false,
   strict = false
 } = {}) => {
   if (strict && sourceMap) {
     throw new _speclynx_apidom_error__WEBPACK_IMPORTED_MODULE_1__["default"]('Cannot use sourceMap with strict parsing. Strict parsing does not support source maps.');
   }
+  if (strict && style) {
+    throw new _speclynx_apidom_error__WEBPACK_IMPORTED_MODULE_1__["default"]('Cannot use style with strict parsing. Strict parsing does not support style preservation.');
+  }
   if (strict) {
     return _yaml_index_mjs__WEBPACK_IMPORTED_MODULE_2__.parse(source);
   }
   return _tree_sitter_index_mjs__WEBPACK_IMPORTED_MODULE_3__.parse(source, {
-    sourceMap
+    sourceMap,
+    style
   });
 };
 
@@ -41364,12 +41692,14 @@ const detect = async source => {
  * @public
  */
 const parse = async (source, {
-  sourceMap = false
+  sourceMap = false,
+  style = false
 } = {}) => {
   const cst = await (0,_lexical_analysis_index_mjs__WEBPACK_IMPORTED_MODULE_0__["default"])(source);
   try {
     return (0,_syntactic_analysis_index_mjs__WEBPACK_IMPORTED_MODULE_1__["default"])(cst, {
-      sourceMap
+      sourceMap,
+      style
     });
   } finally {
     cst.delete();
@@ -41443,18 +41773,20 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _ast_Error_mjs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(33240);
 /* harmony import */ var _ast_Literal_mjs__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(86951);
 /* harmony import */ var _ast_ParseResult_mjs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(88912);
-/* harmony import */ var _ast_nodes_YamlAlias_mjs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(15103);
-/* harmony import */ var _ast_nodes_YamlAnchor_mjs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2838);
-/* harmony import */ var _ast_nodes_YamlComment_mjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(14120);
-/* harmony import */ var _ast_nodes_YamlDirective_mjs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(22532);
-/* harmony import */ var _ast_nodes_YamlDocument_mjs__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(17374);
-/* harmony import */ var _ast_nodes_YamlKeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(39113);
-/* harmony import */ var _ast_nodes_YamlMapping_mjs__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(17373);
-/* harmony import */ var _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(20301);
-/* harmony import */ var _ast_nodes_YamlSequence_mjs__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(46794);
-/* harmony import */ var _ast_nodes_YamlStream_mjs__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(74213);
-/* harmony import */ var _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(48139);
-/* harmony import */ var _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(21544);
+/* harmony import */ var _ast_nodes_YamlNode_mjs__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6821);
+/* harmony import */ var _ast_nodes_YamlAlias_mjs__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(15103);
+/* harmony import */ var _ast_nodes_YamlAnchor_mjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(2838);
+/* harmony import */ var _ast_nodes_YamlComment_mjs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(14120);
+/* harmony import */ var _ast_nodes_YamlDirective_mjs__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(22532);
+/* harmony import */ var _ast_nodes_YamlDocument_mjs__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(17374);
+/* harmony import */ var _ast_nodes_YamlKeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(39113);
+/* harmony import */ var _ast_nodes_YamlMapping_mjs__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(17373);
+/* harmony import */ var _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(20301);
+/* harmony import */ var _ast_nodes_YamlSequence_mjs__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(46794);
+/* harmony import */ var _ast_nodes_YamlStream_mjs__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(74213);
+/* harmony import */ var _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(48139);
+/* harmony import */ var _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(21544);
+
 
 
 
@@ -41494,16 +41826,16 @@ const toPositionProps = info => ({
   endOffset: info.endIndex
 });
 const toYamlAnchor = info => {
-  return new _ast_nodes_YamlAnchor_mjs__WEBPACK_IMPORTED_MODULE_4__["default"]({
+  return new _ast_nodes_YamlAnchor_mjs__WEBPACK_IMPORTED_MODULE_5__["default"]({
     name: info.text,
     ...toPositionProps(info)
   });
 };
 const toYamlTag = (info, tagInfo) => {
   const explicitName = tagInfo?.text || (info.type === 'plain_scalar' ? '?' : '!');
-  const kind = info.type.endsWith('mapping') ? _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__.YamlNodeKind.Mapping : info.type.endsWith('sequence') ? _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__.YamlNodeKind.Sequence : _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__.YamlNodeKind.Scalar;
+  const kind = info.type.endsWith('mapping') ? _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlNodeKind.Mapping : info.type.endsWith('sequence') ? _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlNodeKind.Sequence : _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlNodeKind.Scalar;
   const positionProps = tagInfo ? toPositionProps(tagInfo) : undefined;
-  return new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__["default"]({
+  return new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__["default"]({
     explicitName,
     kind,
     ...positionProps
@@ -41551,12 +41883,29 @@ const processChildren = (cursor, ctx, transformerMap) => {
   return results;
 };
 
+// strip leading '# ' (or bare '#') from comment text, keeping only the content
+const stripCommentHash = text => text.split('\n').map(line => line.replace(/^#\s?/, '')).join('\n');
+
+// find the first YamlNode in a TransformResult (which may be an array from block_node)
+const findYamlNode = result => {
+  if (result instanceof _ast_nodes_YamlNode_mjs__WEBPACK_IMPORTED_MODULE_3__["default"]) return result;
+  if (Array.isArray(result)) {
+    for (const item of result.flat()) {
+      if (item instanceof _ast_nodes_YamlNode_mjs__WEBPACK_IMPORTED_MODULE_3__["default"]) return item;
+    }
+  }
+  return null;
+};
 // Helper to process key-value pair children
 const processKeyValuePairChildren = (cursor, ctx, transformerMap) => {
   let key = null;
   let value = null;
   const errors = [];
+  const commentsBetweenKeyValue = [];
+  const commentsAfterValue = [];
   let siblings = {};
+  let seenKey = false;
+  let seenValue = false;
   if (cursor.gotoFirstChild()) {
     do {
       const info = getCursorInfo(cursor);
@@ -41571,12 +41920,25 @@ const processKeyValuePairChildren = (cursor, ctx, transformerMap) => {
         siblings.anchor = info;
         continue;
       }
+
+      // collect comment nodes (extras placed by tree-sitter between key/value)
+      if (info.type === 'comment') {
+        const commentText = stripCommentHash(info.text);
+        if (seenValue) {
+          commentsAfterValue.push(commentText);
+        } else if (seenKey) {
+          commentsBetweenKeyValue.push(commentText);
+        }
+        continue;
+      }
       if (fieldName === 'key') {
         key = transform(cursor, ctx, transformerMap, siblings);
         siblings = {};
+        seenKey = true;
       } else if (fieldName === 'value') {
         value = transform(cursor, ctx, transformerMap, siblings);
         siblings = {};
+        seenValue = true;
       } else if (info.type === 'ERROR') {
         const errorResult = transform(cursor, ctx, transformerMap, siblings);
         if (errorResult !== null) {
@@ -41589,7 +41951,9 @@ const processKeyValuePairChildren = (cursor, ctx, transformerMap) => {
   return {
     key,
     value,
-    errors
+    errors,
+    commentsBetweenKeyValue,
+    commentsAfterValue
   };
 };
 const transform = (cursor, ctx, transformerMap, siblings = {}) => {
@@ -41618,7 +41982,7 @@ const createTransformers = transformerMap => ({
   stream(cursor, ctx) {
     const info = getCursorInfo(cursor);
     const children = processChildren(cursor, ctx, transformerMap);
-    const stream = new _ast_nodes_YamlStream_mjs__WEBPACK_IMPORTED_MODULE_12__["default"]({
+    const stream = new _ast_nodes_YamlStream_mjs__WEBPACK_IMPORTED_MODULE_13__["default"]({
       children: children.filter(c => c !== null),
       ...toPositionProps(info),
       isMissing: info.isMissing
@@ -41641,7 +42005,7 @@ const createTransformers = transformerMap => ({
       } while (cursor.gotoNextSibling());
       cursor.gotoParent();
     }
-    return new _ast_nodes_YamlDirective_mjs__WEBPACK_IMPORTED_MODULE_6__["default"]({
+    return new _ast_nodes_YamlDirective_mjs__WEBPACK_IMPORTED_MODULE_7__["default"]({
       ...toPositionProps(info),
       name: '%YAML',
       parameters: {
@@ -41660,7 +42024,7 @@ const createTransformers = transformerMap => ({
       } while (cursor.gotoNextSibling());
       cursor.gotoParent();
     }
-    const tagDirective = new _ast_nodes_YamlDirective_mjs__WEBPACK_IMPORTED_MODULE_6__["default"]({
+    const tagDirective = new _ast_nodes_YamlDirective_mjs__WEBPACK_IMPORTED_MODULE_7__["default"]({
       ...toPositionProps(info),
       name: '%TAG',
       parameters: {
@@ -41682,7 +42046,7 @@ const createTransformers = transformerMap => ({
       } while (cursor.gotoNextSibling());
       cursor.gotoParent();
     }
-    return new _ast_nodes_YamlDirective_mjs__WEBPACK_IMPORTED_MODULE_6__["default"]({
+    return new _ast_nodes_YamlDirective_mjs__WEBPACK_IMPORTED_MODULE_7__["default"]({
       ...toPositionProps(info),
       name: children[0],
       parameters: {
@@ -41694,7 +42058,7 @@ const createTransformers = transformerMap => ({
   document(cursor, ctx) {
     const info = getCursorInfo(cursor);
     const children = processChildren(cursor, ctx, transformerMap);
-    return new _ast_nodes_YamlDocument_mjs__WEBPACK_IMPORTED_MODULE_7__["default"]({
+    return new _ast_nodes_YamlDocument_mjs__WEBPACK_IMPORTED_MODULE_8__["default"]({
       children: children.flat().filter(c => c !== null),
       ...toPositionProps(info),
       isMissing: info.isMissing
@@ -41726,7 +42090,7 @@ const createTransformers = transformerMap => ({
 
     // No kind node - create empty scalar
     if (lastChildInfo) {
-      const emptyScalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
+      const emptyScalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
         content: '',
         anchor: siblings.anchor ? toYamlAnchor(siblings.anchor) : undefined,
         tag: toYamlTag(lastChildInfo, siblings.tag),
@@ -41736,8 +42100,8 @@ const createTransformers = transformerMap => ({
         endLine: lastChildInfo.endPosition.row,
         endCharacter: lastChildInfo.endPosition.column,
         endOffset: lastChildInfo.endIndex,
-        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
-        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Plain
+        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
+        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Plain
       });
       registerAnchor(emptyScalarNode, ctx);
       return emptyScalarNode;
@@ -41749,13 +42113,13 @@ const createTransformers = transformerMap => ({
     const tag = toYamlTag(info, siblings.tag);
     const anchor = siblings.anchor ? toYamlAnchor(siblings.anchor) : undefined;
     const children = processChildren(cursor, ctx, transformerMap);
-    const mappingNode = new _ast_nodes_YamlMapping_mjs__WEBPACK_IMPORTED_MODULE_9__["default"]({
+    const mappingNode = new _ast_nodes_YamlMapping_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
       children: children.filter(c => c !== null),
       ...toPositionProps(info),
       anchor,
       tag,
-      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Block,
-      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.NextLine,
+      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Block,
+      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.NextLine,
       isMissing: info.isMissing
     });
     registerAnchor(mappingNode, ctx);
@@ -41766,13 +42130,15 @@ const createTransformers = transformerMap => ({
     const {
       key,
       value,
-      errors
+      errors,
+      commentsBetweenKeyValue,
+      commentsAfterValue
     } = processKeyValuePairChildren(cursor, ctx, transformerMap);
     const children = [];
 
     // Handle empty key
     if (key === null) {
-      const emptyKey = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
+      const emptyKey = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
         content: '',
         startLine: info.startPosition.row,
         startCharacter: info.startPosition.column,
@@ -41780,12 +42146,12 @@ const createTransformers = transformerMap => ({
         endLine: info.startPosition.row,
         endCharacter: info.startPosition.column,
         endOffset: info.startIndex,
-        tag: new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__["default"]({
+        tag: new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__["default"]({
           explicitName: '?',
-          kind: _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__.YamlNodeKind.Scalar
+          kind: _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlNodeKind.Scalar
         }),
-        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
-        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Plain
+        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
+        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Plain
       });
       children.push(emptyKey);
     } else {
@@ -41794,7 +42160,7 @@ const createTransformers = transformerMap => ({
 
     // Handle empty value
     if (value === null) {
-      const emptyValue = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
+      const emptyValue = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
         content: '',
         startLine: info.endPosition.row,
         startCharacter: info.endPosition.column,
@@ -41802,22 +42168,37 @@ const createTransformers = transformerMap => ({
         endLine: info.endPosition.row,
         endCharacter: info.endPosition.column,
         endOffset: info.endIndex,
-        tag: new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__["default"]({
+        tag: new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__["default"]({
           explicitName: '?',
-          kind: _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__.YamlNodeKind.Scalar
+          kind: _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlNodeKind.Scalar
         }),
-        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
-        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Plain
+        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
+        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Plain
       });
       children.push(emptyValue);
     } else {
       children.push(value);
     }
+
+    // attach comments found between key and value to the value node
+    if (commentsBetweenKeyValue.length > 0) {
+      const valueNode = findYamlNode(value);
+      if (valueNode) {
+        valueNode.commentBefore = commentsBetweenKeyValue.join('\n');
+      }
+    }
+    // attach comments found after value to the value node
+    if (commentsAfterValue.length > 0) {
+      const valueNode = findYamlNode(value);
+      if (valueNode) {
+        valueNode.comment = commentsAfterValue.join('\n');
+      }
+    }
     children.push(...errors);
-    return new _ast_nodes_YamlKeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_8__["default"]({
+    return new _ast_nodes_YamlKeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_9__["default"]({
       children: children.flat().filter(c => c !== null),
       ...toPositionProps(info),
-      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Block,
+      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Block,
       isMissing: info.isMissing
     });
   },
@@ -41826,13 +42207,13 @@ const createTransformers = transformerMap => ({
     const tag = toYamlTag(info, siblings.tag);
     const anchor = siblings.anchor ? toYamlAnchor(siblings.anchor) : undefined;
     const children = processChildren(cursor, ctx, transformerMap);
-    const mappingNode = new _ast_nodes_YamlMapping_mjs__WEBPACK_IMPORTED_MODULE_9__["default"]({
+    const mappingNode = new _ast_nodes_YamlMapping_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
       children: children.flat().filter(c => c !== null),
       ...toPositionProps(info),
       anchor,
       tag,
-      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
-      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Explicit,
+      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
+      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Explicit,
       isMissing: info.isMissing
     });
     registerAnchor(mappingNode, ctx);
@@ -41843,13 +42224,15 @@ const createTransformers = transformerMap => ({
     const {
       key,
       value,
-      errors
+      errors,
+      commentsBetweenKeyValue,
+      commentsAfterValue
     } = processKeyValuePairChildren(cursor, ctx, transformerMap);
     const children = [];
 
     // Handle empty key
     if (key === null) {
-      const emptyKey = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
+      const emptyKey = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
         content: '',
         startLine: info.startPosition.row,
         startCharacter: info.startPosition.column,
@@ -41857,12 +42240,12 @@ const createTransformers = transformerMap => ({
         endLine: info.startPosition.row,
         endCharacter: info.startPosition.column,
         endOffset: info.startIndex,
-        tag: new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__["default"]({
+        tag: new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__["default"]({
           explicitName: '?',
-          kind: _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__.YamlNodeKind.Scalar
+          kind: _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlNodeKind.Scalar
         }),
-        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
-        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Plain
+        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
+        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Plain
       });
       children.push(emptyKey);
     } else {
@@ -41871,7 +42254,7 @@ const createTransformers = transformerMap => ({
 
     // Handle empty value
     if (value === null) {
-      const emptyValue = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
+      const emptyValue = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
         content: '',
         startLine: info.endPosition.row,
         startCharacter: info.endPosition.column,
@@ -41879,22 +42262,37 @@ const createTransformers = transformerMap => ({
         endLine: info.endPosition.row,
         endCharacter: info.endPosition.column,
         endOffset: info.endIndex,
-        tag: new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__["default"]({
+        tag: new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__["default"]({
           explicitName: '?',
-          kind: _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__.YamlNodeKind.Scalar
+          kind: _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlNodeKind.Scalar
         }),
-        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
-        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Plain
+        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
+        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Plain
       });
       children.push(emptyValue);
     } else {
       children.push(value);
     }
+
+    // attach comments found between key and value to the value node
+    if (commentsBetweenKeyValue.length > 0) {
+      const valueNode = findYamlNode(value);
+      if (valueNode) {
+        valueNode.commentBefore = commentsBetweenKeyValue.join('\n');
+      }
+    }
+    // attach comments found after value to the value node
+    if (commentsAfterValue.length > 0) {
+      const valueNode = findYamlNode(value);
+      if (valueNode) {
+        valueNode.comment = commentsAfterValue.join('\n');
+      }
+    }
     children.push(...errors);
-    return new _ast_nodes_YamlKeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_8__["default"]({
+    return new _ast_nodes_YamlKeyValuePair_mjs__WEBPACK_IMPORTED_MODULE_9__["default"]({
       children: children.flat().filter(c => c !== null),
       ...toPositionProps(info),
-      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
+      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
       isMissing: info.isMissing
     });
   },
@@ -41903,13 +42301,13 @@ const createTransformers = transformerMap => ({
     const tag = toYamlTag(info, siblings.tag);
     const anchor = siblings.anchor ? toYamlAnchor(siblings.anchor) : undefined;
     const children = processChildren(cursor, ctx, transformerMap);
-    const sequenceNode = new _ast_nodes_YamlSequence_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
+    const sequenceNode = new _ast_nodes_YamlSequence_mjs__WEBPACK_IMPORTED_MODULE_12__["default"]({
       children: children.flat(Infinity).filter(c => c !== null),
       ...toPositionProps(info),
       anchor,
       tag,
-      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Block,
-      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.NextLine
+      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Block,
+      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.NextLine
     });
     registerAnchor(sequenceNode, ctx);
     return ctx.schema.resolve(sequenceNode);
@@ -41920,11 +42318,11 @@ const createTransformers = transformerMap => ({
 
     // If only one child (the "-" literal), create empty node
     if (children.length === 0) {
-      const emptyScalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
+      const emptyScalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
         content: '',
-        tag: new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__["default"]({
+        tag: new _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__["default"]({
           explicitName: '?',
-          kind: _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_13__.YamlNodeKind.Scalar
+          kind: _ast_nodes_YamlTag_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlNodeKind.Scalar
         }),
         startLine: info.endPosition.row,
         startCharacter: info.endPosition.column,
@@ -41932,8 +42330,8 @@ const createTransformers = transformerMap => ({
         endLine: info.endPosition.row,
         endCharacter: info.endPosition.column,
         endOffset: info.endIndex,
-        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
-        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Plain
+        styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
+        style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Plain
       });
       return [emptyScalarNode];
     }
@@ -41944,13 +42342,13 @@ const createTransformers = transformerMap => ({
     const tag = toYamlTag(info, siblings.tag);
     const anchor = siblings.anchor ? toYamlAnchor(siblings.anchor) : undefined;
     const children = processChildren(cursor, ctx, transformerMap);
-    const sequenceNode = new _ast_nodes_YamlSequence_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
+    const sequenceNode = new _ast_nodes_YamlSequence_mjs__WEBPACK_IMPORTED_MODULE_12__["default"]({
       children: children.flat().filter(c => c !== null),
       ...toPositionProps(info),
       anchor,
       tag,
-      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
-      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Explicit
+      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
+      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Explicit
     });
     registerAnchor(sequenceNode, ctx);
     return ctx.schema.resolve(sequenceNode);
@@ -41959,14 +42357,15 @@ const createTransformers = transformerMap => ({
     const info = getCursorInfo(cursor);
     const tag = toYamlTag(info, siblings.tag);
     const anchor = siblings.anchor ? toYamlAnchor(siblings.anchor) : undefined;
-    const scalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
+    const scalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
       content: info.text,
       anchor,
       tag,
       ...toPositionProps(info),
-      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
-      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Plain
+      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
+      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Plain
     });
+    scalarNode.rawContent = info.text;
     registerAnchor(scalarNode, ctx);
     return ctx.schema.resolve(scalarNode);
   },
@@ -41974,14 +42373,15 @@ const createTransformers = transformerMap => ({
     const info = getCursorInfo(cursor);
     const tag = toYamlTag(info, siblings.tag);
     const anchor = siblings.anchor ? toYamlAnchor(siblings.anchor) : undefined;
-    const scalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
+    const scalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
       content: info.text,
       anchor,
       tag,
       ...toPositionProps(info),
-      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
-      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.SingleQuoted
+      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
+      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.SingleQuoted
     });
+    scalarNode.rawContent = info.text;
     registerAnchor(scalarNode, ctx);
     return ctx.schema.resolve(scalarNode);
   },
@@ -41989,14 +42389,15 @@ const createTransformers = transformerMap => ({
     const info = getCursorInfo(cursor);
     const tag = toYamlTag(info, siblings.tag);
     const anchor = siblings.anchor ? toYamlAnchor(siblings.anchor) : undefined;
-    const scalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
+    const scalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
       content: info.text,
       anchor,
       tag,
       ...toPositionProps(info),
-      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Flow,
-      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.DoubleQuoted
+      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Flow,
+      style: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.DoubleQuoted
     });
+    scalarNode.rawContent = info.text;
     registerAnchor(scalarNode, ctx);
     return ctx.schema.resolve(scalarNode);
   },
@@ -42004,27 +42405,29 @@ const createTransformers = transformerMap => ({
     const info = getCursorInfo(cursor);
     const tag = toYamlTag(info, siblings.tag);
     const anchor = siblings.anchor ? toYamlAnchor(siblings.anchor) : undefined;
-    const style = info.text.startsWith('|') ? _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Literal : info.text.startsWith('>') ? _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Folded : _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyle.Plain;
-    const scalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_10__["default"]({
+    const style = info.text.startsWith('|') ? _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Literal : info.text.startsWith('>') ? _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Folded : _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyle.Plain;
+    const scalarNode = new _ast_nodes_YamlScalar_mjs__WEBPACK_IMPORTED_MODULE_11__["default"]({
       content: info.text,
       anchor,
       tag,
       ...toPositionProps(info),
-      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_14__.YamlStyleGroup.Block,
+      styleGroup: _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_15__.YamlStyleGroup.Block,
       style
     });
+    scalarNode.rawContent = info.text;
     registerAnchor(scalarNode, ctx);
     return ctx.schema.resolve(scalarNode);
   },
   comment(cursor) {
     const info = getCursorInfo(cursor);
-    return new _ast_nodes_YamlComment_mjs__WEBPACK_IMPORTED_MODULE_5__["default"]({
-      content: info.text
+    return new _ast_nodes_YamlComment_mjs__WEBPACK_IMPORTED_MODULE_6__["default"]({
+      content: info.text,
+      ...toPositionProps(info)
     });
   },
   alias(cursor, ctx) {
     const info = getCursorInfo(cursor);
-    const alias = new _ast_nodes_YamlAlias_mjs__WEBPACK_IMPORTED_MODULE_3__["default"]({
+    const alias = new _ast_nodes_YamlAlias_mjs__WEBPACK_IMPORTED_MODULE_4__["default"]({
       content: info.text
     });
     return ctx.referenceManager.resolveAlias(alias);
@@ -42106,6 +42509,147 @@ const maybeAddSourceMap = (node, element, ctx) => {
   _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_8__["default"].transfer(node, element);
 };
 
+// find the first descendant matching a type path through the AST
+const findFirst = (node, path) => {
+  if (path.length === 0) return node;
+  const [type, ...rest] = path;
+  for (const child of node.children || []) {
+    if (child.type !== type) continue;
+    const found = findFirst(child, rest);
+    if (found) return found;
+  }
+  return undefined;
+};
+
+// detect indent from first nested block mapping (stream > document > mapping > keyValuePair > mapping)
+const detectIndent = node => {
+  const nested = findFirst(node, ['document', 'mapping', 'keyValuePair', 'mapping']);
+  if (nested?.styleGroup === _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_9__.YamlStyleGroup.Block && typeof nested.startCharacter === 'number' && nested.startCharacter > 0) {
+    return nested.startCharacter;
+  }
+  return 2;
+};
+
+// strip leading '#' from each line of comment text; yaml library adds '#' during stringification
+const stripCommentHash = text => text.split('\n').map(line => line.replace(/^#/, '')).join('\n');
+
+// collect comment texts from raw AST children, indexed by position relative to non-comment siblings
+
+// is the comment on the same line as the previous non-comment sibling?
+const isInlineComment = (child, lastEndLine, pending) => {
+  return pending.length === 0 && lastEndLine !== undefined && child.startLine === lastEndLine;
+};
+
+/**
+ * @param children - raw AST children of a mapping/sequence
+ * @param containerStartCol - the start column of the container node;
+ *   trailing comments whose startCharacter is less than this are out-of-scope
+ *   (tree-sitter may place them inside a nested block they don't belong to)
+ */
+const collectComments = (children, containerStartCol) => {
+  const before = new Map();
+  const after = new Map();
+  const pending = [];
+  let lastNonCommentEndLine;
+  let elementIdx = 0;
+  for (const child of children) {
+    if (child?.type === 'comment') {
+      const text = stripCommentHash(child.content || '');
+      if (elementIdx > 0 && isInlineComment(child, lastNonCommentEndLine, pending)) {
+        after.set(elementIdx - 1, text);
+      } else {
+        pending.push({
+          text,
+          startLine: child.startLine,
+          startCharacter: child.startCharacter
+        });
+      }
+      continue;
+    }
+
+    // non-comment node: attach any pending comments as commentBefore
+    if (pending.length > 0) {
+      before.set(elementIdx, pending.map(c => c.text).join('\n'));
+      pending.length = 0;
+    }
+    lastNonCommentEndLine = child.endLine;
+    elementIdx++;
+  }
+
+  // remaining pending comments are trailing — split into in-scope and out-of-scope
+  let trailing = null;
+  const outOfScope = [];
+  for (const c of pending) {
+    if (containerStartCol !== undefined && c.startCharacter !== undefined && c.startCharacter < containerStartCol) {
+      outOfScope.push(c.text);
+    } else {
+      trailing = trailing ? `${trailing}\n${c.text}` : c.text;
+    }
+  }
+  return {
+    before,
+    after,
+    trailing,
+    outOfScope
+  };
+};
+
+// set a yaml style property on an element, initializing style.yaml if needed
+const setYamlStyleProp = (element, key, value) => {
+  if (!element.style) element.style = {};
+  const yaml = element.style.yaml ?? {};
+  yaml[key] = value;
+  element.style.yaml = yaml;
+};
+
+// apply collected comments to transformed ApiDOM elements
+const applyComments = (elements, comments) => {
+  comments.before.forEach((text, idx) => {
+    if (elements[idx]) setYamlStyleProp(elements[idx], 'commentBefore', text);
+  });
+  comments.after.forEach((text, idx) => {
+    if (elements[idx]) setYamlStyleProp(elements[idx], 'comment', text);
+  });
+};
+
+// detect flow collection padding from node positions
+// gap of 1 between container start and first child start → no padding: [x
+// gap of 2+ → padding: [ x
+// gap of 1 between container start and first child start → no padding: {x
+// gap of 2+ → padding: { x
+const detectFlowPadding = node => {
+  const firstChild = (node.children || [])[0];
+  if (firstChild && typeof node.startCharacter === 'number' && typeof firstChild.startCharacter === 'number') {
+    return firstChild.startCharacter - node.startCharacter > 1;
+  }
+  return true;
+};
+
+// build yaml style object for an element
+const buildYamlStyle = (node, ctx, extras) => {
+  const yamlStyle = {
+    styleGroup: node.styleGroup,
+    indent: ctx.indent
+  };
+  if (ctx.flowCollectionPadding !== null) {
+    yamlStyle.flowCollectionPadding = ctx.flowCollectionPadding;
+  }
+  if (node.comment) {
+    yamlStyle.comment = node.comment;
+  }
+  if (node.commentBefore) {
+    yamlStyle.commentBefore = node.commentBefore;
+  }
+  if (extras) {
+    for (const [key, value] of Object.entries(extras)) {
+      if (value !== undefined) yamlStyle[key] = value;
+    }
+  }
+  return {
+    yaml: yamlStyle
+  };
+};
+
 // Transform a single node based on its type
 const transform = (node, ctx) => {
   if (node === null || node === undefined) {
@@ -42141,22 +42685,58 @@ const transform = (node, ctx) => {
 // Transform children array and flatten results
 const transformChildren = (children, ctx) => {
   const results = [];
+  let pendingPromoted = [];
   for (const child of children) {
     const result = transform(child, ctx);
     if (result === null) {
+      // collect any promoted comments generated during this null transform
+      if (ctx.style && ctx.promotedComments.length > 0) {
+        pendingPromoted.push(...ctx.promotedComments);
+        ctx.promotedComments = [];
+      }
       continue;
     }
+
+    // apply promoted comments from PREVIOUS children as commentBefore on this element
+    if (ctx.style && pendingPromoted.length > 0) {
+      const target = Array.isArray(result) ? result[0] : result;
+      if (target) {
+        if (!target.style) target.style = {};
+        const yaml = target.style.yaml ?? {};
+        const existing = yaml.commentBefore;
+        const promoted = pendingPromoted.join('\n');
+        yaml.commentBefore = existing ? `${promoted}\n${existing}` : promoted;
+        target.style.yaml = yaml;
+      }
+      pendingPromoted = [];
+    }
+
+    // collect any promoted comments generated by this child's transform
+    // (these will be applied to the NEXT sibling)
+    if (ctx.style && ctx.promotedComments.length > 0) {
+      pendingPromoted.push(...ctx.promotedComments);
+      ctx.promotedComments = [];
+    }
     if (Array.isArray(result)) {
       results.push(...result);
     } else {
       results.push(result);
     }
   }
+
+  // if promoted comments remain after all children, propagate up to parent scope
+  if (pendingPromoted.length > 0) {
+    ctx.promotedComments.push(...pendingPromoted);
+  }
   return results;
 };
 
 // Stream: Wraps transformed children in ParseResultElement
 const transformStream = (node, ctx) => {
+  // detect indent from the stream structure (only needed for style preservation)
+  if (ctx.style) {
+    ctx.indent = detectIndent(node);
+  }
   const element = new _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_7__["default"]();
 
   // Transform all children
@@ -42202,12 +42782,35 @@ const transformDocument = (node, ctx) => {
   return transformChildren(node.children || [], ctx);
 };
 
+// shared logic for transformMapping and transformSequence
+const transformCollection = (element, node, ctx) => {
+  const typedNode = node;
+  const children = node.children || [];
+  if (ctx.style) {
+    if (ctx.flowCollectionPadding === null && node.styleGroup === _ast_nodes_YamlStyle_mjs__WEBPACK_IMPORTED_MODULE_9__.YamlStyleGroup.Flow) {
+      ctx.flowCollectionPadding = detectFlowPadding(typedNode);
+    }
+    const comments = collectComments(children, typedNode.startCharacter);
+    const childElements = transformChildren(children, ctx);
+    // bypass content setter to avoid re-refracting already-transformed elements
+    element._content = childElements; // eslint-disable-line @typescript-eslint/no-explicit-any
+    applyComments(childElements, comments);
+    element.style = buildYamlStyle(node, ctx, {
+      comment: comments.trailing
+    });
+    if (comments.outOfScope.length > 0) {
+      ctx.promotedComments.push(...comments.outOfScope);
+    }
+  } else {
+    element._content = transformChildren(children, ctx); // eslint-disable-line @typescript-eslint/no-explicit-any
+  }
+  maybeAddSourceMap(typedNode, element, ctx);
+};
+
 // Mapping: Transforms to ObjectElement
 const transformMapping = (node, ctx) => {
   const element = new _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_4__["default"]();
-  // @ts-ignore
-  element._content = transformChildren(node.children || [], ctx);
-  maybeAddSourceMap(node, element, ctx);
+  transformCollection(element, node, ctx);
   return element;
 };
 
@@ -42241,9 +42844,7 @@ const transformKeyValuePair = (node, ctx) => {
 // Sequence: Transforms to ArrayElement
 const transformSequence = (node, ctx) => {
   const element = new _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_2__["default"]();
-  // @ts-ignore
-  element._content = transformChildren(node.children || [], ctx);
-  maybeAddSourceMap(node, element, ctx);
+  transformCollection(element, node, ctx);
   return element;
 };
 
@@ -42256,6 +42857,15 @@ const transformScalar = (node, ctx) => {
     element.classes.push('yaml-e-node');
     element.classes.push('yaml-e-scalar');
   }
+  if (ctx.style) {
+    const extras = {
+      scalarStyle: node.style
+    };
+    if (node.rawContent !== undefined) {
+      extras.rawContent = node.rawContent;
+    }
+    element.style = buildYamlStyle(node, ctx, extras);
+  }
   maybeAddSourceMap(node, element, ctx);
   return element;
 };
@@ -42320,13 +42930,18 @@ const transformRootError = (node, ctx) => {
  * @public
  */
 const transformYamlAstToApiDOM = (yamlAst, {
-  sourceMap = false
+  sourceMap = false,
+  style = false
 } = {}) => {
   const ctx = {
     sourceMap,
+    style,
     namespace: new _speclynx_apidom_datamodel__WEBPACK_IMPORTED_MODULE_0__["default"](),
     annotations: [],
-    processedDocumentCount: 0
+    processedDocumentCount: 0,
+    indent: 2,
+    flowCollectionPadding: null,
+    promotedComments: []
   };
   const rootNode = yamlAst.rootNode;
 
@@ -42925,6 +43540,8 @@ class YamlNode extends _Node_mjs__WEBPACK_IMPORTED_MODULE_0__["default"] {
   tag;
   style;
   styleGroup;
+  comment;
+  commentBefore;
   constructor({
     anchor,
     tag,
@@ -42964,6 +43581,7 @@ __webpack_require__.r(__webpack_exports__);
 class YamlScalar extends _YamlNode_mjs__WEBPACK_IMPORTED_MODULE_0__["default"] {
   static type = 'scalar';
   content;
+  rawContent;
   constructor({
     content,
     ...rest
@@ -43761,7 +44379,8 @@ __webpack_require__.r(__webpack_exports__);
  * @public
  */
 const analyze = (cst, {
-  sourceMap = false
+  sourceMap = false,
+  style = false
 } = {}) => {
   const cursor = cst.walk();
   const schema = new _ast_schemas_json_index_mjs__WEBPACK_IMPORTED_MODULE_0__["default"]();
@@ -43776,7 +44395,8 @@ const analyze = (cst, {
 
   // Pass 2: YAML AST -> ApiDOM (direct transformation)
   return (0,_YamlAstTransformer_mjs__WEBPACK_IMPORTED_MODULE_3__.transformYamlAstToApiDOM)(yamlAst, {
-    sourceMap
+    sourceMap,
+    style
   });
 };
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (analyze);