view_component_devtools 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 133887ab12a90a7f356d8ab4c77475c53ac65e9280769060c1a02f6e9df6043e
-  data.tar.gz: fcf6a866579b6a27b71d40ac3c57d8453b76907e9520fb5b74cc03260985820b
+  metadata.gz: bf5b2619905340a6dd2b5e8bc564172c9a49441a6353d48e36619585abb190b3
+  data.tar.gz: c5fc0d7882588e18739448c3cc147d3a10a4e0c93fdad4c0a8a5406fe65958b4
 SHA512:
-  metadata.gz: 9e79c04dd30cdcadb4c80a1dbf4f53410d17a95f2fdcffe4c27e03e98cd718705e89ee56de1f8c82a8a65e784cae21b86b7a0dacdb07dc4e8f95d99a2cdbae09
-  data.tar.gz: cbb037a59de31c4d41fb7017d2231f1e58660031f1a8f6c422eda105cf7e00afb5174d5dd7d7df0810510875d704b64db28d925f001c9ce56ee8c3f238e44c97
+  metadata.gz: cd02547ecaca8df7483794ee934f9b7374821fd10df047028e9739d43277207c7b1aa3cb10b92f5ae5da91f43497b84f232d61669042a30d6d2fe1bdb08288a0
+  data.tar.gz: d3f7f7a4000c3fe7527bdd87de585806d4e8fb559d1e3970e9900d884495e817a4d537fe98b3a740d9387effcf9d1ac558a93c25182bf1cb70728009a1e64a8a

data/lib/view_component_devtools/component.rb

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/string/output_safety"
+require "base64"
+
 module ViewComponentDevtools
   module Component
+    MARKER_PREFIX = "view-component-devtools"
+
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -13,54 +18,66 @@ module ViewComponentDevtools
       end
 
       def view_component_devtools_prop_names
-        classes = component_class_chain
-        declared = classes.flat_map do |component_class|
-          component_class.instance_variable_get(:@view_component_devtools_props) || []
-        end
-        inferred = classes.flat_map do |component_class|
-          component_initializer(component_class)&.parameters&.filter_map do |kind, name|
-            name if %i[req opt keyreq key].include?(kind)
-          end || []
+        declared = (@view_component_devtools_props || []).select do |name|
+          directly_defined_zero_argument_method?(name)
         end
+        inferred = component_initializer&.parameters&.filter_map do |kind, name|
+          name if %i[req opt keyreq key].include?(kind) && directly_defined_attribute_reader?(name)
+        end || []
 
-        (declared + inferred).uniq.select do |name|
-          prop_reader?(name, classes:, explicitly_declared: declared.include?(name))
-        end
+        (declared + inferred).uniq
       end
 
       private
 
-      def component_class_chain
-        boundary = defined?(ViewComponent::Base) && self < ViewComponent::Base ?
-          ViewComponent::Base : Object
-        classes = []
-        component_class = self
+      def attr(*names)
+        result = super
+        reader_names = names.last == true || names.last == false ? names[0...-1] : names
+        track_attribute_readers(reader_names)
+        result
+      end
 
-        while component_class.is_a?(Class) && component_class != boundary
-          classes << component_class
-          component_class = component_class.superclass
-        end
+      def attr_accessor(*names)
+        result = super
+        track_attribute_readers(names)
+        result
+      end
 
-        classes
+      def attr_reader(*names)
+        result = super
+        track_attribute_readers(names)
+        result
       end
 
-      def component_initializer(component_class)
-        return unless component_class.private_instance_methods(false).include?(:initialize) ||
-          component_class.protected_instance_methods(false).include?(:initialize) ||
-          component_class.public_instance_methods(false).include?(:initialize)
+      def component_initializer
+        return unless private_instance_methods(false).include?(:initialize) ||
+          protected_instance_methods(false).include?(:initialize) ||
+          public_instance_methods(false).include?(:initialize)
 
-        initializer = component_class.instance_method(:initialize)
-        initializer if initializer.owner == component_class
+        instance_method(:initialize)
       end
 
-      def prop_reader?(name, classes:, explicitly_declared:)
-        return false unless public_method_defined?(name)
+      def directly_defined_attribute_reader?(name)
+        reader = (@view_component_devtools_attribute_readers || {})[name]
+        return false unless reader
+        return false unless directly_defined_zero_argument_method?(name)
+
+        instance_method(name) == reader
+      end
+
+      def directly_defined_zero_argument_method?(name)
+        return false unless public_instance_methods(false).include?(name)
 
         method = instance_method(name)
-        callable_without_arguments = method.parameters.none? do |kind, _|
-          %i[req keyreq].include?(kind)
+        method.owner == self && method.arity.zero?
+      end
+
+      def track_attribute_readers(names)
+        @view_component_devtools_attribute_readers ||= {}
+        names.each do |name|
+          name = name.to_sym
+          @view_component_devtools_attribute_readers[name] = instance_method(name)
         end
-        callable_without_arguments && (explicitly_declared || classes.include?(method.owner))
       end
     end
 
@@ -75,7 +92,15 @@ module ViewComponentDevtools
         end
       }
 
-      State.with_component(metadata) { super }
+      rendered = State.with_component(metadata) { super }
+      component_id = metadata[:devtools_id]
+      return rendered unless component_id
+
+      marker_id = Base64.strict_encode64(component_id)
+      start_marker = "<!--#{MARKER_PREFIX}:start:#{marker_id}-->".html_safe
+      end_marker = "<!--#{MARKER_PREFIX}:end:#{marker_id}-->".html_safe
+
+      start_marker + rendered.to_s.html_safe + end_marker
     end
 
     private
@@ -86,9 +111,7 @@ module ViewComponentDevtools
         return identifier if identifier
       end
 
-      initializer = self.class.send(:component_class_chain).filter_map do |component_class|
-        self.class.send(:component_initializer, component_class)
-      end.first
+      initializer = self.class.send(:component_initializer)
       initializer&.source_location&.join(":")
     end
   end

data/lib/view_component_devtools/state.rb

@@ -106,8 +106,11 @@ module ViewComponentDevtools
         @component_count += 1
         metadata = component_stack.last
         metadata = nil unless metadata&.fetch(:name, nil) == payload[:name]
+        id = "#{request_id}:#{@component_count}"
+        metadata[:devtools_id] = id if metadata
+
         {
-          id: "#{request_id}:#{@component_count}",
+          id:,
           name: payload[:name] || metadata&.fetch(:name, nil) || "AnonymousComponent",
           sourceLocation: payload[:identifier] || metadata&.fetch(:source_location, nil),
           templateLocation: payload[:view_identifier],

data/lib/view_component_devtools/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: view_component_devtools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - ViewComponent DevTools contributors
 bindir: bin
 cert_chain: []
-date: 2026-08-11 00:00:00.000000000 Z
+date: 2026-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport