sord 0.10.0 → 3.0.0

data/sord.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|sorbet)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'yard'
   spec.add_dependency 'sorbet-runtime'
-  spec.add_dependency 'commander', '~> 4.4'
-  spec.add_dependency 'parlour', '~> 0.8.0'
+  spec.add_dependency 'commander', '~> 4.5'
+  spec.add_dependency 'parlour', '~> 5.0'
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sord
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Aaron Christiansen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-14 00:00:00.000000000 Z
+date: 2020-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '4.5'
 - !ruby/object:Gem::Dependency
   name: parlour
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - aaronc20000@gmail.com
 executables:
@@ -158,38 +158,19 @@ files:
 - Rakefile
 - exe/sord
 - lib/sord.rb
+- lib/sord/generator.rb
 - lib/sord/logging.rb
 - lib/sord/parlour_plugin.rb
-- lib/sord/rbi_generator.rb
 - lib/sord/resolver.rb
 - lib/sord/type_converter.rb
 - lib/sord/version.rb
 - rbi/sord.rbi
-- sorbet/config
-- sorbet/rbi/gems/docile.rbi
-- sorbet/rbi/gems/parlour.rbi
-- sorbet/rbi/gems/rainbow.rbi
-- sorbet/rbi/gems/rake.rbi
-- sorbet/rbi/gems/rspec-core.rbi
-- sorbet/rbi/gems/rspec-expectations.rbi
-- sorbet/rbi/gems/rspec-mocks.rbi
-- sorbet/rbi/gems/rspec-support.rbi
-- sorbet/rbi/gems/rspec.rbi
-- sorbet/rbi/gems/simplecov-html.rbi
-- sorbet/rbi/gems/simplecov.rbi
-- sorbet/rbi/gems/sorbet-runtime.rbi
-- sorbet/rbi/gems/yard.rbi
-- sorbet/rbi/hidden-definitions/errors.txt
-- sorbet/rbi/hidden-definitions/hidden.rbi
-- sorbet/rbi/sorbet-typed/lib/bundler/all/bundler.rbi
-- sorbet/rbi/sorbet-typed/lib/ruby/all/open3.rbi
-- sorbet/rbi/sorbet-typed/lib/ruby/all/resolv.rbi
 - sord.gemspec
 homepage: https://github.com/AaronC81/sord
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Generate Sorbet RBI files from YARD documentation
 test_files: []

data/lib/sord/rbi_generator.rb

@@ -1,391 +0,0 @@
-# typed: true
-require 'yard'
-require 'sord/type_converter'
-require 'sord/logging'
-require 'parlour'
-require 'rainbow'
-
-module Sord
-  # Converts the current working directory's YARD registry into an RBI file.
-  class RbiGenerator    
-    # @return [Integer] The number of objects this generator has processed so 
-    #   far.
-    def object_count
-      @namespace_count + @method_count
-    end
-
-    # @return [Array<Array(String, YARD::CodeObjects::Base, Integer)>] The 
-    #   errors encountered by by the generator. Each element is of the form
-    #   [message, item, line].
-    attr_reader :warnings
-
-    # Create a new RBI generator.
-    # @param [Hash] options
-    # @option options [Integer] break_params
-    # @option options [Boolean] replace_errors_with_untyped
-    # @option options [Boolean] replace_unresolved_with_untyped
-    # @option options [Boolean] comments
-    # @option options [Parlour::RbiGenerator] generator
-    # @option options [Parlour::RbiGenerator::Namespace] root
-    # @return [void]
-    def initialize(options)
-      @parlour = options[:parlour] || Parlour::RbiGenerator.new
-      @current_object = options[:root] || @parlour.root
-
-      @namespace_count = 0
-      @method_count = 0
-      @warnings = []
-
-      @replace_errors_with_untyped = options[:replace_errors_with_untyped]
-      @replace_unresolved_with_untyped = options[:replace_unresolved_with_untyped]
-      @keep_original_comments = options[:keep_original_comments]
-
-      # Hook the logger so that messages are added as comments to the RBI file
-      Logging.add_hook do |type, msg, item|
-        @current_object.add_comment_to_next_child("sord #{type} - #{msg}")
-      end if options[:sord_comments]
-
-      # Hook the logger so that warnings are collected
-      Logging.add_hook do |type, msg, item|
-        # TODO: is it possible to get line numbers here?
-        warnings << [msg, item, 0] if type == :warn
-      end
-    end
-
-    # Increment the namespace counter.
-    # @return [void]
-    def count_namespace
-      @namespace_count += 1
-    end
-
-    # Increment the method counter.
-    # @return [void]
-    def count_method
-      @method_count += 1
-    end
-
-    # Given a YARD CodeObject, add lines defining its mixins (that is, extends
-    # and includes) to the current RBI file. Returns the number of mixins.
-    # @param [YARD::CodeObjects::Base] item
-    # @return [Integer]
-    def add_mixins(item)
-      item.instance_mixins.reverse_each do |i|
-        @current_object.create_include(i.path.to_s)
-      end
-      item.class_mixins.reverse_each do |e|
-        @current_object.create_extend(e.path.to_s)
-      end
-
-      item.instance_mixins.length + item.class_mixins.length
-    end
-
-    # Given a YARD NamespaceObject, add lines defining constants.
-    # @param [YARD::CodeObjects::NamespaceObject] item
-    # @return [void]
-    def add_constants(item)
-      item.constants.each do |constant|
-        # Take a constant (like "A::B::CONSTANT"), split it on each '::', and
-        # set the constant name to the last string in the array.
-        constant_name = constant.to_s.split('::').last
-        
-        # Add the constant to the current object being generated.
-        @current_object.create_constant(constant_name, value: "T.let(#{constant.value}, T.untyped)") do |c|
-          c.add_comments(constant.docstring.all.split("\n"))
-        end
-      end
-    end
-
-    # Given a YARD NamespaceObject, add lines defining its methods and their
-    # signatures to the current RBI file.
-    # @param [YARD::CodeObjects::NamespaceObject] item
-    # @return [void]
-    def add_methods(item)
-      item.meths(inherited: false).each do |meth|
-        count_method
-
-        # If the method is an alias, skip it so we don't define it as a
-        # separate method. Sorbet will handle it automatically.
-        if meth.is_alias?
-          next
-        end
-
-        # This is better than iterating over YARD's "@param" tags directly 
-        # because it includes parameters without documentation
-        # (The gsubs allow for better splat-argument compatibility)
-        parameter_names_and_defaults_to_tags = meth.parameters.map do |name, default|
-          [[name, default], meth.tags('param')
-            .find { |p| p.name&.gsub('*', '')&.gsub(':', '') == name.gsub('*', '').gsub(':', '') }]
-        end.to_h
-
-        parameter_types = parameter_names_and_defaults_to_tags.map do |name_and_default, tag|
-          name = name_and_default.first
-
-          if tag
-            TypeConverter.yard_to_sorbet(tag.types, meth, @replace_errors_with_untyped, @replace_unresolved_with_untyped)
-          elsif name.start_with? '&'
-            # Find yieldparams and yieldreturn
-            yieldparams = meth.tags('yieldparam')
-            yieldreturn = meth.tag('yieldreturn')&.types
-            yieldreturn = nil if yieldreturn&.length == 1 &&
-              yieldreturn&.first&.downcase == 'void'
-
-            # Create strings
-            params_string = yieldparams.map do |param|
-              "#{param.name.gsub('*', '')}: #{TypeConverter.yard_to_sorbet(param.types, meth, @replace_errors_with_untyped, @replace_unresolved_with_untyped)}" unless param.name.nil?
-            end.join(', ')
-            return_string = TypeConverter.yard_to_sorbet(yieldreturn, meth, @replace_errors_with_untyped, @replace_unresolved_with_untyped)
-
-            # Create proc types, if possible
-            if yieldparams.empty? && yieldreturn.nil?
-              'T.untyped'
-            elsif yieldreturn.nil?
-              "T.proc#{params_string.empty? ? '' : ".params(#{params_string})"}.void"
-            else
-              "T.proc#{params_string.empty? ? '' : ".params(#{params_string})"}.returns(#{return_string})"
-            end
-          elsif meth.path.end_with? '='
-            # Look for the matching getter method
-            getter_path = meth.path[0...-1]
-            getter = item.meths.find { |m| m.path == getter_path }
-
-            unless getter
-              if parameter_names_and_defaults_to_tags.length == 1 \
-                && meth.tags('param').length == 1 \
-                && meth.tag('param').types
-  
-                Logging.infer("argument name in single @param inferred as #{parameter_names_and_defaults_to_tags.first.first.first.inspect}", meth)
-                next TypeConverter.yard_to_sorbet(meth.tag('param').types, meth, @replace_errors_with_untyped, @replace_unresolved_with_untyped)
-              else  
-                Logging.omit("no YARD type given for #{name.inspect}, using T.untyped", meth)
-                next 'T.untyped'
-              end
-            end
-
-            return_types = getter.tags('return').flat_map(&:types)
-            unless return_types.any?
-              Logging.omit("no YARD type given for #{name.inspect}, using T.untyped", meth)
-              next 'T.untyped'
-            end
-            inferred_type = TypeConverter.yard_to_sorbet(
-              return_types, meth, @replace_errors_with_untyped, @replace_unresolved_with_untyped)
-            
-            Logging.infer("inferred type of parameter #{name.inspect} as #{inferred_type} using getter's return type", meth)
-            inferred_type
-          else
-            # Is this the only argument, and was a @param specified without an
-            # argument name? If so, infer it
-            if parameter_names_and_defaults_to_tags.length == 1 \
-              && meth.tags('param').length == 1 \
-              && meth.tag('param').types
-
-              Logging.infer("argument name in single @param inferred as #{parameter_names_and_defaults_to_tags.first.first.first.inspect}", meth)
-              TypeConverter.yard_to_sorbet(meth.tag('param').types, meth, @replace_errors_with_untyped, @replace_unresolved_with_untyped)
-            else
-              Logging.omit("no YARD type given for #{name.inspect}, using T.untyped", meth)
-              'T.untyped'
-            end
-          end
-        end
-
-        return_tags = meth.tags('return')
-        returns = if return_tags.length == 0
-          Logging.omit("no YARD return type given, using T.untyped", meth)
-          'T.untyped'
-        elsif return_tags.length == 1 && return_tags&.first&.types&.first&.downcase == "void"
-          nil
-        else
-          TypeConverter.yard_to_sorbet(meth.tag('return').types, meth, @replace_errors_with_untyped, @replace_unresolved_with_untyped)
-        end
-
-        parlour_params = parameter_names_and_defaults_to_tags
-          .zip(parameter_types)
-          .map do |((name, default), _), type|
-            # If the default is "nil" but the type is not nilable, then it 
-            # should become nilable
-            # (T.untyped can include nil, so don't alter that)
-            type = "T.nilable(#{type})" \
-              if default == 'nil' && !type.start_with?('T.nilable') && type != 'T.untyped'
-            Parlour::RbiGenerator::Parameter.new(
-              name.to_s,
-              type: type,
-              default: default
-            )
-          end
-
-        @current_object.create_method(
-          meth.name.to_s, 
-          parameters: parlour_params,
-          returns: returns,
-          class_method: meth.scope == :class
-        ) do |m|
-          if @keep_original_comments
-            m.add_comments(meth.docstring.all.split("\n"))
-          else
-            parser = YARD::Docstring.parser
-            parser.parse(meth.docstring.all)
-
-            docs_array = parser.text.split("\n")
-
-            # Add @param tags if there are any with names and descriptions.
-            params = parser.tags.select { |tag| tag.tag_name == 'param' && tag.is_a?(YARD::Tags::Tag) && !tag.name.nil? }
-            # Add a blank line if there's anything before the params.
-            docs_array << '' if docs_array.length.positive? && params.length.positive?
-            params.each do |param|
-              docs_array << '' if docs_array.last != '' && docs_array.length.positive?
-              # Output params in the form of:
-              # _@param_ `foo` — Lorem ipsum.
-              # _@param_ `foo`
-              if param.text.nil?
-                docs_array << "_@param_ `#{param.name}`"
-              else
-                docs_array << "_@param_ `#{param.name}` — #{param.text}"
-              end
-            end
-
-            # Add @return tags (there could possibly be more than one, despite this not being supported)
-            returns = parser.tags.select { |tag| tag.tag_name == 'return' && tag.is_a?(YARD::Tags::Tag) && !tag.text.nil? && tag.text.strip != '' }
-            # Add a blank line if there's anything before the returns.
-            docs_array << '' if docs_array.length.positive? && returns.length.positive?
-            returns.each do |retn|
-              docs_array << '' if docs_array.last != '' && docs_array.length.positive?
-              # Output returns in the form of:
-              # _@return_ — Lorem ipsum.
-              docs_array << "_@return_ — #{retn.text}"
-            end
-
-            # Iterate through the @example tags for a given YARD doc and output them in Markdown codeblocks.
-            examples = parser.tags.select { |tag| tag.tag_name == 'example' && tag.is_a?(YARD::Tags::Tag) }
-            examples.each do |example|
-              # Only add a blank line if there's anything before the example.
-              docs_array << '' if docs_array.length.positive?
-              # Include the example's 'name' if there is one.
-              docs_array << example.name unless example.name.nil? || example.name == ""
-              docs_array << "```ruby"
-              docs_array.concat(example.text.split("\n"))
-              docs_array << "```"
-            end if examples.length.positive?
-
-            # Add @note and @deprecated tags.
-            notice_tags = parser.tags.select { |tag| ['note', 'deprecated'].include?(tag.tag_name) && tag.is_a?(YARD::Tags::Tag) }
-            # Add a blank line if there's anything before the params.
-            docs_array << '' if docs_array.last != '' && docs_array.length.positive? && notice_tags.length.positive?
-            notice_tags.each do |notice_tag|
-              docs_array << '' if docs_array.last != ''
-              # Output note/deprecated/see in the form of:
-              # _@note_ — Lorem ipsum.
-              # _@note_
-              if notice_tag.text.nil?
-                docs_array << "_@#{notice_tag.tag_name}_"
-              else
-                docs_array << "_@#{notice_tag.tag_name}_ — #{notice_tag.text}"
-              end
-            end
-
-            # Add @see tags.
-            see_tags = parser.tags.select { |tag| tag.tag_name == 'see' && tag.is_a?(YARD::Tags::Tag) }
-            # Add a blank line if there's anything before the params.
-            docs_array << '' if docs_array.last != '' && docs_array.length.positive? && see_tags.length.positive?
-            see_tags.each do |see_tag|
-              docs_array << '' if docs_array.last != ''
-              # Output note/deprecated/see in the form of:
-              # _@see_ `B` — Lorem ipsum.
-              # _@see_ `B`
-              if see_tag.text.nil?
-                docs_array << "_@see_ `#{see_tag.name}`"
-              else
-                docs_array << "_@see_ `#{see_tag.name}` — #{see_tag.text}"
-              end
-            end
-
-            m.add_comments(docs_array)
-          end
-        end
-      end
-    end
-
-    # Given a YARD NamespaceObject, add lines defining its mixins, methods
-    # and children to the RBI file.
-    # @param [YARD::CodeObjects::NamespaceObject] item
-    # @return [void]
-    def add_namespace(item)
-      count_namespace
-
-      superclass = nil
-      superclass = item.superclass.path.to_s if item.type == :class && item.superclass.to_s != "Object"
-
-      parent = @current_object
-      @current_object = item.type == :class \
-        ? parent.create_class(item.name.to_s, superclass: superclass)
-        : parent.create_module(item.name.to_s)
-      @current_object.add_comments(item.docstring.all.split("\n"))
-
-      add_mixins(item)
-      add_methods(item)
-      add_constants(item)
-
-      item.children.select { |x| [:class, :module].include?(x.type) }
-        .each { |child| add_namespace(child) }
-
-      @current_object = parent
-    end
-
-    # Populates the RBI generator with the contents of the YARD registry. You 
-    # must load the YARD registry first!
-    # @return [void]
-    def populate
-      # Generate top-level modules, which recurses to all modules
-      YARD::Registry.root.children
-        .select { |x| [:class, :module].include?(x.type) }
-        .each { |child| add_namespace(child) }
-      end
-
-    # Populates the RBI generator with the contents of the YARD registry, then
-    # uses the loaded Parlour::RbiGenerator to generate the RBI file. You must
-    # load the YARD registry first!
-    # @return [void]
-    def generate
-      populate
-      @parlour.rbi
-    end
-
-    # Loads the YARD registry, populates the RBI file, and prints any relevant
-    # final logs.
-    # @return [void]
-    def run
-      # Get YARD ready
-      YARD::Registry.load!
-
-      # Populate the RBI
-      populate
-
-      if object_count.zero?
-        Logging.warn("No objects processed.")
-        Logging.warn("Have you definitely generated the YARD documentation for this project?")
-        Logging.warn("Run `yard` to generate docs.")
-      end
-
-      Logging.done("Processed #{object_count} objects (#{@namespace_count} namespaces and #{@method_count} methods)")
-
-      Logging.hooks.clear
-
-      unless warnings.empty?
-        Logging.warn("There were #{warnings.length} important warnings in the RBI file, listed below.")
-        if @replace_errors_with_untyped
-          Logging.warn("The types which caused them have been replaced with T.untyped.")
-        else
-          Logging.warn("The types which caused them have been replaced with SORD_ERROR_ constants.")
-        end
-        Logging.warn("Please edit the file to fix these errors.")
-        Logging.warn("Alternatively, edit your YARD documentation so that your types are valid and re-run Sord.")
-        warnings.each do |(msg, item, _)|
-          puts "        (#{Rainbow(item&.path).bold}) #{msg}"
-        end
-      end
-    rescue
-      Logging.error($!)
-      $@.each do |line|
-        puts "         #{line}"
-      end
-    end
-  end
-end