rbs-inline 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 330c5c083c1dda38f3f0263729aea1d39c16484e67deee0717b28881ec22da8a
-  data.tar.gz: 2f1e8f2910669d33f6ed64897b0e5db00285b42626d846402a85c5c294c23155
+  metadata.gz: d5a68634b62b49714735e0b84f748c4e2a646dc1f785644202b76dcbcb7a3937
+  data.tar.gz: 19d106b8ff48e0eab47f30751764611437fb13a1cf54bb382738e849217fb2fe
 SHA512:
-  metadata.gz: ad396cb989f857ada7203ca6ab2129dae79f471520d816e791c8be80b9d3d4b3d5301f8360dfe8ccba5fe30d99f92dd56eea81c32b092a946d91aab431f57e26
-  data.tar.gz: 4487616c28a042e68f167ea191b7ab4265704228b6a104e0bf52a15d909b096bb8a8798d273de97cebba72f2a8bf0b2635168cee5e7961a7c37ec0a9f3364c25
+  metadata.gz: b8f197fbd6ed4bbb17f3715aa314320405561ee2dd8fe61c7a1d61279e8f1c7d2ba166308cee7282114f004a195853f0bb1f736a932466e58000ced915f844d7
+  data.tar.gz: 7ae9e4c5a8ecbdc3c9935c698ed5964454c5d1b152e3f637457b96220f959e3489df7906c674f88a99f346879d9cd66768dd4ec7b4a39206030e41c880493344

data/lib/rbs/inline/annotation_parser.rb

@@ -754,7 +754,14 @@ module RBS
         tree = AST::Tree.new(:module_self)
 
         tokenizer.consume_token!(K_MODULE_SELF, tree: tree)
-        tree << parse_type(tokenizer, tree)
+        while true
+          tree << parse_type(tokenizer, tree)
+          if tokenizer.type?(K_COMMA)
+            tokenizer.advance(tree, eat: true)
+          else
+            break
+          end
+        end
 
         tree << parse_optional(tokenizer, K_MINUS2, tree: tree) do
           parse_comment(tokenizer)

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

@@ -509,7 +509,7 @@ module RBS
 
         # `# @rbs module-self [MODULE_SELF]`
         class ModuleSelf < Base
-          attr_reader :constraint #: RBS::AST::Declarations::Module::Self?
+          attr_reader :self_types #: Array[RBS::AST::Declarations::Module::Self]
 
           attr_reader :comment #: String?
 
@@ -517,20 +517,34 @@ module RBS
           def initialize(tree, source)
             @tree = tree
             @source = source
+            @self_types = []
 
             module_self = tree.nth_tree!(1)
-            type = module_self.nth_type?(1)
+            self_trees = module_self.non_trivia_trees
+            self_trees.shift
 
-            case type
-            when Types::ClassInstance, Types::Interface
-              @constraint = RBS::AST::Declarations::Module::Self.new(
-                name: type.name,
-                args: type.args,
-                location: nil
-              )
+            while true
+              type = self_trees.shift
+              case type
+              when Types::ClassInstance, Types::Interface
+                @self_types << RBS::AST::Declarations::Module::Self.new(
+                  name: type.name,
+                  args: type.args,
+                  location: nil
+                )
+              end
+
+              break if self_trees.empty?
+
+              next_tree = self_trees.first
+              if next_tree.is_a?(Array) && next_tree[0] == :kCOMMA
+                self_trees.shift
+              else
+                break
+              end
             end
 
-            if comment = module_self.nth_tree(2)
+            if comment = self_trees.first
               @comment = comment.to_s
             end
           end

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

@@ -241,6 +241,21 @@ module RBS
         end
 
         class SingletonClassDecl < ModuleOrClass #[Prism::SingletonClassNode]
+          # @rbs (AST::Members::RubyDef) -> (:private | nil)
+          def visibility(def_member)
+            current_visibility = nil
+            members.each do |member|
+              case member
+              when AST::Members::RubyPublic
+                current_visibility = nil
+              when AST::Members::RubyPrivate
+                current_visibility = :private
+              end
+
+              break if member == def_member
+            end
+            current_visibility
+          end
         end
 
         class BlockDecl < Base

data/lib/rbs/inline/version.rb

@@ -2,6 +2,6 @@
 
 module RBS
   module Inline
-    VERSION = "0.6.0"
+    VERSION = "0.8.0"
   end
 end

data/lib/rbs/inline/writer.rb

@@ -155,7 +155,7 @@ module RBS
 
         translate_members(decl.members, nil, members)
 
-        self_types = decl.module_selfs.map { _1.constraint }.compact
+        self_types = decl.module_selfs.flat_map { _1.self_types }.compact
 
         rbs << RBS::AST::Declarations::Module.new(
           name: decl.module_name,
@@ -257,10 +257,40 @@ module RBS
           visibility: nil
         )
 
+        members = [:singleton, :instance].map do |kind|
+          RBS::AST::Members::MethodDefinition.new(
+            name: :members,
+            kind: kind, #: RBS::AST::MethodDefinition::Kind
+            overloads: [
+              RBS::AST::Members::MethodDefinition::Overload.new(
+                method_type: RBS::MethodType.new(
+                  type_params: [],
+                  type: Types::Function.empty(
+                    Types::Tuple.new(
+                      types: decl.each_attribute.map do |name, _|
+                        Types::Literal.new(literal: name, location: nil)
+                      end,
+                      location: nil
+                    )
+                  ),
+                  block: nil,
+                  location: nil
+                ),
+                annotations: []
+              )
+            ],
+            annotations: [],
+            location: nil,
+            comment: nil,
+            overloading: false,
+            visibility: nil
+          )
+        end
+
         rbs << RBS::AST::Declarations::Class.new(
           name: decl.constant_name,
           type_params: [],
-          members: [*attributes, new],
+          members: [*attributes, new, *members],
           super_class: RBS::AST::Declarations::Class::Super.new(
             name: RBS::TypeName.new(name: :Data, namespace: RBS::Namespace.empty),
             args: [],
@@ -365,6 +395,29 @@ module RBS
               method_type: RBS::MethodType.new(type_params: [], type: method_type, block: nil, location: nil),
               annotations: []
             )
+
+          unless decl.positional_init?
+            new.overloads <<
+              RBS::AST::Members::MethodDefinition::Overload.new(
+                method_type: RBS::MethodType.new(
+                  type_params: [],
+                  type: Types::Function.empty(Types::Bases::Instance.new(location: nil)).then do |t|
+                    t.update(required_positionals: [
+                      RBS::Types::Function::Param.new(
+                        type: RBS::Types::Record.new(all_fields: decl.each_attribute.map do |name, attr|
+                          [name, attr&.type || Types::Bases::Any.new(location: nil)]
+                        end.to_h, location: nil),
+                        name: nil,
+                        location: nil
+                      )
+                    ])
+                  end,
+                  block: nil,
+                  location: nil
+                ),
+                annotations:[]
+              )
+          end
         end
 
         rbs << RBS::AST::Declarations::Class.new(
@@ -421,6 +474,7 @@ module RBS
             return
           end
 
+          visibility = member.visibility || decl&.visibility(member)
           rbs << RBS::AST::Members::MethodDefinition.new(
             name: member.method_name,
             kind: kind,
@@ -429,7 +483,7 @@ module RBS
             location: nil,
             comment: comment,
             overloading: member.overloading?,
-            visibility: member.visibility
+            visibility: visibility
           )
         when AST::Members::RubyAlias
           if member.comments
@@ -453,9 +507,9 @@ module RBS
             rbs.concat m
           end
         when AST::Members::RubyPrivate
-          rbs << RBS::AST::Members::Private.new(location: nil)
+          rbs << RBS::AST::Members::Private.new(location: nil) unless decl
         when AST::Members::RubyPublic
-          rbs << RBS::AST::Members::Public.new(location: nil)
+          rbs << RBS::AST::Members::Public.new(location: nil) unless decl
         when AST::Members::RBSIvar
           if m = member.rbs
             rbs << m

data/rbs_collection.lock.yaml

@@ -42,11 +42,11 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 3670834268f4ea9c10aefeffae7e072b51256375
+    revision: 03121e6bbf2340e3b179edcc351deac45476f4d0
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.5.2
+  version: 3.5.3
   source:
     type: rubygems
 - name: rdoc

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

@@ -195,7 +195,7 @@ module RBS
 
         # `# @rbs module-self [MODULE_SELF]`
         class ModuleSelf < Base
-          attr_reader constraint: RBS::AST::Declarations::Module::Self?
+          attr_reader self_types: Array[RBS::AST::Declarations::Module::Self]
 
           attr_reader comment: String?
 

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

@@ -115,6 +115,8 @@ module RBS
         end
 
         class SingletonClassDecl < ModuleOrClass[Prism::SingletonClassNode]
+          # @rbs (AST::Members::RubyDef) -> (:private | nil)
+          def visibility: (AST::Members::RubyDef) -> (:private | nil)
         end
 
         class BlockDecl < Base

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs-inline
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-01 00:00:00.000000000 Z
+date: 2024-09-17 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: '0.31'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.29'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="