syntax_tree-rbs 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22d2b985f00c4722c74fad681a8ee586a6bebbf3fbc2aa0a6476fce331379bed
-  data.tar.gz: 9d077e966f23b4777f0d4a8d41ff4a6cde08493c8759f8b399d2f494cc3abc2f
+  metadata.gz: 7b66221375118043b0ba6f425de966904df6a558be4e2d07f67455947de1cc55
+  data.tar.gz: e6e0e6df40192b49c6e1dc073a55803bcdebb2523024bdf7f6a71ebe6736f93f
 SHA512:
-  metadata.gz: fc9cc4ff0703d4ade8295ff7784082f1d4372340ba2bb5094c9f928d5c11726c08437669a8a3b9fb001715b859f2085ce2ca543176541fbebf9ad61ee3fd249b
-  data.tar.gz: ad7b5984c280199385c501a743587c06455db0a0d86ffc7072971597113bf3aad4b9a6de794d5d3f2577fba26a95d682a53ccb40d4facbafc767d9f45834e59c
+  metadata.gz: 0253f026e5248ec173de6c2f135f7b60135655c55883c94767ba5217f73066f45e7c0eefeff4205208a61112ea8ec1b857416023831f14487b9483a579e04a4c
+  data.tar.gz: c2009e30dafd9c04b95f688a9353d2b20f947a6d9b9f7f98d58b71bf92a91c8c843947b85d96274777726124272f1fae0591f24536c53517d7af7c96e9918f79

data/.github/dependabot.yml

@@ -4,3 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/auto-merge.yml

@@ -0,0 +1,22 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.6
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

data/.github/workflows/main.yml

@@ -1,24 +1,27 @@
 name: Main
+
 on:
 - push
-- pull_request_target
+- pull_request
+
 jobs:
   ci:
     strategy:
       fail-fast: false
       matrix:
         ruby:
-        - '2.7.5'
+        - '2.7.0'
         - '3.0'
         - '3.1'
+        - '3.2'
         gemfile:
         - rbs1
         - rbs2
+        - rbs3
     name: CI
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
-      CI: true
     steps:
     - uses: actions/checkout@master
     - uses: ruby/setup-ruby@v1
@@ -29,17 +32,3 @@ jobs:
       run: |
         bundle exec rake test
         bundle exec rake stree:check
-  automerge:
-    name: AutoMerge
-    needs: ci
-    runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request_target' && github.actor == 'dependabot[bot]'
-    steps:
-    - uses: actions/github-script@v3
-      with:
-        script: |
-          github.pulls.merge({
-            owner: context.payload.repository.owner.login,
-            repo: context.payload.repository.name,
-            pull_number: context.payload.pull_request.number
-          })

data/CHANGELOG.md

@@ -6,6 +6,23 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [1.0.0] - 2023-03-07
+
+### Added
+
+- Support for RBS 3.
+
+### Changed
+
+- The `visit_alias_declaration` method has been renamed to `visit_type_alias` to better reflect RBS 3.
+- The `visit_alias_member` method has been renamed to `visit_alias` to better reflect RBS 3.
+
+## [0.5.1] - 2022-09-03
+
+### Added
+
+- Ruby 2.7.0 is now supported, not just 2.7.3 and above. This allows usage on Ubuntu 20.04 by default.
+
 ## [0.5.0] - 2022-07-07
 
 ### Added
@@ -42,7 +59,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - 🎉 Initial release! 🎉
 
-[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v0.5.0...HEAD
+[unreleased]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v1.0.0...HEAD
+[1.0.0]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v0.5.1...v1.0.0
+[0.5.1]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v0.4.0...v0.5.0
 [0.4.0]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/ruby-syntax-tree/syntax_tree-rbs/compare/v0.2.0...v0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    syntax_tree-rbs (0.5.0)
+    syntax_tree-rbs (1.0.0)
       prettier_print
       rbs
       syntax_tree (>= 2.0.1)
@@ -10,23 +10,21 @@ GEM
   remote: https://rubygems.org/
   specs:
     docile (1.4.0)
-    minitest (5.16.2)
-    prettier_print (0.1.0)
+    minitest (5.18.0)
+    prettier_print (1.2.0)
     rake (13.0.6)
-    rbs (2.6.0)
-    simplecov (0.21.2)
+    rbs (3.0.3)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    syntax_tree (3.0.0)
-      prettier_print
+    syntax_tree (6.0.2)
+      prettier_print (>= 1.2.0)
 
 PLATFORMS
-  x86_64-darwin-19
-  x86_64-darwin-21
-  x86_64-linux
+  arm64-darwin-21
 
 DEPENDENCIES
   bundler
@@ -36,4 +34,4 @@ DEPENDENCIES
   syntax_tree-rbs!
 
 BUNDLED WITH
-   2.3.6
+   2.3.24

data/gemfiles/rbs3.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rbs", "~> 3"

data/lib/syntax_tree/rbs/entrypoints.rb

@@ -48,13 +48,6 @@ module RBS
         include SyntaxTree::RBS::Entrypoints
       end
 
-      # type foo = String
-      class Alias
-        def accept(visitor)
-          visitor.visit_alias_declaration(self)
-        end
-      end
-
       # class Foo end
       class Class
         def accept(visitor)
@@ -89,6 +82,13 @@ module RBS
           visitor.visit_module_declaration(self)
         end
       end
+
+      # type foo = String
+      class TypeAlias
+        def accept(visitor)
+          visitor.visit_type_alias(self)
+        end
+      end
     end
 
     module Members
@@ -100,7 +100,7 @@ module RBS
       # alias self.foo self.bar
       class Alias
         def accept(visitor)
-          visitor.visit_alias_member(self)
+          visitor.visit_alias(self)
         end
       end
 

data/lib/syntax_tree/rbs/format.rb

@@ -13,26 +13,8 @@ module SyntaxTree
         q.text(node.to_s)
       end
 
-      # Visit a RBS::AST::Declarations::Alias node.
-      def visit_alias_declaration(node)
-        print_comment(node)
-        print_annotations(node)
-
-        q.group do
-          q.text("type ")
-          visit(node.name)
-          q.text(" =")
-          q.group do
-            q.indent do
-              q.breakable
-              visit(node.type)
-            end
-          end
-        end
-      end
-
       # Visit a RBS::AST::Members::Alias node.
-      def visit_alias_member(node)
+      def visit_alias(node)
         print_comment(node)
         print_annotations(node)
 
@@ -299,9 +281,9 @@ module SyntaxTree
           )
           q.text(":")
 
-          if node.types.length == 1 && !node.overload?
+          if node.overloads.length == 1 && !node.overloading?
             q.text(" ")
-            print_method_signature(node.types.first)
+            print_method_overload(node.overloads.first)
           else
             separator =
               lambda do
@@ -312,11 +294,11 @@ module SyntaxTree
             q.group do
               q.indent do
                 q.breakable
-                q.seplist(node.types, separator) do |type|
-                  print_method_signature(type)
+                q.seplist(node.overloads, separator) do |overload|
+                  print_method_overload(overload)
                 end
 
-                if node.overload?
+                if node.overloading?
                   separator.call
                   q.text("...")
                 end
@@ -452,6 +434,24 @@ module SyntaxTree
         end
       end
 
+      # Visit a RBS::AST::Declarations::TypeAlias node.
+      def visit_type_alias(node)
+        print_comment(node)
+        print_annotations(node)
+
+        q.group do
+          q.text("type ")
+          visit(node.name)
+          q.text(" =")
+          q.group do
+            q.indent do
+              q.breakable
+              visit(node.type)
+            end
+          end
+        end
+      end
+
       # Visit a RBS::TypeName node.
       def visit_type_name(node)
         q.text(node.to_s)
@@ -550,6 +550,11 @@ module SyntaxTree
         end
       end
 
+      # (T t) -> void
+      def print_method_overload(node)
+        print_method_signature(node.method_type)
+      end
+
       # (T t) -> void
       def print_method_signature(node)
         q.group do

data/lib/syntax_tree/rbs/pretty_print.rb

@@ -13,18 +13,8 @@ module SyntaxTree
         q.text("(#{node.class.name.downcase})")
       end
 
-      # Visit a RBS::AST::Declarations::Alias node.
-      def visit_alias_declaration(node)
-        group("constant") do
-          print_comment(node)
-          print_annotations(node)
-          visit_field("name", node.name)
-          visit_field("type", node.type)
-        end
-      end
-
       # Visit a RBS::AST::Members::Alias node.
-      def visit_alias_member(node)
+      def visit_alias(node)
         group("alias") do
           print_comment(node)
           print_annotations(node)
@@ -209,12 +199,14 @@ module SyntaxTree
           pp_field("kind", node.kind)
           pp_field("name", node.name)
           pp_field("visibility", node.visibility) if node.visibility
-          bool_field("overload") if node.overload?
+          bool_field("overload") if node.overloading?
 
           q.breakable
-          q.text("types=")
+          q.text("overloads=")
           q.group(2, "[", "]") do
-            q.seplist(node.types) { |type| print_method_signature(type) }
+            q.seplist(node.overloads) do |overload|
+              print_method_overload(overload)
+            end
           end
         end
       end
@@ -293,6 +285,16 @@ module SyntaxTree
         group("tuple") { pp_field("types", node.types) }
       end
 
+      # Visit a RBS::AST::Declarations::TypeAlias node.
+      def visit_type_alias(node)
+        group("constant") do
+          print_comment(node)
+          print_annotations(node)
+          visit_field("name", node.name)
+          visit_field("type", node.type)
+        end
+      end
+
       # Visit a RBS::TypeName node.
       def visit_type_name(node)
         group("type-name") do
@@ -404,6 +406,10 @@ module SyntaxTree
         end
       end
 
+      def print_method_overload(node)
+        print_method_signature(node.method_type)
+      end
+
       def print_method_signature(node)
         if node.respond_to?(:type_params) && node.type_params.any?
           q.breakable

data/lib/syntax_tree/rbs/shims.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
-if defined?(RBS::AST::Declarations::ModuleTypeParams)
+# If we're using RBS 1, then we need to include these monkey-patches to have a
+# consistent interface in RBS 2+.
+if RBS::VERSION < "2.0.0"
   require "delegate"
 
-  # Previously there were specialized types that didn't include some additional
-  # information for type params. So here we wrap them up in order to maintain the
-  # same API.
-  module ShimTypeParams
+  module RBS::AST::Declarations
     class ShimTypeParam < SimpleDelegator
       def unchecked?
         false
@@ -17,29 +16,63 @@ if defined?(RBS::AST::Declarations::ModuleTypeParams)
       end
     end
 
-    # Overriding the type params method to return an array of wrapped objects.
-    def type_params
-      super.params.map { |param| ShimTypeParam.new(param) }
+    # Previously there were specialized types that didn't include some
+    # additional information for type params. So here we wrap them up in order
+    # to maintain the same API.
+    module ShimTypeParams
+      def type_params
+        super.params.map { |param| ShimTypeParam.new(param) }
+      end
     end
-  end
 
-  module RBS::AST::Declarations
     Alias.prepend(ShimTypeParams)
     Class.prepend(ShimTypeParams)
     Interface.prepend(ShimTypeParams)
     Module.prepend(ShimTypeParams)
   end
-end
 
-# Previously this attribute didn't exist on some nodes. So if they don't have
-# it, we're just going to apply it and have it return nil.
-module ShimVisibility
-  def visibility
+  module RBS::AST::Members::Attribute
+    def visibility
+    end
+  end
+
+  class RBS::AST::Members::MethodDefinition
+    def visibility
+    end
   end
 end
 
-module RBS::AST::Members
-  [AttrAccessor, AttrReader, AttrWriter, MethodDefinition].each do |klass|
-    klass.include(ShimVisibility) unless klass.method_defined?(:visibility)
+# If we're using RBS 2, then we need to include these monkey-patches to have a
+# consistent interface in RBS 3+.
+if RBS::VERSION < "3.0.0"
+  class RBS::AST::Declarations::Alias
+    def accept(visitor)
+      visitor.visit_type_alias(self)
+    end
+  end
+
+  class RBS::AST::Members::MethodDefinition
+    class MethodOverloadShim
+      attr_reader :method_type
+
+      def initialize(method_type)
+        @method_type = method_type
+      end
+    end
+
+    alias overloading? overload?
+
+    def overloads
+      types.map { |method_type| MethodOverloadShim.new(method_type) }
+    end
+  end
+
+  module SyntaxTree::RBS
+    class << self
+      undef parse
+      def parse(source)
+        Root.new(::RBS::Parser.parse_signature(source))
+      end
+    end
   end
 end

data/lib/syntax_tree/rbs/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module RBS
-    VERSION = "0.5.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/syntax_tree/rbs.rb

@@ -4,9 +4,6 @@ require "prettier_print"
 require "rbs"
 require "syntax_tree"
 
-require_relative "rbs/shims"
-require_relative "rbs/version"
-
 module SyntaxTree
   module RBS
     # This is the parent class of any of the visitors that we define in this
@@ -24,8 +21,8 @@ module SyntaxTree
     class Formatter < PrettierPrint
       attr_reader :source
 
-      def initialize(source, ...)
-        super(...)
+      def initialize(source, *rest)
+        super(*rest)
         @source = source
         @force_parens = false
       end
@@ -53,7 +50,8 @@ module SyntaxTree
       end
 
       def parse(source)
-        Root.new(::RBS::Parser.parse_signature(source))
+        _, _, declarations = ::RBS::Parser.parse_signature(source)
+        Root.new(declarations)
       end
 
       def read(filepath)
@@ -65,6 +63,8 @@ module SyntaxTree
   register_handler(".rbs", RBS)
 end
 
+require_relative "rbs/shims"
 require_relative "rbs/entrypoints"
 require_relative "rbs/format"
 require_relative "rbs/pretty_print"
+require_relative "rbs/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syntax_tree-rbs
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prettier_print
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/auto-merge.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - CHANGELOG.md
@@ -130,6 +131,7 @@ files:
 - bin/setup
 - gemfiles/rbs1.gemfile
 - gemfiles/rbs2.gemfile
+- gemfiles/rbs3.gemfile
 - lib/syntax_tree/rbs.rb
 - lib/syntax_tree/rbs/entrypoints.rb
 - lib/syntax_tree/rbs/format.rb
@@ -157,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.21
 signing_key:
 specification_version: 4
 summary: Syntax Tree support for RBS