rbs 3.6.0.pre.2 → 3.6.0.pre.3

data/lib/rbs/ast/type_param.rb

@@ -154,39 +154,72 @@ module RBS
       end
 
       def self.application(params, args)
-        subst = Substitution.new()
-
         if params.empty?
           return nil
         end
 
-        min_count = params.count { _1.default_type.nil? }
-        max_count = params.size
+        optional_params, required_params = params.partition {|param| param.default_type }
+
+        param_subst = Substitution.new()
+        app_subst = Substitution.new()
+
+        required_params.zip(args.take(required_params.size)).each do |param, arg|
+          arg ||= Types::Bases::Any.new(location: nil)
+          param_subst.add(from: param.name, to: arg)
+          app_subst.add(from: param.name, to: arg)
+        end
 
-        unless min_count <= args.size && args.size <= max_count
-          raise "Invalid type application: required type params=#{min_count}, optional type params=#{max_count - min_count}, given args=#{args.size}"
+        optional_params.each do |param|
+          param_subst.add(from: param.name, to: Types::Bases::Any.new(location: nil))
         end
 
-        params.zip(args).each do |param, arg|
+        optional_params.zip(args.drop(required_params.size)).each do |param, arg|
           if arg
-            subst.add(from: param.name, to: arg)
+            app_subst.add(from: param.name, to: arg)
           else
-            subst.add(from: param.name, to: param.default_type || raise)
+            param.default_type or raise
+            app_subst.add(from: param.name, to: param.default_type.sub(param_subst))
           end
         end
 
-        subst
+        app_subst
       end
 
       def self.normalize_args(params, args)
+        app = application(params, args) or return []
+
+        min_count = params.count { _1.default_type.nil? }
+        unless min_count <= args.size && args.size <= params.size
+          return args
+        end
+
         params.zip(args).filter_map do |param, arg|
           if arg
             arg
           else
-            param.default_type
+            if param.default_type
+              param.default_type.sub(app)
+            else
+              Types::Bases::Any.new(location: nil)
+            end
           end
         end
       end
+
+      def self.validate(type_params)
+        optionals = type_params.filter {|param| param.default_type }
+
+        optional_param_names = optionals.map(&:name).sort
+
+        optionals.filter! do |param|
+          default_type = param.default_type or raise
+          optional_param_names.any? { default_type.free_variables.include?(_1) }
+        end
+
+        unless optionals.empty?
+          optionals
+        end
+      end
     end
   end
 end

data/lib/rbs/cli/validate.rb

@@ -117,10 +117,6 @@ EOU
                   no_classish_type_validator(arg)
                   @validator.validate_type(arg, context: nil)
                 end
-
-                if super_entry = @env.normalized_class_entry(super_class.name)
-                  InvalidTypeApplicationError.check!(type_name: super_class.name, args: super_class.args, params: super_entry.type_params, location: super_class.location)
-                end
               end
             end
           when Environment::ModuleEntry
@@ -171,6 +167,8 @@ EOU
             end
           end
 
+          TypeParamDefaultReferenceError.check!(d.type_params)
+
           entry.decls.each do |d|
             d.decl.each_member do |member|
               case member
@@ -248,6 +246,8 @@ EOU
             end
           end
 
+          TypeParamDefaultReferenceError.check!(decl.decl.type_params)
+
           decl.decl.members.each do |member|
             case member
             when AST::Members::MethodDefinition
@@ -319,6 +319,8 @@ EOU
             end
           end
 
+          TypeParamDefaultReferenceError.check!(decl.decl.type_params)
+
           no_self_type_validator(decl.decl.type)
           no_classish_type_validator(decl.decl.type)
           void_type_context_validator(decl.decl.type)

data/lib/rbs/definition.rb

@@ -237,14 +237,8 @@ module RBS
         @ancestors = ancestors
       end
 
-      def apply(args, location:)
-        # Assume default types of type parameters are already added to `args`
-        InvalidTypeApplicationError.check!(
-          type_name: type_name,
-          args: args,
-          params: params.map { AST::TypeParam.new(name: _1, variance: :invariant, upper_bound: nil, location: nil, default_type: nil) },
-          location: location
-        )
+      def apply(args, env:, location:)
+        InvalidTypeApplicationError.check2!(env: env, type_name: type_name, args: args, location: location)
 
         subst = Substitution.build(params, args)
 

data/lib/rbs/definition_builder/ancestor_builder.rb

@@ -213,7 +213,7 @@ module RBS
             end
 
             super_name = env.normalize_module_name(super_name)
-            
+
             NoSuperclassFoundError.check!(super_name, env: env, location: primary.decl.location)
             if super_class
               InheritModuleError.check!(super_class, env: env)
@@ -458,7 +458,9 @@ module RBS
             super_name = super_class.name
             super_args = super_class.args
 
-            super_ancestors = instance_ancestors(super_name, building_ancestors: building_ancestors).apply(super_args, location: entry.primary.decl.location)
+            super_ancestors =
+              instance_ancestors(super_name, building_ancestors: building_ancestors)
+                .apply(super_args, env: env, location: entry.primary.decl.super_class&.location)
             super_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: super_name, source: :super) }
             ancestors.unshift(*super_ancestors)
           end
@@ -477,7 +479,10 @@ module RBS
           included_modules.each do |mod|
             name = mod.name
             arg_types = mod.args
-            mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors).apply(arg_types, location: entry.primary.decl.location)
+            mod.source.is_a?(AST::Members::Include) or raise
+            mod_ancestors =
+              instance_ancestors(name, building_ancestors: building_ancestors)
+                .apply(arg_types, env: env, location: mod.source.location)
             mod_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: name, source: mod.source) }
             ancestors.unshift(*mod_ancestors)
           end
@@ -489,7 +494,10 @@ module RBS
           prepended_modules.each do |mod|
             name = mod.name
             arg_types = mod.args
-            mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors).apply(arg_types, location: entry.primary.decl.location)
+            mod.source.is_a?(AST::Members::Prepend) or raise
+            mod_ancestors =
+              instance_ancestors(name, building_ancestors: building_ancestors)
+                .apply(arg_types, env: env, location: mod.source.location)
             mod_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: name, source: mod.source) }
             ancestors.unshift(*mod_ancestors)
           end
@@ -524,7 +532,9 @@ module RBS
           super_name = super_class.name
           super_args = super_class.args
 
-          super_ancestors = instance_ancestors(super_name, building_ancestors: building_ancestors).apply(super_args, location: entry.primary.decl.location)
+          super_ancestors =
+            instance_ancestors(super_name, building_ancestors: building_ancestors)
+              .apply(super_args, env: env, location: nil)
           super_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: super_name, source: :super) }
           ancestors.unshift(*super_ancestors)
 
@@ -539,7 +549,10 @@ module RBS
         extended_modules.each do |mod|
           name = mod.name
           args = mod.args
-          mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors).apply(args, location: entry.primary.decl.location)
+          mod.source.is_a?(AST::Members::Extend) or raise
+          mod_ancestors =
+            instance_ancestors(name, building_ancestors: building_ancestors)
+              .apply(args, env: env, location: mod.source.location)
           mod_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: name, source: mod.source) }
           ancestors.unshift(*mod_ancestors)
         end
@@ -572,7 +585,10 @@ module RBS
 
         included_interfaces = one_ancestors.included_interfaces or raise
         included_interfaces.each do |a|
-          included_ancestors = interface_ancestors(a.name, building_ancestors: building_ancestors).apply(a.args, location: entry.decl.location)
+          a.source.is_a?(AST::Members::Include) or raise
+          included_ancestors =
+            interface_ancestors(a.name, building_ancestors: building_ancestors)
+              .apply(a.args, env: env, location: a.source.location)
           included_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: a.name, source: a.source) }
           ancestors.unshift(*included_ancestors)
         end

data/lib/rbs/definition_builder.rb

@@ -79,7 +79,7 @@ module RBS
           raise
         end
 
-      Substitution.build(params.map(&:name), args)
+      AST::TypeParam.application(params, args) || Substitution.new()
     end
 
     def define_instance(definition, type_name, subst)
@@ -549,16 +549,17 @@ module RBS
       interfaces_methods.each do |interface, (methods, member)|
         unless interface.args.empty?
           methods.type.is_a?(Types::Interface) or raise
-          params = methods.type.args.map do |arg|
-            arg.is_a?(Types::Variable) or raise
-            arg.name
-          end
 
           interface.args.each do |arg|
             validate_type_presence(arg)
           end
 
-          subst_ = subst + Substitution.build(params, interface.args)
+          type_params = env.interface_decls.fetch(interface.name).decl.type_params
+          if s = AST::TypeParam.application(type_params, interface.args)
+            subst_ = subst + s
+          else
+            subst_ = subst
+          end
         else
           subst_ = subst
         end

data/lib/rbs/errors.rb

@@ -88,6 +88,23 @@ module RBS
         raise new(type_name: type_name, args: args, params: params, location: location)
       end
     end
+
+    def self.check2!(env:, type_name:, args:, location:)
+      params =
+        case
+        when type_name.class?
+          decl = env.normalized_module_class_entry(type_name) or raise
+          decl.type_params
+        when type_name.interface?
+          env.interface_decls.fetch(type_name).decl.type_params
+        when type_name.alias?
+          env.type_alias_decls.fetch(type_name).decl.type_params
+        else
+          raise
+        end
+
+      check!(type_name: type_name, args: args, params: params, location: location)
+    end
   end
 
   class RecursiveAncestorError < DefinitionError
@@ -559,4 +576,25 @@ module RBS
       @location = location
     end
   end
+
+  class TypeParamDefaultReferenceError < DefinitionError
+    include DetailedMessageable
+
+    attr_reader :type_param
+    attr_reader :location
+
+    def initialize(type_param, location:)
+      super "#{Location.to_string(location)}: the default of #{type_param.name} cannot include optional type parameter"
+      @location = location
+      @type_param = type_param
+    end
+
+    def self.check!(type_params)
+      if errors = AST::TypeParam.validate(type_params)
+        error = errors[0] or raise
+        error.default_type or raise
+        raise new(error, location: error.default_type.location)
+      end
+    end
+  end
 end

data/lib/rbs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBS
-  VERSION = "3.6.0.pre.2"
+  VERSION = "3.6.0.pre.3"
 end

data/sig/definition.rbs

@@ -109,7 +109,7 @@ module RBS
 
       def initialize: (type_name: TypeName, params: Array[Symbol], ancestors: Array[Ancestor::t]) -> void
 
-      def apply: (Array[Types::t], location: Location[untyped, untyped]?) -> Array[Ancestor::t]
+      def apply: (Array[Types::t], env: Environment, location: Location[untyped, untyped]?) -> Array[Ancestor::t]
     end
 
     class SingletonAncestors

data/sig/errors.rbs

@@ -66,6 +66,8 @@ module RBS
     def initialize: (type_name: TypeName, args: Array[Types::t], params: Array[AST::TypeParam], location: Location[untyped, untyped]?) -> void
 
     def self.check!: (type_name: TypeName, args: Array[Types::t], params: Array[AST::TypeParam], location: Location[untyped, untyped]?) -> void
+
+    def self.check2!: (env: Environment, type_name: TypeName, args: Array[Types::t], location: Location[untyped, untyped]?) -> void
   end
 
   class RecursiveAncestorError < DefinitionError
@@ -366,4 +368,16 @@ module RBS
 
     attr_reader location: Location[untyped, untyped]?
   end
+
+  class TypeParamDefaultReferenceError < BaseError
+    include DetailedMessageable
+
+    attr_reader type_param: AST::TypeParam
+
+    def initialize: (AST::TypeParam, location: Location[untyped, untyped]?) -> void
+
+    attr_reader location: Location[untyped, untyped]?
+
+    def self.check!: (Array[AST::TypeParam]) -> void
+  end
 end

data/sig/members.rbs

@@ -122,8 +122,7 @@ module RBS
         # include Array[String]
         # ^^^^^^^                keyword
         #         ^^^^^          name
-        #              ^         arg_open
-        #                     ^  arg_close
+        #              ^^^^^^^^  args
         #
         type loc = Location[:name | :keyword, :args]
 

data/sig/type_param.rbs

@@ -75,7 +75,14 @@ module RBS
 
       def to_s: () -> String
 
-      # Returns an application with respect to type params` default
+      # Validates TypeParams if it refers another optiional type params
+      #
+      # * Returns array of TypeParam objects that refers other optional type params
+      # * Returns `nil` if all type params are valid
+      #
+      def self.validate: (Array[TypeParam]) -> Array[TypeParam]?
+
+      # Returns an application with respect to type params' default
       #
       def self.application: (Array[TypeParam], Array[Types::t]) -> Substitution?
 
@@ -95,10 +102,7 @@ module RBS
       # _Foo[String, Integer, untyped] # => _Foo[String, Integer, untyped]  (Keeping extra args)
       # ```
       #
-      # Note that it allows iinvalid arities.
-      #
-      # * Missing args will be omitted
-      # * Extra args will be keeped
+      # Note that it allows iinvalid arities, returning the `args` immediately.
       #
       def self.normalize_args: (Array[TypeParam], Array[Types::t]) -> Array[Types::t]
     end

data/stdlib/bigdecimal/0/big_decimal.rbs

@@ -408,8 +408,6 @@ class BigDecimal < Numeric
   #
   def self.save_rounding_mode: () { (?nil) -> void } -> void
 
-  public
-
   # <!--
   #   rdoc-file=ext/bigdecimal/bigdecimal.c
   #   - a % b

data/stdlib/cgi/0/core.rbs

@@ -382,8 +382,6 @@ class CGI
   #
   def self.parse: (String query) -> Hash[String, Array[String]]
 
-  public
-
   # <!-- rdoc-file=lib/cgi/core.rb -->
   # Return the accept character set for this CGI instance.
   #
@@ -706,8 +704,6 @@ class CGI
     #
     def self.parse: (String raw_cookie) -> Hash[String, instance]
 
-    public
-
     # <!-- rdoc-file=lib/cgi/cookie.rb -->
     # Domain for which this cookie applies, as a `String`
     #
@@ -864,8 +860,6 @@ class CGI
   end
 
   module Escape
-    public
-
     # <!--
     #   rdoc-file=ext/cgi/escape/escape.c
     #   - CGI.escape(string) -> string
@@ -940,8 +934,6 @@ class CGI
   #     mode.
   #
   module QueryExtension
-    public
-
     # <!--
     #   rdoc-file=lib/cgi/core.rb
     #   - [](key)
@@ -1135,8 +1127,6 @@ class CGI
   module Util
     include CGI::Escape
 
-    public
-
     # <!--
     #   rdoc-file=lib/cgi/util.rb
     #   - escapeElement(string, *elements)

data/stdlib/date/0/date.rbs

@@ -733,8 +733,6 @@ class Date
   #
   def self.xmlschema: (String str, ?Integer start) -> Date
 
-  public
-
   # <!--
   #   rdoc-file=ext/date/date_core.c
   #   - d + other  ->  date

data/stdlib/date/0/date_time.rbs

@@ -388,8 +388,6 @@ class DateTime < Date
   #
   def self.xmlschema: (String str, ?Integer start) -> DateTime
 
-  public
-
   # <!--
   #   rdoc-file=ext/date/date_core.c
   #   - deconstruct_keys(array_of_names_or_nil) -> hash

data/stdlib/dbm/0/dbm.rbs

@@ -74,8 +74,6 @@ class DBM
   def self.open: (String filename, ?Integer mode, ?Integer flags) -> DBM
                | [T] (String filename, ?Integer mode, ?Integer flags) { (DBM) -> T } -> T
 
-  public
-
   # <!--
   #   rdoc-file=ext/dbm/dbm.c
   #   - dbm[key] -> string value or nil

data/stdlib/delegate/0/delegator.rbs

@@ -40,8 +40,6 @@ class Delegator < BasicObject
 
   def self.public_api: () -> untyped
 
-  public
-
   # <!--
   #   rdoc-file=lib/delegate.rb
   #   - !()

data/stdlib/delegate/0/simple_delegator.rbs

@@ -67,8 +67,6 @@
 #       Unique:  6
 #
 class SimpleDelegator < Delegator
-  public
-
   # <!--
   #   rdoc-file=lib/delegate.rb
   #   - __getobj__() { || ... }

data/stdlib/digest/0/digest.rbs

@@ -103,8 +103,6 @@ Digest::REQUIRE_MUTEX: Thread::Mutex
 # calculate message digest values.
 #
 module Digest::Instance
-  public
-
   # <!-- rdoc-file=ext/digest/digest.c -->
   # Updates the digest using a given *string* and returns self.
   #
@@ -403,8 +401,6 @@ end
 #                 Data_Wrap_Struct(0, 0, 0, (void *)&sha1));
 #
 class Digest::Base < Digest::Class
-  public
-
   # <!-- rdoc-file=ext/digest/digest.c -->
   # Update the digest using given *string* and return `self`.
   #

data/stdlib/etc/0/etc.rbs

@@ -709,8 +709,6 @@ module Etc
 
     def self.new: (*untyped) -> untyped
 
-    public
-
     def gid: () -> Integer
 
     def gid=: (Integer new_gid) -> void
@@ -807,8 +805,6 @@ module Etc
 
     def self.new: (*untyped) -> untyped
 
-    public
-
     def change: () -> Integer
 
     def change=: (Integer new_change) -> void

data/stdlib/json/0/json.rbs

@@ -980,6 +980,28 @@ module JSON
   #
   def self?.load: (string | _JsonReadableIO | _JsonRead source, ?Proc proc, ?json_options options) -> untyped
 
+  # <!--
+  #   rdoc-file=ext/json/lib/json/common.rb
+  #   - JSON.load_file(path, opts={}) -> object
+  # -->
+  # Calls:
+  #     parse(File.read(path), opts)
+  #
+  # See method #parse.
+  #
+  def self?.load_file: (string path, ?json_options opts) -> untyped
+
+  # <!--
+  #   rdoc-file=ext/json/lib/json/common.rb
+  #   - JSON.load_file!(path, opts = {})
+  # -->
+  # Calls:
+  #     JSON.parse!(File.read(path, opts))
+  #
+  # See method #parse!
+  #
+  def self?.load_file!: (string path, ?json_options opts) -> untyped
+
   # <!-- rdoc-file=ext/json/lib/json/common.rb -->
   # Sets or returns default options for the JSON.load method. Initially:
   #     opts = JSON.load_default_options

data/stdlib/logger/0/formatter.rbs

@@ -4,8 +4,6 @@ class Logger
   # Default formatter for log messages.
   #
   class Formatter
-    public
-
     attr_accessor datetime_format: String?
 
     # <!--

data/stdlib/logger/0/log_device.rbs

@@ -11,8 +11,6 @@ class Logger
     attr_reader dev: _WriteCloser
     attr_reader filename: String?
 
-    public
-
     # <!--
     #   rdoc-file=lib/logger/log_device.rb
     #   - close()

data/stdlib/logger/0/logger.rbs

@@ -357,8 +357,6 @@ class Logger
 
   include Logger::Severity
 
-  public
-
   # <!--
   #   rdoc-file=lib/logger.rb
   #   - <<(msg)

data/stdlib/monitor/0/monitor.rbs

@@ -10,8 +10,6 @@
 #     end
 #
 class Monitor
-  public
-
   # <!--
   #   rdoc-file=ext/monitor/monitor.c
   #   - enter()
@@ -195,8 +193,6 @@ module MonitorMixin
   #
   def self.extend_object: (untyped obj) -> untyped
 
-  public
-
   # <!--
   #   rdoc-file=ext/monitor/lib/monitor.rb
   #   - mon_enter()
@@ -303,8 +299,6 @@ end
 # calls while_wait and signal, this class should be documented.
 #
 class MonitorMixin::ConditionVariable
-  public
-
   # <!--
   #   rdoc-file=ext/monitor/lib/monitor.rb
   #   - broadcast()

data/stdlib/mutex_m/0/mutex_m.rbs

@@ -34,8 +34,6 @@ module Mutex_m
 
   def self.extend_object: (Object obj) -> untyped
 
-  public
-
   def mu_extended: () -> untyped
 
   # <!--

data/stdlib/net-http/0/net-http.rbs

@@ -1485,8 +1485,6 @@ module Net
     def start: [T] () { (Net::HTTP) -> T } -> T
              | () -> Net::HTTP
 
-    public
-
     # <!--
     #   rdoc-file=lib/net/http.rb
     #   - finish()
@@ -1503,8 +1501,6 @@ module Net
     #
     def finish: () -> void
 
-    public
-
     # <!--
     #   rdoc-file=lib/net/http.rb
     #   - Proxy(p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil)
@@ -1583,8 +1579,6 @@ module Net
     #
     alias proxyport proxy_port
 
-    public
-
     # <!--
     #   rdoc-file=lib/net/http.rb
     #   - get(path, initheader = nil) {|res| ... }
@@ -3976,8 +3970,6 @@ module Net
     #
     def self.body_permitted?: () -> bool
 
-    public
-
     include Net::HTTPHeader
 
     # <!-- rdoc-file=lib/net/http/response.rb -->

data/stdlib/observable/0/observable.rbs

@@ -130,8 +130,6 @@
 #     ticker.run
 #
 module Observable
-  public
-
   # <!--
   #   rdoc-file=lib/observer.rb
   #   - add_observer(observer, func=:update)