view_component_devtools 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 133887ab12a90a7f356d8ab4c77475c53ac65e9280769060c1a02f6e9df6043e
-  data.tar.gz: fcf6a866579b6a27b71d40ac3c57d8453b76907e9520fb5b74cc03260985820b
+  metadata.gz: 2af7b0e20aeaa0d3d3e75c5255b567050c2425b73d95819c539eff4ea289bfaf
+  data.tar.gz: 7653f7e096b59b3629a591610e814917c55d8ebac86a760993eb204fe61e1714
 SHA512:
-  metadata.gz: 9e79c04dd30cdcadb4c80a1dbf4f53410d17a95f2fdcffe4c27e03e98cd718705e89ee56de1f8c82a8a65e784cae21b86b7a0dacdb07dc4e8f95d99a2cdbae09
-  data.tar.gz: cbb037a59de31c4d41fb7017d2231f1e58660031f1a8f6c422eda105cf7e00afb5174d5dd7d7df0810510875d704b64db28d925f001c9ce56ee8c3f238e44c97
+  metadata.gz: d05d4d3bc6e21473251b807f4680ce8a551c5d9de5bc195f37be2e730aaea7b19598ced8b9b948f5a1637ab108fb7818b869b82b9a06ffd6ecf83281649818ab
+  data.tar.gz: 309af696584ad38c6bed98e5210707c480401f355e66ece9f4183e88ba5555f65542bea0d77ea556384f548a6a51cf833adf72517d397747a0d4b1e706763b87

data/lib/view_component_devtools/component.rb

@@ -13,54 +13,33 @@ 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 || []
-        end
+        declared = @view_component_devtools_props || []
+        inferred = component_initializer&.parameters&.filter_map do |kind, name|
+          name if %i[req opt keyreq key].include?(kind)
+        end || []
 
         (declared + inferred).uniq.select do |name|
-          prop_reader?(name, classes:, explicitly_declared: declared.include?(name))
+          directly_defined_reader?(name)
         end
       end
 
       private
 
-      def component_class_chain
-        boundary = defined?(ViewComponent::Base) && self < ViewComponent::Base ?
-          ViewComponent::Base : Object
-        classes = []
-        component_class = self
-
-        while component_class.is_a?(Class) && component_class != boundary
-          classes << component_class
-          component_class = component_class.superclass
-        end
-
-        classes
-      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_reader?(name)
+        return false unless public_instance_methods(false).include?(name)
 
         method = instance_method(name)
-        callable_without_arguments = method.parameters.none? do |kind, _|
+        method.parameters.none? do |kind, _|
           %i[req keyreq].include?(kind)
         end
-        callable_without_arguments && (explicitly_declared || classes.include?(method.owner))
       end
     end
 
@@ -86,9 +65,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/version.rb

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

metadata

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