spoom 1.6.3 → 1.7.1

data/lib/spoom/sorbet/translate/strip_sorbet_sigs.rb

@@ -0,0 +1,23 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Spoom
+  module Sorbet
+    module Translate
+      # Deletes all `sig` nodes from the given Ruby code.
+      # It doesn't handle type members and class annotations.
+      class StripSorbetSigs < Translator
+        # @override
+        #: (Prism::CallNode node) -> void
+        def visit_call_node(node)
+          return unless sorbet_sig?(node)
+
+          @rewriter << Source::Delete.new(
+            adjust_to_line_start(node.location.start_offset),
+            adjust_to_line_end(node.location.end_offset),
+          )
+        end
+      end
+    end
+  end
+end

data/lib/spoom/sorbet/translate/translator.rb

@@ -0,0 +1,71 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Spoom
+  module Sorbet
+    module Translate
+      # @abstract
+      class Translator < Spoom::Visitor
+        #: (String, file: String) -> void
+        def initialize(ruby_contents, file:)
+          super()
+
+          @file = file #: String
+
+          @original_encoding = ruby_contents.encoding #: Encoding
+          @ruby_contents = if @original_encoding == "UTF-8"
+            ruby_contents
+          else
+            ruby_contents.encode("UTF-8")
+          end #: String
+
+          node = Spoom.parse_ruby(ruby_contents, file: file, comments: true)
+          @node = node #: Prism::Node
+          @ruby_bytes = ruby_contents.bytes #: Array[Integer]
+          @rewriter = Spoom::Source::Rewriter.new #: Source::Rewriter
+        end
+
+        #: -> String
+        def rewrite
+          visit(@node)
+          @rewriter.rewrite!(@ruby_bytes)
+          @ruby_bytes.pack("C*").force_encoding(@original_encoding)
+        end
+
+        private
+
+        #: (Prism::CallNode node) -> bool
+        def sorbet_sig?(node)
+          return false unless node.message == "sig"
+
+          recv = node.receiver
+          return false if recv && !recv.is_a?(Prism::SelfNode) && !recv.slice.match?(/(::)?T::Sig::WithoutRuntime/)
+
+          true
+        end
+
+        #: (Integer) -> Integer
+        def adjust_to_line_start(offset)
+          offset -= 1 while offset > 0 && @ruby_bytes[offset - 1] != "\n".ord
+          offset
+        end
+
+        #: (Integer) -> Integer
+        def adjust_to_line_end(offset)
+          offset += 1 while offset < @ruby_bytes.size && @ruby_bytes[offset] != "\n".ord
+          offset
+        end
+
+        # Consume the next blank line if any
+        #: (Integer) -> Integer
+        def adjust_to_new_line(offset)
+          if offset + 1 < @ruby_bytes.size && @ruby_bytes[offset + 1] == "\n".ord
+            offset += 1
+          end
+
+          offset
+        end
+      end
+    end
+  end
+end

data/lib/spoom/sorbet/translate.rb

@@ -0,0 +1,49 @@
+# typed: strict
+# frozen_string_literal: true
+
+require "rbi"
+
+require "spoom/source/rewriter"
+require "spoom/sorbet/translate/translator"
+require "spoom/sorbet/translate/rbs_comments_to_sorbet_sigs"
+require "spoom/sorbet/translate/sorbet_assertions_to_rbs_comments"
+require "spoom/sorbet/translate/sorbet_sigs_to_rbs_comments"
+require "spoom/sorbet/translate/strip_sorbet_sigs"
+
+module Spoom
+  module Sorbet
+    module Translate
+      class Error < Spoom::Error; end
+
+      class << self
+        # Deletes all `sig` nodes from the given Ruby code.
+        # It doesn't handle type members and class annotations.
+        #: (String ruby_contents, file: String) -> String
+        def strip_sorbet_sigs(ruby_contents, file:)
+          StripSorbetSigs.new(ruby_contents, file: file).rewrite
+        end
+
+        # Converts all `sig` nodes to RBS comments in the given Ruby code.
+        # It also handles type members and class annotations.
+        #: (String ruby_contents, file: String, ?positional_names: bool) -> String
+        def sorbet_sigs_to_rbs_comments(ruby_contents, file:, positional_names: true)
+          SorbetSigsToRBSComments.new(ruby_contents, file: file, positional_names: positional_names).rewrite
+        end
+
+        # Converts all the RBS comments in the given Ruby code to `sig` nodes.
+        # It also handles type members and class annotations.
+        #: (String ruby_contents, file: String) -> String
+        def rbs_comments_to_sorbet_sigs(ruby_contents, file:)
+          RBSCommentsToSorbetSigs.new(ruby_contents, file: file).rewrite
+        end
+
+        # Converts all `T.let` and `T.cast` nodes to RBS comments in the given Ruby code.
+        # It also handles type members and class annotations.
+        #: (String ruby_contents, file: String) -> String
+        def sorbet_assertions_to_rbs_comments(ruby_contents, file:)
+          SorbetAssertionsToRBSComments.new(ruby_contents, file: file).rewrite
+        end
+      end
+    end
+  end
+end

data/lib/spoom/sorbet.rb

@@ -1,12 +1,12 @@
 # typed: strict
 # frozen_string_literal: true
 
-require "spoom/sorbet/assertions"
 require "spoom/sorbet/config"
 require "spoom/sorbet/errors"
 require "spoom/sorbet/lsp"
 require "spoom/sorbet/metrics"
 require "spoom/sorbet/sigils"
+require "spoom/sorbet/translate"
 
 require "open3"
 

data/lib/spoom/source/rewriter.rb

@@ -0,0 +1,167 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Spoom
+  # This module provides a simple API to rewrite source code.
+  #
+  # Using a `Rewriter`, you can build a list of changes to apply to a source file
+  # and apply them all at once. Edits are applied from bottom to top, so that the
+  # line numbers are not remapped after each edit.
+  #
+  # The source code is represented as an array of bytes, so that it can be
+  # manipulated in place. The client is responsible for `string <-> bytes`
+  # conversions and encoding handling.
+  #
+  # ```ruby
+  # bytes = "def foo; end".bytes
+  #
+  # rewriter = Spoom::Source::Rewriter.new
+  # rewriter << Spoom::Source::Replace.new(4, 6, "baz")
+  # rewriter << Spoom::Source::Insert.new(0, "def bar; end\n")
+  # rewriter.rewrite!(bytes)
+  #
+  # puts bytes.pack("C*") # => "def bar; end\ndef baz; end"
+  # ```
+  module Source
+    class PositionError < Spoom::Error; end
+
+    # @abstract
+    class Edit
+      # @abstract
+      #: (Array[Integer]) -> void
+      def apply(bytes); end
+
+      # @abstract
+      #: -> [Integer, Integer]
+      def range; end
+    end
+
+    class Insert < Edit
+      #: Integer
+      attr_reader :position
+
+      #: String
+      attr_reader :text
+
+      #: (Integer, String) -> void
+      def initialize(position, text)
+        super()
+
+        @position = position
+        @text = text
+      end
+
+      # @override
+      #: (Array[Integer]) -> void
+      def apply(bytes)
+        raise PositionError, "Position is out of bounds" if position < 0 || position > bytes.size
+
+        bytes #: untyped
+          .insert(position, *text.bytes)
+      end
+
+      # @override
+      #: -> [Integer, Integer]
+      def range
+        [position, position]
+      end
+
+      # @override
+      #: -> String
+      def to_s
+        "Insert `#{text}` at #{position}"
+      end
+    end
+
+    class Replace < Edit
+      #: Integer
+      attr_reader :from, :to
+
+      #: String
+      attr_reader :text
+
+      #: (Integer, Integer, String) -> void
+      def initialize(from, to, text)
+        super()
+
+        @from = from
+        @to = to
+        @text = text
+      end
+
+      # @override
+      #: (Array[Integer]) -> void
+      def apply(bytes)
+        raise PositionError, "Position is out of bounds" if from < 0 || to < 0 || from > bytes.size || to > bytes.size || from > to
+
+        bytes[from..to] = *text.bytes
+      end
+
+      # @override
+      #: -> [Integer, Integer]
+      def range
+        [from, to]
+      end
+
+      # @override
+      #: -> String
+      def to_s
+        "Replace #{from}-#{to} with `#{text}`"
+      end
+    end
+
+    class Delete < Edit
+      #: Integer
+      attr_reader :from, :to
+
+      #: (Integer, Integer) -> void
+      def initialize(from, to)
+        super()
+
+        @from = from
+        @to = to
+      end
+
+      # @override
+      #: (Array[untyped]) -> void
+      def apply(bytes)
+        raise PositionError, "Position is out of bounds" if from < 0 || to < 0 || from > bytes.size || to > bytes.size || from > to
+
+        bytes[from..to] = "".bytes
+      end
+
+      # @override
+      #: -> [Integer, Integer]
+      def range
+        [from, to]
+      end
+
+      # @override
+      #: -> String
+      def to_s
+        "Delete #{from}-#{to}"
+      end
+    end
+
+    class Rewriter
+      #: -> void
+      def initialize
+        @edits = [] #: Array[Edit]
+      end
+
+      #: (Edit) -> void
+      def <<(other)
+        @edits << other
+      end
+
+      #: (Array[Integer]) -> void
+      def rewrite!(bytes)
+        # To avoid remapping positions after each edit,
+        # we sort the changes by position and apply them in reverse order.
+        @edits.sort_by(&:range).reverse_each do |edit|
+          edit.apply(bytes)
+        end
+      end
+    end
+  end
+end

data/lib/spoom/source.rb

@@ -0,0 +1,4 @@
+# typed: strict
+# frozen_string_literal: true
+
+require_relative "source/rewriter"

data/lib/spoom/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Spoom
-  VERSION = "1.6.3"
+  VERSION = "1.7.1"
 end

data/lib/spoom.rb

@@ -15,7 +15,10 @@ require "spoom/context"
 require "spoom/colors"
 require "spoom/poset"
 require "spoom/model"
+require "spoom/source"
 require "spoom/deadcode"
+require "spoom/rbs"
+require "spoom/counters"
 require "spoom/sorbet"
 require "spoom/cli"
 require "spoom/version"