rbs-inline 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae1ebe5ac15f3f5c12c3b162fbcdc754de5544867fbc2d455af7a2028bfc12c7
-  data.tar.gz: aecd4c155a61ff168e9dea24d22cd9772566b26d973ffe9857e85f369e716a32
+  metadata.gz: f73d1f3ac7e111f773fe9b2d034dc5ccc3a8732f50aacf1a07655ad3450e24f4
+  data.tar.gz: '082c1f8a6ef85a239f29563f1e95d6af0ac0af89c5860a6c552d56505a0a27ba'
 SHA512:
-  metadata.gz: ffb76bf31d5c65a4e50edc61bd5538214d15fca1c4bcf0be83a86c32fbb22f27f5947279bec2919aee94928c236605f3998395a9c4b8f2329f0fe933bdff4e87
-  data.tar.gz: 7dd187fd1519420e823133a84abb6fc858ac6e8024b899b96a0e6cd6c581b42c332e161e9af67067224d9b95d939e32900eeeb5e61b3c5d405b94433e0c19d17
+  metadata.gz: 6002e610f1440abbfe351ee3c746e6c4c1f6dcae1a885fc9a5f60d701ebd0548620d8c6ffc6211bffd5830fd9c65901f7d7155d6de049a8670f0b72749f55b0c
+  data.tar.gz: 61041de88fbc0048f48fc46c012e1d1a7ff66760aef73e288f60351705425f466d84a4d50488feac54bb58e50fb504916596a8ceaf8ee5f99c76919227ee431e

data/README.md

@@ -34,7 +34,7 @@ class Person
   end
 
   # @rbs &block: (String) -> void
-  def each_address(&block) #:: void
+  def each_address(&block) #: void
     addresses.each(&block)
   end
 end

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/parser.rb

@@ -274,6 +274,7 @@ module RBS
       # @rbs override
       def visit_call_node(node)
         return if ignored_node?(node)
+        return super unless current_class_module_decl
 
         case node.name
         when :include, :prepend, :extend

data/lib/rbs/inline/version.rb

@@ -2,6 +2,6 @@
 
 module RBS
   module Inline
-    VERSION = "0.7.0"
+    VERSION = "0.9.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,
@@ -180,7 +180,7 @@ module RBS
 
         rbs << RBS::AST::Declarations::Constant.new(
           name: decl.constant_name,
-          type: decl.type,
+          type: constant_decl_to_type(decl),
           comment: comment,
           location: nil
         )
@@ -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(
@@ -555,6 +608,28 @@ module RBS
           comment: comment
         )
       end
+
+      # @rbs decl: AST::Declarations::ConstantDecl
+      # @rbs return: RBS::Types::t
+      def constant_decl_to_type(decl)
+        type = decl.type
+        return type unless type.is_a?(RBS::Types::ClassInstance)
+        return type if type.args.any?
+
+        case decl.node.value
+        when Prism::ArrayNode
+          RBS::BuiltinNames::Array.instance_type(untyped)
+        when Prism::HashNode
+          RBS::BuiltinNames::Hash.instance_type(untyped, untyped)
+        else
+          type
+        end
+      end
+
+      # @rbs return: RBS::Types::Bases::Any
+      def untyped
+        @untyped ||= RBS::Types::Bases::Any.new(location: nil)
+      end
     end
   end
 end

data/rbs_collection.lock.yaml

@@ -34,7 +34,7 @@ gems:
   source:
     type: stdlib
 - name: prism
-  version: 0.30.0
+  version: 1.0.0
   source:
     type: rubygems
 - name: rake
@@ -42,11 +42,11 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 03121e6bbf2340e3b179edcc351deac45476f4d0
+    revision: 25b8cf2135233e112d93d6b64083ee5e419875b6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.5.3
+  version: 3.6.0
   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/writer.rbs

@@ -107,6 +107,13 @@ module RBS
       # @rbs rbs: _Content
       # @rbs return: void
       def translate_class_block_decl: (AST::Declarations::BlockDecl block, _Content rbs) -> void
+
+      # @rbs decl: AST::Declarations::ConstantDecl
+      # @rbs return: RBS::Types::t
+      def constant_decl_to_type: (AST::Declarations::ConstantDecl decl) -> RBS::Types::t
+
+      # @rbs return: RBS::Types::Bases::Any
+      def untyped: () -> RBS::Types::Bases::Any
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs-inline
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-29 00:00:00.000000000 Z
+date: 2024-10-01 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,19 +29,19 @@ 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
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
 description: Inline RBS type declaration.
@@ -103,14 +103,14 @@ 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:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Inline RBS type declaration.