rbi 0.0.1 → 0.0.2

data/lib/rbi/rewriters/nest_non_public_methods.rb

@@ -0,0 +1,63 @@
+# typed: strict
+# frozen_string_literal: true
+
+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

data/lib/rbi/rewriters/nest_singleton_methods.rb

@@ -0,0 +1,40 @@
+# typed: strict
+# frozen_string_literal: true
+
+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

data/lib/rbi/rewriters/sort_nodes.rb

@@ -0,0 +1,84 @@
+# typed: strict
+# frozen_string_literal: true
+
+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)
+        node.nodes.sort! do |a, b|
+          return 0 if a.is_a?(Mixin) || b.is_a?(Mixin)
+
+          res = node_rank(a) <=> node_rank(b)
+          res = node_name(a) <=> node_name(b) if res == 0
+          res || 0
+        end
+      end
+
+      private
+
+      sig { params(node: Node).returns(Integer) }
+      def node_rank(node)
+        case node
+        when Group                then kind_rank(node.kind)
+        when Include, Extend      then 0
+        when Helper               then 1
+        when TypeMember           then 2
+        when MixesInClassMethods  then 3
+        when TStructField         then 4
+        when TEnumBlock           then 5
+        when Method
+          if node.name == "initialize"
+            7
+          elsif !node.is_singleton
+            8
+          else
+            9
+          end
+        when Scope, Const then 9
+        else
+          10
+        end
+      end
+
+      sig { params(kind: Group::Kind).returns(Integer) }
+      def kind_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

data/lib/rbi/version.rb

@@ -1,3 +1,7 @@
+# typed: true
+# typed: false
+# frozen_string_literal: true
+
 module RBI
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/rbi/visitor.rb

@@ -0,0 +1,19 @@
+# typed: strict
+# frozen_string_literal: true
+
+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

metadata

@@ -1,59 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alexandre Terrasa
-autorequire:
-bindir: exe
+autorequire: 
+bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: ast
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 13.0.1
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sorbet-runtime
+  name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,35 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sorbet
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.19.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,27 +80,35 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - alexandre.terrasa@shopify.com
-executables:
-- rbi
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
 - README.md
 - Rakefile
-- exe/rbi
 - lib/rbi.rb
-- lib/rbi/cli.rb
+- lib/rbi/index.rb
+- lib/rbi/loc.rb
+- lib/rbi/model.rb
+- lib/rbi/parser.rb
+- lib/rbi/printer.rb
+- lib/rbi/rewriters/group_nodes.rb
+- lib/rbi/rewriters/merge_trees.rb
+- lib/rbi/rewriters/nest_non_public_methods.rb
+- lib/rbi/rewriters/nest_singleton_methods.rb
+- lib/rbi/rewriters/sort_nodes.rb
 - lib/rbi/version.rb
+- lib/rbi/visitor.rb
 homepage: https://github.com/Shopify/rbi
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -136,15 +116,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.7
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.2.20
+signing_key: 
 specification_version: 4
-summary: RBI related tools.
+summary: RBI generation framework
 test_files: []

data/exe/rbi

@@ -1,7 +0,0 @@
-#! /usr/bin/env ruby
-# typed: true
-# frozen_string_literal: true
-
-require_relative "../lib/rbi"
-
-RBI::CLI.start(ARGV)

data/lib/rbi/cli.rb

@@ -1,19 +0,0 @@
-# typed: true
-# frozen_string_literal: true
-
-module RBI
-  class CLI < ::Thor
-    extend T::Sig
-
-    map T.unsafe(%w[--version] => :__print_version)
-
-    desc "--version", "Show version"
-    def __print_version
-      puts "RBI v#{RBI::VERSION}"
-    end
-
-    def self.exit_on_failure?
-      true
-    end
-  end
-end