rigortype 0.3.5 → 0.3.7

data/lib/rigor/environment.rb

@@ -38,9 +38,9 @@ module Rigor
     # ADR-87 WD4 boot-slimming probe can read it without loading the inference engine.
 
     # ADR-72 — a Gemfile.lock gem name mapped to the opt-in plugin id that ships the SAME core-ext RBS. When
-    # that plugin is loaded the auto-overlay for the gem stands down, so the two never both declare the
-    # methods (which would raise a duplicate-declaration error). Keyed on the gem name `RbsCoverageReport`
-    # reports.
+    # that plugin's signatures are reachable the auto-overlay for the gem stands down, so the two never both
+    # declare the methods (which would raise a duplicate-declaration error). Keyed on the gem name
+    # `RbsCoverageReport` reports.
     GEM_OVERLAY_PLUGIN_IDS = { "activesupport" => "activesupport-core-ext" }.freeze
 
     attr_reader :class_registry, :rbs_loader, :plugin_registry, :dependency_source_index,
@@ -190,7 +190,7 @@ module Rigor
       #   {Environment::RbsLoader} so constant lookups (and, in later v0.0.9 slices, other reflection
       #   artefacts) consult the cache. Pass `nil` (the default) to skip caching for this environment.
       # @return [Rigor::Environment]
-      # rubocop:disable Metrics/MethodLength, Metrics/ParameterLists
+      # rubocop:disable-next Metrics/MethodLength, Metrics/ParameterLists
       def for_project(root: Dir.pwd, libraries: [], signature_paths: nil, cache_store: nil,
                       plugin_registry: nil, dependency_source_index: nil,
                       rbs_extended_reporter: nil, boundary_cross_reporter: nil,
@@ -253,11 +253,13 @@ module Rigor
         # extensions resolve (e.g. `Integer#minutes` on a Rails project) — turning a systematic false
         # `call.undefined-method` into a no-op while a project WITHOUT the gem still sees the genuine
         # diagnostic. Appended last so any RBS the project already supplies wins, and skipped for a gem whose
-        # opt-in plugin twin is loaded (no duplicate declaration). The paths ride in
-        # `loader_signature_paths`, so the env cache descriptor digests them for free.
+        # opt-in plugin twin is REACHABLE — loaded as a plugin, or wired in by `signature_paths:` (#672) —
+        # so the two never both declare the methods. The paths ride in `loader_signature_paths`, so the env
+        # cache descriptor digests them for free.
         missing_gems, overlay_paths = missing_gems_and_overlay_paths(
           locked: locked, default_libraries: merged_libraries, bundle_sig_paths: gem_sig_paths,
-          rbs_collection_paths: collection_paths, plugin_registry: plugin_registry
+          rbs_collection_paths: collection_paths, plugin_registry: plugin_registry,
+          signature_paths: resolved_paths
         )
         loader_signature_paths = resolved_paths + plugin_sig_paths + gem_sig_paths +
                                  collection_paths + overlay_paths
@@ -276,7 +278,11 @@ module Rigor
           libraries: merged_libraries,
           signature_paths: loader_signature_paths,
           cache_store: cache_store,
-          virtual_rbs: virtual_rbs
+          virtual_rbs: virtual_rbs,
+          # Issue #610 — the plugin-contributed subset is loaded LAST and may stand down against a colliding
+          # generic arity. Only the bundled plugins' own `sig/` is deferred: the user's `signature_paths:`,
+          # the bundle walk and `rbs collection install` all stay authoritative.
+          deferred_signature_paths: plugin_sig_paths
         )
         # ADR-20 slice 2c + 2e — seed hkt_registry with the bundled builtins. The Environment's
         # `#hkt_registry` getter then LAZILY merges in the RBS env scan on first call so fast paths that
@@ -297,7 +303,6 @@ module Rigor
           missing_rbs_bundle_path: bundle_root
         )
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/ParameterLists
 
       private
 
@@ -330,27 +335,45 @@ module Rigor
       # and consumed twice: as `[gem_name, version]` pairs for the ADR-82 WD9 constant-ownership index, and
       # as the eligible-gem set for the ADR-72 overlay resolution. Returns `[pairs, overlay_paths]`.
       def missing_gems_and_overlay_paths(locked:, default_libraries:, bundle_sig_paths:,
-                                         rbs_collection_paths:, plugin_registry:)
+                                         rbs_collection_paths:, plugin_registry:, signature_paths: [])
         return [[], []] if locked.empty?
 
         rows = RbsCoverageReport.classify(
           locked_gems: locked, default_libraries: default_libraries,
           bundle_sig_paths: bundle_sig_paths, rbs_collection_paths: rbs_collection_paths
         ).select { |row| row.source == :missing }
-        overlays = gem_overlay_paths(missing_gem_names: rows.map(&:gem_name), plugin_registry: plugin_registry)
+        overlays = gem_overlay_paths(
+          missing_gem_names: rows.map(&:gem_name), plugin_registry: plugin_registry,
+          signature_paths: signature_paths
+        )
         [rows.map { |row| [row.gem_name, row.version] }, overlays]
       end
 
       # ADR-72 — resolve the bundled RBS overlay directories to load for this project. A gem is eligible when
-      # it is classified `:missing` (see {missing_rbs_gem_rows}) and its conflicting opt-in plugin (if any)
-      # is not loaded. Returns `[Pathname]`, deterministically ordered, or `[]` when no eligible gem.
-      def gem_overlay_paths(missing_gem_names:, plugin_registry:)
+      # it is classified `:missing` (see {missing_rbs_gem_rows}) and its conflicting opt-in plugin twin (if
+      # any) is NOT already reachable. Returns `[Pathname]`, deterministically ordered, or `[]` when no
+      # eligible gem.
+      #
+      # "Reachable" is two questions, not one. The plugin being LOADED is the route ADR-72 anticipated. The
+      # second is the route issue #672 found: a project that wires the plugin's signatures through
+      # `signature_paths:` instead of `plugins:` reaches the same `.rbs` with no registry entry to key on, so
+      # both halves loaded, `RBS::DefinitionBuilder` raised `DuplicatedMethodDefinitionError` for every class
+      # they share, and each one silently degraded to `Dynamic[top]` — the run reported LESS while exiting 0.
+      #
+      # This method keeps the POLICY (which gem maps to which plugin id, and when an overlay is eligible at
+      # all); `RbsLoader.bundled_overlay_twin_signatures_loaded?` answers the filesystem half, beside the
+      # overlay-side answer to the same question, and carries the reasoning for why it asks what an entry
+      # LOADS rather than what it looks like.
+      def gem_overlay_paths(missing_gem_names:, plugin_registry:, signature_paths: [])
         return [] if missing_gem_names.empty?
 
         loaded_ids = plugin_registry ? plugin_registry.ids.to_set : Set.new
         eligible = missing_gem_names.reject do |gem_name|
           plugin_id = GEM_OVERLAY_PLUGIN_IDS[gem_name]
-          plugin_id && loaded_ids.include?(plugin_id)
+          next false unless plugin_id
+
+          loaded_ids.include?(plugin_id) ||
+            RbsLoader.bundled_overlay_twin_signatures_loaded?(plugin_id, signature_paths)
         end.sort
         RbsLoader.gem_overlay_sig_paths(eligible)
       end

data/lib/rigor/inference/acceptance.rb

@@ -23,7 +23,7 @@ module Rigor
     # `Nominal[Hash, [K, V]]` the shape is projected to its underlying nominal so the existing
     # generic-acceptance pipeline continues to apply; the converse direction (a Tuple receiver accepting a
     # generic Array) stays conservative because the analyzer cannot verify arity from a raw nominal alone.
-    # rubocop:disable Metrics/ModuleLength
+    # rubocop:disable-next Metrics/ModuleLength
     module Acceptance
       module_function
 
@@ -67,11 +67,15 @@ module Rigor
         Type::Refined => :accepts_refined,
         Type::Intersection => :accepts_intersection,
         Type::Tuple => :accepts_tuple,
-        Type::HashShape => :accepts_hash_shape
+        Type::HashShape => :accepts_hash_shape,
+        Type::Result => :accepts_result,
+        Type::Maybe => :accepts_maybe,
+        Type::StructClass => :accepts_class_factory,
+        Type::DataClass => :accepts_class_factory
       }.freeze
       private_constant :TYPE_HANDLERS
 
-      # rubocop:disable Metrics/ClassLength
+      # rubocop:disable-next Metrics/ClassLength
       class << self
         private
 
@@ -165,20 +169,28 @@ module Rigor
           end
         end
 
-        # Singleton[C] only accepts another Singleton[D] where D is a subclass of (or equal to) C. Any other
-        # carrier (instance, constant, ...) is no, because the singleton type's inhabitants are the class
-        # objects themselves.
+        # Singleton[C] only accepts another Singleton[D] (or StructClass / DataClass) where D is a subclass
+        # of (or equal to) C. Any other carrier (instance, constant, ...) is no, because the singleton type's
+        # inhabitants are the class objects themselves.
         def accepts_singleton(self_type, other_type, mode)
-          unless other_type.is_a?(Type::Singleton)
-            return Type::AcceptsResult.no(
-              mode: mode,
-              reasons: "Singleton[#{self_type.class_name}] does not accept #{other_type.class}"
-            )
-          end
+          actual_name =
+            case other_type
+            when Type::Singleton then other_type.class_name
+            when Type::StructClass, Type::DataClass
+              return Type::AcceptsResult.yes(mode: mode, reasons: "exact name match") if
+                other_type.class_name == self_type.class_name
+
+              class_factory_base_name(other_type)
+            else
+              return Type::AcceptsResult.no(
+                mode: mode,
+                reasons: "Singleton[#{self_type.class_name}] does not accept #{other_type.class}"
+              )
+            end
 
           class_subtype_result(
             target_name: self_type.class_name,
-            actual_name: other_type.class_name,
+            actual_name: actual_name,
             mode: mode,
             kind: :singleton
           )
@@ -195,11 +207,13 @@ module Rigor
         # - HashShape{*} when self is the Hash (or a supertype) family, projected to
         #   `Nominal[Hash, [union(keys), union(values)]]`.
         # - Singleton: never (wrong value kind).
+        # - StructClass / DataClass: class-side carriers, accepted when C is a meta nominal (Class, Module, ...).
         def accepts_nominal(self_type, other_type, mode)
           case other_type
           when Type::Nominal then accepts_nominal_from_nominal(self_type, other_type, mode)
           when Type::Constant then accepts_nominal_from_constant(self_type, other_type, mode)
           when Type::Singleton then accepts_nominal_from_singleton(self_type, other_type, mode)
+          when Type::StructClass, Type::DataClass then accepts_nominal_from_class_factory(self_type, other_type, mode)
           when Type::IntegerRange then accepts_nominal_from_integer_range(self_type, other_type, mode)
           else accepts_nominal_from_shape(self_type, other_type, mode)
           end
@@ -234,6 +248,8 @@ module Rigor
             # is bounded because every refinement carrier's `base` is closer to the nominal layer.
             accepts(self_type, other_type.base, mode: mode)
               .with_reason("projected #{other_type.class.name.split('::').last} to its base")
+          when Type::Result, Type::Maybe
+            accepts_nominal_from_monad(self_type, other_type, mode)
           else
             Type::AcceptsResult.no(
               mode: mode,
@@ -242,6 +258,32 @@ module Rigor
           end
         end
 
+        def accepts_nominal_from_monad(self_type, other_type, mode)
+          cls = self_type.class_name.sub(/\A::/, "")
+          case other_type
+          when Type::Result
+            unless %w[Dry::Monads::Result Result].include?(cls)
+              return Type::AcceptsResult.no(mode: mode, reasons: "Nominal[#{self_type.class_name}] rejects Result")
+            end
+
+            target = Type::Combinator.nominal_of(
+              self_type.class_name,
+              type_args: [other_type.ok_type, other_type.err_type]
+            )
+            accepts(self_type, target, mode: mode).with_reason("projected Result to Nominal")
+          when Type::Maybe
+            unless %w[Dry::Monads::Maybe Maybe].include?(cls)
+              return Type::AcceptsResult.no(mode: mode, reasons: "Nominal[#{self_type.class_name}] rejects Maybe")
+            end
+
+            target = Type::Combinator.nominal_of(
+              self_type.class_name,
+              type_args: [other_type.value_type]
+            )
+            accepts(self_type, target, mode: mode).with_reason("projected Maybe to Nominal")
+          end
+        end
+
         # `Nominal[Integer]` (and anything Integer is-a, like Numeric) accepts any `IntegerRange`; nothing
         # else does. Argument-bearing `Nominal`s never accept `IntegerRange` because IntegerRange has no
         # type args.
@@ -275,11 +317,11 @@ module Rigor
         # introspection patterns. The rule conservatively answers `:yes` for `Module` (every singleton is at
         # least a Module) and for `Class` / `Object` / `BasicObject` (the class object inherits from those).
         # Other Nominals fall through to the default `:no`.
-        META_NOMINALS_FROM_SINGLETON = %w[Module Class Object BasicObject].freeze
-        private_constant :META_NOMINALS_FROM_SINGLETON
+        CLASS_OBJECT_NOMINALS = %w[Module Class Object Kernel BasicObject].freeze
+        private_constant :CLASS_OBJECT_NOMINALS
 
         def accepts_nominal_from_singleton(self_type, other_type, mode)
-          if META_NOMINALS_FROM_SINGLETON.include?(self_type.class_name)
+          if CLASS_OBJECT_NOMINALS.include?(self_type.class_name)
             return Type::AcceptsResult.yes(
               mode: mode,
               reasons: "Singleton[#{other_type.class_name}] is-a #{self_type.class_name}"
@@ -292,6 +334,38 @@ module Rigor
           )
         end
 
+        def accepts_nominal_from_class_factory(self_type, other_type, mode)
+          if CLASS_OBJECT_NOMINALS.include?(self_type.class_name) && self_type.type_args.empty?
+            return Type::AcceptsResult.yes(
+              mode: mode,
+              reasons: "#{other_type.describe} is-a #{self_type.class_name}"
+            )
+          end
+
+          if self_type.class_name == "Class" && self_type.type_args.one?
+            return accepts_class_factory_instance_arg(self_type.type_args.first, other_type, mode)
+          end
+
+          Type::AcceptsResult.no(
+            mode: mode,
+            reasons: "Nominal[#{self_type.class_name}] rejects #{other_type.class}"
+          )
+        end
+
+        def accepts_class_factory_instance_arg(formal, factory, mode)
+          if factory.class_name
+            named = accepts(formal, Type::Combinator.nominal_of(factory.class_name), mode: mode)
+            return named.with_reason("matched the factory class name") if named.yes?
+          end
+
+          accepts(formal, Type::Combinator.nominal_of(class_factory_base_name(factory)), mode: mode)
+            .with_reason("projected the factory instance type")
+        end
+
+        def class_factory_base_name(factory)
+          factory.is_a?(Type::StructClass) ? "Struct" : "Data"
+        end
+
         def accepts_nominal_from_nominal(self_type, other_type, mode)
           class_result = class_subtype_result(
             target_name: self_type.class_name,
@@ -753,6 +827,63 @@ module Rigor
           Type::AcceptsResult.no(mode: mode, reasons: reason)
         end
 
+        def accepts_result(self_type, other_type, mode)
+          case other_type
+          when Type::Result
+            combine_arg_results(
+              [
+                accepts(self_type.ok_type, other_type.ok_type, mode: mode),
+                accepts(self_type.err_type, other_type.err_type, mode: mode)
+              ],
+              mode
+            )
+          when Type::Nominal
+            cls = other_type.class_name.sub(/\A::/, "")
+            if %w[Dry::Monads::Result Result].include?(cls) && other_type.type_args.size == 2
+              combine_arg_results(
+                [
+                  accepts(self_type.ok_type, other_type.type_args[0], mode: mode),
+                  accepts(self_type.err_type, other_type.type_args[1], mode: mode)
+                ],
+                mode
+              )
+            else
+              Type::AcceptsResult.no(mode: mode, reasons: "Result does not accept Nominal[#{other_type.class_name}]")
+            end
+          else
+            Type::AcceptsResult.no(
+              mode: mode,
+              reasons: "Result does not accept #{other_type.class}"
+            )
+          end
+        end
+
+        def accepts_maybe(self_type, other_type, mode)
+          case other_type
+          when Type::Maybe
+            accepts(self_type.value_type, other_type.value_type, mode: mode)
+          when Type::Nominal
+            cls = other_type.class_name.sub(/\A::/, "")
+            if %w[Dry::Monads::Maybe Maybe].include?(cls) && other_type.type_args.size == 1
+              accepts(self_type.value_type, other_type.type_args[0], mode: mode)
+            else
+              Type::AcceptsResult.no(mode: mode, reasons: "Maybe does not accept Nominal[#{other_type.class_name}]")
+            end
+          else
+            Type::AcceptsResult.no(
+              mode: mode,
+              reasons: "Maybe does not accept #{other_type.class}"
+            )
+          end
+        end
+
+        def accepts_class_factory(self_type, other_type, mode)
+          Type::AcceptsResult.no(
+            mode: mode,
+            reasons: "#{self_type.describe} rejects #{other_type.class}"
+          )
+        end
+
         # Uses Ruby's actual class hierarchy via Object.const_get to answer "is D a subclass of C?" for core,
         # stdlib, and application classes. When either name fails to resolve we surface "maybe": the caller
         # (overload selector) treats yes/maybe identically, so the conservative answer keeps overload
@@ -791,14 +922,35 @@ module Rigor
           end
         end
 
+        # Resolves a class name taken from the analysed program without triggering `const_missing`
+        # or executing a pending autoload.
+        #
+        # `const_defined?(part, false)` answers true for a REGISTERED-BUT-NOT-YET-TRIGGERED autoload,
+        # so on its own it does not mean "already in memory" and `const_get` would execute the target
+        # file inside the analyzer. `Module#autoload?` separates the two: it returns the registered
+        # path while the autoload is pending and nil once it has run, so declining on it declines
+        # exactly the dangerous case and still resolves a class genuinely loaded ([#680], [#689]).
+        #
+        # The rescue catches `StandardError`, `ScriptError` and `SystemExit`. `Interrupt`,
+        # `SignalException` and `NoMemoryError` stay uncaught on purpose.
         def resolve_class(name)
-          Object.const_get(name)
-        rescue NameError
+          return nil unless name.is_a?(::String)
+
+          parts = name.delete_prefix("::").split("::")
+          return nil if parts.empty?
+
+          mod = ::Object
+          parts.each do |part|
+            return nil unless mod.is_a?(::Module) && mod.const_defined?(part, false)
+            return nil if mod.autoload?(part)
+
+            mod = mod.const_get(part, false)
+          end
+          mod.is_a?(::Module) ? mod : nil
+        rescue ::StandardError, ::ScriptError, ::SystemExit
           nil
         end
       end
-      # rubocop:enable Metrics/ClassLength
     end
-    # rubocop:enable Metrics/ModuleLength
   end
 end

data/lib/rigor/inference/captured_locals.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "prism"
+
+require_relative "../source/node_walker"
+require_relative "block_parameter_binder"
+
+module Rigor
+  module Inference
+    # The outer locals a block body can REBIND — the one name set that ADR-56's captured-local write-back
+    # (`StatementEvaluator#write_back_block_captures`), the escaping-block narrowing drop
+    # (`StatementEvaluator#drop_captured_narrowing`) and issue #587's per-element fold
+    # (`ExpressionTyper#per_element_captured_bindings`) all key on. It lives in one place so the four
+    # cannot disagree about what "captured" means.
+    #
+    # A write counts across every local-write form — plain `=` (`LocalVariableWriteNode`), the operator /
+    # `||=` / `&&=` compound forms, and a multi-assign target (`x, y = …` → `LocalVariableTargetNode` under
+    # a `MultiWriteNode`) — at ANY depth: a block is a closure, so a write inside a nested block binds the
+    # same outer variable. Block-introduced names (parameters, numbered parameters, `;`-locals) and names
+    # not bound in the outer scope are excluded; a write to either is not a captured rebind of an outer
+    # variable.
+    module CapturedLocals
+      LOCAL_WRITE_NODES = [
+        Prism::LocalVariableWriteNode,
+        Prism::LocalVariableOperatorWriteNode,
+        Prism::LocalVariableOrWriteNode,
+        Prism::LocalVariableAndWriteNode,
+        Prism::LocalVariableTargetNode
+      ].freeze
+
+      module_function
+
+      # @param block_node [Prism::BlockNode]
+      # @param base_scope [Rigor::Scope] the call-site scope the block closes over.
+      # @return [Array<Symbol>] the captured names the body writes, each once, in first-write order.
+      def writes(block_node, base_scope)
+        body = block_node.body
+        return [] if body.nil?
+
+        introduced = introduced_locals(block_node)
+        outer_writes = []
+        Source::NodeWalker.each(body) do |descendant|
+          next unless LOCAL_WRITE_NODES.any? { |klass| descendant.is_a?(klass) }
+          next if introduced.include?(descendant.name)
+          next unless base_scope.locals.key?(descendant.name)
+
+          outer_writes << descendant.name
+        end
+        outer_writes.uniq
+      end
+
+      # Names the block itself introduces: parameters (numbered parameters included, via
+      # `BlockParameterBinder`) plus the explicit `;`-prefixed block-locals on `BlockParametersNode`.
+      def introduced_locals(block_node)
+        introduced = Set.new(BlockParameterBinder.new.bind(block_node).keys)
+        params_root = block_node.parameters
+        params_root.locals.each { |loc| introduced << loc.name } if params_root.is_a?(Prism::BlockParametersNode)
+        introduced
+      end
+    end
+  end
+end