yard2rbs 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74d0fab907be0a8229347fbda564913a08a6688b3b1c76db58ab98e52a783c3b
-  data.tar.gz: 1e51981642df3c3ee35cfd8a0e8c9651d6c03db6fff51bb7fd8d995f96101b13
+  metadata.gz: 64504ace7fababa2cb5317bcb21e136d76e2e8cf499d4f40f186cab14f9a118b
+  data.tar.gz: 5b7aa4e867494a923a54817ac5dd028ac7f0649402000ca3ca2da00f2a8ea811
 SHA512:
-  metadata.gz: c29df8ed7704ff31f8a7640a52f3f50e02ccf654e0d999c25d3c228b162e9488c1abf598e71d63f39ec4c240ee1a2cd685dcd9a2b898d2d6c35b665035865d6c
-  data.tar.gz: 20c59a4b6462c4d14636587d7426faf377b2931ccb6c9ce7ae6eebaf5725ed58cc5dcc4859c6be00b46e6afd70e8efeec1c233bdba648e0b47a4d12d70b74bbb
+  metadata.gz: 5338d1061085af86b8476c2e6aaba9ee1150a44979079ea13e3257bc17977fa9afe10ec914e46b7ab7235b82ea66f20d4b3219ef6cce5839fbc93a1daf5c7c51
+  data.tar.gz: 60fdfd9feda4627ab4f388fcfbd16e72bc0dc002cb769ebf42b1ab969b86549e08eb1ff70ae54e2387de62d81720f74bcd272bef8d8329604e2ce2e2e4e8b481

data/lib/yard2rbs/converter.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "prism"
+require "rbs"
 
 # https://ruby.github.io/prism/rb/index.html
 # https://github.com/ruby/rbs/blob/master/docs/syntax.md
@@ -211,41 +212,8 @@ module Yard2rbs
     # @param node [Prism::Node]
     # @return [Hash]
     def parse_comments(node)
-      params = {}
-      returns = []
-
-      comments = node.location.comments
-      comments&.each do |comment|
-        line = comment.slice
-
-        case line
-        when /@param/
-          if matches = line.match(/# @param ([^\s]+) \[([^\]]+)\].*/)
-            types = matches[2].split(',').map(&:strip)
-            params[matches[1]] = convert_types(types)
-          end
-        when /@return/
-          if matches = line.match(/# @return \[([^\]]+)\].*/)
-            types = matches[1].split(',').map(&:strip)
-            returns += convert_types(types)
-          end
-        end
-      end
-
-      {
-        params: params,
-        returns: returns,
-      }
-    end
-
-    # @param types [String]
-    # @return [Array<String>]
-    def convert_types(types)
-      types.map do |type|
-        type.
-          gsub(/Array\<([^>]+)\>/, 'Array[\1]').
-          gsub(/Hash\<([^>]+),\s*([^>]+)\>/, 'Hash[\1,\2]')
-      end
+      comments = node.location.comments.map(&:slice)
+      YardParser.parse(comments)
     end
 
     # @param types [Array<String>]

data/lib/yard2rbs/version.rb

@@ -2,5 +2,5 @@
 
 module Yard2rbs
   # @return [String]
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/yard2rbs/yard_parser.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Yard2rbs
+  class YardParser
+    class << self
+      # @param comments [Array<String>]
+      # @return [Hash]
+      def parse(comments)
+        params = {}
+        returns = []
+
+        comments&.each do |comment|
+          case comment
+          when /@param/
+            if matches = comment.match(/# @param ([^\s]+) \[([^\]]+)\].*/)
+              params[matches[1]] = convert(matches[2])
+            end
+          when /@return/
+            if matches = comment.match(/# @return \[([^\]]+)\].*/)
+              returns += convert(matches[1])
+            end
+          end
+        end
+
+        {
+          params: params,
+          returns: returns,
+        }
+      end
+
+      # Converts YARD type string into RBS type array
+      # e.g. Input:  "String, Array<String>, Hash<String, String>"
+      #      Output: ["String", "Array[String]", "Hash[String, String]"]
+      #
+      # @param types_str [String]
+      # @return [Array<String>]
+      def convert(types_str)
+        types = []
+
+        nested_level = 0
+        current_type = []
+        types_str.each_char.with_index(1) do |char, index|
+          case char
+          when ','
+            if nested_level > 0
+              current_type << char
+            else
+              types << current_type.join
+              current_type = []
+            end
+          when '<'
+            nested_level += 1
+            current_type << "["
+          when '>'
+            nested_level -= 1
+            current_type << "]"
+          when ' '
+            if current_type.any?
+              current_type << " "
+            end
+          else
+            current_type << char
+          end
+
+          if index == types_str.size
+            types << current_type.join
+          end
+        end
+
+        types
+      end
+    end
+  end
+end

data/lib/yard2rbs.rb

@@ -1,17 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "yard2rbs/converter"
+require_relative "yard2rbs/yard_parser"
 require_relative "yard2rbs/version"
 
-require "rbs"
-
 module Yard2rbs
   class << self
     # @param file_paths [Array<String>]
     # @return [Boolean]
     def convert(file_paths)
-      # TODO: Clear out rbs/ directory
-
       file_paths.each do |file_path|
         output = Converter.new(file_path).convert
         next if output.empty?

data/sig/lib/yard2rbs/converter.rbs

@@ -8,7 +8,6 @@ module Yard2rbs
     def output: (String str) -> String
     def self?: (Prism::Node node) -> Boolean
     def parse_comments: (Prism::Node node) -> Hash
-    def convert_types: (String types) -> Array[String]
     def format_types: (Array[String] types) -> String
   end
 end

data/sig/lib/yard2rbs/yard_parser.rbs

@@ -0,0 +1,6 @@
+module Yard2rbs
+  class YardParser
+    def self.parse: (Array[String] comments) -> Hash
+    def self.convert: (String types_str) -> Array[String]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard2rbs
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kieran Pilkington
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -54,9 +54,11 @@ files:
 - lib/yard2rbs.rb
 - lib/yard2rbs/converter.rb
 - lib/yard2rbs/version.rb
+- lib/yard2rbs/yard_parser.rb
 - sig/lib/yard2rbs.rbs
 - sig/lib/yard2rbs/converter.rbs
 - sig/lib/yard2rbs/version.rbs
+- sig/lib/yard2rbs/yard_parser.rbs
 homepage:
 licenses:
 - MIT