yerba 0.4.2 → 0.5.0

data/lib/yerba/map.rb

@@ -3,51 +3,46 @@
 module Yerba
   class Map
     include Enumerable
+    include Node
 
-    attr_reader :selector, :location, :key
-
-    def initialize(document_or_hash = nil, selector = nil, location = nil, key = nil)
-      if document_or_hash.is_a?(Document)
-        @document = document_or_hash
-        @selector = selector
-        @location = location
-        @key = key
-        @data = nil
-      elsif document_or_hash.is_a?(Hash)
-        @document = nil
-        @selector = nil
-        @location = nil
-        @data = document_or_hash
-      else
-        @document = nil
-        @selector = nil
-        @location = nil
-        @data = {}
-      end
+    def initialize(hash = nil, **data)
+      init_node(nil, nil, nil, nil, nil, nil)
+
+      @data = if hash.is_a?(Hash)
+                hash
+              else
+                (data.empty? ? {} : data)
+              end
     end
 
     def [](key)
-      if @document
+      if connected?
         new_path = @selector.empty? ? key.to_s : "#{@selector}.#{key}"
-        @document[new_path]
+        document[new_path]
       else
         @data[key]
       end
     end
 
     def []=(key, value)
-      if @document
+      if connected?
         new_path = @selector.empty? ? key.to_s : "#{@selector}.#{key}"
-        @document.set(new_path, value)
+
+        if document.exists?(new_path)
+          document.set(new_path, value)
+        else
+          document.insert(new_path, value)
+        end
       else
         @data[key] = value
       end
     end
 
     def insert(key, value, before: nil, after: nil)
-      if @document
+      if connected?
         new_path = @selector.empty? ? key.to_s : "#{@selector}.#{key}"
-        @document.insert(new_path, value.to_s, before: before, after: after)
+
+        document.insert(new_path, value, before: before, after: after)
       else
         @data[key] = value
       end
@@ -56,14 +51,14 @@ module Yerba
     end
 
     def sort_keys(order)
-      @document&.sort_keys(@selector, order)
+      document&.sort_keys(@selector, order)
 
       self
     end
 
     def keys
-      if @document
-        results = @document.find(@selector)
+      if connected?
+        results = document.find(@selector)
         return [] unless results.is_a?(Array) && results.first.is_a?(Hash)
 
         results.first.keys
@@ -75,28 +70,45 @@ module Yerba
     def each(&)
       return enum_for(:each) unless block_given?
 
-      if @document
+      if connected?
         keys.each { |key| yield key, self[key] }
       else
         @data.each(&)
       end
     end
 
+    def fetch(key)
+      if connected?
+        new_path = @selector.empty? ? key.to_s : "#{@selector}.#{key}"
+        document.fetch(new_path)
+      else
+        @data.fetch(key)
+      end
+    end
+
     def dig(*keys)
-      if @document
-        result = keys.reduce(self) { |node, key| node.nil? ? nil : node[key] }
-        result&.value
+      if connected?
+        keys.reduce(self) { |node, key| node.nil? ? nil : node[key] }
       else
         @data.dig(*keys)
       end
     end
 
+    def value_at(key)
+      if connected?
+        new_path = @selector.empty? ? key.to_s : "#{@selector}.#{key}"
+        document.value_at(new_path)
+      else
+        @data[key]
+      end
+    end
+
     def delete(key = nil)
-      if key && @document
+      if key && connected?
         new_path = @selector.empty? ? key.to_s : "#{@selector}.#{key}"
-        @document.delete(new_path)
-      elsif @document
-        @document.delete(@selector)
+        document.delete(new_path)
+      elsif connected?
+        document.delete(@selector)
       else
         @data.delete(key)
       end
@@ -105,9 +117,9 @@ module Yerba
     end
 
     def key?(key)
-      if @document
+      if connected?
         new_path = @selector.empty? ? key.to_s : "#{@selector}.#{key}"
-        @document.exists?(new_path)
+        document.exists?(new_path)
       else
         @data.key?(key)
       end
@@ -120,8 +132,8 @@ module Yerba
     end
 
     def to_h
-      if @document
-        results = @document.find(@selector)
+      if connected?
+        results = document.find(@selector)
         results&.first || {}
       else
         @data
@@ -137,8 +149,8 @@ module Yerba
     end
 
     def inspect
-      if @document
-        results = @document.find(@selector)
+      if connected?
+        results = document.find(@selector)
 
         if results.is_a?(Array) && !results.empty? && results.first.is_a?(Hash)
           map_keys = results.first.keys.first(5)

data/lib/yerba/node.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Yerba
+  module Node
+    attr_reader :selector, :location, :key
+
+    def file_path
+      @file_path || @document&.path
+    end
+
+    def line
+      @line || @location&.start_line
+    end
+
+    def document
+      @document ||= @file_path ? Yerba::Document.cache[@file_path] : nil
+    end
+
+    def connected?
+      !@document.nil? || !@file_path.nil?
+    end
+
+    module ClassMethods
+      def from_document(document, selector, location = nil, key = nil, **attributes)
+        instance = allocate
+
+        instance.send(:init_node, document, selector, location, key, nil, nil)
+        instance.send(:init_from, **attributes) if instance.respond_to?(:init_from, true)
+
+        instance
+      end
+
+      def from(file_path:, selector:, line: nil, **attributes)
+        instance = allocate
+
+        instance.send(:init_node, nil, selector, nil, nil, file_path, line)
+        instance.send(:init_from, **attributes) if instance.respond_to?(:init_from, true)
+
+        instance
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    private
+
+    def init_node(document, selector, location, key, file_path, line)
+      @document = document
+      @selector = selector
+      @location = location
+      @key = key
+      @file_path = file_path
+      @line = line
+    end
+  end
+end

data/lib/yerba/scalar.rb

@@ -2,42 +2,32 @@
 
 module Yerba
   class Scalar
-    attr_reader :selector, :location, :key
-
-    def initialize(document_or_value, selector_or_opts = nil, value = nil, location = nil, key = nil, quote_style: nil)
-      if document_or_value.is_a?(Document) || document_or_value.nil?
-        @document = document_or_value
-        @selector = selector_or_opts
-        @value = value
-        @location = location
-        @key = key
-        @quote_style = quote_style
-      else
-        @document = nil
-        @selector = nil
-        @value = document_or_value
-        @location = nil
-        @key = nil
-        @quote_style = selector_or_opts.is_a?(Hash) ? selector_or_opts[:quote_style] : quote_style
-      end
+    include Node
+
+    def initialize(value = nil, quote_style: nil)
+      init_node(nil, nil, nil, nil, nil, nil)
+
+      @value = value
+      @quote_style = quote_style
     end
 
     def value
-      @value ||= @document&.get(@selector)
+      @value ||= document&.value_at(@selector)
     end
 
     def quote_style
-      @quote_style || @document&.get_quote_style(@selector)
+      @quote_style || document&.get_quote_style(@selector)
     end
 
     def quote_style=(style)
-      @document&.set_quote_style(@selector, style)
+      document&.set_quote_style(@selector, style)
 
       @quote_style = style
     end
 
     def value=(new_value)
-      @document&.set(@selector, new_value)
+      document&.set(@selector, new_value)
+
       @value = new_value
     end
     alias set value=
@@ -71,7 +61,7 @@ module Yerba
     end
 
     def delete
-      @document&.delete(@selector)
+      document&.delete(@selector)
     end
 
     def inspect
@@ -81,5 +71,12 @@ module Yerba
         "#<Yerba::Scalar value=#{value.inspect} quote_style=#{quote_style.inspect}>"
       end
     end
+
+    private
+
+    def init_from(value: nil, quote_style: nil, **)
+      @value = value
+      @quote_style = quote_style
+    end
   end
 end

data/lib/yerba/sequence.rb

@@ -3,50 +3,67 @@
 module Yerba
   class Sequence
     include Enumerable
+    include Node
 
-    attr_reader :selector, :location, :key
-
-    def initialize(document_or_array = nil, selector = nil, location = nil, key = nil)
-      if document_or_array.is_a?(Document)
-        @document = document_or_array
-        @selector = selector
-        @location = location
-        @key = key
-        @data = nil
-      elsif document_or_array.is_a?(Array)
-        @document = nil
-        @selector = nil
-        @location = nil
-        @data = document_or_array
+    def initialize(array = nil)
+      init_node(nil, nil, nil, nil, nil, nil)
+
+      @data = array.is_a?(Array) ? array : []
+    end
+
+    def [](index)
+      if connected?
+        new_path = "#{@selector}[#{index}]"
+        document[new_path]
       else
-        @document = nil
-        @selector = nil
-        @location = nil
-        @data = []
+        @data[index]
       end
     end
 
-    def [](index)
-      if @document
+    def fetch(index)
+      if connected?
+        new_path = "#{@selector}[#{index}]"
+        result = document[new_path]
+
+        if result.nil?
+          raise IndexError, "index #{index} outside of sequence bounds: 0...#{length}"
+        end
+
+        result
+      else
+        @data.fetch(index)
+      end
+    end
+
+    def dig(*keys)
+      if connected?
+        keys.reduce(self) { |node, key| node.nil? ? nil : node[key] }
+      else
+        @data.dig(*keys)
+      end
+    end
+
+    def value_at(index)
+      if connected?
         new_path = "#{@selector}[#{index}]"
-        @document[new_path]
+        document.value_at(new_path)
       else
         @data[index]
       end
     end
 
     def <<(item)
-      if @document
+      if connected?
         case item
         when Map
-          @document.insert_object(@selector, item.to_hash)
+          document.insert_object(@selector, item.to_hash)
         when Hash
-          @document.insert_object(@selector, item)
+          document.insert_object(@selector, item)
         when Scalar
-          @document.insert(@selector, item.to_yaml)
+          document.insert(@selector, item.to_yaml)
         else
           formatted = format_for_insert(item.to_s)
-          @document.insert(@selector, formatted)
+          document.insert(@selector, formatted)
         end
       else
         @data << item
@@ -56,7 +73,7 @@ module Yerba
     end
 
     def concat(items)
-      if @document
+      if connected?
         hashes = items.map do |item|
           case item
           when Map then item.to_hash
@@ -65,7 +82,7 @@ module Yerba
           end
         end
 
-        @document.insert_objects(@selector, hashes)
+        document.insert_objects(@selector, hashes)
       else
         @data.concat(items)
       end
@@ -90,9 +107,9 @@ module Yerba
     end
 
     def pluck(*fields)
-      return [] unless @document
+      return [] unless connected?
 
-      all_values = @document.get_value(@selector)
+      all_values = document.value_at(@selector)
       return [] unless all_values.is_a?(Array)
 
       if fields.length == 1
@@ -106,11 +123,11 @@ module Yerba
 
     def index_of(selector = nil, value = nil, **criteria)
       if selector && value.nil? && criteria.empty?
-        values = @document&.get("#{@selector}[]")
+        all_values = document&.value_at(@selector)
 
-        return values.index(selector) if values.is_a?(Array)
+        return nil unless all_values.is_a?(Array)
 
-        return nil
+        return all_values.index(selector.to_s)
       end
 
       criteria[selector] = value if selector && value
@@ -124,11 +141,16 @@ module Yerba
         if field_string.include?("[]")
           matching = nested_indices_for(field_string, expected)
         else
-          values = @document&.get("#{@selector}[].#{field_string}")
+          all_values = document&.value_at(@selector)
+
+          next unless all_values.is_a?(Array)
 
-          next unless values.is_a?(Array)
+          matching = all_values.each_with_index.filter_map do |item, index|
+            next unless item.is_a?(Hash)
 
-          matching = values.each_with_index.filter_map { |actual, index| index if actual == expected }
+            actual = dig_into(item, field_string)
+            index if actual.to_s == expected.to_s
+          end
         end
 
         indices = indices ? indices & matching : matching
@@ -139,10 +161,10 @@ module Yerba
 
     def indices_of(selector = nil, value = nil, **criteria)
       if selector && value.nil? && criteria.empty?
-        values = @document&.get("#{@selector}[]")
+        all_values = document&.value_at(@selector)
 
-        if values.is_a?(Array)
-          return values.each_with_index.filter_map { |actual, index| index if actual == selector }
+        if all_values.is_a?(Array)
+          return all_values.each_with_index.filter_map { |actual, index| index if actual.to_s == selector.to_s }
         end
 
         return []
@@ -159,11 +181,16 @@ module Yerba
         if field_string.include?("[]")
           matching = nested_indices_for(field_string, expected)
         else
-          values = @document&.get("#{@selector}[].#{field_string}")
+          all_values = document&.value_at(@selector)
+
+          next unless all_values.is_a?(Array)
 
-          next unless values.is_a?(Array)
+          matching = all_values.each_with_index.filter_map do |item, index|
+            next unless item.is_a?(Hash)
 
-          matching = values.each_with_index.filter_map { |actual, index| index if actual == expected }
+            actual = dig_into(item, field_string)
+            index if actual.to_s == expected.to_s
+          end
         end
 
         indices = indices ? indices & matching : matching
@@ -173,13 +200,13 @@ module Yerba
     end
 
     def length
-      if @document
-        scalar_items = @document.get("#{@selector}[]")
+      if connected?
+        scalar_items = document.value_at("#{@selector}[]")
 
         if scalar_items.is_a?(Array) && !scalar_items.empty?
           scalar_items.length
         else
-          data = @document.get_value(@selector)
+          data = document.value_at(@selector)
 
           data.is_a?(Array) ? data.length : 0
         end
@@ -198,13 +225,13 @@ module Yerba
     end
 
     def remove(value)
-      @document&.remove(@selector, value.to_s)
+      document&.remove(@selector, value.to_s)
 
       self
     end
 
     def delete_at(index)
-      @document&.remove_at(@selector, index)
+      document&.remove_at(@selector, index)
 
       self
     end
@@ -219,20 +246,20 @@ module Yerba
       end
 
       indices_to_remove.reverse_each do |index|
-        @document&.remove_at(@selector, index)
+        document&.remove_at(@selector, index)
       end
 
       self
     end
 
     def sort(by: nil, case_sensitive: false)
-      @document&.sort(@selector, by: by, case_sensitive: case_sensitive)
+      document&.sort(@selector, by: by, case_sensitive: case_sensitive)
 
       self
     end
 
     def delete
-      @document&.delete(@selector)
+      document&.delete(@selector)
     end
 
     def value
@@ -268,6 +295,12 @@ module Yerba
 
     private
 
+    def dig_into(hash, path)
+      keys = path.split(".")
+
+      keys.reduce(hash) { |current, key| current.is_a?(Hash) ? current[key] : nil }
+    end
+
     def expand_nested_criteria(criteria)
       expanded = []
 
@@ -305,7 +338,7 @@ module Yerba
     end
 
     def nested_indices_for(field, expected)
-      all_values = @document&.get_value(@selector)
+      all_values = document&.value_at(@selector)
       return [] unless all_values.is_a?(Array)
 
       all_values.each_with_index.filter_map do |item, index|
@@ -346,17 +379,17 @@ module Yerba
     end
 
     def detect_quote_style
-      @document.get_quote_style("#{@selector}[0]")
+      document.get_quote_style("#{@selector}[0]")
     end
 
     def items
-      if @document
-        result = @document.get("#{@selector}[]")
+      if connected?
+        result = document.value_at("#{@selector}[]")
 
         if result.is_a?(Array) && !result.empty?
           result
         else
-          data = @document.get_value(@selector)
+          data = document.value_at(@selector)
 
           data.is_a?(Array) ? data : []
         end

data/lib/yerba/version.rb

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

data/lib/yerba.rb

@@ -5,6 +5,7 @@ require "fileutils"
 require_relative "yerba/version"
 require_relative "yerba/location"
 require_relative "yerba/formatting"
+require_relative "yerba/node"
 require_relative "yerba/scalar"
 require_relative "yerba/map"
 require_relative "yerba/sequence"
@@ -28,6 +29,7 @@ module Yerba
   class UnsupportedPlatformError < StandardError; end
   class ExecutableNotFoundError < StandardError; end
   class CompilationError < StandardError; end
+  class SelectorNotFoundError < StandardError; end
 
   GEM_NAME = "yerba"
   EXECUTABLE_NAME = "yerba"

data/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "yerba"
-version = "0.4.2"
+version = "0.5.0"
 edition = "2021"
 authors = ["Marco Roth <marco.roth@intergga.ch>"]
 description = "YAML Editing and Refactoring with Better Accuracy"
@@ -29,6 +29,7 @@ serde_json = { version = "1", features = ["preserve_order"] }
 clap = { version = "4", features = ["derive"] }
 indoc = "2"
 rayon = "1"
+jsonschema = "0.29"
 
 [build-dependencies]
 cbindgen = "0.28"

data/rust/src/commands/delete.rs

@@ -33,7 +33,7 @@ impl Args {
       let mut document = parse_file(&resolved_file);
       let result = document.delete(&self.selector);
 
-      run_op(&resolved_file, &document, result);
+      run_op(&self.file, &document, result);
       output(&resolved_file, &document, self.dry_run);
     }
   }