yerba 0.7.1-aarch64-linux-gnu → 0.7.3-aarch64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707ccb13f6302905ec41b66a43e393c948ffd61b0bcd465ceba44523ab271b79
-  data.tar.gz: 4e894b3193f091b2171e7c1049e41c68c4efdc104c60b80c0d710d0dea961267
+  metadata.gz: f833e343807c30f0370315dd082a4bb931ef283ab61da1917185bd993c192185
+  data.tar.gz: b6a4090bea313c06a5a7c6ac23638e8d223c3869a6d117fa4f3508260bae1245
 SHA512:
-  metadata.gz: 303099f898671db798cac8c13cc54b820ceb00aa61a1473636f20ea485c393d6732f339e315ff313ef33e24411196e6b5e94b1bd026ed9a1cd9f593bc97b1392
-  data.tar.gz: 976fdc7159877d38f43578beafb71d5ee8f6db6f78ee0326dbe1b58fdd5e0c8815ed8e5e62bdcd6a9e4416e1d2792c4849e82764ff07665f7030cb1403474a84
+  metadata.gz: 1bea0a8fd3cf92f0e8f814884d35b1b8ebfba4ef28498f377f3f4343e23db5cfaa50f48ac0e8dd5832f32824410ce3bdad208c60dfc97e9c74d42a5d179c83e9
+  data.tar.gz: e49bc007a98d7871b67cad0c4095512db1c28f88f1b2b2868fff0913ea4970df85a859100fba6149c7f93ce77dd42f1c27fb0cb7eef4888ec98c121633636091

data/ext/yerba/include/yerba.h

@@ -72,6 +72,11 @@ void yerba_document_free(struct Document *document);
 
 struct YerbaGetResult yerba_document_get(const struct Document *document, const char *path);
 
+/**
+ * Caller must free with yerba_string_free.
+ */
+char *yerba_document_source(const struct Document *document, const char *path);
+
 /**
  * Caller must free with yerba_string_free.
  */

data/ext/yerba/yerba.c

@@ -119,10 +119,12 @@ static VALUE document_initialize(int argc, VALUE *argv, VALUE self) {
   if (NIL_P(path)) {
     result = yerba_document_parse("---\n");
     rb_iv_set(self, "@path", Qnil);
+    rb_iv_set(self, "@loaded_mtime", Qnil);
   } else {
     const char *file_path = StringValueCStr(path);
     result = yerba_document_parse_file(file_path);
     rb_iv_set(self, "@path", path);
+    rb_iv_set(self, "@loaded_mtime", rb_funcall(rb_cFile, rb_intern("mtime"), 1, path));
   }
 
   if (!result.document) {
@@ -297,6 +299,19 @@ static VALUE document_valid_selector_p(VALUE self, VALUE path) {
   return yerba_document_valid_selector(document, StringValueCStr(path)) ? Qtrue : Qfalse;
 }
 
+/* document.source(path) → raw YAML text of the node at path */
+static VALUE document_source(VALUE self, VALUE path) {
+  struct Document *document = get_document(self);
+  char *text = yerba_document_source(document, StringValueCStr(path));
+
+  if (!text) return Qnil;
+
+  VALUE result = make_utf8_string(text);
+  yerba_string_free(text);
+
+  return result;
+}
+
 /* document.get_value(path) → parsed Ruby object (Hash/Array/String/Integer/etc) */
 static VALUE document_get_value(VALUE self, VALUE path) {
   struct Document *document = get_document(self);
@@ -1091,6 +1106,7 @@ void Init_yerba(void) {
   rb_define_method(rb_cDocument, "blank_lines", document_blank_lines, 2);
   rb_define_method(rb_cDocument, "apply_yerbafile", document_apply_yerbafile, -1);
   rb_define_method(rb_cDocument, "validate_schema", document_validate_schema, -1);
+  rb_define_method(rb_cDocument, "source", document_source, 1);
   rb_define_method(rb_cDocument, "to_s", document_to_s, 0);
   rb_define_method(rb_cDocument, "write!", document_save, 0);
   rb_define_method(rb_cDocument, "changed?", document_changed_p, 0);

data/lib/yerba/document.rb

@@ -64,9 +64,16 @@ module Yerba
 
     def save_to!(path)
       @path = path
+      @loaded_mtime = nil
       save!
     end
 
+    def stale?
+      return false unless @path && @loaded_mtime
+
+      File.mtime(@path) != @loaded_mtime
+    end
+
     def dig(*keys)
       keys.reduce(self) { |node, key| node.nil? ? nil : node[key] }
     end
@@ -106,15 +113,18 @@ module Yerba
     end
 
     def save!(apply: false)
+      check_stale!
       Yerbafile.apply!(self, apply) if apply
       write!
-
+      @loaded_mtime = File.mtime(@path) if @path
       self
     end
 
     def apply!(yerbafile = nil)
+      check_stale!
       apply(yerbafile)
       write! if changed?
+      @loaded_mtime = File.mtime(@path) if @path
 
       self
     end
@@ -157,6 +167,16 @@ module Yerba
       raise Yerba::SelectorNotFoundError, message
     end
 
+    private
+
+    def check_stale!
+      return unless stale?
+
+      raise Yerba::StaleFileError, "#{@path} was modified externally since it was loaded"
+    end
+
+    public
+
     def inspect
       if path
         "#<Yerba::Document path=#{path.inspect}>"

data/lib/yerba/map.rb

@@ -161,6 +161,10 @@ module Yerba
     end
     alias to_hash to_h
 
+    def to_s
+      source || to_yaml
+    end
+
     def to_yaml
       to_hash.map do |key, val|
         formatted = format_value(val)

data/lib/yerba/node.rb

@@ -20,6 +20,12 @@ module Yerba
       !@document.nil? || !@file_path.nil?
     end
 
+    def source
+      return nil unless connected? && @selector
+
+      document.source(@selector)
+    end
+
     module ClassMethods
       def from_document(document, selector, location = nil, key = nil, **attributes)
         instance = allocate

data/lib/yerba/sequence.rb

@@ -281,6 +281,10 @@ module Yerba
       end.join("\n")
     end
 
+    def to_s
+      source || super
+    end
+
     def inspect
       list = items
       preview = list.first(5).map(&:inspect).join(", ")

data/lib/yerba/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yerba
-  VERSION = "0.7.1"
+  VERSION = "0.7.3"
 end

data/lib/yerba.rb

@@ -30,6 +30,7 @@ module Yerba
   class ExecutableNotFoundError < StandardError; end
   class CompilationError < StandardError; end
   class SelectorNotFoundError < StandardError; end
+  class StaleFileError < StandardError; end
 
   GEM_NAME = "yerba"
   EXECUTABLE_NAME = "yerba"

data/rust/Cargo.lock

@@ -1772,7 +1772,7 @@ dependencies = [
 
 [[package]]
 name = "yerba"
-version = "0.7.1"
+version = "0.7.3"
 dependencies = [
  "cbindgen",
  "clap",

data/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "yerba"
-version = "0.7.1"
+version = "0.7.3"
 edition = "2021"
 authors = ["Marco Roth <marco.roth@intergga.ch>"]
 description = "YAML Editing and Refactoring with Better Accuracy"

data/rust/src/document/condition.rs

@@ -11,7 +11,7 @@ impl Document {
   }
 
   pub fn filter_with_selectors(&self, dot_path: &str, condition: &str) -> Vec<(yaml_serde::Value, String, usize)> {
-    let source = self.root.text().to_string();
+    let source = self.source_text();
 
     self
       .navigate_all_compact(dot_path)
@@ -19,7 +19,7 @@ impl Document {
       .filter(|node| self.evaluate_condition_on_node(node, condition))
       .map(|node| {
         let offset: usize = node.text_range().start().into();
-        let line = source[..offset].matches('\n').count() + 1;
+        let line = line_at(&source, offset);
 
         (node_to_yaml_value(node), super::get::node_selector(node), line)
       })
@@ -52,7 +52,7 @@ impl Document {
         }
 
         for node in &target_nodes {
-          if let Some(sequence) = node.descendants().find_map(BlockSeq::cast) {
+          if let Some(sequence) = find_block_sequence(node) {
             for entry in sequence.entries() {
               if let Some(text) = entry.flow().and_then(|flow| extract_scalar_text(flow.syntax())) {
                 if text == right {
@@ -67,7 +67,7 @@ impl Document {
       }
       "not_contains" => {
         for node in &target_nodes {
-          if let Some(sequence) = node.descendants().find_map(BlockSeq::cast) {
+          if let Some(sequence) = find_block_sequence(node) {
             for entry in sequence.entries() {
               if let Some(text) = entry.flow().and_then(|flow| extract_scalar_text(flow.syntax())) {
                 if text == right {

data/rust/src/document/delete.rs

@@ -13,10 +13,7 @@ impl Document {
       let (parent_path, source_key) = source_path.rsplit_once('.').unwrap_or(("", source_path));
       let parent_node = self.navigate(parent_path)?;
 
-      let map = parent_node
-        .descendants()
-        .find_map(BlockMap::cast)
-        .ok_or_else(|| YerbaError::SelectorNotFound(source_path.to_string()))?;
+      let map = find_block_map(&parent_node).ok_or_else(|| YerbaError::SelectorNotFound(source_path.to_string()))?;
 
       let entry = find_entry_by_key(&map, source_key).ok_or_else(|| YerbaError::SelectorNotFound(source_path.to_string()))?;
       let key_node = entry.key().ok_or_else(|| YerbaError::SelectorNotFound(source_path.to_string()))?;
@@ -46,10 +43,7 @@ impl Document {
 
         if parent_path.is_empty() && !has_wildcard {
           let parent_node = self.navigate(&parent_path)?;
-          let map = parent_node
-            .descendants()
-            .find_map(BlockMap::cast)
-            .ok_or_else(|| YerbaError::SelectorNotFound(dot_path.to_string()))?;
+          let map = find_block_map(&parent_node).ok_or_else(|| YerbaError::SelectorNotFound(dot_path.to_string()))?;
 
           let entry = find_entry_by_key(&map, last_key).ok_or_else(|| YerbaError::SelectorNotFound(dot_path.to_string()))?;
 
@@ -67,10 +61,7 @@ impl Document {
         }
 
         if parent_nodes.len() == 1 && !has_wildcard {
-          let map = parent_nodes[0]
-            .descendants()
-            .find_map(BlockMap::cast)
-            .ok_or_else(|| YerbaError::SelectorNotFound(dot_path.to_string()))?;
+          let map = find_block_map(&parent_nodes[0]).ok_or_else(|| YerbaError::SelectorNotFound(dot_path.to_string()))?;
 
           let entry = find_entry_by_key(&map, last_key).ok_or_else(|| YerbaError::SelectorNotFound(dot_path.to_string()))?;
 
@@ -80,24 +71,16 @@ impl Document {
         let mut ranges: Vec<TextRange> = Vec::new();
 
         for parent_node in &parent_nodes {
-          if let Some(map) = parent_node.descendants().find_map(BlockMap::cast) {
+          if let Some(map) = find_block_map(parent_node) {
             if let Some(entry) = find_entry_by_key(&map, last_key) {
               ranges.push(removal_range(entry.syntax()));
             }
           }
         }
 
-        if ranges.is_empty() {
-          return Ok(());
-        }
-
-        ranges.reverse();
-
-        for range in ranges {
-          self.apply_edit(range, "")?;
-        }
+        let edits = ranges.into_iter().map(|range| (range, String::new())).collect();
 
-        Ok(())
+        self.apply_edits(edits)
       }
 
       crate::selector::SelectorSegment::Index(index) => self.remove_at(&parent_path, *index),
@@ -108,10 +91,7 @@ impl Document {
   pub fn remove(&mut self, dot_path: &str, value: &str) -> Result<(), YerbaError> {
     let current_node = self.navigate(dot_path)?;
 
-    let sequence = current_node
-      .descendants()
-      .find_map(BlockSeq::cast)
-      .ok_or_else(|| YerbaError::NotASequence(dot_path.to_string()))?;
+    let sequence = find_block_sequence(&current_node).ok_or_else(|| YerbaError::NotASequence(dot_path.to_string()))?;
 
     let target_entry = sequence
       .entries()
@@ -132,10 +112,7 @@ impl Document {
 
     let current_node = self.navigate(dot_path)?;
 
-    let sequence = current_node
-      .descendants()
-      .find_map(BlockSeq::cast)
-      .ok_or_else(|| YerbaError::NotASequence(dot_path.to_string()))?;
+    let sequence = find_block_sequence(&current_node).ok_or_else(|| YerbaError::NotASequence(dot_path.to_string()))?;
 
     let entries: Vec<_> = sequence.entries().collect();
 

data/rust/src/document/get.rs

@@ -83,7 +83,7 @@ impl Document {
   }
 
   pub fn get_all_located(&self, dot_path: &str) -> Vec<LocatedNode> {
-    let source = self.root.text().to_string();
+    let source = self.source_text();
     let file_path = self.path.as_ref().map(|p| p.to_string_lossy().to_string());
 
     self
@@ -91,7 +91,7 @@ impl Document {
       .iter()
       .map(|node| {
         let offset: usize = node.text_range().start().into();
-        let line = source[..offset].matches('\n').count() + 1;
+        let line = line_at(&source, offset);
         let selector = node_selector(node);
         let is_scalar = !node
           .descendants()
@@ -108,13 +108,8 @@ impl Document {
         let node_type = if is_scalar {
           "scalar"
         } else {
-          let map_pos = node.descendants().find_map(BlockMap::cast).map(|m| m.syntax().text_range().start());
-          let seq_pos = node.descendants().find_map(BlockSeq::cast).map(|s| s.syntax().text_range().start());
-
-          match (map_pos, seq_pos) {
-            (Some(m), Some(s)) if s < m => "sequence",
-            (Some(_), _) => "map",
-            (None, Some(_)) => "sequence",
+          match first_collection(node) {
+            Some(FirstCollection::Sequence(_)) => "sequence",
             _ => "map",
           }
         };
@@ -142,7 +137,7 @@ impl Document {
 
   pub fn get_node_info(&self, dot_path: &str) -> NodeInfo {
     let selector = crate::selector::Selector::parse(dot_path);
-    let source = self.root.text().to_string();
+    let source = self.source_text();
 
     let (location, key_name, key_location) = self.resolve_location(dot_path, &source);
 
@@ -364,7 +359,7 @@ impl Document {
       self.navigate(parent_path).ok()?
     };
 
-    let map = parent_node.descendants().find_map(BlockMap::cast)?;
+    let map = find_block_map(&parent_node)?;
 
     find_entry_by_key(&map, last_key).map(|entry| entry.syntax().clone())
   }
@@ -375,7 +370,7 @@ impl Document {
       Err(_) => return Vec::new(),
     };
 
-    let sequence = match current_node.descendants().find_map(BlockSeq::cast) {
+    let sequence = match find_block_sequence(&current_node) {
       Some(sequence) => sequence,
       None => return Vec::new(),
     };
@@ -403,17 +398,16 @@ impl Document {
   pub fn get_sequence_indent(&self, dot_path: &str) -> Option<&'static str> {
     let current_node = self.navigate(dot_path).ok()?;
 
-    let sequence = current_node.descendants().find_map(BlockSeq::cast)?;
+    let sequence = find_block_sequence(&current_node)?;
     let first_entry = sequence.entries().next()?;
 
     let entry_indent = preceding_whitespace_indent(first_entry.syntax());
 
     let entry_node = current_node.ancestors().find(|ancestor| ancestor.kind() == SyntaxKind::BLOCK_MAP_ENTRY)?;
 
-    let source = self.root.text().to_string();
+    let source = self.source_text();
     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 = &source[line_start..entry_start];
+    let key_indent = &source[line_start_at(&source, entry_start)..entry_start];
 
     if entry_indent.len() > key_indent.len() {
       Some("indented")