rbs 0.3.1 → 0.8.0

data/lib/rbs/validator.rb

@@ -0,0 +1,51 @@
+module RBS
+  class Validator
+    attr_reader :env
+    attr_reader :resolver
+
+    def initialize(env:, resolver:)
+      @env = env
+      @resolver = resolver
+    end
+
+    def absolute_type(type, context:)
+      type.map_type_name do |type_name, _, type|
+        resolver.resolve(type_name, context: context) || yield(type)
+      end
+    end
+
+    # Validates presence of the relative type, and application arity match.
+    def validate_type(type, context:)
+      case type
+      when Types::ClassInstance, Types::Interface
+        if type.name.namespace.relative?
+          type = absolute_type(type, context: context) do |type|
+            NoTypeFoundError.check!(type.name.absolute!, env: env, location: type.location)
+          end
+        end
+
+        type_params = case type
+                      when Types::ClassInstance
+                        env.class_decls[type.name]&.type_params
+                      when Types::Interface
+                        env.interface_decls[type.name]&.decl&.type_params
+                      end
+
+        unless type_params
+          raise NoTypeFoundError.new(type_name: type.name, location: type.location)
+        end
+
+        InvalidTypeApplicationError.check!(
+          type_name: type.name,
+          args: type.args,
+          params: type_params.each.map(&:name),
+          location: type.location
+        )
+      end
+
+      type.each_type do |type|
+        validate_type(type, context: context)
+      end
+    end
+  end
+end

data/lib/rbs/variance_calculator.rb

@@ -107,9 +107,19 @@ module RBS
           end
         end
       when Types::ClassInstance, Types::Interface
-        decl = env.find_class(type.name)
+        NoTypeFoundError.check!(type.name,
+                                env: env,
+                                location: type.location)
+
+        type_params = case type
+                      when Types::ClassInstance
+                        env.class_decls[type.name]&.type_params
+                      when Types::Interface
+                        env.interface_decls[type.name]&.decl&.type_params
+                      end
+
         type.args.each.with_index do |ty, i|
-          var = decl.type_params.params[i]
+          var = type_params.params[i]
           case var.variance
           when :invariant
             type(ty, result: result, context: :invariant)

data/lib/rbs/version.rb

@@ -1,3 +1,3 @@
 module RBS
-  VERSION = "0.3.1"
+  VERSION = "0.8.0"
 end

data/lib/rbs/writer.rb

@@ -1,37 +1,59 @@
 module RBS
   class Writer
     attr_reader :out
+    attr_reader :indentation
 
     def initialize(out:)
       @out = out
+      @indentation = []
     end
 
-    def write_annotation(annotations, level:)
-      prefix = " " * level
+    def indent(size = 2)
+      indentation.push(" " * size)
+      yield
+    ensure
+      indentation.pop
+    end
+
+    def prefix
+      indentation.join()
+    end
+
+    def puts(string = "")
+      if string.size > 0
+        @out.puts("#{prefix}#{string}")
+      else
+        @out.puts
+      end
+    end
 
+    def write_annotation(annotations)
       annotations.each do |annotation|
         string = annotation.string
         case
         when string !~ /\}/
-          out.puts "#{prefix}%a{#{string}}"
+          puts "%a{#{string}}"
         when string !~ /\)/
-          out.puts "#{prefix}%a(#{string})"
+          puts "%a(#{string})"
         when string !~ /\]/
-          out.puts "#{prefix}%a[#{string}]"
+          puts "%a[#{string}]"
         when string !~ /\>/
-          out.puts "#{prefix}%a<#{string}>"
+          puts "%a<#{string}>"
         when string !~ /\|/
-          out.puts "#{prefix}%a|#{string}|"
+          puts "%a|#{string}|"
         end
       end
     end
 
-    def write_comment(comment, level:)
+    def write_comment(comment)
       if comment
-        prefix = " " * level
         comment.string.lines.each do |line|
-          line = " #{line}" unless line.chomp.empty?
-          out.puts "#{prefix}##{line}"
+          line = line.chomp
+          unless line.empty?
+            puts "# #{line}"
+          else
+            puts "#"
+          end
         end
       end
     end
@@ -49,68 +71,72 @@ module RBS
         super_class = if decl.super_class
                         " < #{name_and_args(decl.super_class.name, decl.super_class.args)}"
                       end
-        write_comment decl.comment, level: 0
-        write_annotation decl.annotations, level: 0
-        out.puts "class #{name_and_params(decl.name, decl.type_params)}#{super_class}"
+        write_comment decl.comment
+        write_annotation decl.annotations
+        puts "class #{name_and_params(decl.name, decl.type_params)}#{super_class}"
 
-        [nil, *decl.members].each_cons(2) do |prev, member|
-          preserve_empty_line prev, member
-          write_member member
+        indent do
+          [nil, *decl.members].each_cons(2) do |prev, member|
+            preserve_empty_line prev, member
+            write_member member
+          end
         end
 
-        out.puts "end"
+        puts "end"
 
       when AST::Declarations::Module
-        self_type = if decl.self_type
-                      " : #{decl.self_type}"
+        self_type = unless decl.self_types.empty?
+                      " : #{decl.self_types.join(", ")}"
                     end
 
-        write_comment decl.comment, level: 0
-        write_annotation decl.annotations, level: 0
-        out.puts "module #{name_and_params(decl.name, decl.type_params)}#{self_type}"
-        decl.members.each.with_index do |member, index|
-          if index > 0
-            out.puts
+        write_comment decl.comment
+        write_annotation decl.annotations
+
+        puts "module #{name_and_params(decl.name, decl.type_params)}#{self_type}"
+
+        indent do
+          decl.members.each.with_index do |member, index|
+            if index > 0
+              puts
+            end
+            write_member member
           end
-          write_member member
         end
-        out.puts "end"
+
+        puts "end"
       when AST::Declarations::Constant
-        write_comment decl.comment, level: 0
-        out.puts "#{decl.name}: #{decl.type}"
+        write_comment decl.comment
+        puts "#{decl.name}: #{decl.type}"
 
       when AST::Declarations::Global
-        write_comment decl.comment, level: 0
-        out.puts "#{decl.name}: #{decl.type}"
+        write_comment decl.comment
+        puts "#{decl.name}: #{decl.type}"
 
       when AST::Declarations::Alias
-        write_comment decl.comment, level: 0
-        write_annotation decl.annotations, level: 0
-        out.puts "type #{decl.name} = #{decl.type}"
+        write_comment decl.comment
+        write_annotation decl.annotations
+        puts "type #{decl.name} = #{decl.type}"
 
       when AST::Declarations::Interface
-        write_comment decl.comment, level: 0
-        write_annotation decl.annotations, level: 0
-        out.puts "interface #{name_and_params(decl.name, decl.type_params)}"
-        decl.members.each.with_index do |member, index|
-          if index > 0
-            out.puts
+        write_comment decl.comment
+        write_annotation decl.annotations
+
+        puts "interface #{name_and_params(decl.name, decl.type_params)}"
+
+        indent do
+          decl.members.each.with_index do |member, index|
+            if index > 0
+              puts
+            end
+            write_member member
           end
-          write_member member
         end
-        out.puts "end"
+
+        puts "end"
 
       when AST::Declarations::Extension
-        write_comment decl.comment, level: 0
-        write_annotation decl.annotations, level: 0
-        out.puts "extension #{name_and_args(decl.name, decl.type_params)} (#{decl.extension_name})"
-        decl.members.each.with_index do |member, index|
-          if index > 0
-            out.puts
-          end
-          write_member member
-        end
-        out.puts "end"
+        RBS.logger.warn "Extension is ignored: #{decl.name}"
+
       end
     end
 
@@ -151,52 +177,54 @@ module RBS
     def write_member(member)
       case member
       when AST::Members::Include
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  include #{name_and_args(member.name, member.args)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "include #{name_and_args(member.name, member.args)}"
       when AST::Members::Extend
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  extend #{name_and_args(member.name, member.args)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "extend #{name_and_args(member.name, member.args)}"
       when AST::Members::Prepend
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  prepend #{name_and_args(member.name, member.args)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "prepend #{name_and_args(member.name, member.args)}"
       when AST::Members::AttrAccessor
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  #{attribute(:accessor, member)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "#{attribute(:accessor, member)}"
       when AST::Members::AttrReader
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  #{attribute(:reader, member)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "#{attribute(:reader, member)}"
       when AST::Members::AttrWriter
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
-        out.puts "  #{attribute(:writer, member)}"
+        write_comment member.comment
+        write_annotation member.annotations
+        puts "#{attribute(:writer, member)}"
       when AST::Members::Public
-        out.puts "  public"
+        puts "public"
       when AST::Members::Private
-        out.puts "  private"
+        puts "private"
       when AST::Members::Alias
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
+        write_comment member.comment
+        write_annotation member.annotations
         new_name = member.singleton? ? "self.#{member.new_name}" : member.new_name
         old_name = member.singleton? ? "self.#{member.old_name}" : member.old_name
-        out.puts "  alias #{new_name} #{old_name}"
+        puts "alias #{new_name} #{old_name}"
       when AST::Members::InstanceVariable
-        write_comment member.comment, level: 2
-        out.puts "  #{member.name}: #{member.type}"
+        write_comment member.comment
+        puts "#{member.name}: #{member.type}"
       when AST::Members::ClassInstanceVariable
-        write_comment member.comment, level: 2
-        out.puts "  self.#{member.name}: #{member.type}"
+        write_comment member.comment
+        puts "self.#{member.name}: #{member.type}"
       when AST::Members::ClassVariable
-        write_comment member.comment, level: 2
-        out.puts "  #{member.name}: #{member.type}"
+        write_comment member.comment
+        puts "#{member.name}: #{member.type}"
       when AST::Members::MethodDefinition
-        write_comment member.comment, level: 2
-        write_annotation member.annotations, level: 2
+        write_comment member.comment
+        write_annotation member.annotations
         write_def member
+      else
+        write_decl member
       end
     end
 
@@ -220,18 +248,26 @@ module RBS
                "self.#{method_name(member.name)}"
              end
 
+      string = ""
+
       attrs = member.attributes.empty? ? "" : member.attributes.join(" ") + " "
-      prefix = "  #{attrs}def #{name}:"
+      overload = member.overload? ? "overload " : ""
+      prefix = "#{overload}#{attrs}def #{name}:"
       padding = " " * (prefix.size-1)
 
-      out.print prefix
+      string << prefix
 
       member.types.each.with_index do |type, index|
         if index > 0
-          out.print padding
-          out.print "|"
+          string << padding
+          string << "|"
         end
-        out.puts " #{type}"
+
+        string << " #{type}\n"
+      end
+
+      string.each_line do |line|
+        puts line.chomp
       end
     end
 
@@ -255,14 +291,14 @@ module RBS
       # When the signature is not constructed by the parser,
       # it always inserts an empty line.
       if !prev.location || !decl.location
-        out.puts
+        puts
         return
       end
 
       prev_end_line = prev.location.end_line
       start_line = decl.location.start_line
       if start_line - prev_end_line > 1
-        out.puts
+        puts
       end
     end
   end

data/rbs.gemspec

@@ -34,13 +34,4 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "racc", "~> 1.4.16"
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "rubocop-rubycw"
-  spec.add_development_dependency "minitest-reporters", "~> 1.3.6"
-  spec.add_development_dependency "json", "~> 2.3.0"
 end

data/schema/annotation.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Annotation associated to a declaration or a member: `%a{rbs:test}`, `%a{steep:deprecated}`, ...",
+  "type": "object",
+  "properties": {
+    "string": {
+      "type": "string"
+    },
+    "location": {
+      "$ref": "location.json"
+    }
+  },
+  "required": ["string", "location"]
+}

data/schema/comment.json

@@ -0,0 +1,26 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "definitions": {
+    "comment": {
+      "type": "object",
+      "properties": {
+        "string": {
+          "type": "string"
+        },
+        "location": {
+          "$ref": "location.json"
+        }
+      },
+      "required": ["string", "location"]
+    }
+  },
+  "title": "Comment associated with a declaration or a member",
+  "oneOf": [
+    {
+      "$ref": "#/definitions/comment"
+    },
+    {
+      "type": "null"
+    }
+  ]
+}