view_component_reducible 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63ab84272ee25669a3647287a779462deb0ea3ae4b12327cc7b5b632a3bcfb08
-  data.tar.gz: 57ce9c56c9aa55d61597f22faab956ffcc9865f93e9296ba08f6c0881cf84fc1
+  metadata.gz: 5505b895dc07055d3d09ad5e466316aadab92321fd2b8a71c3889cc1284059f2
+  data.tar.gz: 66757165853350bb660d16605c935ec5072eb01aedf4dfaf62419ab4d1af5439
 SHA512:
-  metadata.gz: bd8662871ea30fd81a8ffc695067322fc7ff23fdaf625cd1e43bedab36bc198962aa7210d320ec79532fb88f784b03492ab23112b3fdfbc9a3f906cc7762e9a0
-  data.tar.gz: e8fdda9358af6377de808a9beaa016d9e3603c4b167978c7230e882f7a551e27e2840d2239bb777c1e6ef56299f443a8e6e6af9374930da8683c6269b18e63b6
+  metadata.gz: a5a98ecba5e6ac762086bce05b77409360708c91489d6bbd23bba626e9cc0f6ed1f06ee138b90bcb44c68c06e4b35f4474365ea4b5baae3600283e261e1b09aa
+  data.tar.gz: b56697564e122c374d7291cd1955678af2fb79ca307351b74f4c39043e7912bebab33d4f2ae17d26644a46a42a6f9781267be0db27601b5bbad14affe7fa9a3d

data/README.md

@@ -9,7 +9,7 @@ The only thing you add in Rails is a single endpoint:
 mount ViewComponentReducible::Engine, at: "/vcr"
 ```
 
-Everything else stays inside ViewComponent—no extra endpoints, controllers, WebSockets, or JS frameworks required.
+Everything else is **reducible** to ViewComponent—no extra endpoints, controllers, WebSockets, or JS frameworks required.
 
 view_component_reducible brings reducer-based state transitions
-to Rails ViewComponent, inspired by TEA (The Elm Architecture).
+to Rails ViewComponent, inspired by TEA (The Elm Architecture).

data/lib/view_component_reducible/adapter/hidden_field.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "active_support"
-require "active_support/message_verifier"
+require 'active_support'
+require 'active_support/message_verifier'
 
 module ViewComponentReducible
   module Adapter
@@ -9,20 +9,21 @@ module ViewComponentReducible
     class HiddenField < Base
       # @return [ActiveSupport::MessageVerifier]
       def verifier
-        @verifier ||= ActiveSupport::MessageVerifier.new(@secret, digest: "SHA256", serializer: JSON)
+        @verifier ||= ActiveSupport::MessageVerifier.new(@secret, digest: 'SHA256', serializer: JSON)
       end
 
       # @param envelope [Hash]
       # @param request [ActionDispatch::Request]
       # @return [String]
-      def dump(envelope, request:)
+      def dump(envelope, request: nil)
+        _ = request
         verifier.generate(envelope)
       end
 
       # @param request [ActionDispatch::Request]
       # @return [Hash]
       def load(request:)
-        signed = request.params.fetch("vcr_state")
+        signed = request.params.fetch('vcr_state')
         verifier.verify(signed)
       end
     end

data/lib/view_component_reducible/adapter/session.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "active_support"
-require "active_support/message_verifier"
-require "securerandom"
+require 'active_support'
+require 'active_support/message_verifier'
+require 'securerandom'
 
 module ViewComponentReducible
   module Adapter
@@ -10,7 +10,7 @@ module ViewComponentReducible
     class Session < Base
       # @return [ActiveSupport::MessageVerifier]
       def verifier
-        @verifier ||= ActiveSupport::MessageVerifier.new(@secret, digest: "SHA256", serializer: JSON)
+        @verifier ||= ActiveSupport::MessageVerifier.new(@secret, digest: 'SHA256', serializer: JSON)
       end
 
       # @param envelope [Hash]
@@ -19,15 +19,15 @@ module ViewComponentReducible
       def dump(envelope, request:)
         key = SecureRandom.hex(16)
         request.session["vcr:#{key}"] = envelope
-        verifier.generate({ "k" => key })
+        verifier.generate({ 'k' => key })
       end
 
       # @param request [ActionDispatch::Request]
       # @return [Hash]
       def load(request:)
-        signed = request.params.fetch("vcr_state")
+        signed = request.params.fetch('vcr_state')
         payload = verifier.verify(signed)
-        key = payload.fetch("k")
+        key = payload.fetch('k')
         request.session.fetch("vcr:#{key}")
       end
     end

data/lib/view_component_reducible/component.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'nokogiri'
+require 'securerandom'
+
 module ViewComponentReducible
   # Include to enable the component state DSL and helpers.
   module Component
@@ -27,13 +30,12 @@ module ViewComponentReducible
     end
 
     # Build state hash for rendering from the envelope.
-    # @return [Hash{String=>Hash}]
+    # @return [Hash{String=>Object}]
     def vcr_state
-      return { "data" => {}, "meta" => {} } if vcr_envelope.nil?
+      return {} if vcr_envelope.nil?
 
       schema = self.class.vcr_state_schema
-      data, meta = schema.build(vcr_envelope["data"], vcr_envelope["meta"])
-      { "data" => data, "meta" => meta }
+      schema.build(vcr_envelope['data'])
     end
 
     # Optional DOM target id for updates.
@@ -43,6 +45,24 @@ module ViewComponentReducible
       "vcr:#{self.class.vcr_id}:#{path}"
     end
 
+    # Render component markup wrapped in a VCR boundary when available.
+    # @param view_context [ActionView::Base]
+    # @return [String]
+    def render_in(view_context, &block)
+      ensure_vcr_state(view_context) if vcr_envelope.nil?
+
+      path = vcr_envelope && vcr_envelope['path']
+      previous_path = view_context.instance_variable_get(:@vcr_current_path)
+      view_context.instance_variable_set(:@vcr_current_path, path)
+
+      rendered = super
+      return rendered if path.nil? || path.to_s.empty?
+
+      inject_vcr_path(rendered, path)
+    ensure
+      view_context.instance_variable_set(:@vcr_current_path, previous_path)
+    end
+
     module ClassMethods
       # Stable component identifier for envelopes.
       # @return [String]
@@ -50,5 +70,33 @@ module ViewComponentReducible
         name.to_s
       end
     end
+
+    private
+
+    def inject_vcr_path(rendered, path)
+      fragment = Nokogiri::HTML::DocumentFragment.parse(rendered.to_s)
+      root = fragment.children.find(&:element?)
+      return rendered if root.nil?
+
+      root['data-vcr-path'] = path
+      html = fragment.to_html
+      html.respond_to?(:html_safe) ? html.html_safe : html
+    end
+
+    def ensure_vcr_state(view_context)
+      return unless view_context.respond_to?(:controller)
+
+      controller = view_context.controller
+      return unless controller.respond_to?(:request)
+
+      envelope = State::Envelope.initial(self.class, path: next_root_path(view_context))
+      adapter = ViewComponentReducible.config.adapter_for(controller)
+      @vcr_state_token = adapter.dump(envelope, request: controller.request)
+      @vcr_envelope = envelope
+    end
+
+    def next_root_path(_view_context)
+      "root/#{SecureRandom.uuid}"
+    end
   end
 end

data/lib/view_component_reducible/configuration.rb

@@ -15,9 +15,9 @@ module ViewComponentReducible
     # @param controller [ActionController::Base]
     # @param adapter_class [Class, nil]
     # @return [ViewComponentReducible::Adapter::Base]
-    def adapter_for(controller, adapter_class: nil)
+    def adapter_for(_controller, adapter_class: nil)
       resolved_secret = secret || default_secret
-      raise "ViewComponentReducible secret is missing" if resolved_secret.nil?
+      raise 'ViewComponentReducible secret is missing' if resolved_secret.nil?
 
       (adapter_class || adapter).new(secret: resolved_secret)
     end

data/lib/view_component_reducible/dispatch.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "erb"
+require 'erb'
 
 module ViewComponentReducible
   # Helpers for dispatch responses.
@@ -24,7 +24,7 @@ module ViewComponentReducible
       SCRIPT
 
       injection = meta + script
-      html.include?("</head>") ? html.sub("</head>", "#{injection}</head>") : (injection + html)
+      html.include?('</head>') ? html.sub('</head>', "#{injection}</head>") : (injection + html)
     end
   end
 end

data/lib/view_component_reducible/dispatch_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "action_controller"
+require 'action_controller'
 
 module ViewComponentReducible
   # Rails controller entry for dispatch requests.
@@ -21,7 +21,7 @@ module ViewComponentReducible
       adapter = ViewComponentReducible.config.adapter_for(self, adapter_class: adapter_class)
       envelope = adapter.load(request:)
       msg = ViewComponentReducible::Msg.from_params(params)
-      target_path = params.fetch("vcr_target_path", envelope["path"])
+      target_path = params.fetch('vcr_target_path', envelope['path'])
 
       runtime = ViewComponentReducible::Runtime.new
       new_envelope, html = runtime.call(
@@ -32,15 +32,15 @@ module ViewComponentReducible
       )
 
       signed = adapter.dump(new_envelope, request:)
-      if params["vcr_partial"] == "1"
+      if params['vcr_partial'] == '1'
         partial_html = runtime.render_target(envelope: new_envelope, target_path:, controller: self)
-        response.set_header("X-VCR-State", signed)
-        render html: partial_html, content_type: "text/html"
+        response.set_header('X-VCR-State', signed)
+        render html: partial_html, content_type: 'text/html'
       else
-        render html: ViewComponentReducible::Dispatch.inject_state(html, signed), content_type: "text/html"
+        render html: ViewComponentReducible::Dispatch.inject_state(html, signed), content_type: 'text/html'
       end
     rescue ActiveSupport::MessageVerifier::InvalidSignature
-      render status: 400, plain: "Invalid state signature"
+      render status: 400, plain: 'Invalid state signature'
     end
   end
 end

data/lib/view_component_reducible/engine.rb

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 
-require "rails/engine"
+require 'rails/engine'
 
 module ViewComponentReducible
   # Rails engine for mounting dispatch routes.
   class Engine < ::Rails::Engine
     isolate_namespace ViewComponentReducible
-
-    routes.draw do
-      post "/dispatch", to: "dispatch#call"
-    end
   end
 end

data/lib/view_component_reducible/helpers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "json"
+require 'json'
 
 module ViewComponentReducible
   # View helpers for dispatching messages to the VCR endpoint.
@@ -17,20 +17,21 @@ module ViewComponentReducible
     # @param state [String] signed state token
     # @param msg_type [String]
     # @param msg_payload [Hash, String]
-    # @param target_path [String]
+    # @param target_path [String, nil]
     # @param url [String]
     # @yield block for the form body (e.g., submit button)
     # @return [String]
-    def vcr_dispatch_form(state:, msg_type:, msg_payload: {}, target_path: "root", url: "/vcr/dispatch", &block)
+    def vcr_dispatch_form(state:, msg_type:, msg_payload: {}, target_path: nil, url: '/vcr/dispatch', &block)
       payload = msg_payload.is_a?(String) ? msg_payload : JSON.generate(msg_payload)
+      resolved_target = target_path || vcr_envelope_path || instance_variable_get(:@vcr_current_path) || 'root'
 
       form_tag(url, method: :post, data: { vcr_form: true }) do
         body = [
-          hidden_field_tag("vcr_state", state),
-          hidden_field_tag("vcr_msg_type", msg_type),
-          hidden_field_tag("vcr_msg_payload", payload),
-          hidden_field_tag("vcr_target_path", target_path),
-          (block_given? ? capture(&block) : "")
+          hidden_field_tag('vcr_state', state),
+          hidden_field_tag('vcr_msg_type', msg_type),
+          hidden_field_tag('vcr_msg_payload', payload),
+          hidden_field_tag('vcr_target_path', resolved_target),
+          (block_given? ? capture(&block) : '')
         ]
         safe_join(body)
       end
@@ -71,9 +72,12 @@ module ViewComponentReducible
                   current.replaceWith(newNode);
                 }
                 if (payload.state) {
-                  document.querySelectorAll('input[name="vcr_state"]').forEach(function(input) {
-                    input.value = payload.state;
-                  });
+                  var boundary = document.querySelector('[data-vcr-path="' + targetPath + '"]');
+                  if (boundary) {
+                    boundary.querySelectorAll('input[name="vcr_state"]').forEach(function(input) {
+                      input.value = payload.state;
+                    });
+                  }
                 }
               });
           });
@@ -81,5 +85,11 @@ module ViewComponentReducible
       JS
       content_tag(:script, js.html_safe)
     end
+
+    def vcr_envelope_path
+      return unless respond_to?(:vcr_envelope) && vcr_envelope
+
+      vcr_envelope['path']
+    end
   end
 end

data/lib/view_component_reducible/msg.rb

@@ -1,18 +1,78 @@
 # frozen_string_literal: true
 
-require "json"
+require 'json'
 
 module ViewComponentReducible
   # Message payload sent from the client.
   Msg = Struct.new(:type, :payload, keyword_init: true) do
+    # Enable pattern matching with normalized symbol types.
+    # @param keys [Array<Symbol>, nil]
+    # @return [Hash{Symbol=>Object}]
+    def deconstruct_keys(keys)
+      payload_hash = { type: normalized_type, payload: payload }
+      keys ? payload_hash.slice(*keys) : payload_hash
+    end
+
     # Build a Msg from request params.
     # @param params [Hash]
     # @return [ViewComponentReducible::Msg]
     def self.from_params(params)
-      type = params.fetch("vcr_msg_type")
-      payload_json = params["vcr_msg_payload"]
-      payload = payload_json && payload_json != "" ? JSON.parse(payload_json) : {}
-      new(type:, payload:)
+      type = params.fetch('vcr_msg_type')
+      payload_json = params['vcr_msg_payload']
+      payload = payload_json && payload_json != '' ? JSON.parse(payload_json) : {}
+      build(type:, payload:)
+    end
+
+    # Build a Msg with a normalized payload object.
+    # @param type [String, Symbol]
+    # @param payload [Object, nil]
+    # @return [ViewComponentReducible::Msg]
+    def self.build(type:, payload: nil)
+      return new(type:, payload:) if payload.is_a?(Data)
+
+      normalized = normalize_type(type)
+      new(type:, payload: self::Payload.from_hash(normalized, payload))
+    end
+
+    # @param type [String, Symbol]
+    # @return [Symbol]
+    def self.normalize_type(type)
+      type.to_s
+          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+          .tr('-', '_')
+          .downcase
+          .to_sym
+    end
+
+    private
+
+    def normalized_type
+      self.class.normalize_type(type)
+    end
+  end
+
+  class Msg
+    module Payload
+      Empty = Data.define
+      Value = Data.define(:value)
+
+      def self.from_hash(_type, payload)
+        payload_hash = payload.is_a?(Hash) ? payload.transform_keys(&:to_s) : nil
+
+        return Empty.new if payload.nil? || (payload.respond_to?(:empty?) && payload.empty?)
+        return Value.new(value: payload) unless payload_hash
+
+        build_generic(payload_hash)
+      end
+
+      def self.build_generic(payload_hash)
+        return Empty.new if payload_hash.empty?
+
+        keys = payload_hash.keys.map(&:to_sym)
+        klass = Data.define(*keys)
+        values = keys.to_h { |key| [key, payload_hash[key.to_s]] }
+        klass.new(**values)
+      end
     end
   end
 end

data/lib/view_component_reducible/railtie.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require "rails/railtie"
+require 'rails/railtie'
 
 module ViewComponentReducible
   # Railtie for wiring helpers into ActionView.
   class Railtie < ::Rails::Railtie
-    initializer "view_component_reducible.helpers" do
+    initializer 'view_component_reducible.helpers' do
       ActiveSupport.on_load(:action_view) do
         include ViewComponentReducible::Helpers
       end

data/lib/view_component_reducible/runtime.rb

@@ -11,7 +11,7 @@ module ViewComponentReducible
     # @param controller [ActionController::Base]
     # @return [Array<Hash, String>] [new_envelope, html]
     def call(envelope:, msg:, target_path:, controller:)
-      root_klass = ViewComponentReducible.registry.fetch(envelope["root"])
+      root_klass = ViewComponentReducible.registry.fetch(envelope['root'])
       new_env = deep_dup(envelope)
 
       new_env = dispatch_to_path(root_klass, new_env, msg, target_path, controller)
@@ -25,7 +25,7 @@ module ViewComponentReducible
     # @param controller [ActionController::Base]
     # @return [String]
     def render_target(envelope:, target_path:, controller:)
-      root_klass = ViewComponentReducible.registry.fetch(envelope["root"])
+      root_klass = ViewComponentReducible.registry.fetch(envelope['root'])
       component_klass, env = find_env_and_class(root_klass, envelope, target_path)
       controller.view_context.render(component_klass.new(vcr_envelope: env))
     end
@@ -33,12 +33,12 @@ module ViewComponentReducible
     private
 
     def dispatch_to_path(root_klass, env, msg, target_path, controller)
-      if target_path == env["path"]
+      if target_path == env['path']
         apply_reducer(root_klass, env, msg, controller)
       else
-        child = env["children"].fetch(target_path) { raise KeyError, "Unknown path: #{target_path}" }
-        child_klass = ViewComponentReducible.registry.fetch(child["root"])
-        env["children"][target_path] = dispatch_to_path(child_klass, child, msg, target_path, controller)
+        child = env['children'].fetch(target_path) { raise KeyError, "Unknown path: #{target_path}" }
+        child_klass = ViewComponentReducible.registry.fetch(child['root'])
+        env['children'][target_path] = dispatch_to_path(child_klass, child, msg, target_path, controller)
         env
       end
     end
@@ -46,38 +46,55 @@ module ViewComponentReducible
     def apply_reducer(component_klass, env, msg, controller)
       component = component_klass.new(vcr_envelope: env)
       schema = component_klass.vcr_state_schema
-      data, meta = schema.build(env["data"], env["meta"])
-      state = { "data" => data, "meta" => meta }
-
-      new_state, effects = component.reduce(state, msg)
-      env["data"] = new_state["data"]
-      env["meta"] = new_state["meta"]
+      state = schema.build_data(env['data'])
+
+      reducer_result = component.reduce(state, msg)
+      reduced_state, reducer_effects = case reducer_result
+                                       in state_only unless reducer_result.is_a?(Array)
+                                         [state_only, []]
+                                       in [state_only]
+                                         [state_only, []]
+                                       in [state_only, *effects]
+                                         [state_only, effects]
+                                       end
+      env['data'] = normalize_state(reduced_state, schema)
+      effects = normalize_effects(reducer_effects) + normalize_effects(build_effects(component, schema, env['data'],
+                                                                                     msg))
 
       run_effects(component_klass, env, effects, controller)
     end
 
     def run_effects(component_klass, env, effects, controller)
-      return env if effects.nil? || effects.empty?
+      effects_queue = normalize_effects(effects).dup
+      return env if effects_queue.empty?
 
-      effects_queue = effects.dup
       steps = 0
 
       while (eff = effects_queue.shift)
         steps += 1
-        raise "Too many effect steps" if steps > MAX_EFFECT_STEPS
+        raise 'Too many effect steps' if steps > MAX_EFFECT_STEPS
 
-        follow_msg = eff.call(controller: controller, envelope: env)
+        follow_msg = resolve_effect_msg(eff, controller, env)
         next unless follow_msg
+        raise ArgumentError, 'Effect must return a Msg' unless follow_msg.is_a?(Msg)
 
         component = component_klass.new(vcr_envelope: env)
         schema = component_klass.vcr_state_schema
-        data, meta = schema.build(env["data"], env["meta"])
-        state = { "data" => data, "meta" => meta }
-
-        new_state, new_effects = component.reduce(state, follow_msg)
-        env["data"] = new_state["data"]
-        env["meta"] = new_state["meta"]
-        effects_queue.concat(Array(new_effects))
+        state = schema.build_data(env['data'])
+
+        reducer_result = component.reduce(state, follow_msg)
+        reduced_state, reducer_effects = case reducer_result
+                                         in state_only unless reducer_result.is_a?(Array)
+                                           [state_only, []]
+                                         in [state_only]
+                                           [state_only, []]
+                                         in [state_only, *effects]
+                                           [state_only, effects]
+                                         end
+        env['data'] = normalize_state(reduced_state, schema)
+        new_effects = normalize_effects(reducer_effects) + normalize_effects(build_effects(component, schema,
+                                                                                           env['data'], follow_msg))
+        effects_queue.concat(new_effects)
       end
 
       env
@@ -88,13 +105,41 @@ module ViewComponentReducible
     end
 
     def find_env_and_class(component_klass, env, target_path)
-      return [component_klass, env] if target_path == env["path"]
+      return [component_klass, env] if target_path == env['path']
 
-      child = env["children"].fetch(target_path) { raise KeyError, "Unknown path: #{target_path}" }
-      child_klass = ViewComponentReducible.registry.fetch(child["root"])
+      child = env['children'].fetch(target_path) { raise KeyError, "Unknown path: #{target_path}" }
+      child_klass = ViewComponentReducible.registry.fetch(child['root'])
       find_env_and_class(child_klass, child, target_path)
     end
 
+    def normalize_state(state, schema)
+      if state.is_a?(schema.data_class)
+        state.to_h.transform_keys(&:to_s)
+      elsif state.is_a?(Hash)
+        schema.build(state)
+      else
+        raise ArgumentError, "Reducer must return a Hash or #{schema.data_class}"
+      end
+    end
+
+    def build_effects(component, schema, state_hash, msg)
+      return [] unless component.respond_to?(:effects)
+
+      state = schema.build_data(state_hash)
+      Array(component.effects(state, msg))
+    end
+
+    def normalize_effects(effects)
+      Array(effects).compact
+    end
+
+    def resolve_effect_msg(effect, controller, env)
+      return effect if effect.is_a?(Msg)
+      return effect.call(controller: controller, envelope: env) if effect.respond_to?(:call)
+
+      raise ArgumentError, 'Effect must respond to #call or be a Msg'
+    end
+
     def deep_dup(obj)
       Marshal.load(Marshal.dump(obj))
     end

data/lib/view_component_reducible/state/dsl.rb

@@ -28,20 +28,12 @@ module ViewComponentReducible
       class Builder
         def initialize(schema) = (@schema = schema)
 
-        # Define a data field.
+        # Define a state field.
         # @param name [Symbol]
         # @param default [Object, #call]
         # @return [void]
         def field(name, default:)
-          @schema.add_field(name, default:, kind: :data)
-        end
-
-        # Define a meta field.
-        # @param name [Symbol]
-        # @param default [Object, #call]
-        # @return [void]
-        def meta(name, default:)
-          @schema.add_field(name, default:, kind: :meta)
+          @schema.add_field(name, default:)
         end
       end
     end

data/lib/view_component_reducible/state/envelope.rb

@@ -8,16 +8,15 @@ module ViewComponentReducible
       # @param root_component_klass [Class]
       # @param path [String]
       # @return [Hash{String=>Object}]
-      def self.initial(root_component_klass, path: "root")
+      def self.initial(root_component_klass, path: 'root')
         schema = root_component_klass.vcr_state_schema
-        data, meta = schema.defaults
+        data = schema.defaults
         {
-          "v" => 1,
-          "root" => root_component_klass.vcr_id,
-          "path" => path,
-          "data" => data,
-          "children" => {},
-          "meta" => meta
+          'v' => 1,
+          'root' => root_component_klass.vcr_id,
+          'path' => path,
+          'data' => data,
+          'children' => {}
         }
       end
     end

data/lib/view_component_reducible/state/schema.rb

@@ -4,30 +4,48 @@ module ViewComponentReducible
   module State
     # State schema for defining default fields and building state payloads.
     class Schema
-      Field = Struct.new(:name, :default, :kind, keyword_init: true) # kind: :data or :meta
+      Field = Struct.new(:name, :default, keyword_init: true)
 
       def initialize
         @fields = []
+        @data_class = nil
+        @data_class_fields = nil
       end
 
       # Add a field definition.
       # @param name [Symbol]
       # @param default [Object, #call]
-      # @param kind [Symbol] :data or :meta
       # @return [void]
-      def add_field(name, default:, kind:)
-        @fields << Field.new(name:, default:, kind:)
+      def add_field(name, default:)
+        @fields << Field.new(name:, default:)
+      end
+
+      # @return [Class]
+      def data_class
+        field_names = @fields.map(&:name)
+        return @data_class if @data_class && @data_class_fields == field_names
+
+        defaults_proc = -> { build({}) }
+        @data_class_fields = field_names
+        @data_class = Data.define(*field_names) do
+          def [](key)
+            to_h[key.to_sym]
+          end
+
+          define_method(:with_defaults) do
+            defaults = defaults_proc.call.transform_keys(&:to_sym)
+            self.class.new(**defaults)
+          end
+        end
       end
 
       # Build state hashes from input payloads.
-      # @param data_hash [Hash]
-      # @param meta_hash [Hash]
-      # @return [Array<Hash{String=>Object}>] [data, meta]
-      def build(data_hash, meta_hash)
+      # @param state_hash [Hash]
+      # @return [Hash{String=>Object}]
+      def build(state_hash)
         data = {}
-        meta = {}
         @fields.each do |field|
-          src = (field.kind == :meta ? meta_hash : data_hash) || {}
+          src = state_hash || {}
           value = if src.key?(field.name.to_s)
                     src[field.name.to_s]
                   elsif src.key?(field.name)
@@ -36,19 +54,23 @@ module ViewComponentReducible
           value = field.default.call if value.nil? && field.default.respond_to?(:call)
           value = field.default if value.nil? && !field.default.respond_to?(:call)
 
-          if field.kind == :meta
-            meta[field.name.to_s] = value
-          else
-            data[field.name.to_s] = value
-          end
+          data[field.name.to_s] = value
         end
-        [data, meta]
+        data
+      end
+
+      # Build a Data object from input payloads.
+      # @param state_hash [Hash]
+      # @return [Data]
+      def build_data(state_hash)
+        data = build(state_hash)
+        data_class.new(**data.transform_keys(&:to_sym))
       end
 
       # Build default state hashes.
-      # @return [Array<Hash{String=>Object}>] [data, meta]
+      # @return [Hash{String=>Object}]
       def defaults
-        build({}, {})
+        build({})
       end
     end
   end

data/lib/view_component_reducible/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ViewComponentReducible
-  VERSION = "0.1.1"
+  VERSION = '0.1.3'
 end

data/lib/view_component_reducible.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require_relative "view_component_reducible/version"
-require_relative "view_component_reducible/configuration"
-require_relative "view_component_reducible/msg"
-require_relative "view_component_reducible/adapter/base"
-require_relative "view_component_reducible/adapter/hidden_field"
-require_relative "view_component_reducible/adapter/session"
-require_relative "view_component_reducible/helpers"
-require_relative "view_component_reducible/state/schema"
-require_relative "view_component_reducible/state/dsl"
-require_relative "view_component_reducible/state/envelope"
-require_relative "view_component_reducible/component"
-require_relative "view_component_reducible/runtime"
-require_relative "view_component_reducible/dispatch"
-require_relative "view_component_reducible/dispatch_controller"
-require_relative "view_component_reducible/engine"
-require_relative "view_component_reducible/railtie"
+require_relative 'view_component_reducible/version'
+require_relative 'view_component_reducible/configuration'
+require_relative 'view_component_reducible/msg'
+require_relative 'view_component_reducible/adapter/base'
+require_relative 'view_component_reducible/adapter/hidden_field'
+require_relative 'view_component_reducible/adapter/session'
+require_relative 'view_component_reducible/helpers'
+require_relative 'view_component_reducible/state/schema'
+require_relative 'view_component_reducible/state/dsl'
+require_relative 'view_component_reducible/state/envelope'
+require_relative 'view_component_reducible/component'
+require_relative 'view_component_reducible/runtime'
+require_relative 'view_component_reducible/dispatch'
+require_relative 'view_component_reducible/dispatch_controller'
+require_relative 'view_component_reducible/engine'
+require_relative 'view_component_reducible/railtie'
 
 module ViewComponentReducible
   class Error < StandardError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: view_component_reducible
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - manabeai
@@ -37,6 +37,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="