typespec_from_serializers 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bc90948b5d93848663bab0d1162a1f26d49d832a05ef4c57eb5cb1e90f74ff3
-  data.tar.gz: '008ddb8319166e72e2e75a30d840ad387a082df6e4d0846698e87f9b15ac1c05'
+  metadata.gz: e442eede2713d04dc58848c414f8c97fb3131ec16aff96c33b31fc2b9bfe248b
+  data.tar.gz: 88424e945a35538e356adceaf9abdcb2ceb5997469a94efe9d661c31b228050a
 SHA512:
-  metadata.gz: 950c7c34c0d3766854fd6eb4b3aa958b7ed8a20040ad8a43c5573d52741b156441b43e0fbded753536624d368ce353959f5f9e13d311eddea05ba75b8a4e85df
-  data.tar.gz: 6695700e9a0f73b03e97107d1844e2ef878dcf50217b45826418488827643923260f9b2465bd20fc4d03ef298ea2028f87132fa496abbb67f43ad635fda47562
+  metadata.gz: 960f08588e534643e0ecdb2cf4f3129d351995330f4474748c10ee8f7e844e202614c3e8ae391753c5b45b555831398aff2ffa3474af080ef9e5767b86f2f706
+  data.tar.gz: 32cd0ff2d5b1e339829a78f7150b3870a4ef954d61d12c8738b3ebe5f0d04b31ea7ba1988fc4efd7f5c46e436f56e96d52b2719f77b29a95231fdfaf13d07777

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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

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) }
 
@@ -1133,19 +1136,40 @@ module TypeSpecFromSerializers
       {}
     end
 
-    # Internal: Finds *_params methods that are called by a specific action method
+    # 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_method_calls(method_node)
-        .select { |name| name.end_with?(suffix) }
-        .map(&:to_sym)
+
+      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)
@@ -1154,7 +1178,7 @@ module TypeSpecFromSerializers
       file_path, line_number = method.source_location
       return unless file_path && File.exist?(file_path)
 
-      find_method_at_line(file_path, line_number)
+      find_def_node(file_path) { |node| node.location.start_line == line_number }
     end
 
     # Internal: Parses a Ruby file and caches the result.
@@ -1166,28 +1190,29 @@ module TypeSpecFromSerializers
       end
     end
 
-    # Internal: Finds a DefNode at the exact line number.
-    def find_method_at_line(file_path, line_number)
+    # 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
-
-      queue = [ast]
-      while (node = queue.shift)
-        return node if node.is_a?(Prism::DefNode) && node.location.start_line == line_number
-        queue.concat(node.compact_child_nodes)
-      end
-      nil
+      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)
-      calls = []
-      queue = [node]
-      while (current = queue.shift)
-        calls << current.name.to_s if current.is_a?(Prism::CallNode) && current.receiver.nil?
-        queue.concat(current.compact_child_nodes)
-      end
-      calls.uniq
+      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

data/lib/typespec_from_serializers/version.rb

@@ -2,5 +2,5 @@
 
 module TypeSpecFromSerializers
   # Public: This library adheres to semantic versioning.
-  VERSION = "0.5.3"
+  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.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Danila Poyarkov