ruby-lsp-ree 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1e4648f75111e19d2590f3baadc308e6b02440c982b62947f8a5c381217f25d
-  data.tar.gz: cb32459d1c9a3f9a185f3679649190a57f9da5a15f8a54eff2e0653c6a7f8850
+  metadata.gz: 46e3cdb9ee36b1b88e20d71c218ce355571da9aa6d405dfe0dcd879e1b37a5ef
+  data.tar.gz: a668bef693a29e639c6acb57f1a8ad2415d630242a2eecc04ff188f3d2fd93f4
 SHA512:
-  metadata.gz: 9e0464c6765abdef69d671440ed281d7829dd4d0178c1faf1274bc9edde0abd0c87ab985f76b19a236fd7288a0d2603d6708690e7b6c025e122e6a04d617199a
-  data.tar.gz: cd97920a10f8525baeb400eb68e83af9844a6935d5a29e37da1724149ba52d65db835591068fa821dc891b8136edf9d0cbbc8f4e8c7c5b31fe8d05a95765ce10
+  metadata.gz: bad0e641f6076ceb9544c0e159598a64e44343e890bddb627603d3ba9c0124b6a654f271e5599bc8e045ab7fac117b1844ce25bac5b6d2c4bb1b8457587b43b4
+  data.tar.gz: 8e691510c967c4788bc3ba9636571644a611bbe909a8e17f1cab4ea140f81f0878f346e0523f7d0020ae3d007248e402a21be3ab4afa201eb7d328afd1c79160

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.1.20] - 2025-05-15
+
+- formatter: add missing columns to entities
+- add missing imports: add missing imports from string interpolation and blocks
+- add missing imports: add imports in dtos
+- Go To Definition: fixed for entities inside dao
+
 ## [0.1.18] - 2025-05-05
 
 - formatter: do not remove links from mappers

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-lsp-ree (0.1.19)
+    ruby-lsp-ree (0.1.20)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -32,7 +32,7 @@ To switch off/on formatter features, use Ruby LSP addon settings:
     }
   }
 ```
-available formatters: `SortLinksFormatter`, `MissingErrorDefinitionsFormatter`, `MissingErrorContractsFormatter`, `MissingErrorLocalesFormatter`, `UnusedLinksFormatter`, `MissingImportsFormatter`, `ImportPackagesFormatter`
+available formatters: `SortLinksFormatter`, `MissingErrorDefinitionsFormatter`, `MissingErrorContractsFormatter`, `MissingErrorLocalesFormatter`, `UnusedLinksFormatter`, `MissingImportsFormatter`, `ImportPackagesFormatter`, `SyncDaoColumnsFormatter`
 
 ## Functions
 

data/lib/ruby_lsp/ruby_lsp_ree/formatters/missing_imports_formatter.rb

@@ -6,6 +6,8 @@ module RubyLsp
     class MissingImportsFormatter < BaseFormatter
       include RubyLsp::Ree::ReeLspUtils
 
+      IGNORE_METHOD_CALL_NAMES = ['build_dto', 'schema']
+
       def call(source, uri)
         return source unless @index
 
@@ -25,6 +27,7 @@ module RubyLsp
         }.compact
 
         objects_to_add.uniq!{ |obj| obj.name }
+        objects_to_add.reject!{ |obj| IGNORE_METHOD_CALL_NAMES.include?(obj.name) }
         objects_to_add.reject!{ |obj| parsed_doc.includes_linked_object?(obj.name) }
         return editor.source if objects_to_add.size == 0
         

data/lib/ruby_lsp/ruby_lsp_ree/formatters/sync_dao_columns_formatter.rb

@@ -0,0 +1,76 @@
+require_relative 'base_formatter'
+
+module RubyLsp
+  module Ree
+    class SyncDaoColumnsFormatter < BaseFormatter
+      include RubyLsp::Ree::ReeLspUtils
+
+      def call(source, uri)
+        path = get_uri_path(uri)
+        path_parts = path.split('/')
+        return source unless path_parts.include?('dao')
+        
+        parsed_doc = RubyLsp::Ree::ParsedDocumentBuilder.build_from_source(source, type: :dao)
+        return source if !parsed_doc
+        
+        parsed_doc.parse_class_includes
+        return source unless parsed_doc.includes_dao_dsl?
+        return source unless parsed_doc.has_schema?
+
+        dao_folder_index = path_parts.index('dao')
+        entities_folder = path_parts.take(dao_folder_index).join('/') + '/entities'
+
+        entity_filename = underscore(parsed_doc.schema_name) + '.rb'
+
+        entity_paths = Dir[File.join(entities_folder, '**', entity_filename)]
+        if entity_paths.size > 1
+          $stderr.puts("multiple entity paths for #{path}")
+          return source
+        elsif entity_paths.size == 0
+          $stderr.puts("no entity paths #{path}")
+          return source
+        end
+
+        entity_path = entity_paths.first
+        entity_source = File.read(entity_path)
+        entity_doc = RubyLsp::Ree::ParsedDocumentBuilder.build_from_source(entity_source, type: :entity)
+
+        missed_column_names = parsed_doc.dao_fields.map(&:name) - entity_doc.columns.map(&:name)
+        missed_columns = parsed_doc.dao_fields.select{ missed_column_names.include?(_1.name) }
+        add_columns(entity_path, entity_source, entity_doc, missed_columns)
+
+        source
+      end
+
+      private 
+      
+      def add_columns(entity_path, entity_source, entity_doc, missed_columns)
+        return if !missed_columns || missed_columns.size == 0
+
+        columns_strs = missed_columns.map do |col|
+          str = "    column :#{col.name}, #{col.type}"
+          if col.has_default?
+            str += ", default: #{col.default}"
+          end
+          str
+        end
+
+        columns_str = columns_strs.join("\n") + "\n"
+
+        source_lines = entity_source.lines
+
+        prev_line_location = if entity_doc.columns.size > 0
+          entity_doc.columns.last.location
+        else
+          entity_doc.build_dto_node.location
+        end
+
+        line = prev_line_location.start_line - 1
+
+        source_lines[line] += columns_str
+
+        File.write(entity_path, source_lines.join)
+      end
+    end
+  end
+end

data/lib/ruby_lsp/ruby_lsp_ree/parsing/body_parsers/call_objects_parser.rb

@@ -53,6 +53,8 @@ class RubyLsp::Ree::CallObjectsParser
   def parse_body_call_objects(node_body)
     call_objects = []
 
+    return call_objects unless node_body
+    
     node_body.each do |node|
       if node.is_a?(Prism::CallNode)
         if node.receiver
@@ -78,10 +80,6 @@ class RubyLsp::Ree::CallObjectsParser
         if node.respond_to?(:statements)
           call_objects += parse_body_call_objects(node.statements.body)
         end
-        
-        if node.respond_to?(:block) && node.block && node.block.is_a?(Prism::BlockNode)
-          call_objects += parse_body_call_objects(get_method_body(node.block))
-        end
 
         if node.respond_to?(:value) && node.value
           call_objects += parse_body_call_objects([node.value])
@@ -94,6 +92,14 @@ class RubyLsp::Ree::CallObjectsParser
         if node.respond_to?(:right) && node.right
           call_objects += parse_body_call_objects([node.right])
         end
+
+        if node.respond_to?(:parts) && node.parts
+          call_objects += parse_body_call_objects(node.parts)
+        end
+      end
+
+      if node.respond_to?(:block) && node.block && node.block.is_a?(Prism::BlockNode)
+        call_objects += parse_body_call_objects(get_method_body(node.block))
       end
     end
 

data/lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_base_document.rb

@@ -20,6 +20,10 @@ class RubyLsp::Ree::ParsedBaseDocument
     false
   end
 
+  def includes_dao_dsl?
+    false
+  end
+
   def includes_routes_dsl?
     false
   end

data/lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_class_document.rb

@@ -11,7 +11,7 @@ class RubyLsp::Ree::ParsedClassDocument < RubyLsp::Ree::ParsedBaseDocument
   include RubyLsp::Ree::ReeConstants
 
   attr_reader :class_node, :class_includes, 
-    :values, :filters, :bean_methods, :links_container_block_node, :error_definitions, 
+    :values, :bean_methods, :links_container_block_node, :error_definitions, 
     :error_definition_names, :doc_instance_methods, :links_container_node, 
     :defined_classes, :defined_consts
 
@@ -36,6 +36,10 @@ class RubyLsp::Ree::ParsedClassDocument < RubyLsp::Ree::ParsedBaseDocument
     @class_includes.any?{ node_name(_1) == LINK_DSL_MODULE }
   end
 
+  def includes_dao_dsl?
+    @class_includes.any?{ node_name(_1) == DAO_DSL_MODULE }
+  end
+
   def includes_routes_dsl?
     @class_includes.any?{ node_name(_1) == ROUTES_DSL_MODULE }
   end
@@ -126,15 +130,6 @@ class RubyLsp::Ree::ParsedClassDocument < RubyLsp::Ree::ParsedBaseDocument
       .map{ OpenStruct.new(name: _1.arguments.arguments.first.unescaped) }
   end
 
-  def parse_filters
-    return unless class_node
-    
-    @filters ||= class_node.body.body
-      .select{ node_name(_1) == :filter }
-      .map{ OpenStruct.new(name: _1.arguments.arguments.first.unescaped, signatures: parse_filter_signature(_1)) }
-
-  end
-
   def parse_bean_methods
     return unless has_body?
 
@@ -163,15 +158,6 @@ class RubyLsp::Ree::ParsedClassDocument < RubyLsp::Ree::ParsedBaseDocument
     @doc_instance_methods
   end
 
-  def parse_filter_signature(filter_node)
-    return [] unless filter_node
-
-    lambda_node = filter_node.arguments&.arguments[1]
-    return [] unless lambda_node
-
-    parse_signatures_from_params(lambda_node.parameters.parameters)
-  end
-
   def parse_signatures_from_params(parameters)
     signature_params = signature_params_from_node(parameters)
     [RubyIndexer::Entry::Signature.new(signature_params)]

data/lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_dao_document.rb

@@ -0,0 +1,96 @@
+class RubyLsp::Ree::ParsedDaoDocument < RubyLsp::Ree::ParsedClassDocument
+  include RubyLsp::Ree::ReeLspUtils
+
+  attr_reader :dao_fields, :filters
+
+  class DaoField
+    attr_reader :name, :location, :type, :default
+
+    def initialize(name:, location:, type:, default:)
+      @name = name
+      @location = location
+      @type = type
+      @default = default
+    end
+
+    def has_default?
+      !!@default
+    end
+  end
+
+  def initialize(ast, package_name = nil)
+    super
+    parse_filters
+    parse_dao_fields
+  end
+
+  def has_schema?
+    !!@schema_node
+  end
+
+  def schema_name
+    @schema_node.arguments.arguments.first.name.to_s
+  end
+
+  private 
+
+  def parse_dao_fields
+    @dao_fields = []
+    @schema_node = nil
+    return unless has_body?
+   
+    @schema_node = class_node.body.body
+      .detect{ |node| node.is_a?(Prism::CallNode) && node.name == :schema }
+
+    return unless @schema_node
+
+    @dao_fields = @schema_node.block.body.body.map do |node|
+      if node.name.to_s == 'pg_jsonb'
+        field_type = "Nilor[Hash]"  
+        default_val = "nil"
+      else
+        field_type = camelize(node.name.to_s)
+        default_val = nil
+
+        if field_allows_null?(node)
+          field_type = "Nilor[#{field_type}]"  
+          default_val = "nil"
+        end
+      end
+
+      DaoField.new(
+        name: node.arguments.arguments.first.unescaped,
+        location: node.location,
+        type: field_type,
+        default: default_val
+      )
+    end
+  end
+
+  def parse_filters
+    return unless has_body?
+    
+    @filters ||= class_node.body.body
+      .select{ node_name(_1) == :filter }
+      .map{ OpenStruct.new(name: _1.arguments.arguments.first.unescaped, signatures: parse_filter_signature(_1)) }
+  end
+
+  def parse_filter_signature(filter_node)
+    return [] unless filter_node
+
+    lambda_node = filter_node.arguments&.arguments[1]
+    return [] if !lambda_node || !lambda_node.parameters
+
+    parse_signatures_from_params(lambda_node.parameters.parameters)
+  end
+
+  def field_allows_null?(node)
+    kw_node = node.arguments.arguments.detect{ _1.is_a?(Prism::KeywordHashNode) }
+    return false unless kw_node
+    
+    null_el = kw_node.elements.detect{ _1.key.unescaped == "null" }
+    return false unless null_el
+
+    null_el.value.is_a?(Prism::TrueNode)
+  end
+end

data/lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_document_builder.rb

@@ -2,6 +2,8 @@ require 'prism'
 require_relative 'parsed_class_document'
 require_relative 'parsed_rspec_document'
 require_relative 'parsed_route_document'
+require_relative 'parsed_entity_document'
+require_relative 'parsed_dao_document'
 
 class RubyLsp::Ree::ParsedDocumentBuilder
   extend RubyLsp::Ree::ReeLspUtils
@@ -40,6 +42,8 @@ class RubyLsp::Ree::ParsedDocumentBuilder
       build_bean_document(ast)
     when :route
       build_route_document(ast)
+    when :entity
+      build_entity_document(ast)
     else
       build_detected_document_type(ast, package_name)
     end
@@ -88,15 +92,6 @@ class RubyLsp::Ree::ParsedDocumentBuilder
 
     document
   end   
-
-  def self.build_dao_document(ast)
-    document = RubyLsp::Ree::ParsedClassDocument.new(ast)
-    
-    document.parse_class_node
-    document.parse_filters
-
-    document
-  end  
   
   def self.build_bean_document(ast)
     document = RubyLsp::Ree::ParsedClassDocument.new(ast)
@@ -107,10 +102,18 @@ class RubyLsp::Ree::ParsedDocumentBuilder
     document
   end  
 
+  def self.build_dao_document(ast)
+    RubyLsp::Ree::ParsedDaoDocument.new(ast)
+  end  
+
   def self.build_route_document(ast)
     RubyLsp::Ree::ParsedRouteDocument.new(ast)
   end
 
+  def self.build_entity_document(ast)
+    RubyLsp::Ree::ParsedEntityDocument.new(ast)
+  end
+
   def self.is_ruby_file?(uri)
     File.extname(uri.to_s) == '.rb'
   end

data/lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_entity_document.rb

@@ -0,0 +1,41 @@
+class RubyLsp::Ree::ParsedEntityDocument < RubyLsp::Ree::ParsedClassDocument
+  include RubyLsp::Ree::ReeLspUtils
+
+  attr_reader :columns, :build_dto_node
+
+  class EntityField
+    attr_reader :name, :location
+
+    def initialize(name:, location:)
+      @name = name
+      @location = location
+    end
+  end
+
+  def initialize(ast, package_name = nil)
+    super
+    parse_class_includes
+    parse_build_dto_structure
+  end
+
+  private 
+
+  def parse_build_dto_structure
+    @columns = []
+    @build_dto_node = nil
+
+    return unless has_body?
+
+    @build_dto_node = @class_node.body.body.detect{ node_name(_1) == :build_dto }
+    return unless @build_dto_node.block.body
+
+    @columns = @build_dto_node.block.body.body
+      .select{ _1.name == :column }
+      .map do 
+        EntityField.new(
+          name: _1.arguments.arguments.first.unescaped,
+          location: _1.location
+        )
+      end
+  end
+end

data/lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_method_node.rb

@@ -14,6 +14,8 @@ class RubyLsp::Ree::ParsedMethodNode
   end
 
   def param_names
+    return [] unless @method_node.parameters
+    
     @method_node.parameters.requireds.map(&:name) + 
     @method_node.parameters.keywords.map(&:name) + 
     [@method_node.parameters.rest&.name] + 

data/lib/ruby_lsp/ruby_lsp_ree/ree_constants.rb

@@ -4,6 +4,7 @@ module RubyLsp
       LINK_DSL_MODULE = 'Ree::LinkDSL'
       ROUTES_DSL_MODULE = 'ReeRoutes::DSL'
       MAPPER_DSL_MODULE = 'ReeMapper::DSL'
+      DAO_DSL_MODULE = 'ReeDao::DSL'
 
       LINKS_CONTAINER_TYPES = [
         :fn,

data/lib/ruby_lsp/ruby_lsp_ree/ree_formatter.rb

@@ -5,6 +5,7 @@ require_relative 'formatters/missing_error_locales_formatter'
 require_relative 'formatters/unused_links_formatter'
 require_relative 'formatters/missing_imports_formatter'
 require_relative 'formatters/import_packages_formatter'
+require_relative 'formatters/sync_dao_columns_formatter'
 
 module RubyLsp
   module Ree
@@ -32,6 +33,7 @@ module RubyLsp
           RubyLsp::Ree::MissingImportsFormatter,
           RubyLsp::Ree::ImportPackagesFormatter,
           RubyLsp::Ree::SortLinksFormatter,
+          RubyLsp::Ree::SyncDaoColumnsFormatter,
         ].select do |formatter|
           formatter_name = formatter.name.split('::').last.to_sym
           @settings[formatter_name] != false

data/lib/ruby_lsp/ruby_lsp_ree/ree_indexing_enhancement.rb

@@ -12,9 +12,10 @@ module RubyLsp
       def on_call_node_enter(node)
         return unless @listener.current_owner
       
-        if node.name == SCHEMA_NODE_NAME
-          return index_ree_schema(node)
-        end
+        # remove for now as it breaks go-to-definition for entities
+        # if node.name == SCHEMA_NODE_NAME
+        #   return index_ree_schema(node)
+        # end
 
         return unless REE_INDEXED_OBJECTS.include?(node.name)
         return unless node.arguments

data/lib/ruby_lsp/ruby_lsp_ree/ree_source_editor.rb

@@ -88,9 +88,16 @@ module RubyLsp
           new_text = "\sdo#{new_text}\s\send\n"
         end
 
-        line = parsed_doc.links_container_node.location.start_line - 1
-
-        source_lines[line] = source_lines[line].chomp + new_text
+        if parsed_doc.links_container_node
+          line = parsed_doc.links_container_node.location.start_line - 1
+          source_lines[line] = source_lines[line].chomp + new_text
+        elsif parsed_doc.link_nodes.size > 0
+          line = parsed_doc.link_nodes.last.location.end_line - 1
+          source_lines[line] = source_lines[line].chomp + new_text
+        else
+          line = parsed_doc.class_includes.last.location.end_line - 1
+          source_lines[line] = source_lines[line].chomp + "\n" + new_text
+        end
       end
 
       def change_link_package(link_node, new_package, current_package)

data/lib/ruby_lsp/ruby_lsp_ree/utils/ree_lsp_utils.rb

@@ -190,6 +190,17 @@ module RubyLsp
         word.downcase!
         word
       end
+
+      # copied from ree string_utils
+      def camelize(string, uppercase_first_letter = true)
+        if uppercase_first_letter
+          string = string.sub(/^[a-z\d]*/) { |match| match.capitalize }
+        else
+          string = string.sub(/^(?:(?=\b|[A-Z_])|\w)/) { |match| match.downcase }
+        end
+  
+        string.gsub(/(?:_|(\/))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }.gsub("/", "::")
+      end
     end
   end
 end

data/lib/ruby_lsp_ree/version.rb

@@ -2,6 +2,6 @@
 
 module RubyLsp
   module Ree
-    VERSION = "0.1.19"
+    VERSION = "0.1.20"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-ree
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-05-05 00:00:00.000000000 Z
+date: 2025-05-16 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby LSP addon that adds extra editor functionality for Ree applications
 email:
@@ -36,6 +36,7 @@ files:
 - lib/ruby_lsp/ruby_lsp_ree/formatters/missing_error_locales_formatter.rb
 - lib/ruby_lsp/ruby_lsp_ree/formatters/missing_imports_formatter.rb
 - lib/ruby_lsp/ruby_lsp_ree/formatters/sort_links_formatter.rb
+- lib/ruby_lsp/ruby_lsp_ree/formatters/sync_dao_columns_formatter.rb
 - lib/ruby_lsp/ruby_lsp_ree/formatters/unused_links_formatter.rb
 - lib/ruby_lsp/ruby_lsp_ree/handlers/completion_handler.rb
 - lib/ruby_lsp/ruby_lsp_ree/handlers/definition_handler.rb
@@ -47,7 +48,9 @@ files:
 - lib/ruby_lsp/ruby_lsp_ree/parsing/body_parsers/local_variables_parser.rb
 - lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_base_document.rb
 - lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_class_document.rb
+- lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_dao_document.rb
 - lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_document_builder.rb
+- lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_entity_document.rb
 - lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_link_node.rb
 - lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_method_node.rb
 - lib/ruby_lsp/ruby_lsp_ree/parsing/parsed_route_document.rb