spoom 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebcf07d1aa065b643270105e211a05e9698befb8a67cf307c87c2fb957cd69fa
-  data.tar.gz: 4de71559b8d0812d7ab2456404cdf1ec840bd7031c7138a04e3233208ab8f827
+  metadata.gz: 3c9b64402b943d03196b4ac55fc9f9582c635e20b50639ea631b345149e02fa3
+  data.tar.gz: 9e1720b82a26ac68cd91125bf05605f7964926829a06d9b9a7b2ac3bb4881e26
 SHA512:
-  metadata.gz: ffd0520b3dcce46ea2ee2e00f4f7de974cedf21eddc706bed67616696f3f23406cbee80aeb62715c7dbfa7562a88486e21b6424b84b62d9f9a13b0a2d2f287b9
-  data.tar.gz: 7a7256c1a7114e46254d0cd648306ee8b1e9565522671318c710af33a571461da14b40e0d99405e63a12481f05c29b35bc3d0e660c8e7129928f1a9c34264ca9
+  metadata.gz: d8138e2c64f4615b21f3b83b6c42013f6559a51ea173bc1086d8aae44c300a0596338826e3f03653c9ed39ead2fc799bec901b8cfac684cafb341981aeeea3e6
+  data.tar.gz: 38140e0e9cda06b563595a1616622f81f4860a8f3f9fbf2bafd2111879f56349b65c2865769b25035902dedc5574ef1267ae1b14cd05517867d20ef3296f52e1

data/lib/spoom/cli/srb/sigs.rb

@@ -12,6 +12,11 @@ module Spoom
         desc "translate", "Translate signatures from/to RBI and RBS"
         option :from, type: :string, aliases: :f, desc: "From format", enum: ["rbi", "rbs"], default: "rbi"
         option :to, type: :string, aliases: :t, desc: "To format", enum: ["rbi", "rbs"], default: "rbs"
+        option :positional_names,
+          type: :boolean,
+          aliases: :p,
+          desc: "Use positional names when translating from RBI to RBS",
+          default: true
         def translate(*paths)
           from = options[:from]
           to = options[:to]
@@ -29,7 +34,7 @@ module Spoom
           case from
           when "rbi"
             transformed_files = transform_files(files) do |_file, contents|
-              Spoom::Sorbet::Sigs.rbi_to_rbs(contents)
+              Spoom::Sorbet::Sigs.rbi_to_rbs(contents, positional_names: options[:positional_names])
             end
           when "rbs"
             transformed_files = transform_files(files) do |_file, contents|

data/lib/spoom/sorbet/sigs.rb

@@ -20,8 +20,8 @@ module Spoom
           lines.join
         end
 
-        #: (String ruby_contents) -> String
-        def rbi_to_rbs(ruby_contents)
+        #: (String ruby_contents, positional_names: bool) -> String
+        def rbi_to_rbs(ruby_contents, positional_names: true)
           ruby_contents = ruby_contents.dup
           sigs = collect_sorbet_sigs(ruby_contents)
 
@@ -35,7 +35,8 @@ module Spoom
               sig.loc&.end_line&.pred,
               T.must(sig.loc).end_column,
             )
-            ruby_contents[start_index...end_index] = RBIToRBSTranslator.translate(sig, node)
+            rbs = RBIToRBSTranslator.translate(sig, node, positional_names: positional_names)
+            ruby_contents[start_index...end_index] = rbs
           end
 
           ruby_contents
@@ -56,7 +57,10 @@ module Spoom
               rbs_comment.loc&.end_line&.pred,
               T.must(rbs_comment.loc).end_column,
             )
-            ruby_contents[start_index...end_index] = RBSToRBITranslator.translate(rbs_comment, node)
+            rbi = RBSToRBITranslator.translate(rbs_comment, node)
+            next unless rbi
+
+            ruby_contents[start_index...end_index] = rbi
           end
 
           ruby_contents
@@ -118,22 +122,22 @@ module Spoom
 
       class RBIToRBSTranslator
         class << self
-          #: (RBI::Sig sig, (RBI::Method | RBI::Attr) node) -> String
-          def translate(sig, node)
+          #: (RBI::Sig sig, (RBI::Method | RBI::Attr) node, positional_names: bool) -> String
+          def translate(sig, node, positional_names: true)
             case node
             when RBI::Method
-              translate_method_sig(sig, node)
+              translate_method_sig(sig, node, positional_names: positional_names)
             when RBI::Attr
-              translate_attr_sig(sig, node)
+              translate_attr_sig(sig, node, positional_names: positional_names)
             end
           end
 
           private
 
-          #: (RBI::Sig sig, RBI::Method node) -> String
-          def translate_method_sig(sig, node)
+          #: (RBI::Sig sig, RBI::Method node, positional_names: bool) -> String
+          def translate_method_sig(sig, node, positional_names: true)
             out = StringIO.new
-            p = RBI::RBSPrinter.new(out: out, indent: sig.loc&.begin_column)
+            p = RBI::RBSPrinter.new(out: out, indent: sig.loc&.begin_column, positional_names: positional_names)
 
             if node.sigs.any?(&:is_final)
               p.printn("# @final")
@@ -165,10 +169,10 @@ module Spoom
             out.string
           end
 
-          #: (RBI::Sig sig, RBI::Attr node) -> String
-          def translate_attr_sig(sig, node)
+          #: (RBI::Sig sig, RBI::Attr node, positional_names: bool) -> String
+          def translate_attr_sig(sig, node, positional_names: true)
             out = StringIO.new
-            p = RBI::RBSPrinter.new(out: out)
+            p = RBI::RBSPrinter.new(out: out, positional_names: positional_names)
             p.print_attr_sig(node, sig)
             "#: #{out.string}"
           end
@@ -179,7 +183,7 @@ module Spoom
         class << self
           extend T::Sig
 
-          #: (RBI::RBSComment comment, (RBI::Method | RBI::Attr) node) -> String
+          #: (RBI::RBSComment comment, (RBI::Method | RBI::Attr) node) -> String?
           def translate(comment, node)
             case node
             when RBI::Method
@@ -187,6 +191,8 @@ module Spoom
             when RBI::Attr
               translate_attr_sig(comment, node)
             end
+          rescue RBS::ParsingError
+            nil
           end
 
           private

data/lib/spoom/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Spoom
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/rbi/spoom.rbi

@@ -3417,8 +3417,8 @@ Spoom::Sorbet::Sigils::VALID_STRICTNESS = T.let(T.unsafe(nil), Array)
 
 class Spoom::Sorbet::Sigs
   class << self
-    sig { params(ruby_contents: ::String).returns(::String) }
-    def rbi_to_rbs(ruby_contents); end
+    sig { params(ruby_contents: ::String, positional_names: T::Boolean).returns(::String) }
+    def rbi_to_rbs(ruby_contents, positional_names: T.unsafe(nil)); end
 
     sig { params(ruby_contents: ::String).returns(::String) }
     def rbs_to_rbi(ruby_contents); end
@@ -3440,22 +3440,28 @@ class Spoom::Sorbet::Sigs::Error < ::Spoom::Error; end
 
 class Spoom::Sorbet::Sigs::RBIToRBSTranslator
   class << self
-    sig { params(sig: ::RBI::Sig, node: T.any(::RBI::Attr, ::RBI::Method)).returns(::String) }
-    def translate(sig, node); end
+    sig do
+      params(
+        sig: ::RBI::Sig,
+        node: T.any(::RBI::Attr, ::RBI::Method),
+        positional_names: T::Boolean
+      ).returns(::String)
+    end
+    def translate(sig, node, positional_names: T.unsafe(nil)); end
 
     private
 
-    sig { params(sig: ::RBI::Sig, node: ::RBI::Attr).returns(::String) }
-    def translate_attr_sig(sig, node); end
+    sig { params(sig: ::RBI::Sig, node: ::RBI::Attr, positional_names: T::Boolean).returns(::String) }
+    def translate_attr_sig(sig, node, positional_names: T.unsafe(nil)); end
 
-    sig { params(sig: ::RBI::Sig, node: ::RBI::Method).returns(::String) }
-    def translate_method_sig(sig, node); end
+    sig { params(sig: ::RBI::Sig, node: ::RBI::Method, positional_names: T::Boolean).returns(::String) }
+    def translate_method_sig(sig, node, positional_names: T.unsafe(nil)); end
   end
 end
 
 class Spoom::Sorbet::Sigs::RBSToRBITranslator
   class << self
-    sig { params(comment: ::RBI::RBSComment, node: T.any(::RBI::Attr, ::RBI::Method)).returns(::String) }
+    sig { params(comment: ::RBI::RBSComment, node: T.any(::RBI::Attr, ::RBI::Method)).returns(T.nilable(::String)) }
     def translate(comment, node); end
 
     private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Alexandre Terrasa
 bindir: exe
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler