view_component_devtools 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21babb25c8660808d7564914dd2105566e39e9954a197643e7862815ea867583
-  data.tar.gz: c64e1042bef475216ff30b64d7fc8f5ac16d308524bb916d2460ef3a9d3e75a9
+  metadata.gz: 2af7b0e20aeaa0d3d3e75c5255b567050c2425b73d95819c539eff4ea289bfaf
+  data.tar.gz: 7653f7e096b59b3629a591610e814917c55d8ebac86a760993eb204fe61e1714
 SHA512:
-  metadata.gz: f88cbecd121cc209eb6dd9e2a82e792cf1f7636becbc183ab6ea490cf563af7b3318d86246bce203780f79465ad5f457047ad348704732185d3ce952109fded6
-  data.tar.gz: e9420245c4fdad743a6cec795c2e2c8846d247181436ec3bc0d41f4a1868dc0c793a745f0744be4f565e31976ff5a7a3b70d0ac69a49ebd6c97b271b2727d1d2
+  metadata.gz: d05d4d3bc6e21473251b807f4680ce8a551c5d9de5bc195f37be2e730aaea7b19598ced8b9b948f5a1637ab108fb7818b869b82b9a06ffd6ecf83281649818ab
+  data.tar.gz: 309af696584ad38c6bed98e5210707c480401f355e66ece9f4183e88ba5555f65542bea0d77ea556384f548a6a51cf833adf72517d397747a0d4b1e706763b87

data/lib/view_component_devtools/component.rb

@@ -13,38 +13,32 @@ 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)
-        end
         declared = @view_component_devtools_props || []
-        trusted = inherited + declared
+        inferred = component_initializer&.parameters&.filter_map do |kind, name|
+          name if %i[req opt keyreq key].include?(kind)
+        end || []
 
-        (trusted + initializer_names).uniq.select do |name|
-          prop_reader?(name, trusted: trusted.include?(name))
+        (declared + inferred).uniq.select do |name|
+          directly_defined_reader?(name)
         end
       end
 
       private
 
-      def prop_reader?(name, trusted:)
-        return false unless public_method_defined?(name)
+      def component_initializer
+        return unless private_instance_methods(false).include?(:initialize) ||
+          protected_instance_methods(false).include?(:initialize) ||
+          public_instance_methods(false).include?(:initialize)
 
-        method = instance_method(name)
-        callable_without_arguments = method.parameters.none? do |kind, _|
-          %i[req keyreq].include?(kind)
-        end
-        callable_without_arguments && (trusted || component_class_owner?(method.owner))
+        instance_method(:initialize)
       end
 
-      def component_class_owner?(owner)
-        return false unless owner.is_a?(Class)
+      def directly_defined_reader?(name)
+        return false unless public_instance_methods(false).include?(name)
 
-        if defined?(ViewComponent::Base) && self < ViewComponent::Base
-          owner < ViewComponent::Base
-        else
-          self <= owner
+        method = instance_method(name)
+        method.parameters.none? do |kind, _|
+          %i[req keyreq].include?(kind)
         end
       end
     end
@@ -71,7 +65,8 @@ module ViewComponentDevtools
         return identifier if identifier
       end
 
-      self.class.instance_method(:initialize).source_location&.join(":")
+      initializer = self.class.send(:component_initializer)
+      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.2"
 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.2
 platform: ruby
 authors:
 - ViewComponent DevTools contributors