Fix state machine types

Shopify · Jul 19, 2024 · 503a113 · 503a113
1 parent ee9d273
commit 503a113
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/lib/tapioca/dsl/compilers/state_machines.rb b/lib/tapioca/dsl/compilers/state_machines.rb
@@ -231,12 +231,12 @@ def define_state_accessor(instance_module, machine, state_type)
           instance_module.create_method(
             attribute,
             return_type: state_type,
-          )
+          ) if ::StateMachines::HelperModule === machine.owner_class.instance_method(attribute).owner
           instance_module.create_method(
             "#{attribute}=",
             parameters: [create_param("value", type: state_type)],
             return_type: state_type,
-          )
+          ) if ::StateMachines::HelperModule === machine.owner_class.instance_method("#{attribute}=").owner
         end
 
         sig { params(instance_module: RBI::Module, machine: ::StateMachines::Machine).void }

diff --git a/spec/tapioca/dsl/compilers/state_machines_spec.rb b/spec/tapioca/dsl/compilers/state_machines_spec.rb
@@ -312,6 +312,44 @@ def state_event_transition=(value); end
 
               assert_includes(rbi_for(:Vehicle), expected)
             end
+
+            it "generates an RBI with no machine state reader if reader defined on class" do
+              add_ruby_file("vehicle.rb", <<~RUBY)
+                class Vehicle
+                  attr_reader :state
+                  state_machine :state
+                end
+              RUBY
+
+              reader = indented(<<~RBI, 4)
+                def state; end
+              RBI
+              refute_includes(rbi_for(:Vehicle), reader)
+
+              writer = indented(<<~RBI, 4)
+                def state=(value); end
+              RBI
+              assert_includes(rbi_for(:Vehicle), writer)
+            end
+
+            it "generates an RBI with no machine state writer if writer defined on class" do
+              add_ruby_file("vehicle.rb", <<~RUBY)
+                class Vehicle
+                  attr_writer :state
+                  state_machine :state
+                end
+              RUBY
+
+              reader = indented(<<~RBI, 4)
+                def state; end
+              RBI
+              assert_includes(rbi_for(:Vehicle), reader)
+
+              writer = indented(<<~RBI, 4)
+                def state=(value); end
+              RBI
+              refute_includes(rbi_for(:Vehicle), writer)
+            end
           end
         end
       end