rigortype 0.0.1 → 0.0.2

data/lib/rigor/scope.rb

@@ -19,7 +19,8 @@ module Rigor
     attr_reader :environment, :locals, :fact_store, :self_type, :declared_types,
                 :ivars, :cvars, :globals,
                 :class_ivars, :class_cvars, :program_globals,
-                :discovered_classes, :in_source_constants, :discovered_methods
+                :discovered_classes, :in_source_constants, :discovered_methods,
+                :discovered_def_nodes
 
     EMPTY_DECLARED_TYPES = {}.compare_by_identity.freeze
     EMPTY_VAR_BINDINGS = {}.freeze
@@ -45,7 +46,8 @@ module Rigor
       program_globals: EMPTY_VAR_BINDINGS,
       discovered_classes: EMPTY_VAR_BINDINGS,
       in_source_constants: EMPTY_VAR_BINDINGS,
-      discovered_methods: EMPTY_CLASS_BINDINGS
+      discovered_methods: EMPTY_CLASS_BINDINGS,
+      discovered_def_nodes: EMPTY_CLASS_BINDINGS
     )
       @environment = environment
       @locals = locals
@@ -61,6 +63,7 @@ module Rigor
       @discovered_classes = discovered_classes
       @in_source_constants = in_source_constants
       @discovered_methods = discovered_methods
+      @discovered_def_nodes = discovered_def_nodes
       freeze
     end
 
@@ -231,6 +234,26 @@ module Rigor
       rebuild(discovered_methods: table)
     end
 
+    # v0.0.2 #5 — per-class table mapping
+    # `method_name (Symbol) → Prism::DefNode`. Populated by
+    # `ScopeIndexer` alongside `discovered_methods` for
+    # instance-side defs only (singleton-side and
+    # `define_method`-introduced methods do not contribute a
+    # static body the engine can re-type). Consumed by
+    # `ExpressionTyper` to do inter-procedural return-type
+    # inference when the receiver class is user-defined and
+    # has no RBS sig.
+    def user_def_for(class_name, method_name)
+      table = @discovered_def_nodes[class_name.to_s]
+      return nil unless table
+
+      table[method_name.to_sym]
+    end
+
+    def with_discovered_def_nodes(table)
+      rebuild(discovered_def_nodes: table)
+    end
+
     def facts_for(target: nil, bucket: nil)
       fact_store.facts_for(target: target, bucket: bucket)
     end
@@ -297,7 +320,7 @@ module Rigor
       declared_types: @declared_types, ivars: @ivars, cvars: @cvars, globals: @globals,
       class_ivars: @class_ivars, class_cvars: @class_cvars, program_globals: @program_globals,
       discovered_classes: @discovered_classes, in_source_constants: @in_source_constants,
-      discovered_methods: @discovered_methods
+      discovered_methods: @discovered_methods, discovered_def_nodes: @discovered_def_nodes
     )
       self.class.new(
         environment: environment, locals: locals,
@@ -308,7 +331,8 @@ module Rigor
         program_globals: program_globals,
         discovered_classes: discovered_classes,
         in_source_constants: in_source_constants,
-        discovered_methods: discovered_methods
+        discovered_methods: discovered_methods,
+        discovered_def_nodes: discovered_def_nodes
       )
     end
 
@@ -332,7 +356,8 @@ module Rigor
         program_globals: program_globals,
         discovered_classes: discovered_classes,
         in_source_constants: in_source_constants,
-        discovered_methods: discovered_methods
+        discovered_methods: discovered_methods,
+        discovered_def_nodes: discovered_def_nodes
       )
     end
   end

data/lib/rigor/version.rb

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

data/sig/rigor/inference.rbs

@@ -138,14 +138,17 @@ module Rigor
     end
 
     class CoverageScanner
-      class Stats
+      class Result
+        attr_reader visits: Hash[Class, Integer]
+        attr_reader unrecognized: Hash[Class, Integer]
+        attr_reader events: Array[Fallback]
         def visited_count: () -> Integer
         def unrecognized_count: () -> Integer
         def unrecognized_ratio: () -> Float
       end
 
       def initialize: (?scope: Scope?) -> void
-      def scan: (untyped root) -> Stats
+      def scan: (untyped root) -> Result
     end
   end
 end

data/sig/rigor/rbs_extended.rbs

@@ -10,13 +10,34 @@ module Rigor
       attr_reader target_kind: target_kind
       attr_reader target_name: Symbol
       attr_reader class_name: String
+      attr_reader negative: bool
 
-      def self.new: (edge: predicate_edge, target_kind: target_kind, target_name: Symbol, class_name: String) -> PredicateEffect
+      def self.new: (edge: predicate_edge, target_kind: target_kind, target_name: Symbol, class_name: String, negative: bool) -> PredicateEffect
       def truthy_only?: () -> bool
       def falsey_only?: () -> bool
+      def negative?: () -> bool
     end
 
     def self?.read_predicate_effects: (untyped method_def) -> Array[PredicateEffect]
     def self?.parse_predicate_annotation: (String string) -> PredicateEffect?
+
+    type assert_condition = :always | :if_truthy_return | :if_falsey_return
+
+    class AssertEffect
+      attr_reader condition: assert_condition
+      attr_reader target_kind: target_kind
+      attr_reader target_name: Symbol
+      attr_reader class_name: String
+      attr_reader negative: bool
+
+      def self.new: (condition: assert_condition, target_kind: target_kind, target_name: Symbol, class_name: String, negative: bool) -> AssertEffect
+      def always?: () -> bool
+      def if_truthy_return?: () -> bool
+      def if_falsey_return?: () -> bool
+      def negative?: () -> bool
+    end
+
+    def self?.read_assert_effects: (untyped method_def) -> Array[AssertEffect]
+    def self?.parse_assert_annotation: (String string) -> AssertEffect?
   end
 end

data/sig/rigor/scope.rbs

@@ -14,6 +14,7 @@ module Rigor
     attr_reader discovered_classes: Hash[String, Type::Singleton]
     attr_reader in_source_constants: Hash[String, Type::t]
     attr_reader discovered_methods: Hash[String, Hash[Symbol, Symbol]]
+    attr_reader discovered_def_nodes: Hash[String, Hash[Symbol, untyped]]
 
     def self.empty: (?environment: Environment) -> Scope
 
@@ -35,6 +36,8 @@ module Rigor
     def with_in_source_constants: (Hash[String, Type::t] table) -> Scope
     def with_discovered_methods: (Hash[String, Hash[Symbol, Symbol]] table) -> Scope
     def discovered_method?: (String | Symbol class_name, String | Symbol method_name, Symbol kind) -> bool
+    def with_discovered_def_nodes: (Hash[String, Hash[Symbol, untyped]] table) -> Scope
+    def user_def_for: (String | Symbol class_name, String | Symbol method_name) -> untyped?
     def with_fact: (Analysis::FactStore::Fact fact) -> Scope
     def with_self_type: (Type::t? type) -> Scope
     def with_declared_types: (Hash[untyped, Type::t] table) -> Scope

metadata

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