inertia_rails 3.11.0 → 3.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 416af24e523dd32daacb768be83fc88bf5465a87adbf49e8105cb630409e45f9
-  data.tar.gz: 4c1d7c883d6ffc3e3239777bd1b1f400f5a0f69c22093a307225d696551b2da5
+  metadata.gz: a3bde9e557a4d5b76450d4f019ae8461b40a0eb2fda2984d8d5cb32fa58d769c
+  data.tar.gz: d662136e29e4f72957a6677a74b1c6c29086e8e32056023e5b51fb4b5e70b976
 SHA512:
-  metadata.gz: 23f7eeab79b5e54cc12408f6196f946f5cb5ea78086d55ac56d06827ea0243ba96c90e432e7c69583f7531ae7cd2611a026fdce15039219c36f7ef9034888fa6
-  data.tar.gz: c29f0e2d3c88ebc7a4cc6a405219152a3ae5f4428b23b8ec9a82de8e38e98a52c035d15389c51858b1a6534aae47adef1a26ebd179c4892c7a7b0b76427b88b0
+  metadata.gz: 86753985c32f435b2967144c8b88e22984d1999fd0e528ac862d9b2dcc081545d52841d54b984d8184cb7774681576aa03ce244b09016a79b0110067b1d69d7e
+  data.tar.gz: 22197c8fc07a0f2d25402f04ab9988b3a572bd7c713ef8a391bf95bdb680bfac5a03c65c19796671d7172f921d1fdc900cc9f4f3d41420702e556a1a820a3942

data/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.12.1] - 2025-11-09
+
+* Fix scroll props and deferred props for shared data (@bknoles)
+* Deprecate the probably-no-actually-used-anywhere public readers on InertiaRails::Renderer (@bknoles)
+
+## [3.12.0] - 2025-11-08
+
+* Docs updates (@leenyburger, @skryukov, @bn-l)
+* Reimplement devcontainers (@kieraneglin)
+* Support for Inertia.js infinite scroll components (@skyrukov)
+* New merge options (@skryukov)
+
 ## [3.11.0] - 2025-08-29
 
 * Fix Svelte generator (@skryukov)

data/app/controllers/inertia_rails/static_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InertiaRails
   class StaticController < InertiaRails.configuration.parent_controller.constantize
     def static

data/lib/generators/inertia/install/install_generator.rb

@@ -128,8 +128,12 @@ module Inertia
         add_dependencies(*FRAMEWORKS[framework]['packages_ts'])
 
         say 'Copying adding scripts to package.json'
-        run 'npm pkg set scripts.check="svelte-check --tsconfig ./tsconfig.json && tsc -p tsconfig.node.json"' if svelte?
-        run 'npm pkg set scripts.check="vue-tsc -p tsconfig.app.json && tsc -p tsconfig.node.json"' if framework == 'vue'
+        if svelte?
+          run 'npm pkg set scripts.check="svelte-check --tsconfig ./tsconfig.json && tsc -p tsconfig.node.json"'
+        end
+        if framework == 'vue'
+          run 'npm pkg set scripts.check="vue-tsc -p tsconfig.app.json && tsc -p tsconfig.node.json"'
+        end
         run 'npm pkg set scripts.check="tsc -p tsconfig.app.json && tsc -p tsconfig.node.json"' if framework == 'react'
       end
 
@@ -262,8 +266,9 @@ module Inertia
       end
 
       def inertia_resolved_version
+        package = "@inertiajs/core@#{options[:inertia_version]}"
         @inertia_resolved_version ||= Gem::Version.new(
-          `npm show @inertiajs/core@#{options[:inertia_version]} version --json | tail -n2 | head -n1 | tr -d '", '`.strip
+          `npm show #{package} version --json | tail -n2 | head -n1 | tr -d '", '`.strip
         )
       end
 

data/lib/inertia_rails/action_filter.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 # Based on AbstractController::Callbacks::ActionFilter
 # https://github.com/rails/rails/blob/v7.2.0/actionpack/lib/abstract_controller/callbacks.rb#L39
@@ -6,7 +7,7 @@ module InertiaRails
   class ActionFilter
     def initialize(conditional_key, actions)
       @conditional_key = conditional_key
-      @actions = Array(actions).map(&:to_s).to_set
+      @actions = Array(actions).to_set(&:to_s)
     end
 
     def match?(controller)

data/lib/inertia_rails/controller.rb

@@ -1,7 +1,9 @@
-require_relative "inertia_rails"
-require_relative "helper"
-require_relative "action_filter"
-require_relative "meta_tag_builder"
+# frozen_string_literal: true
+
+require_relative 'inertia_rails'
+require_relative 'helper'
+require_relative 'action_filter'
+require_relative 'meta_tag_builder'
 
 module InertiaRails
   module Controller
@@ -21,8 +23,8 @@ module InertiaRails
         return push_to_inertia_share(**(hash || props), &block) if options.empty?
 
         push_to_inertia_share do
-          next unless options[:if].all? { |filter| instance_exec(&filter) } if options[:if]
-          next unless options[:unless].none? { |filter| instance_exec(&filter)  } if options[:unless]
+          next if options[:if] && !options[:if].all? { |filter| instance_exec(&filter) }
+          next if options[:unless]&.any? { |filter| instance_exec(&filter) }
 
           next hash unless block
 
@@ -81,7 +83,9 @@ module InertiaRails
         return options if options.empty?
 
         if props.except(:if, :unless, :only, :except).any?
-          raise ArgumentError, "You must not mix shared data and [:if, :unless, :only, :except] options, pass data as a hash or a block."
+          raise ArgumentError,
+                'You must not mix shared data and [:if, :unless, :only, :except] options, ' \
+                'pass data as a hash or a block.'
         end
 
         transform_inertia_share_option(options, :only, :if)
@@ -110,7 +114,7 @@ module InertiaRails
         when InertiaRails::ActionFilter
           -> { filter.match?(self) }
         else
-          raise ArgumentError, "You must pass a symbol or a proc as a filter."
+          raise ArgumentError, 'You must pass a symbol or a proc as a filter.'
         end
       end
     end
@@ -136,6 +140,7 @@ module InertiaRails
 
     def inertia_view_assigns
       return {} unless @_inertia_instance_props
+
       view_assigns.except(*@_inertia_skip_props)
     end
 
@@ -152,22 +157,22 @@ module InertiaRails
         else
           if inertia_configuration.always_include_errors_hash.nil?
             InertiaRails.deprecator.warn(
-              "To comply with the Inertia protocol, an empty errors hash `{errors: {}}` " \
-              "will be included to all responses by default starting with InertiaRails 4.0. " \
-              "To opt-in now, set `config.always_include_errors_hash = true`. " \
-              "To disable this warning, set it to `false`."
+              'To comply with the Inertia protocol, an empty errors hash `{errors: {}}` ' \
+              'will be included to all responses by default starting with InertiaRails 4.0. ' \
+              'To opt-in now, set `config.always_include_errors_hash = true`. ' \
+              'To disable this warning, set it to `false`.'
             )
           end
           {}
         end
 
-      self.class._inertia_shared_data.filter_map { |shared_data|
+      self.class._inertia_shared_data.filter_map do |shared_data|
         if shared_data.respond_to?(:call)
           instance_exec(&shared_data)
         else
           shared_data
         end
-      }.reduce(initial_data, &:merge)
+      end.reduce(initial_data, &:merge)
     end
 
     def inertia_location(url)
@@ -183,7 +188,7 @@ module InertiaRails
           session[:inertia_errors] = inertia_errors.to_hash
         else
           InertiaRails.deprecator.warn(
-            "Object passed to `inertia: { errors: ... }` must respond to `to_hash`. Pass a hash-like object instead."
+            'Object passed to `inertia: { errors: ... }` must respond to `to_hash`. Pass a hash-like object instead.'
           )
           session[:inertia_errors] = inertia_errors
         end

data/lib/inertia_rails/defer_prop.rb

@@ -2,27 +2,16 @@
 
 module InertiaRails
   class DeferProp < IgnoreOnFirstLoadProp
-    DEFAULT_GROUP = 'default'
+    prepend PropMergeable
 
-    attr_reader :group, :match_on
+    DEFAULT_GROUP = 'default'
 
-    def initialize(group: nil, merge: nil, deep_merge: nil, match_on: nil, &block)
-      raise ArgumentError, 'Cannot set both `deep_merge` and `merge` to true' if deep_merge && merge
+    attr_reader :group
 
+    def initialize(**props, &block)
       super(&block)
 
-      @group = group || DEFAULT_GROUP
-      @merge = merge || deep_merge
-      @deep_merge = deep_merge
-      @match_on = match_on.nil? ? nil : Array(match_on)
-    end
-
-    def merge?
-      @merge
-    end
-
-    def deep_merge?
-      @deep_merge
+      @group = props[:group] || DEFAULT_GROUP
     end
   end
 end

data/lib/inertia_rails/engine.rb

@@ -1,13 +1,15 @@
-require_relative "middleware"
-require_relative "controller"
+# frozen_string_literal: true
+
+require_relative 'middleware'
+require_relative 'controller'
 
 module InertiaRails
   class Engine < ::Rails::Engine
-    initializer "inertia_rails.configure_rails_initialization" do |app|
+    initializer 'inertia_rails.configure_rails_initialization' do |app|
       app.middleware.use ::InertiaRails::Middleware
     end
 
-    initializer "inertia_rails.action_controller" do
+    initializer 'inertia_rails.action_controller' do
       ActiveSupport.on_load(:action_controller_base) do
         include ::InertiaRails::Controller
       end

data/lib/inertia_rails/helper.rb

@@ -1,32 +1,36 @@
+# frozen_string_literal: true
+
 require_relative 'inertia_rails'
 
-module InertiaRails::Helper
-  def inertia_ssr_head
-    controller.instance_variable_get("@_inertia_ssr_head")
-  end
+module InertiaRails
+  module Helper
+    def inertia_ssr_head
+      controller.instance_variable_get('@_inertia_ssr_head')
+    end
 
-  def inertia_headers
-    InertiaRails.deprecator.warn(
-      "`inertia_headers` is deprecated and will be removed in InertiaRails 4.0, use `inertia_ssr_head` instead."
-    )
-    inertia_ssr_head
-  end
+    def inertia_headers
+      InertiaRails.deprecator.warn(
+        '`inertia_headers` is deprecated and will be removed in InertiaRails 4.0, use `inertia_ssr_head` instead.'
+      )
+      inertia_ssr_head
+    end
 
-  def inertia_rendering?
-    controller.instance_variable_get("@_inertia_rendering")
-  end
+    def inertia_rendering?
+      controller.instance_variable_get('@_inertia_rendering')
+    end
 
-  def inertia_page
-    controller.instance_variable_get("@_inertia_page")
-  end
+    def inertia_page
+      controller.instance_variable_get('@_inertia_page')
+    end
 
-  def inertia_meta_tags
-    meta_tag_data = (inertia_page || {}).dig(:props, :_inertia_meta) || []
+    def inertia_meta_tags
+      meta_tag_data = (inertia_page || {}).dig(:props, :_inertia_meta) || []
 
-    meta_tags = meta_tag_data.map do |inertia_meta_tag|
-      inertia_meta_tag.to_tag(tag)
-    end
+      meta_tags = meta_tag_data.map do |inertia_meta_tag|
+        inertia_meta_tag.to_tag(tag)
+      end
 
-    safe_join(meta_tags, "\n")
+      safe_join(meta_tags, "\n")
+    end
   end
 end

data/lib/inertia_rails/inertia_rails.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'inertia_rails/prop_mergeable'
 require 'inertia_rails/base_prop'
 require 'inertia_rails/ignore_on_first_load_prop'
 require 'inertia_rails/always_prop'
@@ -7,6 +8,7 @@ require 'inertia_rails/lazy_prop'
 require 'inertia_rails/optional_prop'
 require 'inertia_rails/defer_prop'
 require 'inertia_rails/merge_prop'
+require 'inertia_rails/scroll_prop'
 require 'inertia_rails/configuration'
 require 'inertia_rails/meta_tag'
 
@@ -34,8 +36,8 @@ module InertiaRails
       AlwaysProp.new(&block)
     end
 
-    def merge(match_on: nil, &block)
-      MergeProp.new(match_on: match_on, &block)
+    def merge(...)
+      MergeProp.new(...)
     end
 
     def deep_merge(match_on: nil, &block)
@@ -45,5 +47,9 @@ module InertiaRails
     def defer(group: nil, merge: nil, deep_merge: nil, match_on: nil, &block)
       DeferProp.new(group: group, merge: merge, deep_merge: deep_merge, match_on: match_on, &block)
     end
+
+    def scroll(metadata = nil, **options, &block)
+      ScrollProp.new(metadata: metadata, **options, &block)
+    end
   end
 end

data/lib/inertia_rails/lazy_prop.rb

@@ -10,7 +10,7 @@ module InertiaRails
       )
 
       @value = value
-      @block = block
+      super(&block)
     end
 
     def call(controller)

data/lib/inertia_rails/merge_prop.rb

@@ -2,20 +2,11 @@
 
 module InertiaRails
   class MergeProp < BaseProp
-    attr_reader :match_on
+    prepend PropMergeable
 
-    def initialize(deep_merge: false, match_on: nil, &block)
+    def initialize(**_props, &block)
       super(&block)
-      @deep_merge = deep_merge
-      @match_on = match_on.nil? ? nil : Array(match_on)
-    end
-
-    def merge?
-      true
-    end
-
-    def deep_merge?
-      @deep_merge
+      @merge = true
     end
   end
 end

data/lib/inertia_rails/prop_mergeable.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+module InertiaRails
+  module PropMergeable
+    attr_reader :match_on, :appends_at_paths, :prepends_at_paths
+
+    def initialize(**props, &block)
+      raise ArgumentError, 'Cannot set both `deep_merge` and `merge` to true' if props[:deep_merge] && props[:merge]
+
+      @deep_merge = props.fetch(:deep_merge, false)
+      @merge = props[:merge] || @deep_merge
+      @match_on = props[:match_on].nil? ? nil : Array(props[:match_on])
+      @appends_at_paths = []
+      @prepends_at_paths = []
+      @append = true
+
+      append(props[:append]) if props.key?(:append)
+      prepend(props[:prepend]) if props.key?(:prepend)
+
+      super
+    end
+
+    def appends_at_root?
+      @append && merges_at_root?
+    end
+
+    def prepends_at_root?
+      !@append && merges_at_root?
+    end
+
+    def merges_at_root?
+      merge? && appends_at_paths.none? && prepends_at_paths.none?
+    end
+
+    def merge?
+      @merge
+    end
+
+    def deep_merge?
+      @deep_merge
+    end
+
+    private
+
+    def append(path, match_on: nil)
+      case path
+      when TrueClass, FalseClass
+        @append = path
+      when String
+        @appends_at_paths << path
+      when Array
+        @appends_at_paths += path
+      when Hash
+        @match_on ||= []
+        path.each do |key, value|
+          @appends_at_paths << key.to_s
+          @match_on << "#{key}.#{value}" if value
+        end
+      end
+
+      (@match_on ||= []) << "#{path}.#{match_on}" if match_on && path.is_a?(String)
+    end
+
+    def prepend(path, match_on: nil)
+      case path
+      when TrueClass, FalseClass
+        @append = !path
+      when String
+        @prepends_at_paths << path
+      when Array
+        @prepends_at_paths += path
+      when Hash
+        @match_on ||= []
+        path.each do |key, value|
+          @prepends_at_paths << key.to_s
+          @match_on << "#{key}.#{value}" if value
+        end
+      end
+
+      (@match_on ||= []) << "#{path}.#{match_on}" if match_on && path.is_a?(String)
+    end
+  end
+end

data/lib/inertia_rails/renderer.rb

@@ -6,15 +6,15 @@ require_relative 'inertia_rails'
 
 module InertiaRails
   class Renderer
-    attr_reader(
-      :component,
-      :configuration,
-      :controller,
-      :props,
-      :view_data,
-      :encrypt_history,
-      :clear_history
-    )
+    %i[component configuration controller props view_data encrypt_history
+       clear_history].each do |method_name|
+      define_method(method_name) do
+        InertiaRails.deprecator.warn(
+          "[DEPRECATION] Accessing `InertiaRails::Renderer##{method_name}` is deprecated and will be removed in v4.0"
+        )
+        instance_variable_get("@#{method_name}")
+      end
+    end
 
     def initialize(component, controller, request, response, render_method, **options)
       if component.is_a?(Hash) && options.key?(:props)
@@ -24,15 +24,20 @@ module InertiaRails
 
       @controller = controller
       @configuration = controller.__send__(:inertia_configuration)
-      @component = resolve_component(component)
       @request = request
       @response = response
       @render_method = render_method
-      @props = options.fetch(:props, component.is_a?(Hash) ? component : controller.__send__(:inertia_view_assigns))
       @view_data = options.fetch(:view_data, {})
-      @deep_merge = options.fetch(:deep_merge, configuration.deep_merge_shared_data)
-      @encrypt_history = options.fetch(:encrypt_history, configuration.encrypt_history)
+      @encrypt_history = options.fetch(:encrypt_history, @configuration.encrypt_history)
       @clear_history = options.fetch(:clear_history, controller.session[:inertia_clear_history] || false)
+
+      deep_merge = options.fetch(:deep_merge, @configuration.deep_merge_shared_data)
+      passed_props = options.fetch(:props,
+                                   component.is_a?(Hash) ? component : @controller.__send__(:inertia_view_assigns))
+      @props = merge_props(shared_data, passed_props, deep_merge)
+
+      @component = resolve_component(component)
+
       @controller.instance_variable_set('@_inertia_rendering', true)
       controller.inertia_meta.add(options[:meta]) if options[:meta]
     end
@@ -48,32 +53,32 @@ module InertiaRails
         @render_method.call json: page.to_json, status: @response.status, content_type: Mime[:json]
       else
         begin
-          return render_ssr if configuration.ssr_enabled
+          return render_ssr if @configuration.ssr_enabled
         rescue StandardError
           nil
         end
-        controller.instance_variable_set('@_inertia_page', page)
-        @render_method.call template: 'inertia', layout: layout, locals: view_data.merge(page: page)
+        @controller.instance_variable_set('@_inertia_page', page)
+        @render_method.call template: 'inertia', layout: layout, locals: @view_data.merge(page: page)
       end
     end
 
     private
 
     def render_ssr
-      uri = URI("#{configuration.ssr_url}/render")
+      uri = URI("#{@configuration.ssr_url}/render")
       res = JSON.parse(Net::HTTP.post(uri, page.to_json, 'Content-Type' => 'application/json').body)
 
-      controller.instance_variable_set('@_inertia_ssr_head', res['head'].join.html_safe)
-      @render_method.call html: res['body'].html_safe, layout: layout, locals: view_data.merge(page: page)
+      @controller.instance_variable_set('@_inertia_ssr_head', res['head'].join.html_safe)
+      @render_method.call html: res['body'].html_safe, layout: layout, locals: @view_data.merge(page: page)
     end
 
     def layout
-      layout = configuration.layout
+      layout = @configuration.layout
       layout.nil? || layout
     end
 
     def shared_data
-      controller.__send__(:inertia_shared_data)
+      @controller.__send__(:inertia_shared_data)
     end
 
     # Cast props to symbol keyed hash before merging so that we have a consistent data structure and
@@ -81,8 +86,8 @@ module InertiaRails
     #
     # Functionally, this permits using either string or symbol keys in the controller. Since the results
     # is cast to json, we should treat string/symbol keys as identical.
-    def merge_props(shared_props, props)
-      if @deep_merge
+    def merge_props(shared_props, props, deep_merge)
+      if deep_merge
         shared_props.deep_symbolize_keys.deep_merge!(props.deep_symbolize_keys)
       else
         shared_props.symbolize_keys.merge(props.symbolize_keys)
@@ -91,47 +96,39 @@ module InertiaRails
 
     def computed_props
       # rubocop:disable Style/MultilineBlockChain
-      merge_props(shared_data, props)
-        .then do |merged_props| # Always keep errors in the props
+      @props
+        .tap do |merged_props| # Always keep errors in the props
           if merged_props.key?(:errors) && !merged_props[:errors].is_a?(BaseProp)
             errors = merged_props[:errors]
             merged_props[:errors] = InertiaRails.always { errors }
           end
-          merged_props
         end
         .then { |props| deep_transform_props(props) } # Internal hydration/filtering
-        .then { |props| configuration.prop_transformer(props: props) } # Apply user-defined prop transformer
-        .tap { |props| props[:_inertia_meta] = meta_tags if meta_tags.present? } # Add meta tags last (never transformed)
-
+        .then { |props| @configuration.prop_transformer(props: props) } # Apply user-defined prop transformer
+        .tap do |props| # Add meta tags last (never transformed)
+        props[:_inertia_meta] = meta_tags if meta_tags.present?
+      end
       # rubocop:enable Style/MultilineBlockChain
     end
 
     def page
-      default_page = {
-        component: component,
+      return @page if defined?(@page)
+
+      @page = {
+        component: @component,
         props: computed_props,
         url: @request.original_fullpath,
-        version: configuration.version,
-        encryptHistory: encrypt_history,
-        clearHistory: clear_history,
+        version: @configuration.version,
+        encryptHistory: @encrypt_history,
+        clearHistory: @clear_history,
       }
 
       deferred_props = deferred_props_keys
-      default_page[:deferredProps] = deferred_props if deferred_props.present?
-
-      deep_merge_props, merge_props = all_merge_props.partition do |_key, prop|
-        prop.deep_merge?
-      end
-
-      match_props_on = all_merge_props.filter_map do |key, prop|
-        prop.match_on.map { |ms| "#{key}.#{ms}" } if prop.match_on.present?
-      end.flatten
+      @page[:deferredProps] = deferred_props if deferred_props.present?
+      @page[:scrollProps] = scroll_props if scroll_props.present?
+      @page.merge!(resolve_merge_props)
 
-      default_page[:mergeProps] = merge_props.map(&:first) if merge_props.present?
-      default_page[:deepMergeProps] = deep_merge_props.map(&:first) if deep_merge_props.present?
-      default_page[:matchPropsOn] = match_props_on if match_props_on.present?
-
-      default_page
+      @page
     end
 
     def deep_transform_props(props, parent_path = [])
@@ -145,9 +142,9 @@ module InertiaRails
           transformed_props[key] =
             case prop
             when BaseProp
-              prop.call(controller)
+              prop.call(@controller)
             when Proc
-              controller.instance_exec(&prop)
+              @controller.instance_exec(&prop)
             else
               prop
             end
@@ -163,10 +160,28 @@ module InertiaRails
       end
     end
 
-    def all_merge_props
-      @all_merge_props ||= @props.select do |key, prop|
+    def resolve_merge_props
+      deep_merge_props, merge_props = all_merge_props.partition do |_key, prop|
+        prop.deep_merge?
+      end
+
+      {
+        mergeProps: append_merge_props(merge_props),
+        prependProps: prepend_merge_props(merge_props),
+        deepMergeProps: deep_merge_props.map!(&:first),
+        matchPropsOn: resolve_match_on_props,
+      }.delete_if { |_, v| v.blank? }
+    end
+
+    def resolve_match_on_props
+      all_merge_props.filter_map do |key, prop|
+        prop.match_on.map! { |ms| "#{key}.#{ms}" } if prop.match_on.present?
+      end.flatten
+    end
+
+    def requested_merge_props
+      @requested_merge_props ||= @props.select do |key, prop|
         next unless prop.try(:merge?)
-        next if reset_keys.include?(key)
         next if rendering_partial_component? && (
           (partial_keys.present? && partial_keys.exclude?(key.name)) ||
             (partial_except_keys.present? && partial_except_keys.include?(key.name))
@@ -176,25 +191,73 @@ module InertiaRails
       end
     end
 
+    def append_merge_props(props)
+      return props if props.empty?
+
+      root_append_props, nested_append_props = props.partition { |_key, prop| prop.appends_at_root? }
+
+      result = Set.new(root_append_props.map!(&:first))
+
+      nested_append_props.each do |key, prop|
+        prop.appends_at_paths.each do |path|
+          result.add("#{key}.#{path}")
+        end
+      end
+
+      result.to_a
+    end
+
+    def prepend_merge_props(props)
+      return props if props.empty?
+
+      root_prepend_props, nested_prepend_props = props.partition { |_key, prop| prop.prepends_at_root? }
+
+      result = Set.new(root_prepend_props.map!(&:first))
+
+      nested_prepend_props.each do |key, prop|
+        prop.prepends_at_paths.each do |path|
+          result.add("#{key}.#{path}")
+        end
+      end
+
+      result.to_a
+    end
+
+    def scroll_props
+      return @scroll_props if defined?(@scroll_props)
+
+      @scroll_props = {}
+      requested_merge_props.each do |key, prop|
+        next unless prop.is_a?(ScrollProp)
+
+        @scroll_props[key] = prop.metadata.merge!(reset: reset_keys.include?(key))
+      end
+      @scroll_props
+    end
+
+    def all_merge_props
+      @all_merge_props ||= requested_merge_props.reject { |key,| reset_keys.include?(key) }
+    end
+
     def partial_keys
-      @partial_keys ||= (@request.headers['X-Inertia-Partial-Data'] || '').split(',').compact
+      @partial_keys ||= (@request.headers['X-Inertia-Partial-Data'] || '').split(',').compact_blank!
     end
 
     def reset_keys
-      (@request.headers['X-Inertia-Reset'] || '').split(',').compact.map(&:to_sym)
+      @reset_keys ||= (@request.headers['X-Inertia-Reset'] || '').split(',').compact_blank!.map!(&:to_sym)
     end
 
     def partial_except_keys
-      (@request.headers['X-Inertia-Partial-Except'] || '').split(',').compact
+      @partial_except_keys ||= (@request.headers['X-Inertia-Partial-Except'] || '').split(',').compact_blank!
     end
 
     def rendering_partial_component?
-      @request.headers['X-Inertia-Partial-Component'] == component
+      @request.headers['X-Inertia-Partial-Component'] == @component
     end
 
     def resolve_component(component)
       if component == true || component.is_a?(Hash)
-        configuration.component_path_resolver(path: controller.controller_path, action: controller.action_name)
+        @configuration.component_path_resolver(path: @controller.controller_path, action: @controller.action_name)
       else
         component
       end
@@ -230,7 +293,7 @@ module InertiaRails
     end
 
     def meta_tags
-      controller.inertia_meta.meta_tags
+      @controller.inertia_meta.meta_tags
     end
   end
 end

data/lib/inertia_rails/rspec.rb

@@ -1,30 +1,32 @@
-require "rspec/core"
-require "rspec/matchers"
+# frozen_string_literal: true
+
+require 'rspec/core'
+require 'rspec/matchers'
 
 module InertiaRails
   module RSpec
     class InertiaRenderWrapper
       attr_reader :view_data, :props, :component
-    
+
       def initialize
         @view_data = nil
         @props = nil
         @component = nil
       end
-    
+
       def call(params)
-        set_values(params)
+        assign_locals(params)
         @render_method&.call(params)
       end
-    
+
       def wrap_render(render_method)
         @render_method = render_method
         self
       end
-    
+
       protected
-    
-      def set_values(params)
+
+      def assign_locals(params)
         if params[:locals].present?
           @view_data = params[:locals].except(:page)
           @props = params[:locals][:page][:props]
@@ -33,18 +35,24 @@ module InertiaRails
           # Sequential Inertia request
           @view_data = {}
           json = JSON.parse(params[:json])
-          @props = json["props"]
-          @component = json["component"]
+          @props = json['props']
+          @component = json['component']
         end
       end
     end
 
     module Helpers
       def inertia
-        raise 'Inertia test helpers aren\'t set up! Make sure you add inertia: true to describe blocks using inertia tests.' unless inertia_tests_setup?
+        unless inertia_tests_setup?
+          raise "Inertia test helpers aren't set up! " \
+                'Make sure you add `inertia: true` to describe blocks using inertia tests.'
+        end
 
         if @_inertia_render_wrapper.nil? && !::RSpec.configuration.inertia[:skip_missing_renderer_warnings]
-          warn 'WARNING: the test never created an Inertia renderer. Maybe the code wasn\'t able to reach a `render inertia:` call? If this was intended, or you don\'t want to see this message, set ::RSpec.configuration.inertia[:skip_missing_renderer_warnings] = true'
+          warn 'WARNING: the test never created an Inertia renderer. ' \
+               "Maybe the code wasn't able to reach a `render inertia:` call? If this was intended, " \
+               "or you don't want to see this message, " \
+               'set ::RSpec.configuration.inertia[:skip_missing_renderer_warnings] = true'
         end
         @_inertia_render_wrapper
       end
@@ -57,8 +65,8 @@ module InertiaRails
         @_inertia_render_wrapper = InertiaRenderWrapper.new.wrap_render(render)
       end
 
-      protected 
-      
+      protected
+
       def inertia_tests_setup?
         ::RSpec.current_example.metadata.fetch(:inertia, false)
       end
@@ -67,9 +75,9 @@ module InertiaRails
 end
 
 RSpec.configure do |config|
-  config.include ::InertiaRails::RSpec::Helpers
+  config.include InertiaRails::RSpec::Helpers
   config.add_setting :inertia, default: {
-    skip_missing_renderer_warnings: false
+    skip_missing_renderer_warnings: false,
   }
 
   config.before(:each, inertia: true) do
@@ -106,13 +114,14 @@ RSpec::Matchers.define :render_component do |expected_component|
   end
 
   failure_message do |inertia|
-    "expected rendered inertia component to be #{expected_component}, instead received #{inertia.component || 'nothing'}"
+    "expected rendered inertia component to be #{expected_component}, " \
+      "instead received #{inertia.component || 'nothing'}"
   end
 end
 
 RSpec::Matchers.define :have_exact_view_data do |expected_view_data|
   match do |inertia|
-    expect(inertia.view_data).to eq expected_view_data    
+    expect(inertia.view_data).to eq expected_view_data
   end
 
   failure_message do |inertia|

data/lib/inertia_rails/scroll_metadata.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module InertiaRails
+  module ScrollMetadata
+    class MissingMetadataAdapterError < StandardError; end
+
+    class Props
+      def initialize(page_name:, previous_page:, next_page:, current_page:)
+        @page_name = page_name
+        @previous_page = previous_page
+        @next_page = next_page
+        @current_page = current_page
+      end
+
+      def as_json(_options = nil)
+        {
+          pageName: @page_name,
+          previousPage: @previous_page,
+          nextPage: @next_page,
+          currentPage: @current_page,
+        }
+      end
+    end
+
+    class KaminariAdapter
+      def match?(metadata)
+        defined?(Kaminari) && metadata.is_a?(Kaminari::PageScopeMethods)
+      end
+
+      def call(metadata, **_options)
+        {
+          page_name: (Kaminari.config.param_name || 'page').to_s,
+          previous_page: metadata.prev_page,
+          next_page: metadata.next_page,
+          current_page: metadata.current_page,
+        }
+      end
+    end
+
+    class PagyAdapter
+      def match?(metadata)
+        defined?(Pagy) && metadata.is_a?(Pagy)
+      end
+
+      def call(metadata, **_options)
+        page_name = metadata.respond_to?(:vars) ? metadata.vars.fetch(:page_param) : metadata.options[:page_key]
+        {
+          page_name: page_name.to_s,
+          previous_page: metadata.try(:prev) || metadata.try(:previous),
+          next_page: metadata.next,
+          current_page: metadata.page,
+        }
+      end
+    end
+
+    class HashAdapter
+      def match?(metadata)
+        metadata.is_a?(Hash)
+      end
+
+      def call(metadata, **_options)
+        {
+          page_name: metadata.fetch(:page_name),
+          previous_page: metadata.fetch(:previous_page),
+          next_page: metadata.fetch(:next_page),
+          current_page: metadata.fetch(:current_page),
+        }
+      end
+    end
+
+    class << self
+      attr_accessor :adapters
+
+      def extract(metadata, **options)
+        overrides = options.slice(:page_name, :previous_page, :next_page, :current_page)
+
+        adapters.each do |adapter|
+          next unless adapter.match?(metadata)
+
+          return Props.new(**adapter.call(metadata, **options).merge!(overrides)).as_json
+        end
+
+        begin
+          Props.new(**overrides).as_json
+        rescue ArgumentError
+          raise MissingMetadataAdapterError, "No ScrollMetadata adapter found for #{metadata}"
+        end
+      end
+
+      def register_adapter(adapter)
+        adapters.unshift(adapter.new)
+      end
+    end
+
+    self.adapters = [KaminariAdapter, PagyAdapter, HashAdapter].map(&:new)
+  end
+end

data/lib/inertia_rails/scroll_prop.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative 'scroll_metadata'
+
+module InertiaRails
+  class ScrollProp < BaseProp
+    prepend PropMergeable
+
+    def initialize(**options, &block)
+      super(&block)
+
+      @merge = true
+      @metadata = options.delete(:metadata)
+      @wrapper = options.delete(:wrapper)
+
+      @options = options
+    end
+
+    def call(controller)
+      @value = super
+      configure_merge_intent(controller.request.headers['X-Inertia-Infinite-Scroll-Merge-Intent'])
+      @value
+    end
+
+    def metadata
+      ScrollMetadata.extract(@metadata, **@options)
+    end
+
+    private
+
+    def configure_merge_intent(scroll_intent)
+      scroll_intent == 'prepend' ? prepend(@wrapper || true) : append(@wrapper || true)
+    end
+  end
+end

data/lib/inertia_rails/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InertiaRails
-  VERSION = "3.11.0"
+  VERSION = '3.12.1'
 end

data/lib/patches/better_errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Patch BetterErrors::Middleware to render HTML for Inertia requests
 #
 # Original source:
@@ -7,13 +9,11 @@
 module InertiaRails
   module InertiaBetterErrors
     def text?(env)
-      return false if env["HTTP_X_INERTIA"]
+      return false if env['HTTP_X_INERTIA']
 
       super
     end
   end
 end
 
-if defined?(BetterErrors)
-  BetterErrors::Middleware.include InertiaRails::InertiaBetterErrors
-end
+BetterErrors::Middleware.include InertiaRails::InertiaBetterErrors if defined?(BetterErrors)

data/lib/patches/debug_exceptions.rb

@@ -1,17 +1,34 @@
+# frozen_string_literal: true
+
 # Patch ActionDispatch::DebugExceptions to render HTML for Inertia requests
 #
-# Rails has introduced text rendering for XHR requests with Rails 4.1 and
-# changed the implementation in 4.2, 5.0 and 5.1 (unchanged since then).
-#
 # The original source needs to be patched, so that Inertia requests are
 # NOT responded with plain text, but with HTML.
+#
+# Original source (unchanged since Rails 5.1):
+# https://github.com/rails/rails/blob/5-1-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+# https://github.com/rails/rails/blob/8-0-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+#
 
-if defined?(ActionDispatch::DebugExceptions)
-  if ActionPack.version.to_s >= '5.1'
-    require 'patches/debug_exceptions/patch-5-1'
-  elsif ActionPack.version.to_s >= '5.0'
-    require 'patches/debug_exceptions/patch-5-0'
-  else
-    # This gem supports Rails 5 or later
+module InertiaRails
+  module InertiaDebugExceptions
+    def render_for_browser_request(request, wrapper)
+      template = create_template(request, wrapper)
+      file = "rescues/#{wrapper.rescue_template}"
+
+      if request.xhr? && !request.headers['X-Inertia'] # <<<< this line is changed only
+        body = template.render(template: file, layout: false, formats: [:text])
+        format = 'text/plain'
+      else
+        body = template.render(template: file, layout: 'rescues/layout')
+        format = 'text/html'
+      end
+
+      render(wrapper.status_code, body, format)
+    end
   end
 end
+
+if defined?(ActionDispatch::DebugExceptions)
+  ActionDispatch::DebugExceptions.prepend InertiaRails::InertiaDebugExceptions
+end

data/lib/patches/mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InertiaRails
   module InertiaMapper
     def inertia(*args, **options)
@@ -12,7 +14,10 @@ module InertiaRails
       if path.is_a?(Hash)
         path.first
       elsif resource_scope?
-        [path, InertiaRails.configuration.component_path_resolver(path: [@scope[:module], @scope[:controller]].compact.join('/'), action: path)]
+        [path,
+         InertiaRails.configuration.component_path_resolver(
+           path: [@scope[:module], @scope[:controller]].compact.join('/'), action: path
+         )]
       elsif @scope[:module].blank?
         [path, path]
       else

data/lib/patches/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module InertiaRails
   module InertiaRequest
     def inertia?

data/lib/tasks/inertia_rails.rake

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 namespace :inertia_rails do
   namespace :install do
-    desc "Installs inertia_rails packages and configurations for a React based app"
-    task :react => :environment do
+    desc 'Installs inertia_rails packages and configurations for a React based app'
+    task react: :environment do
       system 'rails g inertia_rails:install --front_end react'
     end
-    desc "Installs inertia_rails packages and configurations for a Vue based app"
+    desc 'Installs inertia_rails packages and configurations for a Vue based app'
     task vue: :environment do
       system 'rails g inertia_rails:install --front_end vue'
     end
-    desc "Installs inertia_rails packages and configurations for a Svelte based app"
+    desc 'Installs inertia_rails packages and configurations for a Svelte based app'
     task svelte: :environment do
       system 'rails g inertia_rails:install --front_end svelte'
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inertia_rails
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.12.1
 platform: ruby
 authors:
 - Brian Knoles
@@ -9,7 +9,7 @@ authors:
 - Eugene Granovsky
 bindir: bin
 cert_chain: []
-date: 2025-08-29 00:00:00.000000000 Z
+date: 2025-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -229,13 +229,14 @@ files:
 - lib/inertia_rails/meta_tag_builder.rb
 - lib/inertia_rails/middleware.rb
 - lib/inertia_rails/optional_prop.rb
+- lib/inertia_rails/prop_mergeable.rb
 - lib/inertia_rails/renderer.rb
 - lib/inertia_rails/rspec.rb
+- lib/inertia_rails/scroll_metadata.rb
+- lib/inertia_rails/scroll_prop.rb
 - lib/inertia_rails/version.rb
 - lib/patches/better_errors.rb
 - lib/patches/debug_exceptions.rb
-- lib/patches/debug_exceptions/patch-5-0.rb
-- lib/patches/debug_exceptions/patch-5-1.rb
 - lib/patches/mapper.rb
 - lib/patches/request.rb
 - lib/tasks/inertia_rails.rake

data/lib/patches/debug_exceptions/patch-5-0.rb

@@ -1,27 +0,0 @@
-# Patch ActionDispatch::DebugExceptions to render HTML for Inertia requests
-#
-# Original source:
-# https://github.com/rails/rails/blob/5-0-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
-#
-
-module InertiaRails
-  module InertiaDebugExceptions
-    def render_for_default_application(request, wrapper)
-      template = create_template(request, wrapper)
-      file = "rescues/#{wrapper.rescue_template}"
-
-      if request.xhr? && !request.headers['X-Inertia'] # <<<< this line is changed only
-        body = template.render(template: file, layout: false, formats: [:text])
-        format = "text/plain"
-      else
-        body = template.render(template: file, layout: 'rescues/layout')
-        format = "text/html"
-      end
-      render(wrapper.status_code, body, format)
-    end
-  end
-end
-
-if defined?(ActionDispatch::DebugExceptions)
-  ActionDispatch::DebugExceptions.prepend InertiaRails::InertiaDebugExceptions
-end

data/lib/patches/debug_exceptions/patch-5-1.rb

@@ -1,30 +0,0 @@
-# Patch ActionDispatch::DebugExceptions to render HTML for Inertia requests
-#
-# Original source (unchanged since Rails 5.1):
-# https://github.com/rails/rails/blob/5-1-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
-# https://github.com/rails/rails/blob/5-2-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
-# https://github.com/rails/rails/blob/6-0-stable/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
-#
-
-module InertiaRails
-  module InertiaDebugExceptions
-    def render_for_browser_request(request, wrapper)
-      template = create_template(request, wrapper)
-      file = "rescues/#{wrapper.rescue_template}"
-
-      if request.xhr? && !request.headers['X-Inertia'] # <<<< this line is changed only
-        body = template.render(template: file, layout: false, formats: [:text])
-        format = "text/plain"
-      else
-        body = template.render(template: file, layout: "rescues/layout")
-        format = "text/html"
-      end
-
-      render(wrapper.status_code, body, format)
-    end
-  end
-end
-
-if defined?(ActionDispatch::DebugExceptions)
-  ActionDispatch::DebugExceptions.prepend InertiaRails::InertiaDebugExceptions
-end