view_component_devtools 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21babb25c8660808d7564914dd2105566e39e9954a197643e7862815ea867583
-  data.tar.gz: c64e1042bef475216ff30b64d7fc8f5ac16d308524bb916d2460ef3a9d3e75a9
+  metadata.gz: 133887ab12a90a7f356d8ab4c77475c53ac65e9280769060c1a02f6e9df6043e
+  data.tar.gz: fcf6a866579b6a27b71d40ac3c57d8453b76907e9520fb5b74cc03260985820b
 SHA512:
-  metadata.gz: f88cbecd121cc209eb6dd9e2a82e792cf1f7636becbc183ab6ea490cf563af7b3318d86246bce203780f79465ad5f457047ad348704732185d3ce952109fded6
-  data.tar.gz: e9420245c4fdad743a6cec795c2e2c8846d247181436ec3bc0d41f4a1868dc0c793a745f0744be4f565e31976ff5a7a3b70d0ac69a49ebd6c97b271b2727d1d2
+  metadata.gz: 9e79c04dd30cdcadb4c80a1dbf4f53410d17a95f2fdcffe4c27e03e98cd718705e89ee56de1f8c82a8a65e784cae21b86b7a0dacdb07dc4e8f95d99a2cdbae09
+  data.tar.gz: cbb037a59de31c4d41fb7017d2231f1e58660031f1a8f6c422eda105cf7e00afb5174d5dd7d7df0810510875d704b64db28d925f001c9ce56ee8c3f238e44c97

data/lib/view_component_devtools/component.rb

@@ -13,39 +13,54 @@ module ViewComponentDevtools
       end
 
       def view_component_devtools_prop_names
-        inherited = superclass.respond_to?(:view_component_devtools_prop_names) ?
-          superclass.view_component_devtools_prop_names : []
-        initializer_names = instance_method(:initialize).parameters.filter_map do |kind, name|
-          name if %i[req opt keyreq key].include?(kind)
+        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 || []
         end
-        declared = @view_component_devtools_props || []
-        trusted = inherited + declared
 
-        (trusted + initializer_names).uniq.select do |name|
-          prop_reader?(name, trusted: trusted.include?(name))
+        (declared + inferred).uniq.select do |name|
+          prop_reader?(name, classes:, explicitly_declared: declared.include?(name))
         end
       end
 
       private
 
-      def prop_reader?(name, trusted:)
-        return false unless public_method_defined?(name)
+      def component_class_chain
+        boundary = defined?(ViewComponent::Base) && self < ViewComponent::Base ?
+          ViewComponent::Base : Object
+        classes = []
+        component_class = self
 
-        method = instance_method(name)
-        callable_without_arguments = method.parameters.none? do |kind, _|
-          %i[req keyreq].include?(kind)
+        while component_class.is_a?(Class) && component_class != boundary
+          classes << component_class
+          component_class = component_class.superclass
         end
-        callable_without_arguments && (trusted || component_class_owner?(method.owner))
+
+        classes
       end
 
-      def component_class_owner?(owner)
-        return false unless owner.is_a?(Class)
+      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)
 
-        if defined?(ViewComponent::Base) && self < ViewComponent::Base
-          owner < ViewComponent::Base
-        else
-          self <= owner
+        initializer = component_class.instance_method(:initialize)
+        initializer if initializer.owner == component_class
+      end
+
+      def prop_reader?(name, classes:, explicitly_declared:)
+        return false unless public_method_defined?(name)
+
+        method = instance_method(name)
+        callable_without_arguments = method.parameters.none? do |kind, _|
+          %i[req keyreq].include?(kind)
         end
+        callable_without_arguments && (explicitly_declared || classes.include?(method.owner))
       end
     end
 
@@ -71,7 +86,10 @@ module ViewComponentDevtools
         return identifier if identifier
       end
 
-      self.class.instance_method(:initialize).source_location&.join(":")
+      initializer = self.class.send(:component_class_chain).filter_map do |component_class|
+        self.class.send(:component_initializer, component_class)
+      end.first
+      initializer&.source_location&.join(":")
     end
   end
 end

data/lib/view_component_devtools/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: view_component_devtools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ViewComponent DevTools contributors