rbs 3.3.0.pre.2 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dc5c4dc317f2e52f4626a4fec99d333422d69e6e18ec9fcad02d710bf17a212
-  data.tar.gz: e9da32752089f0d923e82ee304e36751f28263adeb5893860d4f0f84f5b62caf
+  metadata.gz: 8e63ecace589850a190944136198f3d66e4265d7a2d49909e705043687492698
+  data.tar.gz: a6795431478b3d5300a8df0bd4168250c4b7124807a790e99788e05d280e7bdc
 SHA512:
-  metadata.gz: eb722e98a22685907310de9465590da330bf86f4387fc40e65ce692a9fbbd6839d850a706ca7f489954048d40555d3040e83ffddb452494529febfcd98dbeff5
-  data.tar.gz: 2ed8a1e9a4bbb28341f5c578903a94a23ea3b6bcc95721308dcfddce514f269755f0f7baaaf2cb0a4511c7895fc39992fe2cdfe95ad33e66f045971cb137587e
+  metadata.gz: 8ed98b066766f8350bdcd71878120a054a53e9246cf4c7766b4f3b4121a554af6bd94e881e59f0ffc03155e55abcaa6f864a8c763fde1dfa2b9d1930b49d9075
+  data.tar.gz: cc8391b0262bf39937f39f53e9e09e8acf860e32a4d1009e46870c9b9e674910aaf96fff2d9814e176f677fce7675a0d55c063969c8bd8c188512c1b6ef07735

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master
 
+## 3.3.0 (2023-11-09)
+
+### Library changes
+
+* Stop exiting with error when syntax error detected during validation ([#1603](https://github.com/ruby/rbs/pull/1603))
+* [rbs diff] Load dependencies from manifest.yaml ([#1602](https://github.com/ruby/rbs/pull/1602))
+* [rbs diff] Resolve constants name ([#1601](https://github.com/ruby/rbs/pull/1601))
+
 ## 3.3.0.pre.2 (2023-11-02)
 
 ### Signature updates

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs (3.3.0.pre.2)
+    rbs (3.3.0)
       abbrev
 
 PATH
@@ -83,7 +83,7 @@ GEM
     stackprof (0.2.25)
     stringio (3.0.7)
     strong_json (2.1.2)
-    tempfile (0.1.3)
+    tempfile (0.2.0)
     test-unit (3.6.1)
       power_assert
     timeout (0.4.0)

data/lib/rbs/cli.rb

@@ -445,6 +445,7 @@ EOU
 
     def run_validate(args, options)
       stdout = stdout()
+      exit_error = false
 
       OptionParser.new do |opts|
         opts.banner = <<EOU
@@ -460,6 +461,9 @@ EOU
         opts.on("--silent") do
           stdout = StringIO.new
         end
+        opts.on("--[no-]exit-error-on-syntax-error", "exit(1) if syntax error is detected") {|bool|
+          exit_error = bool
+        }
       end.parse!(args)
 
       loader = options.loader()
@@ -632,7 +636,7 @@ EOU
         syntax_errors.each do |message|
           self.stdout.puts message
         end
-        exit(1)
+        exit 1 if exit_error
       end
     end
 

data/lib/rbs/diff.rb

@@ -12,13 +12,13 @@ module RBS
     def each_diff(&block)
       return to_enum(:each_diff) unless block
 
-      before_instance_methods, before_singleton_methods, before_constant_decls = build_methods(@before_path)
-      after_instance_methods, after_singleton_methods, after_constant_decls = build_methods(@after_path)
+      before_instance_methods, before_singleton_methods, before_constant_children = build_methods(@before_path)
+      after_instance_methods, after_singleton_methods, after_constant_children = build_methods(@after_path)
 
       each_diff_methods(:instance, before_instance_methods, after_instance_methods, &block)
       each_diff_methods(:singleton, before_singleton_methods, after_singleton_methods, &block)
 
-      each_diff_constants(before_constant_decls, after_constant_decls, &block)
+      each_diff_constants(before_constant_children, after_constant_children, &block)
     end
 
     private
@@ -34,11 +34,11 @@ module RBS
       end
     end
 
-    def each_diff_constants(before_constant_decls, after_constant_decls)
-      all_keys = before_constant_decls.keys.to_set + after_constant_decls.keys.to_set
+    def each_diff_constants(before_constant_children, after_constant_children)
+      all_keys = before_constant_children.keys.to_set + after_constant_children.keys.to_set
       all_keys.each do |key|
-        before = constant_to_s(key, before_constant_decls[key]) or next
-        after = constant_to_s(key, after_constant_decls[key]) or next
+        before = constant_to_s(before_constant_children[key]) or next
+        after = constant_to_s(after_constant_children[key]) or next
         next if before == after
 
         yield before, after
@@ -52,25 +52,42 @@ module RBS
       instance_methods = begin
         builder.build_instance(@type_name).methods
       rescue => e
-        RBS.logger.warn("#{path}: #{e.message}")
+        RBS.logger.warn("#{path}: (#{e.class}) #{e.message}")
         {}
       end
       singleton_methods = begin
         builder.build_singleton(@type_name).methods
       rescue => e
-        RBS.logger.warn("#{path}: #{e.message}")
+        RBS.logger.warn("#{path}: (#{e.class}) #{e.message}")
         {}
       end
-      type_name_to_s = @type_name.to_s
-      constant_decls = env.constant_decls.select { |key| key.to_s.start_with?(type_name_to_s) }
 
-      [ instance_methods, singleton_methods, constant_decls ]
+      constant_children = begin
+        constant_resolver = RBS::Resolver::ConstantResolver.new(builder: builder)
+        constant_resolver.children(@type_name)
+      rescue => e
+        RBS.logger.warn("#{path}: (#{e.class}) #{e.message}")
+        {}
+      end
+
+      [ instance_methods, singleton_methods, constant_children ]
     end
 
     def build_env(path)
       loader = @library_options.loader()
       path&.each do |dir|
-        loader.add(path: Pathname(dir))
+        dir_pathname = Pathname(dir)
+        loader.add(path: dir_pathname)
+
+        manifest_pathname = dir_pathname / 'manifest.yaml'
+        if manifest_pathname.exist?
+          manifest = YAML.safe_load(manifest_pathname.read)
+          if manifest['dependencies']
+            manifest['dependencies'].each do |dependency|
+              loader.add(library: dependency['name'], version: nil)
+            end
+          end
+        end
       end
       Environment.from_loader(loader)
     end
@@ -93,9 +110,9 @@ module RBS
       end
     end
 
-    def constant_to_s(key, constant)
+    def constant_to_s(constant)
       if constant
-        "#{key}: #{constant.decl.type}"
+        "#{constant.name.name}: #{constant.type}"
       else
         +"-"
       end

data/lib/rbs/resolver/constant_resolver.rb

@@ -22,7 +22,7 @@ module RBS
 
             unless name.namespace.empty?
               parent = name.namespace.to_type_name
-              table = children_table[parent] or raise
+              table = children_table[parent] or raise "#{parent} not found by #{name}"
             else
               table = toplevel
             end

data/lib/rbs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 3.3.0.pre.2
+  version: 3.3.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abbrev
@@ -505,9 +505,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.10
 signing_key: