rigortype 0.1.16 → 0.1.18

data/lib/rigor/type/accepts_result.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
 
 module Rigor
   module Type
@@ -79,17 +80,9 @@ module Rigor
         self.class.new(trinary, mode: mode, reasons: reasons + [reason])
       end
 
-      def ==(other)
-        other.is_a?(AcceptsResult) &&
-          trinary == other.trinary &&
-          mode == other.mode &&
-          reasons == other.reasons
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [AcceptsResult, trinary, mode, reasons].hash
-      end
+      value_fields :trinary, :mode, :reasons
 
       def inspect
         "#<Rigor::Type::AcceptsResult #{trinary.inspect} mode=#{mode}>"

data/lib/rigor/type/app.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
 
 module Rigor
   module Type
@@ -82,14 +83,9 @@ module Rigor
         Inference::Acceptance.accepts(bound, other, mode: mode)
       end
 
-      def ==(other)
-        other.is_a?(App) && uri == other.uri && args == other.args && bound == other.bound
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [App, uri, args, bound].hash
-      end
+      value_fields :uri, :args, :bound
 
       def inspect
         "#<Rigor::Type::App #{describe(:short)} (bound=#{bound.describe(:short)})>"

data/lib/rigor/type/bot.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -39,9 +40,7 @@ module Rigor
         Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
       def ==(other)
         other.is_a?(Bot)

data/lib/rigor/type/bound_method.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -56,20 +58,11 @@ module Rigor
         Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
-      def ==(other)
-        other.is_a?(BoundMethod) &&
-          receiver_type == other.receiver_type &&
-          method_name == other.method_name
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [BoundMethod, receiver_type, method_name].hash
-      end
+      value_fields :receiver_type, :method_name
 
       def inspect
         "#<Rigor::Type::BoundMethod #{describe(:short)}>"

data/lib/rigor/type/combinator.rb

@@ -9,12 +9,15 @@ require_relative "constant"
 require_relative "integer_range"
 require_relative "tuple"
 require_relative "hash_shape"
+require_relative "data_class"
+require_relative "data_instance"
 require_relative "union"
 require_relative "difference"
 require_relative "refined"
 require_relative "intersection"
 require_relative "bound_method"
 require_relative "../inference/budget_trace"
+require_relative "../inference/flow_tracer"
 
 module Rigor
   module Type
@@ -358,6 +361,21 @@ module Rigor
         HashShape.new(pairs, **options)
       end
 
+      # ADR-48 — the class object produced by `Data.define(:x, :y)`.
+      # `members` is the ordered Symbol member-name list; `class_name`
+      # tags the class when known (the named-subclass form) and is nil
+      # for the anonymous `Data.define(...)` result.
+      def data_class_of(members:, class_name: nil)
+        DataClass.new(members, class_name)
+      end
+
+      # ADR-48 — a `Data.define` value instance. `members` is the ordered
+      # member-name -> value-type map; `class_name` tags the instance's
+      # class when known.
+      def data_instance_of(members:, class_name: nil)
+        DataInstance.new(members, class_name)
+      end
+
       # Normalized union. Flattens nested Unions, deduplicates structurally
       # equal members, drops Bot, and collapses 0/1-member results.
       def union(*types)
@@ -365,6 +383,10 @@ module Rigor
         if Inference::BudgetTrace.enabled? && result.is_a?(Union)
           Inference::BudgetTrace.observe(Inference::BudgetTrace::UNION_ARITY, result.members.size)
         end
+        # `rigor trace` — degenerate merges (`1 | 1 → 1`, Dynamic
+        # absorption) are recorded too; the collapse itself is the
+        # teachable moment.
+        Inference::FlowTracer.union(types, result) if Inference::FlowTracer.active? && types.size >= 2
         result
       end
 

data/lib/rigor/type/constant.rb

@@ -2,6 +2,7 @@
 
 require "date"
 require_relative "../trinary"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -111,9 +112,7 @@ module Rigor
         Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
       def ==(other)
         other.is_a?(Constant) && value.class == other.value.class && value == other.value

data/lib/rigor/type/data_class.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
+
+module Rigor
+  module Type
+    # The class object produced by `Data.define(:x, :y)` (ADR-48). Models
+    # the *class*, not an instance — the value bound to `Point` in
+    # `Point = Data.define(:x, :y)` or the anonymous superclass in
+    # `class Point < Data.define(:x, :y)`. Parameterised by the ordered
+    # member-name list so that `Point.new(...)` can materialise a precise
+    # {DataInstance}.
+    #
+    # `class_name` carries the binding name when known (the named-subclass
+    # form, ADR-48 slice 3) and is `nil` for the anonymous result of a bare
+    # `Data.define(...)` before it is assigned to a constant. It tags the
+    # instances `.new` produces; it does not change the carrier's folding
+    # behaviour.
+    #
+    # Equality and hashing are structural over the member list and the
+    # class name. Two distinct `Data.define(:x)` results are equal *as
+    # types* — they describe the same shape; the engine distinguishes the
+    # constants they are bound to by the binding, not by the carrier.
+    #
+    # See docs/adr/48-data-struct-value-folding.md.
+    class DataClass
+      attr_reader :members, :class_name
+
+      # @param members [Array<Symbol>] ordered member names.
+      # @param class_name [String, nil] the bound class name, or nil for
+      #   the anonymous `Data.define(...)` result.
+      def initialize(members, class_name = nil)
+        unless members.is_a?(Array) && members.all?(Symbol)
+          raise ArgumentError, "members must be an Array of Symbols, got #{members.inspect}"
+        end
+        unless class_name.nil? || (class_name.is_a?(String) && !class_name.empty?)
+          raise ArgumentError, "class_name must be a non-empty String or nil, got #{class_name.inspect}"
+        end
+
+        @members = members.dup.freeze
+        @class_name = class_name&.freeze
+        freeze
+      end
+
+      def describe(_verbosity = :short)
+        return "singleton(#{class_name})" if class_name
+
+        "Data.define(#{members.map(&:inspect).join(', ')})"
+      end
+
+      def erase_to_rbs
+        "singleton(#{class_name || 'Data'})"
+      end
+
+      def top
+        Trinary.no
+      end
+
+      def bot
+        Trinary.no
+      end
+
+      def dynamic
+        Trinary.no
+      end
+
+      include Rigor::Type::AcceptanceRouter
+
+      include Rigor::ValueSemantics
+
+      value_fields :members, :class_name
+
+      def inspect
+        "#<Rigor::Type::DataClass #{describe(:short)}>"
+      end
+    end
+  end
+end

data/lib/rigor/type/data_instance.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
+
+module Rigor
+  module Type
+    # A `Data.define` value instance (ADR-48) — `Point.new(1, 2)`. Models a
+    # closed, total, class-tagged member map (member name -> value type).
+    # HashShape-shaped, but nominal: a `DataInstance` tagged `Point` is a
+    # different type from one tagged `Line` even with identical members,
+    # and it erases to its class nominal rather than an RBS record.
+    #
+    # `Data` instances are frozen, so the member map is sound for the
+    # instance's whole lifetime — the reason `Data` is the first target
+    # (a `Struct` instance can be mutated through a setter or `[]=`, which
+    # would invalidate the map; that follow-up is deferred — see ADR-48).
+    #
+    # Member reads fold to the member's type (`Point.new(1, 2).x` ->
+    # `Constant[1]`); `[]`, `to_h`, `deconstruct`, `deconstruct_keys`,
+    # `members`, and `with` project precisely. Methods this carrier does
+    # not fold project to the `Data` nominal (or the tagged class) through
+    # {RbsDispatch}'s `receiver_descriptor`, so non-member calls resolve
+    # without mis-firing undefined-method.
+    #
+    # Equality and hashing are structural over the (member -> type) map and
+    # the class name.
+    #
+    # See docs/adr/48-data-struct-value-folding.md.
+    class DataInstance
+      attr_reader :members, :class_name
+
+      # @param members [Hash{Symbol => Rigor::Type}] ordered member -> type
+      #   map. Every declared member is present (Data instances are total).
+      # @param class_name [String, nil] the tagging class name, or nil for
+      #   an instance of an anonymous `Data.define(...)` class.
+      def initialize(members, class_name = nil)
+        unless members.is_a?(Hash) && members.each_key.all?(Symbol)
+          raise ArgumentError, "members must be a Hash with Symbol keys, got #{members.inspect}"
+        end
+        unless class_name.nil? || (class_name.is_a?(String) && !class_name.empty?)
+          raise ArgumentError, "class_name must be a non-empty String or nil, got #{class_name.inspect}"
+        end
+
+        @members = members.dup.freeze
+        @class_name = class_name&.freeze
+        freeze
+      end
+
+      # @return [Array<Symbol>] ordered member names.
+      def member_names
+        members.keys
+      end
+
+      # @return [Rigor::Type, nil] the member's value type, or nil when the
+      #   name is not a declared member.
+      def member_type(name)
+        members[name]
+      end
+
+      def describe(verbosity = :short)
+        rendered = members.map { |name, type| "#{name}: #{type.describe(verbosity)}" }
+        "#{class_name || 'Data'}(#{rendered.join(', ')})"
+      end
+
+      # Erases to the tagging class nominal (conservative: the structural
+      # members are not RBS-expressible as a class instance). The
+      # anonymous case erases to the `Data` supertype.
+      def erase_to_rbs
+        name = class_name
+        return "Data" if name.nil?
+
+        name
+      end
+
+      def top
+        Trinary.no
+      end
+
+      def bot
+        Trinary.no
+      end
+
+      def dynamic
+        Trinary.no
+      end
+
+      include Rigor::Type::AcceptanceRouter
+
+      include Rigor::ValueSemantics
+
+      value_fields :members, :class_name
+
+      def inspect
+        "#<Rigor::Type::DataInstance #{describe(:short)}>"
+      end
+    end
+  end
+end

data/lib/rigor/type/difference.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -67,18 +69,11 @@ module Rigor
         base.respond_to?(:dynamic) ? base.dynamic : Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
-      def ==(other)
-        other.is_a?(Difference) && base == other.base && removed == other.removed
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [Difference, base, removed].hash
-      end
+      value_fields :base, :removed
 
       def inspect
         "#<Rigor::Type::Difference #{describe(:short)}>"

data/lib/rigor/type/dynamic.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -39,18 +41,11 @@ module Rigor
         Trinary.yes
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
-      def ==(other)
-        other.is_a?(Dynamic) && static_facet == other.static_facet
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [Dynamic, static_facet].hash
-      end
+      value_fields :static_facet
 
       def inspect
         "#<Rigor::Type::Dynamic #{describe(:short)}>"

data/lib/rigor/type/hash_shape.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -106,23 +108,11 @@ module Rigor
         Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
-      def ==(other)
-        other.is_a?(HashShape) &&
-          pairs == other.pairs &&
-          required_keys == other.required_keys &&
-          optional_keys == other.optional_keys &&
-          read_only_keys == other.read_only_keys &&
-          extra_keys == other.extra_keys
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [HashShape, pairs, required_keys, optional_keys, read_only_keys, extra_keys].hash
-      end
+      value_fields :pairs, :required_keys, :optional_keys, :read_only_keys, :extra_keys
 
       def inspect
         "#<Rigor::Type::HashShape #{describe(:short)}>"

data/lib/rigor/type/integer_range.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -113,18 +115,11 @@ module Rigor
         Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
-      def ==(other)
-        other.is_a?(IntegerRange) && min == other.min && max == other.max
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [IntegerRange, min, max].hash
-      end
+      value_fields :min, :max
 
       def inspect
         "#<Rigor::Type::IntegerRange #{describe(:short)}>"

data/lib/rigor/type/intersection.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -72,18 +74,11 @@ module Rigor
         Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
-      def ==(other)
-        other.is_a?(Intersection) && members == other.members
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [Intersection, members].hash
-      end
+      value_fields :members
 
       def inspect
         "#<Rigor::Type::Intersection #{describe(:short)}>"

data/lib/rigor/type/nominal.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -62,18 +64,11 @@ module Rigor
         Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
-      def ==(other)
-        other.is_a?(Nominal) && class_name == other.class_name && type_args == other.type_args
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [Nominal, class_name, type_args].hash
-      end
+      value_fields :class_name, :type_args
 
       def inspect
         "#<Rigor::Type::Nominal #{describe(:short)}>"

data/lib/rigor/type/refined.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -69,18 +71,11 @@ module Rigor
         base.respond_to?(:dynamic) ? base.dynamic : Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
-      def ==(other)
-        other.is_a?(Refined) && base == other.base && predicate_id == other.predicate_id
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [Refined, base, predicate_id].hash
-      end
+      value_fields :base, :predicate_id
 
       def inspect
         "#<Rigor::Type::Refined #{describe(:short)}>"

data/lib/rigor/type/singleton.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -44,18 +46,11 @@ module Rigor
         Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
-      def ==(other)
-        other.is_a?(Singleton) && class_name == other.class_name
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [Singleton, class_name].hash
-      end
+      value_fields :class_name
 
       def inspect
         "#<Rigor::Type::Singleton #{class_name}>"

data/lib/rigor/type/top.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -36,9 +37,7 @@ module Rigor
         Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
       def ==(other)
         other.is_a?(Top)

data/lib/rigor/type/tuple.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../trinary"
+require_relative "../value_semantics"
+require_relative "acceptance_router"
 
 module Rigor
   module Type
@@ -63,18 +65,11 @@ module Rigor
         Trinary.no
       end
 
-      def accepts(other, mode: :gradual)
-        Inference::Acceptance.accepts(self, other, mode: mode)
-      end
+      include Rigor::Type::AcceptanceRouter
 
-      def ==(other)
-        other.is_a?(Tuple) && elements == other.elements
-      end
-      alias eql? ==
+      include Rigor::ValueSemantics
 
-      def hash
-        [Tuple, elements].hash
-      end
+      value_fields :elements
 
       def inspect
         "#<Rigor::Type::Tuple #{describe(:short)}>"