rbs 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9649673f547b364e4d635ab3f65b32a6edbf4e27c066672d07fbcd448c5d4117
-  data.tar.gz: fdc3a315e87664045ac17752441f387626125645e9f1919d5bf7b6f1e74268d8
+  metadata.gz: 7a5d2a9cd76c2802e303f61813f418c15a2fc131b23f1eb8e90a92f409efcf37
+  data.tar.gz: d008724c5628a0c21b153a6ae99dadf7604ee90ad4caa210e07bbad974f91894
 SHA512:
-  metadata.gz: 9f918e0459212a3c8d4b405955e62e14f21e99eb6fb71215feb22353ebb1aa1f2f1863bc7acb8b216ae7db5f98c975001dc45e45bc069354b2362f0a0f9064be
-  data.tar.gz: 18f89a600eefa6de24f4daa699f101fa773ae116ea68c2924b2e2eac52d3b4b373018bf14c33c8fed2bb97e291d3cb998b42ca1d3355c5be92e50414662f9d20
+  metadata.gz: 4c903cc9f9b536281e0632aff0cae6d520856152bdf33b1d8fc34b2dd8e5caab93af6aaa1387eb7433b430d2d90dafcd5557c7aeba0b043d6ab340bc22d36dcb
+  data.tar.gz: 1913b79a1bb5b6510734aaca4aee8fa1759dae851486662ee5055040b8d70554b9466d061cc53c971ade8d76d75312486fe39cea5b1f4c7d3bfa333501fb56da

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## master
 
+## 3.0.3 (2023-03-07)
+
+### Library changes
+
+* Fix `DefinitionBuilder` ([\#1268](https://github.com/ruby/rbs/pull/1268))
+
+#### rbs collection
+
+* Skip dependencies not included in `Gemfile.lock` ([\#1266](https://github.com/ruby/rbs/pull/1266))
+
+### Miscellaneous
+
+* Skip RBS validation on Ruby CI ([\#1264](https://github.com/ruby/rbs/pull/1264), [\#1263](https://github.com/ruby/rbs/pull/1263))
+
 ## 3.0.2 (2023-03-01)
 
 ### Library changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs (3.0.2)
+    rbs (3.0.3)
 
 PATH
   remote: test/assets/test-gem
@@ -115,4 +115,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.4.6
+   2.4.7

data/Rakefile

@@ -59,7 +59,17 @@ task :validate => :compile do
   sh "#{ruby} #{rbs} validate --silent"
 
   libs = FileList["stdlib/*"].map {|path| File.basename(path).to_s }
-  libs << "rbs"
+
+  # Skip RBS validation because Ruby CI runs without rubygems
+  case skip_rbs_validation = ENV["SKIP_RBS_VALIDATION"]
+  when nil
+    libs << "rbs"
+  when "true"
+    # Skip
+  else
+    STDERR.puts "🚨🚨🚨🚨 SKIP_RBS_VALIDATION is expected to be `true` or unset, given `#{skip_rbs_validation}` 🚨🚨🚨🚨"
+    libs << "rbs"
+  end
 
   libs.each do |lib|
     sh "#{ruby} #{rbs} -r #{lib} validate --silent"

data/lib/rbs/collection/config/lockfile_generator.rb

@@ -75,8 +75,9 @@ module RBS
               next
             end
 
-            spec = gem_hash[dep.name] or raise "Cannot find `#{dep.name}` in bundler context"
-            assign_gem(name: dep.name, version: spec.version, ignored_gems: ignored_gems, src_data: nil)
+            if spec = gem_hash[dep.name]
+              assign_gem(name: dep.name, version: spec.version, ignored_gems: ignored_gems, src_data: nil)
+            end
           end
 
           lockfile.lockfile_path.write(YAML.dump(lockfile.to_lockfile))
@@ -131,8 +132,9 @@ module RBS
           end
 
           gem_hash[name].dependencies.each do |dep|
-            spec = gem_hash[dep.name]
-            assign_gem(name: dep.name, version: spec.version, src_data: nil, ignored_gems: ignored_gems)
+            if spec = gem_hash[dep.name]
+              assign_gem(name: dep.name, version: spec.version, src_data: nil, ignored_gems: ignored_gems)
+            end
           end
         end
 

data/lib/rbs/definition_builder/ancestor_builder.rb

@@ -432,8 +432,9 @@ module RBS
             super_name = super_class.name
             super_args = super_class.args
 
-            super_ancestors = instance_ancestors(super_name, building_ancestors: building_ancestors)
-            ancestors.unshift(*super_ancestors.apply(super_args, location: entry.primary.decl.location))
+            super_ancestors = instance_ancestors(super_name, building_ancestors: building_ancestors).apply(super_args, location: entry.primary.decl.location)
+            super_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: super_name, source: :super) }
+            ancestors.unshift(*super_ancestors)
           end
         end
 
@@ -450,8 +451,9 @@ module RBS
           included_modules.each do |mod|
             name = mod.name
             arg_types = mod.args
-            mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors)
-            ancestors.unshift(*mod_ancestors.apply(arg_types, location: entry.primary.decl.location))
+            mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors).apply(arg_types, location: entry.primary.decl.location)
+            mod_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: name, source: mod.source) }
+            ancestors.unshift(*mod_ancestors)
           end
         end
 
@@ -461,8 +463,9 @@ module RBS
           prepended_modules.each do |mod|
             name = mod.name
             arg_types = mod.args
-            mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors)
-            ancestors.unshift(*mod_ancestors.apply(arg_types, location: entry.primary.decl.location))
+            mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors).apply(arg_types, location: entry.primary.decl.location)
+            mod_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: name, source: mod.source) }
+            ancestors.unshift(*mod_ancestors)
           end
         end
 
@@ -495,8 +498,9 @@ module RBS
           super_name = super_class.name
           super_args = super_class.args
 
-          super_ancestors = instance_ancestors(super_name, building_ancestors: building_ancestors)
-          ancestors.unshift(*super_ancestors.apply(super_args, location: entry.primary.decl.location))
+          super_ancestors = instance_ancestors(super_name, building_ancestors: building_ancestors).apply(super_args, location: entry.primary.decl.location)
+          super_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: super_name, source: :super) }
+          ancestors.unshift(*super_ancestors)
 
         when Definition::Ancestor::Singleton
           super_name = super_class.name
@@ -509,8 +513,9 @@ module RBS
         extended_modules.each do |mod|
           name = mod.name
           args = mod.args
-          mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors)
-          ancestors.unshift(*mod_ancestors.apply(args, location: entry.primary.decl.location))
+          mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors).apply(args, location: entry.primary.decl.location)
+          mod_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: name, source: mod.source) }
+          ancestors.unshift(*mod_ancestors)
         end
 
         ancestors.unshift(self_ancestor)
@@ -541,9 +546,9 @@ 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)
-
-          ancestors.unshift(*included_ancestors.apply(a.args, location: entry.decl.location))
+          included_ancestors = interface_ancestors(a.name, building_ancestors: building_ancestors).apply(a.args, location: entry.decl.location)
+          included_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: a.name, source: a.source) }
+          ancestors.unshift(*included_ancestors)
         end
 
         ancestors.unshift(self_ancestor)
@@ -555,6 +560,19 @@ module RBS
           ancestors: ancestors
         )
       end
+
+      def fill_ancestor_source(ancestor, name:, source:, &block)
+        case ancestor
+        when Definition::Ancestor::Instance
+          if ancestor.name == name && !ancestor.source
+            Definition::Ancestor::Instance.new(name: ancestor.name, args: ancestor.args, source: source)
+          else
+            ancestor
+          end
+        else
+          ancestor
+        end
+      end
     end
   end
 end

data/lib/rbs/definition_builder.rb

@@ -31,9 +31,10 @@ module RBS
     end
 
     def define_interface(definition, type_name, subst)
-      included_interfaces = ancestor_builder.one_interface_ancestors(type_name).included_interfaces or raise
-      interface_methods = interface_methods(included_interfaces)
+      included_interfaces = ancestor_builder.interface_ancestors(type_name).ancestors #: Array[Definition::Ancestor::Instance]
+      included_interfaces = included_interfaces.reject {|ancestor| ancestor.source == nil }
 
+      interface_methods = interface_methods(included_interfaces)
       methods = method_builder.build_interface(type_name)
 
       import_methods(definition, type_name, methods, interface_methods, subst)
@@ -55,7 +56,6 @@ module RBS
         Definition.new(type_name: type_name, entry: entry, self_type: self_type, ancestors: ancestors).tap do |definition|
           methods = method_builder.build_interface(type_name)
           one_ancestors = ancestor_builder.one_interface_ancestors(type_name)
-
           validate_type_params(definition, methods: methods, ancestors: one_ancestors)
 
           define_interface(definition, type_name, subst)
@@ -94,7 +94,12 @@ module RBS
         define_instance(definition, mod.name, subst + tapp_subst(mod.name, mod.args))
       end
 
-      interface_methods = interface_methods(one_ancestors.each_included_interface.to_a)
+      all_interfaces = one_ancestors.each_included_interface.flat_map do |interface|
+        other_interfaces = ancestor_builder.interface_ancestors(interface.name).ancestors #: Array[Definition::Ancestor::Instance]
+        other_interfaces = other_interfaces.select {|ancestor| ancestor.source }
+        [interface, *other_interfaces]
+      end
+      interface_methods = interface_methods(all_interfaces)
       import_methods(definition, type_name, methods, interface_methods, subst)
 
       one_ancestors.each_prepended_module do |mod|
@@ -219,6 +224,7 @@ module RBS
 
         Definition.new(type_name: type_name, entry: entry, self_type: self_type, ancestors: ancestors).tap do |definition|
           one_ancestors = ancestor_builder.one_singleton_ancestors(type_name)
+          methods = method_builder.build_singleton(type_name)
 
           if super_class = one_ancestors.super_class
             case super_class
@@ -233,8 +239,13 @@ module RBS
             definition.class_variables.merge!(defn.class_variables)
           end
 
-          one_ancestors = ancestor_builder.one_singleton_ancestors(type_name)
-          methods = method_builder.build_singleton(type_name)
+          all_interfaces = one_ancestors.each_extended_interface.flat_map do |interface|
+            other_interfaces = ancestor_builder.interface_ancestors(interface.name).ancestors #: Array[Definition::Ancestor::Instance]
+            other_interfaces = other_interfaces.select {|ancestor| ancestor.source }
+            [interface, *other_interfaces]
+          end
+          interface_methods = interface_methods(all_interfaces)
+          import_methods(definition, type_name, methods, interface_methods, Substitution.new)
 
           one_ancestors.each_extended_module do |mod|
             mod.args.each do |arg|
@@ -279,7 +290,7 @@ module RBS
 
     def build_singleton(type_name)
       type_name = env.normalize_module_name(type_name)
-      
+
       try_cache type_name, cache: singleton_cache do
         entry = env.class_decls[type_name] or raise "Unknown name for build_singleton: #{type_name}"
         ensure_namespace!(type_name.namespace, location: entry.decls[0].decl.location)
@@ -683,8 +694,8 @@ module RBS
             Definition::Method::TypeDef.new(
               type: method_type,
               member: original,
-              defined_in: definition.type_name,
-              implemented_in: definition.type_name
+              defined_in: defined_in,
+              implemented_in: implemented_in
             )
           ],
           accessibility: method.accessibility,
@@ -713,7 +724,7 @@ module RBS
         method_definition = Definition::Method.new(
           super_method: super_method,
           defs: existing_method.defs.map do |defn|
-            defn.update(implemented_in: definition.type_name)
+            defn.update(implemented_in: implemented_in)
           end,
           accessibility: existing_method.accessibility,
           alias_of: existing_method.alias_of
@@ -725,8 +736,8 @@ module RBS
           type_def = Definition::Method::TypeDef.new(
             type: subst.empty? ? overload.method_type : overload.method_type.sub(subst),
             member: overloading_def,
-            defined_in: definition.type_name,
-            implemented_in: definition.type_name
+            defined_in: defined_in,
+            implemented_in: implemented_in
           )
 
           method_definition.defs.unshift(type_def)

data/lib/rbs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBS
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

data/sig/ancestor_builder.rbs

@@ -154,6 +154,10 @@ module RBS
                         prepended_modules: Array[Definition::Ancestor::Instance]?,
                          extended_modules: Array[Definition::Ancestor::Instance]?,
                       extended_interfaces: Array[Definition::Ancestor::Instance]?) -> void
+
+      # Fill `#source` of instance ancestor if `ancestor.name == name` and its `source` is `nil`
+      #
+      def fill_ancestor_source: (Definition::Ancestor::t, name: TypeName, source: Definition::Ancestor::Instance::source)  -> Definition::Ancestor::t
     end
   end
 end

data/sig/definition.rbs

@@ -83,8 +83,9 @@ module RBS
       type t = Instance | Singleton
 
       class Instance
-        type source = :super | nil
-                    | AST::Members::Include | AST::Members::Extend | AST::Members::Prepend
+        type source = :super     # Inheritance
+                    | nil        # Itself
+                    | AST::Members::Include | AST::Members::Extend | AST::Members::Prepend  # AST
                     | AST::Declarations::Module::Self
 
         attr_reader name: TypeName

data/sig/definition_builder.rbs

@@ -142,6 +142,10 @@ module RBS
     #
     def define_instance: (Definition definition, TypeName type_name, Substitution subst) -> void
 
+    # Updates `definition` with methods defined in an interface `type_name`
+    #
+    # It processes includes recursively
+    #
     def define_interface: (Definition definition, TypeName type_name, Substitution subst) -> void
 
     # Returns a substitution that corresponds to type application

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies: []
 description: RBS is the language for type signatures for Ruby and standard library
   definitions.