yerba 0.5.1-x86_64-linux-gnu → 0.6.0-x86_64-linux-gnu

data/rust/src/document/style.rs

@@ -1,6 +1,613 @@
 use super::*;
 
+pub struct StyleEnforcement {
+  pub collection_style: Option<String>,
+  pub sequence_indent: Option<String>,
+  pub key_style: Option<crate::KeyStyle>,
+  pub value_style: Option<QuoteStyle>,
+}
+
 impl Document {
+  pub fn enforce_styles(&mut self, enforcement: &StyleEnforcement) -> Result<(), YerbaError> {
+    let source = self.root.text().to_string();
+    let mut edits: Vec<(TextRange, String)> = Vec::new();
+    let mut converted_ranges: Vec<TextRange> = Vec::new();
+
+    let want_block_collections = enforcement.collection_style.as_deref() == Some("block");
+    let want_indented = enforcement.sequence_indent.as_deref() == Some("indented");
+    let want_compact = enforcement.sequence_indent.as_deref() == Some("compact");
+
+    for element in self.root.descendants_with_tokens() {
+      match element {
+        rowan::NodeOrToken::Node(ref node) => {
+          if want_block_collections && (node.kind() == SyntaxKind::FLOW_SEQ || node.kind() == SyntaxKind::FLOW_MAP) {
+            if node
+              .ancestors()
+              .skip(1)
+              .any(|ancestor| ancestor.kind() == SyntaxKind::FLOW_SEQ || ancestor.kind() == SyntaxKind::FLOW_MAP)
+            {
+              continue;
+            }
+
+            let value = node_to_yaml_value(node);
+
+            match &value {
+              yaml_serde::Value::Sequence(sequence) if sequence.is_empty() => continue,
+              yaml_serde::Value::Mapping(mapping) if mapping.is_empty() => continue,
+              _ => {}
+            }
+
+            let entry_node = node.ancestors().find(|ancestor| ancestor.kind() == SyntaxKind::BLOCK_MAP_ENTRY);
+
+            if let Some(ref entry) = entry_node {
+              let entry_start: usize = entry.text_range().start().into();
+              let entry_line_start = source[..entry_start].rfind('\n').map(|position| position + 1).unwrap_or(0);
+              let key_indent = entry_start - entry_line_start;
+              let entry_text = entry.text().to_string();
+
+              if let Some(colon_offset) = entry_text.find(':') {
+                let colon_position = entry_start + colon_offset;
+                let value_indent = key_indent + 2;
+                let block_text = crate::yaml_writer::yaml_value_to_block_text(&value, value_indent);
+                let replace_range = TextRange::new(rowan::TextSize::from((colon_position + 1) as u32), node.text_range().end());
+
+                converted_ranges.push(node.text_range());
+                edits.push((replace_range, format!("\n{}", block_text)));
+              }
+            }
+          }
+
+          if (want_indented || want_compact) && BlockSeq::can_cast(node.kind()) {
+            if node.ancestors().skip(1).any(|ancestor| BlockSeq::can_cast(ancestor.kind())) {
+              continue;
+            }
+
+            let parent_entry = match node.ancestors().find(|ancestor| ancestor.kind() == SyntaxKind::BLOCK_MAP_ENTRY) {
+              Some(entry) => entry,
+              None => continue,
+            };
+
+            let sequence = match BlockSeq::cast(node.clone()) {
+              Some(sequence) => sequence,
+              None => continue,
+            };
+
+            let first_entry = match sequence.entries().next() {
+              Some(entry) => entry,
+              None => continue,
+            };
+
+            let entry_start: usize = parent_entry.text_range().start().into();
+            let line_start = source[..entry_start].rfind('\n').map(|position| position + 1).unwrap_or(0);
+            let key_indent_length = entry_start - line_start;
+            let entry_indent_length = preceding_whitespace_indent(first_entry.syntax()).len();
+            let is_indented = entry_indent_length > key_indent_length;
+            let needs_change = (want_indented && !is_indented) || (want_compact && is_indented);
+
+            if needs_change {
+              let target_style = enforcement.sequence_indent.as_deref().unwrap();
+
+              let indent_diff: i32 = match target_style {
+                "indented" => (key_indent_length as i32 + 2) - entry_indent_length as i32,
+                "compact" => key_indent_length as i32 - entry_indent_length as i32,
+                _ => continue,
+              };
+
+              if indent_diff == 0 {
+                continue;
+              }
+
+              let sequence_range = node.text_range();
+              let sequence_start: usize = sequence_range.start().into();
+              let sequence_end: usize = sequence_range.end().into();
+
+              let before_sequence = &source[..sequence_start];
+              let line_start_of_first_entry = before_sequence.rfind('\n').map(|position| position + 1).unwrap_or(0);
+              let full_text = &source[line_start_of_first_entry..sequence_end];
+
+              let reindented: String = full_text
+                .lines()
+                .map(|line| {
+                  if line.trim().is_empty() {
+                    String::new()
+                  } else {
+                    let current_line_indent = line.len() - line.trim_start().len();
+                    let new_indent = (current_line_indent as i32 + indent_diff).max(0) as usize;
+                    format!("{}{}", " ".repeat(new_indent), line.trim_start())
+                  }
+                })
+                .collect::<Vec<_>>()
+                .join("\n");
+
+              let replace_range = TextRange::new(rowan::TextSize::from(line_start_of_first_entry as u32), sequence_range.end());
+
+              edits.push((replace_range, reindented));
+            }
+          }
+        }
+
+        rowan::NodeOrToken::Token(ref token) => {
+          if converted_ranges.iter().any(|range| range.contains_range(token.text_range())) {
+            continue;
+          }
+
+          let current_kind = token.kind();
+
+          if let Some(ref key_style) = enforcement.key_style {
+            if is_map_key(token)
+              && matches!(
+                current_kind,
+                SyntaxKind::PLAIN_SCALAR | SyntaxKind::DOUBLE_QUOTED_SCALAR | SyntaxKind::SINGLE_QUOTED_SCALAR
+              )
+            {
+              let target_kind = key_style.to_syntax_kind();
+
+              if current_kind != target_kind {
+                let raw_value = match current_kind {
+                  SyntaxKind::DOUBLE_QUOTED_SCALAR => {
+                    let text = token.text();
+
+                    unescape_double_quoted(&text[1..text.len() - 1])
+                  }
+
+                  SyntaxKind::SINGLE_QUOTED_SCALAR => {
+                    let text = token.text();
+
+                    unescape_single_quoted(&text[1..text.len() - 1])
+                  }
+
+                  SyntaxKind::PLAIN_SCALAR => token.text().to_string(),
+
+                  _ => continue,
+                };
+
+                let new_text = match key_style {
+                  crate::KeyStyle::Double => {
+                    let escaped = raw_value.replace('\\', "\\\\").replace('"', "\\\"");
+
+                    format!("\"{}\"", escaped)
+                  }
+
+                  crate::KeyStyle::Single => {
+                    let escaped = raw_value.replace('\'', "''");
+
+                    format!("'{}'", escaped)
+                  }
+
+                  crate::KeyStyle::Plain => raw_value,
+                };
+
+                if new_text != token.text() {
+                  edits.push((token.text_range(), new_text));
+                }
+              }
+
+              continue;
+            }
+          }
+
+          if let Some(ref value_style) = enforcement.value_style {
+            if is_map_key(token) {
+              continue;
+            }
+
+            let is_inline_scalar = matches!(
+              current_kind,
+              SyntaxKind::PLAIN_SCALAR | SyntaxKind::DOUBLE_QUOTED_SCALAR | SyntaxKind::SINGLE_QUOTED_SCALAR
+            );
+
+            if !is_inline_scalar {
+              continue;
+            }
+
+            if value_style.is_block_scalar() {
+              continue;
+            }
+
+            let target_kind = value_style.to_syntax_kind();
+
+            if current_kind == target_kind {
+              continue;
+            }
+
+            let raw_value = match current_kind {
+              SyntaxKind::DOUBLE_QUOTED_SCALAR => {
+                let text = token.text();
+                unescape_double_quoted(&text[1..text.len() - 1])
+              }
+
+              SyntaxKind::SINGLE_QUOTED_SCALAR => {
+                let text = token.text();
+                unescape_single_quoted(&text[1..text.len() - 1])
+              }
+
+              SyntaxKind::PLAIN_SCALAR => token.text().to_string(),
+
+              _ => continue,
+            };
+
+            if current_kind == SyntaxKind::PLAIN_SCALAR && is_yaml_non_string(&raw_value) {
+              continue;
+            }
+
+            let new_text = match value_style {
+              QuoteStyle::Double => {
+                if raw_value.contains('"') && current_kind == SyntaxKind::SINGLE_QUOTED_SCALAR {
+                  continue;
+                }
+
+                let escaped = raw_value.replace('\\', "\\\\").replace('"', "\\\"");
+
+                format!("\"{}\"", escaped)
+              }
+
+              QuoteStyle::Single => {
+                let escaped = raw_value.replace('\'', "''");
+                format!("'{}'", escaped)
+              }
+
+              QuoteStyle::Plain => {
+                if raw_value.contains('"') || raw_value.contains('\'') || raw_value.contains(':') || raw_value.contains('#') {
+                  continue;
+                }
+
+                raw_value
+              }
+
+              _ => continue,
+            };
+
+            if new_text != token.text() {
+              edits.push((token.text_range(), new_text));
+            }
+          }
+        }
+      }
+    }
+
+    if edits.is_empty() {
+      return Ok(());
+    }
+
+    edits.sort_by_key(|edit| std::cmp::Reverse(edit.0.start()));
+
+    let mut new_source = source;
+
+    for (range, replacement) in edits {
+      let start: usize = range.start().into();
+      let end: usize = range.end().into();
+
+      new_source.replace_range(start..end, &replacement);
+    }
+
+    let path = self.path.take();
+    *self = Self::parse(&new_source)?;
+    self.path = path;
+
+    Ok(())
+  }
+
+  pub fn enforce_collection_style(&mut self, style: &str, dot_path: Option<&str>) -> Result<(), YerbaError> {
+    let scope_path = dot_path.unwrap_or("");
+
+    if scope_path.contains("[]") {
+      let concrete_selectors = self.resolve_selectors(scope_path);
+
+      for selector in concrete_selectors.iter().rev() {
+        self.enforce_collection_style(style, Some(selector))?;
+      }
+
+      return Ok(());
+    }
+
+    match style {
+      "block" | "flow" => {}
+      _ => {
+        return Err(YerbaError::ParseError(format!(
+          "unknown collection style '{}'. Valid options: flow, block",
+          style
+        )))
+      }
+    }
+
+    if style == "block" {
+      let has_flow = self
+        .root
+        .descendants_with_tokens()
+        .any(|element| matches!(element.kind(), SyntaxKind::FLOW_SEQ | SyntaxKind::FLOW_MAP));
+
+      if !has_flow {
+        return Ok(());
+      }
+    }
+
+    let value = match self.get_value(scope_path) {
+      Some(value) => value,
+      None => return Ok(()),
+    };
+
+    let mut selectors = Vec::new();
+
+    if !scope_path.is_empty() {
+      selectors.push(scope_path.to_string());
+    }
+
+    collect_selectors(&value, scope_path, &mut selectors);
+
+    let mut collection_selectors: Vec<String> = selectors
+      .into_iter()
+      .filter(|selector| self.get_collection_style(selector).is_some_and(|current_style| current_style != style))
+      .collect();
+
+    collection_selectors.sort_by_key(|selector| std::cmp::Reverse(selector.len()));
+
+    for selector in &collection_selectors {
+      self.set_collection_style(selector, style)?;
+    }
+
+    Ok(())
+  }
+
+  pub fn enforce_sequence_indent(&mut self, style: &str, dot_path: Option<&str>) -> Result<(), YerbaError> {
+    let scope_path = dot_path.unwrap_or("");
+
+    if scope_path.contains("[]") {
+      let concrete_selectors = self.resolve_selectors(scope_path);
+
+      for selector in concrete_selectors.iter().rev() {
+        self.enforce_sequence_indent(style, Some(selector))?;
+      }
+
+      return Ok(());
+    }
+
+    let scope_node = if scope_path.is_empty() {
+      self.root.clone()
+    } else {
+      match self.navigate(scope_path) {
+        Ok(node) => node,
+        Err(_) => return Ok(()),
+      }
+    };
+
+    let has_mismatches = scope_node.descendants().any(|descendant| {
+      if !BlockSeq::can_cast(descendant.kind()) {
+        return false;
+      }
+
+      let sequence = match BlockSeq::cast(descendant.clone()) {
+        Some(sequence) => sequence,
+        None => return false,
+      };
+
+      let first_entry = match sequence.entries().next() {
+        Some(entry) => entry,
+        None => return false,
+      };
+
+      let parent_entry = match descendant.ancestors().find(|ancestor| ancestor.kind() == SyntaxKind::BLOCK_MAP_ENTRY) {
+        Some(entry) => entry,
+        None => return false,
+      };
+
+      let key_indent_length = preceding_whitespace_indent(&parent_entry).len();
+      let entry_indent_length = preceding_whitespace_indent(first_entry.syntax()).len();
+      let is_indented = entry_indent_length > key_indent_length;
+
+      match style {
+        "indented" => !is_indented,
+        "compact" => is_indented,
+        _ => false,
+      }
+    });
+
+    if !has_mismatches {
+      return Ok(());
+    }
+
+    loop {
+      let value = match self.get_value(scope_path) {
+        Some(value) => value,
+        None => return Ok(()),
+      };
+
+      let mut selectors = Vec::new();
+
+      if !scope_path.is_empty() {
+        selectors.push(scope_path.to_string());
+      }
+
+      collect_selectors(&value, scope_path, &mut selectors);
+
+      let concrete_selectors: Vec<String> = selectors
+        .into_iter()
+        .flat_map(|selector| {
+          if selector.contains("[]") {
+            self.resolve_selectors(&selector)
+          } else {
+            vec![selector]
+          }
+        })
+        .collect();
+
+      let mut sequence_selectors: Vec<String> = concrete_selectors
+        .into_iter()
+        .filter(|selector| self.get_sequence_indent(selector).is_some_and(|current_style| current_style != style))
+        .collect();
+
+      if sequence_selectors.is_empty() {
+        return Ok(());
+      }
+
+      sequence_selectors.sort_by_key(|selector| std::cmp::Reverse(selector.len()));
+
+      self.set_sequence_indent(&sequence_selectors[0], style)?;
+    }
+  }
+
+  pub fn set_sequence_indent(&mut self, dot_path: &str, style: &str) -> Result<(), YerbaError> {
+    let current_style = self
+      .get_sequence_indent(dot_path)
+      .ok_or_else(|| YerbaError::ParseError(format!("'{}' is not a block sequence", dot_path)))?;
+
+    if current_style == style {
+      return Ok(());
+    }
+
+    if style != "indented" && style != "compact" {
+      return Err(YerbaError::ParseError(format!(
+        "unknown sequence indent style '{}'. Valid options: compact, indented",
+        style
+      )));
+    }
+
+    let current_node = self.navigate(dot_path)?;
+    let source = self.to_string();
+
+    let entry_node = current_node
+      .ancestors()
+      .find(|ancestor| ancestor.kind() == SyntaxKind::BLOCK_MAP_ENTRY)
+      .ok_or_else(|| YerbaError::ParseError("could not find parent map entry".to_string()))?;
+
+    let entry_start: usize = entry_node.text_range().start().into();
+    let line_start = source[..entry_start].rfind('\n').map(|position| position + 1).unwrap_or(0);
+    let key_indent_length = entry_start - line_start;
+
+    let sequence = current_node
+      .descendants()
+      .find_map(BlockSeq::cast)
+      .ok_or_else(|| YerbaError::ParseError("could not find block sequence".to_string()))?;
+
+    let first_entry = sequence.entries().next();
+
+    if first_entry.is_none() {
+      return Ok(());
+    }
+
+    let current_entry_indent_length = preceding_whitespace_indent(first_entry.unwrap().syntax()).len();
+
+    let indent_diff: i32 = match style {
+      "indented" => (key_indent_length as i32 + 2) - current_entry_indent_length as i32,
+      "compact" => key_indent_length as i32 - current_entry_indent_length as i32,
+      _ => unreachable!(),
+    };
+
+    if indent_diff == 0 {
+      return Ok(());
+    }
+
+    let sequence_range = sequence.syntax().text_range();
+    let sequence_start: usize = sequence_range.start().into();
+    let sequence_end: usize = sequence_range.end().into();
+
+    let before_sequence = &source[..sequence_start];
+    let line_start_of_first_entry = before_sequence.rfind('\n').map(|position| position + 1).unwrap_or(0);
+    let full_text = &source[line_start_of_first_entry..sequence_end];
+
+    let reindented: String = full_text
+      .lines()
+      .map(|line| {
+        if line.trim().is_empty() {
+          String::new()
+        } else {
+          let current_line_indent = line.len() - line.trim_start().len();
+          let new_indent = (current_line_indent as i32 + indent_diff).max(0) as usize;
+          format!("{}{}", " ".repeat(new_indent), line.trim_start())
+        }
+      })
+      .collect::<Vec<_>>()
+      .join("\n");
+
+    let replace_range = TextRange::new(rowan::TextSize::from(line_start_of_first_entry as u32), sequence_range.end());
+
+    self.apply_edit(replace_range, &reindented)
+  }
+
+  pub fn set_collection_style(&mut self, dot_path: &str, style: &str) -> Result<(), YerbaError> {
+    let current_style = self
+      .get_collection_style(dot_path)
+      .ok_or_else(|| YerbaError::ParseError(format!("'{}' is not a collection (sequence or map)", dot_path)))?;
+
+    if current_style == style {
+      return Ok(());
+    }
+
+    let current_node = self.navigate(dot_path)?;
+    let value = node_to_yaml_value(&current_node);
+
+    match &value {
+      yaml_serde::Value::Sequence(sequence) if sequence.is_empty() => return Ok(()),
+      yaml_serde::Value::Mapping(mapping) if mapping.is_empty() => return Ok(()),
+      _ => {}
+    }
+
+    let source = self.to_string();
+
+    let entry_node = current_node.ancestors().find(|ancestor| ancestor.kind() == SyntaxKind::BLOCK_MAP_ENTRY);
+
+    let (key_indent, colon_in_line) = if let Some(ref entry) = entry_node {
+      let entry_start: usize = entry.text_range().start().into();
+      let entry_line_start = source[..entry_start].rfind('\n').map(|position| position + 1).unwrap_or(0);
+      let indent = entry_start - entry_line_start;
+
+      let entry_text = entry.text().to_string();
+      let colon_offset = entry_text.find(':').map(|offset| entry_start + offset);
+
+      (indent, colon_offset)
+    } else {
+      (0, None)
+    };
+
+    match style {
+      "flow" => {
+        let flow_text = crate::yaml_writer::yaml_value_to_flow_text(&value);
+
+        let collection_node = current_node
+          .descendants()
+          .find(|descendant| descendant.kind() == SyntaxKind::BLOCK_SEQ || descendant.kind() == SyntaxKind::BLOCK_MAP)
+          .ok_or_else(|| YerbaError::ParseError("could not find block collection node".to_string()))?;
+
+        let block_end: usize = collection_node.text_range().end().into();
+
+        if let Some(colon_position) = colon_in_line {
+          let replace_range = TextRange::new(rowan::TextSize::from((colon_position + 1) as u32), rowan::TextSize::from(block_end as u32));
+
+          self.apply_edit(replace_range, &format!(" {}", flow_text))
+        } else {
+          let replace_range = collection_node.text_range();
+
+          self.apply_edit(replace_range, &flow_text)
+        }
+      }
+
+      "block" => {
+        let flow_node = current_node
+          .descendants()
+          .find(|descendant| descendant.kind() == SyntaxKind::FLOW_SEQ || descendant.kind() == SyntaxKind::FLOW_MAP)
+          .ok_or_else(|| YerbaError::ParseError("could not find flow collection node".to_string()))?;
+
+        let flow_end: usize = flow_node.text_range().end().into();
+        let value_indent = key_indent + 2;
+        let block_text = crate::yaml_writer::yaml_value_to_block_text(&value, value_indent);
+
+        if let Some(colon_position) = colon_in_line {
+          let replace_range = TextRange::new(rowan::TextSize::from((colon_position + 1) as u32), rowan::TextSize::from(flow_end as u32));
+
+          self.apply_edit(replace_range, &format!("\n{}", block_text))
+        } else {
+          let replace_range = flow_node.text_range();
+
+          self.apply_edit(replace_range, &format!("\n{}", block_text))
+        }
+      }
+
+      _ => Err(YerbaError::ParseError(format!(
+        "unknown collection style '{}'. Valid options: flow, block",
+        style
+      ))),
+    }
+  }
+
   pub fn enforce_blank_lines(&mut self, dot_path: &str, blank_lines: usize) -> Result<(), YerbaError> {
     let nodes = if dot_path.contains('[') {
       self.navigate_all_compact(dot_path)
@@ -363,7 +970,7 @@ impl Document {
             _ => continue,
           };
 
-          if raw_value.is_empty() || is_yaml_non_string(&raw_value) {
+          if is_yaml_non_string(&raw_value) {
             continue;
           }
 
@@ -413,7 +1020,7 @@ impl Document {
           _ => continue,
         };
 
-        if is_yaml_non_string(&raw_value) {
+        if current_kind == SyntaxKind::PLAIN_SCALAR && is_yaml_non_string(&raw_value) {
           continue;
         }
 

data/rust/src/ffi.rs

@@ -351,6 +351,52 @@ pub unsafe extern "C" fn yerba_document_set_quote_style(document: *mut Document,
   }
 }
 
+#[no_mangle]
+pub unsafe extern "C" fn yerba_document_get_collection_style(document: *const Document, path: *const c_char) -> *mut c_char {
+  let document = &*document;
+  let selector_string = CStr::from_ptr(path).to_str().unwrap_or("");
+
+  match document.get_collection_style(selector_string) {
+    Some(style) => CString::new(style).map(|s| s.into_raw()).unwrap_or(std::ptr::null_mut()),
+    None => std::ptr::null_mut(),
+  }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn yerba_document_set_collection_style(document: *mut Document, path: *const c_char, style: *const c_char) -> YerbaResult {
+  let document = &mut *document;
+  let selector_string = CStr::from_ptr(path).to_str().unwrap_or("");
+  let style_string = CStr::from_ptr(style).to_str().unwrap_or("");
+
+  match document.set_collection_style(selector_string, style_string) {
+    Ok(()) => YerbaResult::ok(),
+    Err(e) => YerbaResult::err(&e.to_string()),
+  }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn yerba_document_get_sequence_indent(document: *const Document, path: *const c_char) -> *mut c_char {
+  let document = &*document;
+  let selector_string = CStr::from_ptr(path).to_str().unwrap_or("");
+
+  match document.get_sequence_indent(selector_string) {
+    Some(style) => CString::new(style).map(|s| s.into_raw()).unwrap_or(std::ptr::null_mut()),
+    None => std::ptr::null_mut(),
+  }
+}
+
+#[no_mangle]
+pub unsafe extern "C" fn yerba_document_set_sequence_indent(document: *mut Document, path: *const c_char, style: *const c_char) -> YerbaResult {
+  let document = &mut *document;
+  let selector_string = CStr::from_ptr(path).to_str().unwrap_or("");
+  let style_string = CStr::from_ptr(style).to_str().unwrap_or("");
+
+  match document.set_sequence_indent(selector_string, style_string) {
+    Ok(()) => YerbaResult::ok(),
+    Err(e) => YerbaResult::err(&e.to_string()),
+  }
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn yerba_document_evaluate_condition(document: *const Document, parent_path: *const c_char, condition: *const c_char) -> bool {
   let document = &*document;

data/rust/src/lib.rs

@@ -10,6 +10,7 @@ mod syntax;
 mod yaml_writer;
 pub mod yerbafile;
 
+pub use document::style::StyleEnforcement;
 pub use document::{collect_selectors, Document, DuplicateInfo, InsertPosition, LocatedNode, Location, NodeInfo, NodeType, SortField};
 pub use error::YerbaError;
 pub use quote_style::{KeyStyle, QuoteStyle};