ruby-lsp-ree 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e3cdb9ee36b1b88e20d71c218ce355571da9aa6d405dfe0dcd879e1b37a5ef
-  data.tar.gz: a668bef693a29e639c6acb57f1a8ad2415d630242a2eecc04ff188f3d2fd93f4
+  metadata.gz: 3f11e82aca2c43fe42fb37077f3bc8590c5c68e06c13d9068c6872ae859faaad
+  data.tar.gz: 07fa4705541847c82764e5c4e27c13b190c240e63c12bb86a98fd49577be6090
 SHA512:
-  metadata.gz: bad0e641f6076ceb9544c0e159598a64e44343e890bddb627603d3ba9c0124b6a654f271e5599bc8e045ab7fac117b1844ce25bac5b6d2c4bb1b8457587b43b4
-  data.tar.gz: 8e691510c967c4788bc3ba9636571644a611bbe909a8e17f1cab4ea140f81f0878f346e0523f7d0020ae3d007248e402a21be3ab4afa201eb7d328afd1c79160
+  metadata.gz: b7bc67742989ee60af3e3b9f4dd38b44183522e86d7b8f1af90c255edb10179086e55255312fd80abf7306af37d318f0e8343f6183926ffb424288ff479fce4f
+  data.tar.gz: 593ebeac60988a3a9f9db7137d99a313b07d7ebd6385e7e3a566c93960a7ebfd803ce1fccef8d595b12ecd53c5e22a3afa41b4fad279d8de49870ffa9a1c4737

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.1.21] - 2025-05-21
+
+- formatter: deduplicate dao columns
+- unused links formatter: handle link aliases
+
 ## [0.1.20] - 2025-05-15
 
 - formatter: add missing columns to entities

data/Gemfile.lock

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

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

@@ -1,4 +1,5 @@
 require_relative 'base_formatter'
+require_relative '../ree_source_editor'
 
 module RubyLsp
   module Ree
@@ -17,6 +18,8 @@ module RubyLsp
         return source unless parsed_doc.includes_dao_dsl?
         return source unless parsed_doc.has_schema?
 
+        source = deduplicate_dao_fields(parsed_doc, source)
+
         dao_folder_index = path_parts.index('dao')
         entities_folder = path_parts.take(dao_folder_index).join('/') + '/entities'
 
@@ -71,6 +74,30 @@ module RubyLsp
 
         File.write(entity_path, source_lines.join)
       end
+
+      def deduplicate_dao_fields(parsed_doc, source)
+        grouped_fields = parsed_doc.dao_fields.group_by(&:name)
+        uniq_fields = []
+        fields_to_remove = []
+
+        grouped_fields.each do |name, fields|
+          uniq_fields << fields.first
+          if fields.size > 1
+            fields_to_remove += fields[1..-1]
+          end
+        end
+
+        return source if fields_to_remove.size == 0
+
+        parsed_doc.set_dao_fields(uniq_fields)
+        editor = RubyLsp::Ree::ReeSourceEditor.new(source)
+
+        fields_to_remove.each do |field|
+          editor.remove_dao_field(field)
+        end
+
+        editor.source
+      end
     end
   end
 end

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

@@ -32,6 +32,10 @@ class RubyLsp::Ree::ParsedDaoDocument < RubyLsp::Ree::ParsedClassDocument
     @schema_node.arguments.arguments.first.name.to_s
   end
 
+  def set_dao_fields(fields)
+    @dao_fields = fields
+  end
+
   private 
 
   def parse_dao_fields

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

@@ -5,6 +5,7 @@ class RubyLsp::Ree::ParsedLinkNode
 
   FROM_ARG_KEY = 'from'
   IMPORT_ARG_KEY = 'import'
+  AS_ARG_KEY = 'as'
 
   class ImportItem
     attr_reader :name, :original_name
@@ -44,6 +45,11 @@ class RubyLsp::Ree::ParsedLinkNode
     @node.location
   end
 
+  def usage_name
+    return @alias_name if @alias_name
+    @name
+  end
+
   def from_arg_value
     return unless @from_param
 
@@ -75,17 +81,6 @@ class RubyLsp::Ree::ParsedLinkNode
     link_type == :object_name
   end
 
-  def parse_name
-    case name_arg_node
-    when Prism::SymbolNode
-      name_arg_node.value
-    when Prism::StringNode
-      name_arg_node.unescaped
-    else
-      ""
-    end
-  end
-
   def parse_imports
     @import_items ||= get_import_items
   end
@@ -123,12 +118,25 @@ class RubyLsp::Ree::ParsedLinkNode
 
   private
 
+  def parse_name
+    case name_arg_node
+    when Prism::SymbolNode
+      name_arg_node.value
+    when Prism::StringNode
+      name_arg_node.unescaped
+    else
+      ""
+    end
+  end
+
   def parse_params
     @kw_args = @node.arguments.arguments.detect{ |arg| arg.is_a?(Prism::KeywordHashNode) }
     @from_param = nil
     return unless @kw_args
 
     @from_param = @kw_args.elements.detect{ _1.key.unescaped == FROM_ARG_KEY }
+    @as_param = @kw_args.elements.detect{ _1.key.unescaped == AS_ARG_KEY }
+    @alias_name = @as_param ? @as_param.value.unescaped : nil
   end
 
   def last_arg

data/lib/ruby_lsp/ruby_lsp_ree/ree_source_editor.rb

@@ -15,7 +15,7 @@ module RubyLsp
 
       def contains_link_usage?(link_node)
         source_lines_except_link = source_lines[0...(link_node.location.start_line-1)] + source_lines[(link_node.location.end_line)..-1]
-        source_lines_except_link.any?{ |source_line| source_line.match?(/\W#{link_node.name}\W/)}
+        source_lines_except_link.any?{ |source_line| source_line.match?(/\W#{link_node.usage_name}\W/)}
       end
 
       def contains_link_import_usage?(link_node, link_import)
@@ -24,7 +24,7 @@ module RubyLsp
       end
 
       def remove_link(link_node)
-        set_empty_lines!(link_node.location.start_line-1, link_node.location.end_line-1)
+        set_empty_lines_for_location!(link_node.location)
       end
 
       def remove_link_imports(link_node, link_imports)
@@ -58,10 +58,8 @@ module RubyLsp
         set_empty_lines!(link_container_start_line+1, link_container_end_line)
       end
 
-      def set_empty_lines!(start_line, end_line)
-        (start_line .. end_line).each do |i|
-          source_lines[i] = ''
-        end
+      def remove_dao_field(field)
+        set_empty_lines_for_location!(field.location)
       end
 
       def add_links(parsed_doc, ree_objects, current_package)
@@ -127,6 +125,18 @@ module RubyLsp
           source_lines[line] = source_lines[line][0..start_column] + ", from: :#{new_package}" + source_lines[line][start_column+1..-1]
         end
       end
+
+      private
+
+      def set_empty_lines_for_location!(location)
+        set_empty_lines!(location.start_line-1, location.end_line-1)
+      end
+
+      def set_empty_lines!(start_line, end_line)
+        (start_line .. end_line).each do |i|
+          source_lines[i] = ''
+        end
+      end
     end
   end
 end

data/lib/ruby_lsp_ree/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-ree
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-05-16 00:00:00.000000000 Z
+date: 2025-05-21 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby LSP addon that adds extra editor functionality for Ree applications
 email: