tapioca 0.4.21 → 0.4.25

data/lib/tapioca/rbi/rewriters/nest_non_public_methods.rb

@@ -0,0 +1,65 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module RBI
+    module Rewriters
+      class NestNonPublicMethods < Visitor
+        extend T::Sig
+
+        sig { override.params(node: T.nilable(Node)).void }
+        def visit(node)
+          return unless node
+
+          case node
+          when Tree
+            public_group = VisibilityGroup.new(Visibility::Public)
+            protected_group = VisibilityGroup.new(Visibility::Protected)
+            private_group = VisibilityGroup.new(Visibility::Private)
+
+            node.nodes.dup.each do |child|
+              visit(child)
+              next unless child.is_a?(Method)
+              child.detach
+              case child.visibility
+              when Visibility::Protected
+                protected_group << child
+              when Visibility::Private
+                private_group << child
+              else
+                public_group << child
+              end
+            end
+
+            node << public_group unless public_group.empty?
+            node << protected_group unless protected_group.empty?
+            node << private_group unless private_group.empty?
+          end
+        end
+      end
+    end
+
+    class Tree
+      extend T::Sig
+
+      sig { void }
+      def nest_non_public_methods!
+        visitor = Rewriters::NestNonPublicMethods.new
+        visitor.visit(self)
+      end
+    end
+
+    class VisibilityGroup < Tree
+      extend T::Sig
+
+      sig { returns(Visibility) }
+      attr_reader :visibility
+
+      sig { params(visibility: Visibility).void }
+      def initialize(visibility)
+        super()
+        @visibility = visibility
+      end
+    end
+  end
+end

data/lib/tapioca/rbi/rewriters/nest_singleton_methods.rb

@@ -0,0 +1,42 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module RBI
+    module Rewriters
+      class NestSingletonMethods < Visitor
+        extend T::Sig
+
+        sig { override.params(node: T.nilable(Node)).void }
+        def visit(node)
+          return unless node
+
+          case node
+          when Tree
+            singleton_class = SingletonClass.new
+
+            node.nodes.dup.each do |child|
+              visit(child)
+              next unless child.is_a?(Method) && child.is_singleton
+              child.detach
+              child.is_singleton = false
+              singleton_class << child
+            end
+
+            node << singleton_class unless singleton_class.empty?
+          end
+        end
+      end
+    end
+
+    class Tree
+      extend T::Sig
+
+      sig { void }
+      def nest_singleton_methods!
+        visitor = Rewriters::NestSingletonMethods.new
+        visitor.visit(self)
+      end
+    end
+  end
+end

data/lib/tapioca/rbi/rewriters/sort_nodes.rb

@@ -0,0 +1,86 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module RBI
+    module Rewriters
+      class SortNodes < Visitor
+        extend T::Sig
+
+        sig { override.params(node: T.nilable(Node)).void }
+        def visit(node)
+          return unless node.is_a?(Tree)
+          visit_all(node.nodes)
+          original_order = node.nodes.map.with_index.to_h
+          node.nodes.sort! do |a, b|
+            res = node_rank(a) <=> node_rank(b)
+            res = node_name(a) <=> node_name(b) if res == 0
+            res = (original_order[a] || 0) <=> (original_order[b] || 0) if res == 0
+            res || 0
+          end
+        end
+
+        private
+
+        sig { params(node: Node).returns(Integer) }
+        def node_rank(node)
+          case node
+          when Group                then group_rank(node.kind)
+          when Include, Extend      then 10
+          when Helper               then 20
+          when TypeMember           then 30
+          when MixesInClassMethods  then 40
+          when TStructField         then 50
+          when TEnumBlock           then 60
+          when Method
+            if node.name == "initialize"
+              71
+            elsif !node.is_singleton
+              72
+            else
+              73
+            end
+          when Scope, Const then 80
+          else
+            100
+          end
+        end
+
+        sig { params(kind: Group::Kind).returns(Integer) }
+        def group_rank(kind)
+          case kind
+          when Group::Kind::Mixins              then 0
+          when Group::Kind::Helpers             then 1
+          when Group::Kind::TypeMembers         then 2
+          when Group::Kind::MixesInClassMethods then 3
+          when Group::Kind::TStructFields       then 4
+          when Group::Kind::TEnums              then 5
+          when Group::Kind::Inits               then 6
+          when Group::Kind::Methods             then 7
+          when Group::Kind::Consts              then 8
+          else
+            T.absurd(kind)
+          end
+        end
+
+        sig { params(node: Node).returns(T.nilable(String)) }
+        def node_name(node)
+          case node
+          when Module, Class, Const, Method, Helper, TStructField
+            node.name
+          end
+        end
+      end
+    end
+
+    class Tree
+      extend T::Sig
+
+      sig { void }
+      def sort_nodes!
+        visitor = Rewriters::SortNodes.new
+        visitor.visit(self)
+      end
+    end
+  end
+end

data/lib/tapioca/rbi/visitor.rb

@@ -0,0 +1,21 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module RBI
+    class Visitor
+      extend T::Helpers
+      extend T::Sig
+
+      abstract!
+
+      sig { abstract.params(node: T.nilable(Node)).void }
+      def visit(node); end
+
+      sig { params(nodes: T::Array[Node]).void }
+      def visit_all(nodes)
+        nodes.each { |node| visit(node) }
+      end
+    end
+  end
+end

data/lib/tapioca/sorbet_ext/fixed_hash_patch.rb

@@ -0,0 +1,20 @@
+# typed: true
+# frozen_string_literal: true
+
+module T
+  module Types
+    class FixedHash
+      def name
+        entries = @types.map do |(k, v)|
+          if Symbol === k && ":#{k}" == k.inspect
+            "#{k}: #{v}"
+          else
+            "#{k.inspect} => #{v}"
+          end
+        end
+
+        "{#{entries.join(', ')}}"
+      end
+    end
+  end
+end

data/lib/tapioca/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Tapioca
-  VERSION = "0.4.21"
+  VERSION = "0.4.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.4.21
+  version: 0.4.25
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,6 +128,7 @@ files:
 - lib/tapioca/cli/main.rb
 - lib/tapioca/compilers/dsl/action_controller_helpers.rb
 - lib/tapioca/compilers/dsl/action_mailer.rb
+- lib/tapioca/compilers/dsl/active_job.rb
 - lib/tapioca/compilers/dsl/active_record_associations.rb
 - lib/tapioca/compilers/dsl/active_record_columns.rb
 - lib/tapioca/compilers/dsl/active_record_enum.rb
@@ -154,11 +155,20 @@ files:
 - lib/tapioca/config_builder.rb
 - lib/tapioca/constant_locator.rb
 - lib/tapioca/core_ext/class.rb
+- lib/tapioca/core_ext/string.rb
 - lib/tapioca/gemfile.rb
 - lib/tapioca/generator.rb
 - lib/tapioca/generic_type_registry.rb
 - lib/tapioca/internal.rb
 - lib/tapioca/loader.rb
+- lib/tapioca/rbi/model.rb
+- lib/tapioca/rbi/printer.rb
+- lib/tapioca/rbi/rewriters/group_nodes.rb
+- lib/tapioca/rbi/rewriters/nest_non_public_methods.rb
+- lib/tapioca/rbi/rewriters/nest_singleton_methods.rb
+- lib/tapioca/rbi/rewriters/sort_nodes.rb
+- lib/tapioca/rbi/visitor.rb
+- lib/tapioca/sorbet_ext/fixed_hash_patch.rb
 - lib/tapioca/sorbet_ext/generic_name_patch.rb
 - lib/tapioca/sorbet_ext/name_patch.rb
 - lib/tapioca/version.rb
@@ -182,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard