typespec_from_serializers 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46bcf5deebdc474b0f22abee212194c394fc811492bf55c9a3eaae01ed3976a0
-  data.tar.gz: 8dc54c4ffb68a326c94c99f6ac778ebf9ee777e925e2bbe456c9256ed25abae6
+  metadata.gz: e442eede2713d04dc58848c414f8c97fb3131ec16aff96c33b31fc2b9bfe248b
+  data.tar.gz: 88424e945a35538e356adceaf9abdcb2ceb5997469a94efe9d661c31b228050a
 SHA512:
-  metadata.gz: 0bccf7a80481a2c8b20157c9889ef18a89390854692017c559d16feb52c464ba9cf95d9a280078b203d626b4f46c0f720d3b8b46b72d8d8543a550b76e1d7e67
-  data.tar.gz: 42c5a6028324542ecfaf6a79a5fea5fc635677688b960507cb8f4dc805ca7b7be164e3a5f39288dfbeea74f1e3af9b44f462f1d070eaed9cc947f4bee21c8ab0
+  metadata.gz: 960f08588e534643e0ecdb2cf4f3129d351995330f4474748c10ee8f7e844e202614c3e8ae391753c5b45b555831398aff2ffa3474af080ef9e5767b86f2f706
+  data.tar.gz: 32cd0ff2d5b1e339829a78f7150b3870a4ef954d61d12c8738b3ebe5f0d04b31ea7ba1988fc4efd7f5c46e436f56e96d52b2719f77b29a95231fdfaf13d07777

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # TypeSpec From Serializers Changelog
 
+## [0.5.4] - 2025-12-23
+
+### Fixed
+- Transitive params extraction now follows method calls through intermediate methods
+- Route-level `type:` declarations now only apply to actual path params (not inherited by collection routes)
+
+## [0.5.3] - 2025-12-23
+
+### Fixed
+- Body params now scoped per action by analyzing which `*_params` methods are called
+
 ## [0.5.2] - 2025-12-22
 
 ### Fixed

data/lib/typespec_from_serializers/generator.rb

@@ -847,7 +847,10 @@ module TypeSpecFromSerializers
 
     # Internal: Extracts all parameter types from route metadata and controller DSL
     def extract_all_param_types(controller, route)
+      # Route-level types are for path params only - filter to actual path params
+      path_param_names = route[:path].scan(/:([a-zA-Z_][a-zA-Z0-9_]*)/).flatten
       route_param_types = route[:param_types]
+        .select { |k, _| path_param_names.include?(k.to_s) }
         .transform_keys(&:to_s)
         .transform_values { |v| map_type_class_to_typespec(v) }
 
@@ -980,56 +983,19 @@ module TypeSpecFromSerializers
 
     # Internal: Extracts serializer class from controller method source using Prism AST
     def extract_serializer_from_controller_method(controller_class, action)
-      return nil unless controller_class.method_defined?(action)
-
-      method = controller_class.instance_method(action)
-      source_location = method.source_location
-      return nil unless source_location
-
-      file_path, line_number = source_location
-      return nil unless File.exist?(file_path)
-
-      # Parse the file with Prism
-      result = Prism.parse_file(file_path)
-      return nil unless result.success?
-
-      # Find the specific method definition node
-      method_finder = MethodFinder.new(action.to_s, line_number)
-      method_finder.visit(result.value)
-      return nil unless method_finder.method_node
+      method_node = find_action_node(controller_class, action)
+      return unless method_node
 
       # Find serializer references only within this method
       visitor = SerializerVisitor.new
-      visitor.visit(method_finder.method_node)
+      visitor.visit(method_node)
 
       # Try to constantize any found serializers and return the first valid one
       visitor.serializer_names.filter_map(&:safe_constantize).first
     rescue
-      # File read or parsing error - return nil
       nil
     end
 
-    # Internal: Prism visitor to find a specific method definition by name and line
-    class MethodFinder < Prism::Visitor
-      attr_reader :method_node
-
-      def initialize(method_name, line_number)
-        super()
-        @method_name = method_name
-        @line_number = line_number
-        @method_node = nil
-      end
-
-      def visit_def_node(node)
-        # Match by method name and line number proximity
-        if node.name.to_s == @method_name &&
-            node.location.start_line <= @line_number &&
-            node.location.end_line >= @line_number
-          @method_node = node
-        end
-        super
-      end
-    end
 
     # Internal: Prism visitor to extract serializer class names from AST
     class SerializerVisitor < Prism::Visitor
@@ -1124,10 +1090,8 @@ module TypeSpecFromSerializers
     def extract_param_types_from_controller(controller_class, action)
       param_types = {}
 
-      # Extract from *_params methods with type DSL declarations
-      # Include private methods since *_params methods are typically private
-      param_methods = (controller_class.instance_methods(false) | controller_class.private_instance_methods(false))
-        .select { |m| m.to_s.end_with?(config.param_method_suffix) }
+      # Find which *_params methods are called by this action
+      param_methods = find_params_methods_called_by_action(controller_class, action)
 
       param_methods.each do |method_name|
         type_found = false
@@ -1172,6 +1136,85 @@ module TypeSpecFromSerializers
       {}
     end
 
+    # Internal: Finds *_params methods that are called by a specific action method (transitively)
+    def find_params_methods_called_by_action(controller_class, action)
+      method_node = find_action_node(controller_class, action)
+      return [] unless method_node
+
+      method = controller_class.instance_method(action)
+      file_path, = method.source_location
+      suffix = config.param_method_suffix
+
+      find_params_methods_transitively(file_path, method_node, suffix)
+    rescue
+      []
+    end
+
+    # Internal: Recursively finds *_params methods through intermediate method calls
+    def find_params_methods_transitively(file_path, node, suffix, visited = Set.new)
+      calls = find_method_calls(node)
+      params_methods = calls.select { |name| name.end_with?(suffix) }.map(&:to_sym)
+
+      # Follow non-params method calls defined in the same file
+      calls.each do |call_name|
+        next if call_name.end_with?(suffix)
+        next if visited.include?(call_name)
+
+        visited << call_name
+        called_node = find_def_node(file_path) { |n| n.name.to_s == call_name }
+        next unless called_node
+
+        params_methods.concat(find_params_methods_transitively(file_path, called_node, suffix, visited))
+      end
+
+      params_methods.uniq
+    end
+
+    # Internal: Finds the AST node for a controller action method.
+    def find_action_node(controller_class, action)
+      return unless controller_class.method_defined?(action)
+
+      method = controller_class.instance_method(action)
+      file_path, line_number = method.source_location
+      return unless file_path && File.exist?(file_path)
+
+      find_def_node(file_path) { |node| node.location.start_line == line_number }
+    end
+
+    # Internal: Parses a Ruby file and caches the result.
+    def parse_file_cached(file_path)
+      @parsed_files ||= {}
+      @parsed_files[file_path] ||= begin
+        result = Prism.parse_file(file_path)
+        result.success? ? result.value : nil
+      end
+    end
+
+    # Internal: Traverses all descendant nodes in BFS order.
+    def each_descendant(node)
+      return enum_for(:each_descendant, node) unless block_given?
+      queue = [node]
+      while (current = queue.shift)
+        yield current
+        queue.concat(current.compact_child_nodes)
+      end
+    end
+
+    # Internal: Finds a DefNode matching the given condition.
+    def find_def_node(file_path)
+      ast = parse_file_cached(file_path)
+      return unless ast
+      each_descendant(ast).find { |node| node.is_a?(Prism::DefNode) && yield(node) }
+    end
+
+    # Internal: Finds all unqualified method call names in an AST node.
+    def find_method_calls(node)
+      each_descendant(node)
+        .select { |n| n.is_a?(Prism::CallNode) && n.receiver.nil? }
+        .map { |n| n.name.to_s }
+        .uniq
+    end
+
     # Internal: Extracts key-value types from Sorbet hash type
     def extract_hash_types_from_sorbet(sorbet_type)
       param_types = {}

data/lib/typespec_from_serializers/version.rb

@@ -2,5 +2,5 @@
 
 module TypeSpecFromSerializers
   # Public: This library adheres to semantic versioning.
-  VERSION = "0.5.2"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typespec_from_serializers
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Danila Poyarkov
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-22 00:00:00.000000000 Z
+date: 2025-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties