sorbet-eraser 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb18fb992ca140f69b3971850f1aa3da26091b6d01ba133656c13d6c2427a80a
-  data.tar.gz: 7e00f8f81e9b90b23bec44a9e943322eddbf51d75f5ae6491787a7674ce3ca6f
+  metadata.gz: 1ad0af501c0fd60762345ff02fdca609a9380405416e686776afc349de9b50e1
+  data.tar.gz: b53c44b99f68070cdeff20fb98946c9ad36865f0713ae827e7a668eed72d927f
 SHA512:
-  metadata.gz: c5309fc61086dcd2371ab5784847ffa4695ed99fffe18ee25e74b568bf75e75c6ba8d79baedfd3403471fc11008242ccbc453a39517d1b1ff9863d23240f7e6d
-  data.tar.gz: b8599cb21d63143a9ed9ff27df14849c40422d8425b07552b874a69efee908168f01b6862ac05033551b992f998fd934cdd24c5bd0f177094ca63bbb6dafe92d
+  metadata.gz: 9522badb70d5cf342fdd35d9d017d989c042dd1cbab76c341a6f890cc9992e2a33f4c8e6c3e031f9e579c0b0e0b164f272defc8660a4ce0247fc00bc8c933e01
+  data.tar.gz: 1e60091bdc1def556f37d0021fb683632196f08c4cbc01ad9163c0f7930043cee1c85b03109d53a1c7140fd78a517dc579dc4f98c198fb741a00d17a8770a726

data/CHANGELOG.md

@@ -6,6 +6,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.7.0] - 2024-02-14
+
+### Added
+
+- Use `prism` as the parser, not `yarp`.
+
+### Changed
+
+- Fix the return value of `T::Private:Methods.signature_for_method`.
+- `T::Props#props` is expected to be a hash not an array.
+
 ## [0.6.0] - 2023-09-11
 
 ### Added

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    sorbet-eraser (0.6.0)
-      yarp
+    sorbet-eraser (0.7.0)
+      prism
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.20.0)
-    rake (13.0.6)
-    yarp (0.11.0)
+    minitest (5.22.2)
+    prism (0.22.0)
+    rake (13.1.0)
 
 PLATFORMS
   arm64-darwin-21

data/lib/sorbet/eraser/t/props.rb

@@ -16,7 +16,7 @@ module T
     # them and not raise errors and for bookkeeping.
     module ClassMethods
       def props
-        @props ||= []
+        @props ||= {}
       end
 
       def prop(name, rules = {})
@@ -32,8 +32,7 @@ module T
       private
 
       def create_prop(name, rules)
-        props << [name, rules]
-        props.sort_by!(&:first)
+        props[name] = rules
       end
     end
 

data/lib/sorbet/eraser/t.rb

@@ -47,7 +47,7 @@ module T
       module SingletonMethodHooks
       end
 
-      def self.signature_for_method(method); method; end
+      def self.signature_for_method(method); nil; end
     end
   end
 

data/lib/sorbet/eraser/version.rb

@@ -2,6 +2,6 @@
 
 module Sorbet
   module Eraser
-    VERSION = "0.6.0"
+    VERSION = "0.7.0"
   end
 end

data/lib/sorbet/eraser.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "yarp"
+require "prism"
 
 require "sorbet/eraser/version"
 require "sorbet/eraser/t"
@@ -23,7 +23,7 @@ module Sorbet
   module Eraser
     # This class is a YARP visitor that finds the ranges of bytes that should be
     # erased from the source code.
-    class Ranges < YARP::Visitor
+    class Ranges < Prism::Visitor
       attr_reader :ranges
 
       def initialize(ranges)
@@ -32,7 +32,7 @@ module Sorbet
 
       def visit_call_node(node)
         case node.name
-        when "abstract!", "final!", "interface!"
+        when :abstract!, :final!, :interface!
           # abstract!
           # abstract!()
           # final!
@@ -42,7 +42,7 @@ module Sorbet
           if !node.receiver && !node.arguments && !node.block
             ranges << (node.location.start_offset...node.location.end_offset)
           end
-        when "assert_type!", "bind", "cast", "let"
+        when :assert_type!, :bind, :cast, :let
           # T.assert_type! foo, String
           # T.assert_type!(foo, String)
           # T.bind self, String
@@ -51,9 +51,7 @@ module Sorbet
           # T.cast(foo, String)
           # T.let foo, String
           # T.let(foo, String)
-          if node.receiver.is_a?(YARP::ConstantReadNode) && node.receiver.name == :T && node.arguments && !node.block && node.arguments.arguments.length == 2
-            arguments = node.arguments.arguments
-
+          if node.receiver.is_a?(Prism::ConstantReadNode) && node.receiver.name == :T && (arguments = node.arguments&.arguments) && !node.block && arguments.length == 2
             if node.opening_loc
               ranges << (node.location.start_offset...node.opening_loc.start_offset)
               ranges << (arguments.first.location.end_offset...node.closing_loc.start_offset)
@@ -62,7 +60,7 @@ module Sorbet
               ranges << (arguments.last.location.end_offset...node.location.end_offset)
             end
           end
-        when "const", "prop"
+        when :const, :prop
           # const :foo, String
           # const :foo, String, required: true
           # const(:foo, String)
@@ -71,8 +69,8 @@ module Sorbet
           # prop :foo, String, required: true
           # prop(:foo, String)
           # prop(:foo, String, required: true)
-          if !node.receiver && node.arguments && !node.block
-            arguments = node.arguments.arguments
+          if !node.receiver && (arguments = node.arguments) && !node.block
+            arguments = arguments.arguments
 
             case arguments.length
             when 2
@@ -81,21 +79,21 @@ module Sorbet
               ranges << (arguments[1].location.start_offset...arguments[2].location.start_offset)
             end
           end
-        when "mixes_in_class_methods"
+        when :mixes_in_class_methods
           # mixes_in_class_methods Foo
           # mixes_in_class_methods(Foo)
-          if !node.receiver && node.arguments && !node.block && node.arguments.arguments.length == 1
+          if !node.receiver && (arguments = node.arguments&.arguments) && !node.block && arguments.length == 1
             ranges << (node.location.start_offset...node.location.end_offset)
           end
-        when "must", "reveal_type", "unsafe"
+        when :must, :reveal_type, :unsafe
           # T.must foo
           # T.must(foo)
           # T.reveal_type foo
           # T.reveal_type(foo)
           # T.unsafe foo
           # T.unsafe(foo)
-          if node.receiver.is_a?(YARP::ConstantReadNode) && node.receiver.name == :T && node.arguments && !node.block && node.arguments.arguments.length == 1
-            argument = node.arguments.arguments.first
+          if (receiver = node.receiver).is_a?(Prism::ConstantReadNode) && receiver.name == :T && (arguments = node.arguments&.arguments) && !node.block && arguments.length == 1
+            argument = arguments.first
 
             if node.opening_loc
               ranges << (node.location.start_offset...node.opening_loc.start_offset)
@@ -105,7 +103,7 @@ module Sorbet
               ranges << (argument.location.end_offset...node.location.end_offset)
             end
           end
-        when "sig"
+        when :sig
           # sig { ... }
           # sig do ... end
           if !node.receiver && !node.arguments && node.block
@@ -122,14 +120,14 @@ module Sorbet
       # with a string that contains Ruby source. It returns the modified Ruby
       # source.
       def erase(source)
-        erase_result(YARP.parse(source), source)
+        erase_result(Prism.parse(source), source)
       end
 
       # This is one of the two entrypoints to the module. This should be called
       # with a filepath that points to a file that contains Ruby source. It
       # returns the modified Ruby source.
       def erase_file(filepath)
-        erase_result(YARP.parse_file(filepath), File.read(filepath))
+        erase_result(Prism.parse_file(filepath), File.read(filepath))
       end
 
       private
@@ -144,7 +142,7 @@ module Sorbet
           # Implicitly assuming that comments are in order.
           break if comment.location.start_line >= minimum
 
-          if comment.type == :inline && comment.location.slice.match?(/\A#\s*typed:\s*(?:ignore|false|true|strict|strong)\s*\z/)
+          if comment.is_a?(Prism::InlineComment) && comment.location.slice.match?(/\A#\s*typed:\s*(?:ignore|false|true|strict|strong)\s*\z/)
             ranges << ((comment.location.start_offset + 1)...comment.location.end_offset)
           end
         end

data/sorbet-eraser.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "yarp"
+  spec.add_dependency "prism"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-eraser
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: yarp
+  name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -103,7 +103,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/kddnewton/sorbet-eraser/issues
-  changelog_uri: https://github.com/kddnewton/sorbet-eraser/blob/v0.6.0/CHANGELOG.md
+  changelog_uri: https://github.com/kddnewton/sorbet-eraser/blob/v0.7.0/CHANGELOG.md
   source_code_uri: https://github.com/kddnewton/sorbet-eraser
   rubygems_mfa_required: 'true'
 post_install_message: