parlour 4.0.0 → 5.0.0.beta.4

data/lib/parlour/rbi_generator/module_namespace.rb

@@ -1,13 +1,13 @@
 # typed: true
 module Parlour
-  class RbiGenerator
+  class RbiGenerator < Generator
     # Represents a module definition.
     class ModuleNamespace < Namespace
       extend T::Sig
 
       sig do
         params(
-          generator: RbiGenerator,
+          generator: Generator,
           name: String,
           final: T::Boolean,
           interface: T::Boolean,
@@ -96,6 +96,11 @@ module Parlour
         "Module #{name} - #{"interface, " if interface}#{children.length} " +
           "children, #{includes.length} includes, #{extends.length} extends"
       end
+
+      sig { override.void }
+      def generalize_from_rbi!
+        super
+      end
     end
   end
 end

data/lib/parlour/rbi_generator/namespace.rb

@@ -1,6 +1,6 @@
 # typed: true
 module Parlour
-  class RbiGenerator
+  class RbiGenerator < Generator
     # A generic namespace. This shouldn't be used, except as the type of
     # {RbiGenerator#root}.
     class Namespace < RbiObject
@@ -24,7 +24,7 @@ module Parlour
 
       sig do
         params(
-          generator: RbiGenerator,
+          generator: Generator,
           name: T.nilable(String),
           final: T::Boolean,
           block: T.nilable(T.proc.params(x: Namespace).void)
@@ -77,6 +77,17 @@ module Parlour
         )
       end
 
+      sig { returns(T::Array[RbiGenerator::TypeAlias]) }
+      # The {RbiGenerator::TypeAlias} objects from {children}.
+      # @return [Array<RbiGenerator::TypeAlias>]
+      def aliases
+        T.cast(
+          children.select { |c| c.is_a?(RbiGenerator::TypeAlias) },
+          T::Array[RbiGenerator::TypeAlias]
+        )
+      end
+      alias type_aliases aliases
+
       sig { returns(T::Array[RbiGenerator::Constant]) }
       # The {RbiGenerator::Constant} objects from {children}.
       # @return [Array<RbiGenerator::Constant>]
@@ -260,8 +271,8 @@ module Parlour
         params(
           name: String,
           parameters: T.nilable(T::Array[Parameter]),
-          return_type: T.nilable(String),
-          returns: T.nilable(String),
+          return_type: T.nilable(Types::TypeLike),
+          returns: T.nilable(Types::TypeLike),
           abstract: T::Boolean,
           implementation: T::Boolean,
           override: T::Boolean,
@@ -320,7 +331,7 @@ module Parlour
         params(
           name: String,
           kind: Symbol,
-          type: String,
+          type: Types::TypeLike,
           class_attribute: T::Boolean,
           block: T.nilable(T.proc.params(x: Attribute).void)
         ).returns(Attribute)
@@ -376,7 +387,7 @@ module Parlour
       sig do
         params(
           name: String,
-          type: String,
+          type: Types::TypeLike,
           class_attribute: T::Boolean,
           block: T.nilable(T.proc.params(x: Attribute).void)
         ).returns(Attribute)
@@ -397,7 +408,7 @@ module Parlour
       sig do
         params(
           name: String,
-          type: String,
+          type: Types::TypeLike,
           class_attribute: T::Boolean,
           block: T.nilable(T.proc.params(x: Attribute).void)
         ).returns(Attribute)
@@ -418,7 +429,7 @@ module Parlour
       sig do
         params(
           name: String,
-          type: String,
+          type: Types::TypeLike,
           class_attribute: T::Boolean,
           block: T.nilable(T.proc.params(x: Attribute).void)
         ).returns(Attribute)
@@ -552,7 +563,7 @@ module Parlour
         new_constant
       end
 
-      sig { params(name: String, type: String, block: T.nilable(T.proc.params(x: Constant).void)).returns(Constant) }
+      sig { params(name: String, type: Types::TypeLike, block: T.nilable(T.proc.params(x: TypeAlias).void)).returns(TypeAlias) }
       # Adds a new type alias, in the form of a constant, to this namespace.
       #
       # @example Add a +MyType+ type alias, to +Integer+, to the class.
@@ -563,7 +574,15 @@ module Parlour
       # @param block A block which the new instance yields itself to.
       # @return [RbiGenerator::Constant]
       def create_type_alias(name, type:, &block)
-        create_constant(name, value: "T.type_alias { #{type} }", &block)
+        new_type_alias = RbiGenerator::TypeAlias.new(
+          generator,
+          name: name,
+          type: type,
+          &block
+        )
+        move_next_comments(new_type_alias)
+        children << new_type_alias
+        new_type_alias
       end
 
       sig do
@@ -615,12 +634,17 @@ module Parlour
           "includes, #{extends.length} extends, #{constants.length} constants"
       end
 
+      sig { override.void }
+      def generalize_from_rbi!
+        children.each(&:generalize_from_rbi!)
+      end
+
       private
 
       sig do
         overridable.params(
           indent_level: Integer,
-          options: Options
+          options: Options,
         ).returns(T::Array[String])
       end
       # Generates the RBI lines for the body of this namespace. This consists of
@@ -639,13 +663,16 @@ module Parlour
         eigen_constants, non_eigen_constants = constants.partition(&:eigen_constant)
         eigen_constants.sort_by!(&:name) if options.sort_namespaces
 
-        if includes.any? || extends.any? || non_eigen_constants.any?
+        if includes.any? || extends.any? || aliases.any? || non_eigen_constants.any?
           result += (options.sort_namespaces ? includes.sort_by(&:name) : includes)
             .flat_map { |x| x.generate_rbi(indent_level, options) }
             .reject { |x| x.strip == '' }
           result += (options.sort_namespaces ? extends.sort_by(&:name) : extends)
             .flat_map { |x| x.generate_rbi(indent_level, options) }
             .reject { |x| x.strip == '' }
+          result += (options.sort_namespaces ? aliases.sort_by(&:name) : aliases)
+            .flat_map { |x| x.generate_rbi(indent_level, options) }
+            .reject { |x| x.strip == '' }
           result += (options.sort_namespaces ? non_eigen_constants.sort_by(&:name) : non_eigen_constants)
             .flat_map { |x| x.generate_rbi(indent_level, options) }
             .reject { |x| x.strip == '' }
@@ -695,7 +722,7 @@ module Parlour
 
         first, *rest = remaining_children.reject do |child|
           # We already processed these kinds of children
-          child.is_a?(Include) || child.is_a?(Extend) || child.is_a?(Constant)
+          child.is_a?(Include) || child.is_a?(Extend) || child.is_a?(Constant) || child.is_a?(TypeAlias)
         end
         unless first
           # Remove any trailing whitespace due to includes or class attributes

data/lib/parlour/rbi_generator/parameter.rb

@@ -1,6 +1,7 @@
 # typed: true
+require 'rainbow'
 module Parlour
-  class RbiGenerator
+  class RbiGenerator < Generator
     # Represents a method parameter with a Sorbet type signature.
     class Parameter
       extend T::Sig
@@ -8,7 +9,7 @@ module Parlour
       sig do
         params(
           name: String,
-          type: T.nilable(String),
+          type: T.nilable(Types::TypeLike),
           default: T.nilable(String)
         ).void
       end
@@ -80,7 +81,7 @@ module Parlour
         T.must(name[prefix.length..-1])
       end
 
-      sig { returns(String) }
+      sig { returns(Types::TypeLike) }
       # A Sorbet string of this parameter's type, such as +"String"+ or
       # +"T.untyped"+.
       # @return [String]
@@ -118,8 +119,8 @@ module Parlour
       #
       # @return [String]
       def to_sig_param
-        "#{name_without_kind}: #{type}"
-      end#
+        "#{name_without_kind}: #{String === @type ? @type : @type.generate_rbi}"
+      end
 
       # A mapping of {kind} values to the characteristic prefixes each kind has.
       PREFIXES = {
@@ -128,6 +129,11 @@ module Parlour
         double_splat: '**',
         block: '&'
       }.freeze
+
+      sig { void }
+      def generalize_from_rbi!
+        @type = TypeParser.parse_single_type(@type) if String === @type
+      end
     end
   end
 end

data/lib/parlour/rbi_generator/rbi_object.rb

@@ -1,17 +1,15 @@
 # typed: true
 module Parlour
-  class RbiGenerator
+  class RbiGenerator < Generator
     # An abstract class which is subclassed by any classes which can generate
     # entire lines of an RBI, such as {Namespace} and {Method}. (As an example,
     # {Parameter} is _not_ a subclass because it does not generate lines, only
     # segments of definition and signature lines.)
     # @abstract
-    class RbiObject
-      extend T::Helpers
-      extend T::Sig
+    class RbiObject < TypedObject
       abstract!
-
-      sig { params(generator: RbiGenerator, name: String).void }
+      
+      sig { params(generator: Generator, name: String).void }
       # Creates a new RBI object.
       # @note Don't call this directly.
       #
@@ -19,60 +17,16 @@ module Parlour
       # @param name [String] The name of this module.
       # @return [void]
       def initialize(generator, name)
+        super(name)
         @generator = generator
-        @generated_by = generator.current_plugin
-        @name = name
-        @comments = []
+        @generated_by = RbiGenerator === generator ? generator.current_plugin : nil
       end
 
-      sig { returns(RbiGenerator) }
+      sig { returns(Generator) }
       # The generator which this object belongs to.
-      # @return [RbiGenerator]
+      # @return [Generator]
       attr_reader :generator
 
-      sig { returns(T.nilable(Plugin)) }
-      # The {Plugin} which was controlling the {generator} when this object was
-      # created.
-      # @return [Plugin, nil]
-      attr_reader :generated_by
-
-      sig { returns(String) }
-      # The name of this object.
-      # @return [String]
-      attr_reader :name
-
-      sig { returns(T::Array[String]) }
-      # An array of comments which will be placed above the object in the RBI
-      # file.
-      # @return [Array<String>]
-      attr_reader :comments
-
-      sig { params(comment: T.any(String, T::Array[String])).void }
-      # Adds one or more comments to this RBI object. Comments always go above 
-      # the definition for this object, not in the definition's body.
-      #
-      # @example Creating a module with a comment.
-      #   namespace.create_module('M') do |m|
-      #     m.add_comment('This is a module')
-      #   end
-      #
-      # @example Creating a class with a multi-line comment.
-      #   namespace.create_class('C') do |c|
-      #     c.add_comment(['This is a multi-line comment!', 'It can be as long as you want!'])
-      #   end
-      #
-      # @param comment [String, Array<String>] The new comment(s).
-      # @return [void]
-      def add_comment(comment)
-        if comment.is_a?(String)
-          comments << comment
-        elsif comment.is_a?(Array)
-          comments.concat(comment)
-        end
-      end
-
-      alias_method :add_comments, :add_comment
-
       sig do
         abstract.params(
           indent_level: Integer,
@@ -115,32 +69,19 @@ module Parlour
       # @return [void]
       def merge_into_self(others); end
 
-      sig { abstract.returns(String) }
-      # Returns a human-readable brief string description of this object. This
-      # is displayed during manual conflict resolution with the +parlour+ CLI.
-      #
-      # @abstract
-      # @return [String]
-      def describe; end
-      
-      private
-
-      sig do
-        params(
-          indent_level: Integer,
-          options: Options
-        ).returns(T::Array[String])
+      sig { override.overridable.returns(String) }
+      def describe
+        'RBI object'
       end
-      # Generates the RBI lines for this object's comments.
+
+      sig { abstract.void }
+      # Assuming that the types throughout this object and its children have
+      # been specified as RBI-style types, generalises them into type instances
+      # from the {Parlour::Types} module.
       #
-      # @param indent_level [Integer] The indentation level to generate the lines at.
-      # @param options [Options] The formatting options to use.
-      # @return [Array<String>] The RBI lines for each comment, formatted as specified.
-      def generate_comments(indent_level, options)
-        comments.any? \
-          ? comments.map { |c| options.indented(indent_level, "# #{c}") }
-          : []
-      end
+      # @abstract
+      # @return [void]
+      def generalize_from_rbi!; end
     end
   end
 end

data/lib/parlour/rbi_generator/struct_class_namespace.rb

@@ -8,7 +8,7 @@ module Parlour
 
       sig do
         params(
-          generator: RbiGenerator,
+          generator: Generator,
           name: String,
           final: T::Boolean,
           props: T::Array[StructProp],
@@ -39,7 +39,7 @@ module Parlour
       sig do
         override.params(
           indent_level: Integer,
-          options: Options
+          options: Options,
         ).returns(T::Array[String])
       end
       # Generates the RBI lines for the body of this struct. This consists of
@@ -98,6 +98,13 @@ module Parlour
           @props = other.props if props.empty?
         end
       end
+
+      sig { override.void }
+      def generalize_from_rbi!
+        super
+
+        props.each(&:generalize_from_rbi!)
+      end
     end
   end
 end

data/lib/parlour/rbi_generator/struct_prop.rb

@@ -1,6 +1,6 @@
 # typed: true
 module Parlour
-  class RbiGenerator
+  class RbiGenerator < Generator
     # Represents a +T::Struct+ property.
     class StructProp
       extend T::Sig
@@ -8,7 +8,7 @@ module Parlour
       sig do
         params(
           name: String,
-          type: String,
+          type: Types::TypeLike,
           optional: T.nilable(T.any(T::Boolean, Symbol)),
           enum: T.nilable(String),
           dont_store: T.nilable(T::Boolean),
@@ -28,8 +28,7 @@ module Parlour
       # https://github.com/sorbet/sorbet/blob/master/gems/sorbet-runtime/lib/types/props/_props.rb#L31-L106
       #
       # @param name [String] The name of this property.
-      # @param type [String] A Sorbet string of this property's type, such as
-      #   +"String"+.
+      # @param type [String] This property's type.
       # @return [void]
       def initialize(name, type, optional: nil, enum: nil, dont_store: nil,
         foreign: nil, default: nil, factory: nil, immutable: nil, array: nil,
@@ -77,10 +76,9 @@ module Parlour
       # @return [String]
       attr_reader :name
 
-      sig { returns(T.nilable(String)) }
-      # A Sorbet string of this parameter's type, such as +"String"+ or
-      # +"T.untyped"+.
-      # @return [String, nil]
+      sig { returns(Types::TypeLike) }
+      # This parameter's type.
+      # @return [Types::TypeLike, nil]
       attr_reader :type
 
       sig { returns(T.nilable(T.any(T::Boolean, Symbol))) }
@@ -122,7 +120,7 @@ module Parlour
       # Returns the +prop+ call required to create this property.
       # @return [String]
       def to_prop_call
-        call = "prop :#{name}, #{type}"
+        call = "prop :#{name}, #{String === @type ? @type : @type.generate_rbi}"
 
         EXTRA_PROPERTIES.each do |extra_property|
           value = send extra_property
@@ -131,6 +129,11 @@ module Parlour
 
         call
       end
+
+      sig { void }
+      def generalize_from_rbi!
+        @type = TypeParser.parse_single_type(@type) if String === @type
+      end
     end
   end
 end

data/lib/parlour/rbi_generator/type_alias.rb

@@ -0,0 +1,101 @@
+# typed: true
+module Parlour
+  class RbiGenerator < Generator
+    # Represents a type alias.
+    class TypeAlias < RbiObject
+      sig do
+        params(
+          generator: Generator,
+          name: String,
+          type: Types::TypeLike,
+          block: T.nilable(T.proc.params(x: TypeAlias).void)
+        ).void
+      end
+      # Creates a new type alias.
+      #
+      # @param name [String] The name of the alias.
+      # @param value [String] The type to alias to.
+      def initialize(generator, name:, type:, &block)
+        super(generator, name)
+        @type = type
+        yield_self(&block) if block
+      end
+
+      # @return [Types::TypeLike] The type to alias to.
+      sig { returns(Types::TypeLike) }
+      attr_reader :type
+
+      sig { params(other: Object).returns(T::Boolean) }
+      # Returns true if this instance is equal to another type alias.
+      #
+      # @param other [Object] The other instance. If this is not a {TypeAlias} (or a
+      #   subclass of it), this will always return false.
+      # @return [Boolean]
+      def ==(other)
+        TypeAlias === other && name == other.name && type == other.type
+      end
+
+      sig do
+        override.params(
+          indent_level: Integer,
+          options: Options
+        ).returns(T::Array[String])
+      end
+      # Generates the RBI lines for this type alias.
+      #
+      # @param indent_level [Integer] The indentation level to generate the lines at.
+      # @param options [Options] The formatting options to use.
+      # @return [Array<String>] The RBI lines, formatted as specified.
+      def generate_rbi(indent_level, options)
+        [options.indented(indent_level,
+          "#{name} = T.type_alias { #{String === @type ? @type : @type.generate_rbi} }"
+        )]
+      end
+
+      sig do
+        override.params(
+          others: T::Array[RbiGenerator::RbiObject]
+        ).returns(T::Boolean)
+      end
+      # Given an array of {TypeAlias} instances, returns true if they may be 
+      # merged into this instance using {merge_into_self}. This is always false.
+      #
+      # @param others [Array<RbiGenerator::RbiObject>] An array of other
+      #   {TypeAlias} instances.
+      # @return [Boolean] Whether this instance may be merged with them.
+      def mergeable?(others)
+        others.all? { |other| self == other }
+      end
+
+      sig do
+        override.params(
+          others: T::Array[RbiGenerator::RbiObject]
+        ).void
+      end
+      # Given an array of {TypeAlias} instances, merges them into this one.
+      # This particular implementation will simply do nothing, as instances
+      # are only mergeable if they are indentical.
+      # You MUST ensure that {mergeable?} is true for those instances.
+      #
+      # @param others [Array<RbiGenerator::RbiObject>] An array of other
+      #   {TypeAlias} instances.
+      # @return [void]
+      def merge_into_self(others)
+        # We don't need to change anything! We only merge identical type alias
+      end
+
+      sig { override.returns(String) }
+      # Returns a human-readable brief string description of this code.
+      #
+      # @return [String]
+      def describe
+        "Type Alias (#{name} = #{type})"
+      end
+
+      sig { override.void }
+      def generalize_from_rbi!
+        @type = TypeParser.parse_single_type(@type) if String === @type
+      end
+    end
+  end
+end