rigortype 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 775a0b6e3050294352d505366428814ab73348d2ced5ccf45842644c38752155
-  data.tar.gz: 7ec72c4aa56cbb43ae18dd3c1a029da3bb6746a604c4a3d72811b34b5d1c1439
+  metadata.gz: 749e0e15c9b85dcec97c9afc1b107d5ebc1a1a685cc19aa39d316a9826992d4a
+  data.tar.gz: 45bcee26284594e35b51a050ce8ac234935bee954063b50fdfe1b0c6a9bcddea
 SHA512:
-  metadata.gz: cc0650acb783740184fb76f0c5382fefe3950bd84011c84ccd2e23a60ff703519de94a294b39e96e11198748b2539917fae117972be7366dd06725ee54975935
-  data.tar.gz: d06b60ff922cfb4ab77ea680b5d624702a4f782b65c1dcb2e3f631793fe90cb4bb8302d50ac5a3656cbd1a1fe79e198cfee9c8641b037acf48906ae1aa63eeb8
+  metadata.gz: fbf022b6e92a96e1c095cb3d887936161e836201662f051c60de5d0d78494f263228a28df509c3b937768735b5ce18162ee28657b2aaf1cd7a8b2d4851338a53
+  data.tar.gz: a49e89a07950f54fcf8f38e328b8fdb658aaf0802154df457c7b9b1370f35279c1d6d5fe3acf6a45c9e49ff2f7c09ff9f209b1f7dab68d20b283c9baa4b2760b

data/lib/rigor/analysis/diagnostic.rb

@@ -47,6 +47,9 @@ module Rigor
       def initialize(path:, line:, column:, message:, severity: :error, rule: nil, # rubocop:disable Metrics/ParameterLists
                      source_family: DEFAULT_SOURCE_FAMILY,
                      receiver_type: nil, method_name: nil, project_definition_site: nil)
+        raise ArgumentError, "line must be >= 1, got #{line}" if line < 1
+        raise ArgumentError, "column must be >= 1, got #{column}" if column < 1
+
         @path = path
         @line = line
         @column = column

data/lib/rigor/cli/skill_describe.rb

@@ -208,8 +208,14 @@ module Rigor
           ["rigor-rbs-setup", "your gems ship no community RBS yet — install it so Rigor stops typing them as Dynamic."]
         elsif state.fetch(:ci) != :wired
           ["rigor-ci-setup", "Rigor is configured but not wired into CI — lock in the regression guard."]
-        elsif state.fetch(:baseline)
-          ["rigor-baseline-reduce", "a baseline is in place — work it down rule by rule."]
+        # A present baseline is deliberately NOT a recommendation trigger.
+        # A baseline is a healthy, finished onboarding state, not a problem to
+        # work off; pushing every baselined project to "reduce it" turns a
+        # working build into a chore and tempts scattering `# rigor:disable`
+        # through the code to make a number go down — means over ends.
+        # `rigor-baseline-reduce` stays in the catalogue for the intermediate
+        # user who *chooses* to invest in it; the headline routes to genuinely
+        # additive steps instead.
         elsif state.fetch(:editor) == :unwired
           ["rigor-editor-setup",
            "you have an editor config but no Rigor LSP — wire `rigor lsp` for live diagnostics and hover types."]
@@ -297,7 +303,6 @@ module Rigor
           The recommendation above is from a presence-only probe — it does not run
           `rigor check`. If you have run (or now run) `rigor check`, let its findings
           refine the choice:
-          - errors present and no baseline yet → rigor-baseline-reduce
           - a `call.unresolved-toplevel` / `call.undefined-method` cluster on the
             project's own monkey-patches → rigor-monkeypatch-resolve
           - framework calls (ActiveRecord, routes, i18n …) typing as Dynamic with no

data/lib/rigor/environment/rbs_loader.rb

@@ -170,7 +170,7 @@ module Rigor
           source = missing.map { |name| "module #{name}\nend\n" }.join
           buffer = ::RBS::Buffer.new(name: SYNTHETIC_NAMESPACE_BUFFER, content: source)
           _, directives, decls = ::RBS::Parser.parse_signature(buffer)
-          env.add_source(::RBS::Source::RBS.new(buffer, directives || [], decls || []))
+          add_parsed_decls(env, buffer, directives, decls)
         rescue ::RBS::BaseError
           # Fail-soft: synthesis is an opportunistic uplift, never a
           # hard requirement. A parse failure here just leaves the env
@@ -232,11 +232,52 @@ module Rigor
           missing.uniq
         end
 
+        # Normalises a `class_decls` entry's representative declaration
+        # across the gemspec's supported RBS range (`rbs >= 3.0, < 5.0`).
+        # RBS 4.x exposes it as `entry.primary_decl` (the AST declaration
+        # directly); RBS 3.x exposes `entry.primary` (a wrapper whose
+        # `#decl` is the AST declaration). Returns the AST declaration, or
+        # nil when neither accessor is present. Without this guard,
+        # `class_decl_paths` crashed under RBS 3.x with
+        # `undefined method 'primary_decl'`.
+        def primary_decl_for(entry)
+          if entry.respond_to?(:primary_decl)
+            entry.primary_decl
+          elsif entry.respond_to?(:primary)
+            primary = entry.primary
+            primary.respond_to?(:decl) ? primary.decl : primary
+          end
+        end
+
+        # Appends freshly-parsed declarations to an `RBS::Environment`
+        # across the gemspec's supported RBS range (`rbs >= 3.0, < 5.0`).
+        # RBS 4.x wraps the declarations in an `RBS::Source::RBS` and
+        # takes them through `env.add_source`; RBS 3.x has neither
+        # `RBS::Source` nor `add_source` and instead registers them with
+        # `env.add_signature(buffer:, directives:, decls:)` (a bare
+        # `env << decl` is NOT enough — it skips the `signatures` table
+        # that `resolve_type_names` rebuilds from, so the synthesized
+        # declarations silently vanish on resolve). Without this guard
+        # the synthesis paths (`synthesize_missing_namespaces`,
+        # `append_stub_declarations`, `add_virtual_rbs`) crashed under
+        # RBS 3.x with `uninitialized constant RBS::Source`.
+        def add_parsed_decls(env, buffer, directives, decls)
+          decls ||= []
+          directives ||= []
+          if env.respond_to?(:add_source)
+            env.add_source(::RBS::Source::RBS.new(buffer, directives, decls))
+          elsif env.respond_to?(:add_signature)
+            env.add_signature(buffer: buffer, directives: directives, decls: decls)
+          else
+            decls.each { |decl| env << decl }
+          end
+        end
+
         # True when a `class_decls` entry was declared in one of the
         # project's own signature files (by declaration location), so
         # the sweep skips the bundled stdlib / vendored universe.
         def project_entry?(entry, project_files)
-          decl = entry.respond_to?(:primary_decl) ? entry.primary_decl : nil
+          decl = primary_decl_for(entry)
           location = decl&.location
           buffer_name = location&.buffer&.name
           return false unless buffer_name
@@ -262,7 +303,7 @@ module Rigor
           end.join
           buffer = ::RBS::Buffer.new(name: SYNTHETIC_STUB_BUFFER, content: source)
           _, directives, decls = ::RBS::Parser.parse_signature(buffer)
-          base_env.add_source(::RBS::Source::RBS.new(buffer, directives || [], decls || []))
+          add_parsed_decls(base_env, buffer, directives, decls)
         rescue ::RBS::BaseError
           nil
         end
@@ -284,8 +325,7 @@ module Rigor
 
             buffer = ::RBS::Buffer.new(name: filename.to_s, content: content.to_s)
             _, directives, decls = ::RBS::Parser.parse_signature(buffer)
-            source = ::RBS::Source::RBS.new(buffer, directives || [], decls || [])
-            env.add_source(source)
+            add_parsed_decls(env, buffer, directives, decls)
           rescue ::RBS::BaseError
             # WD6 fail-soft: a single broken virtual RBS contribution
             # does not pull the whole env down. The plugin layer
@@ -589,7 +629,7 @@ module Rigor
 
         result = {}
         env.class_decls.each do |rbs_name, entry|
-          decl = entry.primary_decl
+          decl = self.class.primary_decl_for(entry)
           next if decl.nil?
 
           location = decl.location
@@ -911,12 +951,17 @@ module Rigor
       end
 
       # Collects the AST declaration nodes behind a `class_decls`
-      # entry. RBS 4's `ModuleEntry` / `ClassEntry` expose `each_decl`;
-      # the older single-`decl` shape is handled defensively so the
-      # loader survives an rbs-gem minor bump.
+      # entry across the supported RBS range (`rbs >= 3.0, < 5.0`).
+      # RBS 4's `ModuleEntry` / `ClassEntry` expose `each_decl` yielding
+      # bare AST declarations; RBS 3.x exposes `decls`, an array of
+      # `MultiEntry::D` wrappers whose `#decl` is the AST declaration.
+      # The single-`decl` shape is handled defensively so the loader
+      # survives an rbs-gem minor bump.
       def entry_declarations(entry)
         if entry.respond_to?(:each_decl)
           [].tap { |acc| entry.each_decl { |decl| acc << decl } }
+        elsif entry.respond_to?(:decls)
+          entry.decls.map { |d| d.respond_to?(:decl) ? d.decl : d }
         elsif entry.respond_to?(:decl)
           [entry.decl]
         else

data/lib/rigor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rigor
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rigortype
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Rigor contributors