rbs-inline 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f73d1f3ac7e111f773fe9b2d034dc5ccc3a8732f50aacf1a07655ad3450e24f4
-  data.tar.gz: '082c1f8a6ef85a239f29563f1e95d6af0ac0af89c5860a6c552d56505a0a27ba'
+  metadata.gz: 3e5b1f22a68a9b238d2e620d2694a3296b58ced7435e8e8035f000beb1ce40f6
+  data.tar.gz: c81ba9017a9a54e2d8d4401d1ad8d6640fcfac87dd99ab060daad38df8fb3977
 SHA512:
-  metadata.gz: 6002e610f1440abbfe351ee3c746e6c4c1f6dcae1a885fc9a5f60d701ebd0548620d8c6ffc6211bffd5830fd9c65901f7d7155d6de049a8670f0b72749f55b0c
-  data.tar.gz: 61041de88fbc0048f48fc46c012e1d1a7ff66760aef73e288f60351705425f466d84a4d50488feac54bb58e50fb504916596a8ceaf8ee5f99c76919227ee431e
+  metadata.gz: 0f54053824e26053cb0c229c06c1cb8987af68fae1e5340747cc4424f1b549ead53c6ec10cfc4287aaa0aea350848bbccd8c8baa70311c791d5b7300ae9b431b
+  data.tar.gz: 52e6463d2240a0cc1373a15a326f18c1fd2c50ff22df210ed90e3dfd5cd635b43190e11321f8f903593b406b4ee7d3842f9ef3d3cc49a5a8735710b8e5f06901

data/README.md

@@ -2,9 +2,6 @@
 
 RBS::Inline allows embedding RBS type declarations into Ruby code as comments. You can declare types, write the implementation, and verifies they are consistent without leaving the editor opening the Ruby code.
 
-> [!IMPORTANT]
-> The syntax is experimental. We are still seeking the best syntax with your feedbacks.
-
 > [!IMPORTANT]
 > This gem is a prototype for testing. We plan to merge this feature to rbs-gem and deprecate rbs-inline gem after that.
 

data/lib/rbs/inline/ast/members.rb

@@ -41,6 +41,10 @@ module RBS
           # ```
           attr_reader :visibility #: RBS::AST::Members::visibility?
 
+          # The function is defined as singleton and instance method (as known as module_function)
+          #
+          attr_accessor :singleton_instance #: bool
+
           # Assertion given at the end of the method name
           #
           attr_reader :assertion #: Annotations::TypeAssertion?
@@ -48,11 +52,13 @@ module RBS
           # @rbs node: Prism::DefNode
           # @rbs comments: AnnotationParser::ParsingResult?
           # @rbs visibility: RBS::AST::Members::visibility?
+          # @rbs singleton_instance: bool
           # @rbs assertion: Annotations::TypeAssertion?
-          def initialize(node, comments, visibility, assertion) #: void
+          def initialize(node, comments, visibility, singleton_instance, assertion) #: void
             @node = node
             @comments = comments
             @visibility = visibility
+            @singleton_instance = singleton_instance
             @assertion = assertion
 
             super(node.location)

data/lib/rbs/inline/parser.rb

@@ -37,10 +37,14 @@ module RBS
       #
       attr_reader :current_visibility #: RBS::AST::Members::visibility?
 
+      # The current module_function applied to single `def` node
+      attr_reader :current_module_function #: bool
+
       def initialize() #: void
         @decls = []
         @surrounding_decls = []
         @comments = {}
+        @current_module_function = false
       end
 
       # Parses the given Prism result to a three tuple
@@ -253,9 +257,7 @@ module RBS
 
           assertion = assertion_annotation(node.rparen_loc || node&.parameters&.location || node.name_loc)
 
-          current_decl.members << AST::Members::RubyDef.new(node, associated_comment, current_visibility, assertion)
-
-          super
+          current_decl.members << AST::Members::RubyDef.new(node, associated_comment, current_visibility, current_module_function, assertion)
         end
       end
 
@@ -331,6 +333,30 @@ module RBS
               end
             end
           end
+        when :module_function
+          if node.arguments && node.arguments.arguments.size > 0
+            args = node.arguments.arguments.filter_map do |arg|
+              case arg
+              when Prism::SymbolNode
+                arg.unescaped.to_sym
+              end
+            end
+
+            current_decl = current_class_module_decl
+
+            if current_decl
+              node.arguments.arguments.each do |arg|
+                current_decl.members.each do |member|
+                  if member.is_a?(AST::Members::RubyDef) && args.include?(member.node.name)
+                    member.singleton_instance = true
+                    break
+                  end
+                end
+              end
+            end
+          else
+            @current_module_function = true
+          end
         end
 
         super

data/lib/rbs/inline/version.rb

@@ -2,6 +2,6 @@
 
 module RBS
   module Inline
-    VERSION = "0.9.0"
+    VERSION = "0.10.0"
   end
 end

data/lib/rbs/inline/writer.rb

@@ -1,5 +1,7 @@
 # rbs_inline: enabled
 
+require 'stringio'
+
 module RBS
   module Inline
     class Writer
@@ -542,6 +544,7 @@ module RBS
       # @rbs return: RBS::AST::Members::MethodDefinition::kind
       def method_kind(member, decl)
         return :singleton if decl
+        return :singleton_instance if member.singleton_instance
 
         case member.node.receiver
         when Prism::SelfNode

data/rbs_collection.lock.yaml

@@ -34,7 +34,7 @@ gems:
   source:
     type: stdlib
 - name: prism
-  version: 1.0.0
+  version: 1.2.0
   source:
     type: rubygems
 - name: rake
@@ -42,11 +42,11 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 25b8cf2135233e112d93d6b64083ee5e419875b6
+    revision: 218cf130d31f63e110e350efc3fa265311b0f238
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.6.0
+  version: 3.6.1
   source:
     type: rubygems
 - name: rdoc

data/sig/generated/rbs/inline/ast/members.rbs

@@ -37,14 +37,18 @@ module RBS
           # ```
           attr_reader visibility: RBS::AST::Members::visibility?
 
+          # The function is defined as singleton and instance method (as known as module_function)
+          attr_accessor singleton_instance: bool
+
           # Assertion given at the end of the method name
           attr_reader assertion: Annotations::TypeAssertion?
 
           # @rbs node: Prism::DefNode
           # @rbs comments: AnnotationParser::ParsingResult?
           # @rbs visibility: RBS::AST::Members::visibility?
+          # @rbs singleton_instance: bool
           # @rbs assertion: Annotations::TypeAssertion?
-          def initialize: (Prism::DefNode node, AnnotationParser::ParsingResult? comments, RBS::AST::Members::visibility? visibility, Annotations::TypeAssertion? assertion) -> void
+          def initialize: (Prism::DefNode node, AnnotationParser::ParsingResult? comments, RBS::AST::Members::visibility? visibility, bool singleton_instance, Annotations::TypeAssertion? assertion) -> void
 
           # Returns the name of the method
           def method_name: () -> Symbol

data/sig/generated/rbs/inline/parser.rbs

@@ -30,6 +30,9 @@ module RBS
       # `nil` when the `def` node is not inside `private` or `public` calls.
       attr_reader current_visibility: RBS::AST::Members::visibility?
 
+      # The current module_function applied to single `def` node
+      attr_reader current_module_function: bool
+
       def initialize: () -> void
 
       # Parses the given Prism result to a three tuple

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs-inline
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2024-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -19,7 +19,7 @@ dependencies:
         version: '0.29'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.29'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement