rbs-inline 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ce83c34652cf8585d8ffda40fb71534b8829cf513395a3bba27f48be42f27d6
-  data.tar.gz: 0efd8f5ce926b7573c0d12186c8a948883c07df41df6e90681e3ff25cb692ad8
+  metadata.gz: e1c716b3ad3ada559f211899b9e5e586729ee2ea8cf58e92825890042098ad9e
+  data.tar.gz: c446d657e9846b963b23e07f1935ad80d23a77c82f4a76cf60e7e6cc36f2bff3
 SHA512:
-  metadata.gz: 281e0d112f8b1943c2dd8d528a1f53eebf21307212039fbe1db5cef1e1057494e89b656e49cf9a89d51fe8582cd294709e72fc59bdd212874cc42c5eb2bfdac5
-  data.tar.gz: 72024761def9796f3ba65410308cda068fb46e234696ceecabc201b361c0e8effcfbc02dcb5f5e54f06e6b637c63ad2209b51c9fa8699ef5606644b880dc551a
+  metadata.gz: 4925e2fd8a505153c4d5ae56693e29e80033ea78a3ebbe9e3f1ee3d8aab4ff766f7f7919affbfee7b5f48fb13d9d8a50a1a36f98782b3a6fed32e0cb8137065f
+  data.tar.gz: b74dd3c230c5095505aac970004177af41efbcf52d485be27f0bc5793647d9f525a583b7879953e5b84a4b3002a3574e661fd6bcb23f446124660384a45dce46

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

@@ -207,9 +207,27 @@ module RBS
           end
 
           # @rbs %a{pure}
-          # @rbs return Types::t?
+          # @rbs return: Types::t?
           def literal_type
-            case node.value
+            infer_type_from_node(node.value)
+          end
+
+          # @rbs %a{pure}
+          # @rbs return: TypeName?
+          def constant_name
+            TypeName.new(name: node.name, namespace: Namespace.empty)
+          end
+
+          def start_line #: Integer
+            node.location.start_line
+          end
+
+          private
+
+          # @rbs node: Prism::Node
+          # @rbs return: Types::t?
+          def infer_type_from_node(node)
+            case node
             when Prism::StringNode, Prism::InterpolatedStringNode
               BuiltinNames::String.instance_type
             when Prism::SymbolNode, Prism::InterpolatedSymbolNode
@@ -221,22 +239,79 @@ module RBS
             when Prism::FloatNode
               BuiltinNames::Float.instance_type
             when Prism::ArrayNode
-              BuiltinNames::Array.instance_type
+              infer_array_element_type(node)
             when Prism::HashNode
-              BuiltinNames::Hash.instance_type
+              infer_hash_element_type(node)
             when Prism::TrueNode, Prism::FalseNode
               Types::Bases::Bool.new(location: nil)
             end
           end
 
-          # @rbs %a{pure}
-          # @rbs return: TypeName?
-          def constant_name
-            TypeName.new(name: node.name, namespace: Namespace.empty)
+          # @rbs node: Prism::ArrayNode
+          # @rbs return: Types::t
+          def infer_array_element_type(node)
+            return BuiltinNames::Array.instance_type if node.elements.empty?
+
+            element_types = [] #: Array[Types::t]
+            node.elements.each do |elem|
+              type = infer_type_from_node(elem)
+              return BuiltinNames::Array.instance_type unless type
+              element_types << type
+            end
+
+            element_types.uniq!(&:to_s)
+
+            # Union types are not currently supported.
+            case element_types.size
+            when 1
+              BuiltinNames::Array.instance_type(element_types.first || raise)
+            else
+              BuiltinNames::Array.instance_type(
+                Types::Bases::Any.new(location: nil)
+              )
+            end
           end
 
-          def start_line #: Integer
-            node.location.start_line
+          # @rbs node: Prism::HashNode
+          # @rbs return: Types::t
+          def infer_hash_element_type(node)
+            return BuiltinNames::Hash.instance_type if node.elements.empty?
+
+            key_types = [] #: Array[Types::t]
+            value_types = [] #: Array[Types::t]
+
+            node.elements.each do |elem|
+              case elem
+              when Prism::AssocNode
+                key_type = infer_type_from_node(elem.key)
+                value_type = infer_type_from_node(elem.value)
+                return BuiltinNames::Hash.instance_type unless key_type && value_type
+                key_types << key_type
+                value_types << value_type
+              else
+                return BuiltinNames::Hash.instance_type
+              end
+            end
+
+            key_types.uniq!(&:to_s)
+            value_types.uniq!(&:to_s)
+
+            # Union types are not currently supported.
+            key_type = case key_types.size
+                       when 1
+                         key_types.first || raise
+                       else
+                         Types::Bases::Any.new(location: nil)
+                       end
+
+            value_type = case value_types.size
+                         when 1
+                           value_types.first || raise
+                         else
+                           Types::Bases::Any.new(location: nil)
+                         end
+
+            BuiltinNames::Hash.instance_type(key_type, value_type)
           end
         end
 

data/lib/rbs/inline/parser.rb

@@ -69,8 +69,8 @@ module RBS
           instance.comments[result.line_range.end] = result
         end
 
-        with_enable_magic_comment = result.comments.any? {|comment| comment.location.slice =~ /\A# rbs_inline: enabled\Z/}
-        with_disable_magic_comment = result.comments.any? {|comment| comment.location.slice =~ /\A# rbs_inline: disabled\Z/}
+        with_enable_magic_comment = result.comments.any? {|comment| comment.location.slice =~ /\A# rbs_inline: enabled\R?\z/}
+        with_disable_magic_comment = result.comments.any? {|comment| comment.location.slice =~ /\A# rbs_inline: disabled\R?\z/}
 
         return if with_disable_magic_comment # Skips if `rbs_inline: disabled`
 

data/lib/rbs/inline/version.rb

@@ -2,6 +2,6 @@
 
 module RBS
   module Inline
-    VERSION = "0.12.0"
+    VERSION = "0.13.0"
   end
 end

data/lib/rbs/inline/writer.rb

@@ -189,7 +189,8 @@ module RBS
           name: decl.constant_name,
           type: constant_decl_to_type(decl),
           comment: comment,
-          location: nil
+          location: nil,
+          annotations: []
         )
       end
 

data/rbs_collection.lock.yaml

@@ -18,7 +18,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 43b158b1fc209960643ca6baf5f883b186997e8d
+    revision: d70d634c6e848dc5e93cea0163cc8206448be048
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: monitor
@@ -29,12 +29,8 @@ gems:
   version: '0'
   source:
     type: stdlib
-- name: pathname
-  version: '0'
-  source:
-    type: stdlib
 - name: prism
-  version: 1.2.0
+  version: 1.9.0
   source:
     type: rubygems
 - name: rake
@@ -42,11 +38,11 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 43b158b1fc209960643ca6baf5f883b186997e8d
+    revision: d70d634c6e848dc5e93cea0163cc8206448be048
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rbs
-  version: 3.9.4
+  version: 3.10.3
   source:
     type: rubygems
 - name: rdoc

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

@@ -102,7 +102,7 @@ module RBS
           def type: (untyped default_type) -> Types::t
 
           # @rbs %a{pure}
-          # @rbs return Types::t?
+          # @rbs return: Types::t?
           %a{pure}
           def literal_type: () -> Types::t?
 
@@ -112,6 +112,20 @@ module RBS
           def constant_name: () -> TypeName?
 
           def start_line: () -> Integer
+
+          private
+
+          # @rbs node: Prism::Node
+          # @rbs return: Types::t?
+          def infer_type_from_node: (Prism::Node node) -> Types::t?
+
+          # @rbs node: Prism::ArrayNode
+          # @rbs return: Types::t
+          def infer_array_element_type: (Prism::ArrayNode node) -> Types::t
+
+          # @rbs node: Prism::HashNode
+          # @rbs return: Types::t
+          def infer_hash_element_type: (Prism::HashNode node) -> Types::t
         end
 
         class SingletonClassDecl < ModuleOrClass[Prism::SingletonClassNode]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rbs-inline
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 bindir: exe
 cert_chain: []
-date: 2025-10-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Inline RBS type declaration.
 test_files: []