Move component resolving to renderer

Author: skryukov

lib/inertia_rails.rb

@@ -7,11 +7,6 @@
 require 'patches/mapper'
 
 ActionController::Renderers.add :inertia do |component, options|
-  if component.is_a?(Hash) && options[:props].nil?
-    options[:props] = component
-    component = true
-  end
-
   InertiaRails::Renderer.new(
     component,
     self,

lib/inertia_rails/renderer.rb

@@ -20,13 +20,15 @@ class Renderer
     )
 
     def initialize(component, controller, request, response, render_method, props: nil, view_data: nil, deep_merge: nil, encrypt_history: nil, clear_history: nil)
+      raise ArgumentError, 'Parameter `props` is not allowed when passing a Hash as the first argument' if component.is_a?(Hash) && !props.nil?
+
       @controller = controller
       @configuration = controller.__send__(:inertia_configuration)
       @component = resolve_component(component)
       @request = request
       @response = response
       @render_method = render_method
-      @props = props || controller.__send__(:inertia_view_assigns)
+      @props = props || (component.is_a?(Hash) ? component : controller.__send__(:inertia_view_assigns))
       @view_data = view_data || {}
       @deep_merge = !deep_merge.nil? ? deep_merge : configuration.deep_merge_shared_data
       @encrypt_history = !encrypt_history.nil? ? encrypt_history : configuration.encrypt_history
@@ -165,9 +167,11 @@ def rendering_partial_component?
     end
 
     def resolve_component(component)
-      return component unless component.is_a? TrueClass
-
-      configuration.component_path_resolver(path: controller.controller_path, action: controller.action_name)
+      if component == true || component.is_a?(Hash)
+        configuration.component_path_resolver(path: controller.controller_path, action: controller.action_name)
+      else
+        component
+      end
     end
 
     def keep_prop?(prop, path)

spec/dummy/app/controllers/inertia_rails_mimic_controller.rb

@@ -27,7 +27,12 @@ def default_component_test
     render inertia: true
   end
 
-  def default_component_with_params_test
+  def default_component_with_props_test
     render inertia: { my: 'props' }
   end
+
+  def default_component_with_duplicated_props_test
+    # should raise an error
+    render inertia: { my: 'props' }, props: { another: 'prop' }
+  end
 end

spec/dummy/config/routes.rb

@@ -43,7 +43,8 @@
   get 'default_render_test' => 'inertia_rails_mimic#default_render_test'
   get 'transformed_default_render_test' => 'transformed_inertia_rails_mimic#render_test'
   get 'default_component_test' => 'inertia_rails_mimic#default_component_test'
-  get 'default_component_with_params_test' => 'inertia_rails_mimic#default_component_with_params_test'
+  get 'default_component_with_props_test' => 'inertia_rails_mimic#default_component_with_props_test'
+  get 'default_component_with_duplicated_props_test' => 'inertia_rails_mimic#default_component_with_duplicated_props_test'
   get 'provided_props_test' => 'inertia_rails_mimic#provided_props_test'
 
   post 'redirect_to_share_test' => 'inertia_test#redirect_to_share_test'

spec/inertia/rails_mimic_spec.rb

@@ -26,11 +26,17 @@
     end
 
     it 'has the correct derived component with props' do
-      get default_component_with_params_test_path
+      get default_component_with_props_test_path
 
-      expect_inertia.to render_component('inertia_rails_mimic/default_component_with_params_test')
+      expect_inertia.to render_component('inertia_rails_mimic/default_component_with_props_test')
         .and have_exact_props({my: 'props'})
     end
+
+    it 'raises an error when props as properties are provided' do
+      expect {
+        get default_component_with_duplicated_props_test_path
+      }.to raise_error(ArgumentError, 'Parameter `props` is not allowed when passing a Hash as the first argument')
+    end
   end
 
   context 'no render is done at all and default_render is enabled' do