Merge pull request #34 from ksss/typename

Support rbs v3.8
ksss · Feb 3, 2025 · b4ad998 · b4ad998
2 parents 095dab2 + 46df1f2
commit b4ad998
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/lib/orthoses/active_support/concern.rb b/lib/orthoses/active_support/concern.rb
@@ -36,7 +36,7 @@ def call
       def members_prototype_of(mod_name)
         mod = Object.const_get(mod_name)
         runtime = ::RBS::Prototype::Runtime.new(patterns: nil, env: nil, merge: false)
-        type_name = TypeName(mod_name)
+        type_name = ::RBS::TypeName.parse(mod_name)
         [].tap do |members|
           runtime.generate_methods(mod, type_name, members)
         end

diff --git a/lib/orthoses/active_support/delegation.rb b/lib/orthoses/active_support/delegation.rb
@@ -80,7 +80,7 @@ def initialize(store)
         end
 
         def find(mod_name, name, kind, argument)
-          typename = TypeName(mod_name).absolute!
+          typename = ::RBS::TypeName.parse(mod_name).absolute!
 
           if definition_method = build_definition(typename, kind)&.methods&.[](name)
             # found in env

diff --git a/lib/orthoses/active_support/time_with_zone.rb b/lib/orthoses/active_support/time_with_zone.rb
@@ -29,10 +29,10 @@ def call
       ])
 
       TIME_MODULES = Set.new([
-        TypeName("::Time"),
-        TypeName("::DateAndTime::Zones"),
-        TypeName("::DateAndTime::Calculations"),
-        TypeName("::DateAndTime::Compatibility")
+        ::RBS::TypeName.parse("::Time"),
+        ::RBS::TypeName.parse("::DateAndTime::Zones"),
+        ::RBS::TypeName.parse("::DateAndTime::Calculations"),
+        ::RBS::TypeName.parse("::DateAndTime::Compatibility")
       ])
 
       NONEED_METHODS = Set.new(%i[
@@ -65,8 +65,8 @@ def add_signature(env, content)
       end
 
       def each_line_from_core_time_definition(store)
-        type_name_time = TypeName("::Time")
-        type_name_time_with_zone = TypeName("::ActiveSupport::TimeWithZone")
+        type_name_time = ::RBS::TypeName.parse("::Time")
+        type_name_time_with_zone = ::RBS::TypeName.parse("::ActiveSupport::TimeWithZone")
         env = Utils.rbs_environment(collection: true, cache: false)
 
         add_signature(env, store["Time"])

diff --git a/lib/orthoses/active_support/time_with_zone_test.rb b/lib/orthoses/active_support/time_with_zone_test.rb
@@ -38,14 +38,14 @@ class State
 
     definetion_builder = RBS::DefinitionBuilder.new(env: env.resolve_type_names)
     begin
-      unless definetion_builder.build_instance(TypeName("::Time")).methods[:defined_method].instance_of?(RBS::Definition::Method)
+      unless definetion_builder.build_instance(::RBS::TypeName.parse("::Time")).methods[:defined_method].instance_of?(RBS::Definition::Method)
         t.error("#defined_method was dropped.")
       end
     rescue => err
       t.error("\n```rbs\n#{store["Time"].to_rbs}```\n#{err.inspect}")
     end
     begin
-      definetion_builder.build_instance(TypeName("::ActiveSupport::TimeWithZone"))
+      definetion_builder.build_instance(::RBS::TypeName.parse("::ActiveSupport::TimeWithZone"))
     rescue => err
       t.error("\n```rbs\n#{store["ActiveSupport::TimeWithZone"].to_rbs}```\n#{err.inspect}")
     end

diff --git a/lib/orthoses/rails.rb b/lib/orthoses/rails.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'orthoses'
+require_relative 'shims'
 
 require_relative 'action_mailer'
 require_relative 'active_model'

diff --git a/lib/orthoses/shims.rb b/lib/orthoses/shims.rb
@@ -0,0 +1,18 @@
+# RBS 3.8
+unless RBS::TypeName.singleton_class.method_defined?(:parse)
+  module RBS
+    class TypeName
+      def self.parse(string)
+        absolute = string.start_with?("::")
+
+        *path, name = string.delete_prefix("::").split("::").map(&:to_sym)
+        raise unless name
+
+        TypeName.new(
+          name: name,
+          namespace: RBS::Namespace.new(path: path, absolute: absolute)
+        )
+      end
+    end
+  end
+end