orthoses 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a6942bb06928e29ae619e8dfd3f92ac603bda3d0feda99dafd309c4eb493327
-  data.tar.gz: 6affe9ebc4d0b1a3ec31c9192e271ee6a2b35765ad6c753c58fc2310fb6155ae
+  metadata.gz: b4cab7a047064bc63f7fdab6b3644e019dc397cb6bc17670b4acf0d18227b949
+  data.tar.gz: 7cdf8af9f9cea0302b88095be8bd8ce98ccdc64c72cad37634de54fb3591c86d
 SHA512:
-  metadata.gz: 7e5f33fe35dc796660ea45096401a2157ec32ac19ead7af5ead38d4ab96fb40e28a4c266726bf4c0d6769cd8cfa0d6064501c18e99bbcceb1bdb2b929f610eb1
-  data.tar.gz: 8adf74dc954206d5e517cf6d0151cf50500375c9363ede9305c90a0989724f61d956b07daf6a17ebe8f1018912245474e10fa944ba4ecbbda4c927a6253eb0ff
+  metadata.gz: 4d58a223aa21d7dc8db739a329c9037f7158aa41ddb30c500e30636730d21fe2bfba4492d9ffea1eeebd990e593028b009df0a8f74a938c15b93ef8267090eb3
+  data.tar.gz: 253a53938a1b1e20217e45dea9cf102ec5dfd1bb60be6b79b034da451cdd6b5f976d3c5cf5adc360201f676664bface13f3f26a0ab8d2bc780bbc0e6e78e92e8

data/lib/orthoses/content.rb

@@ -191,9 +191,9 @@ module Orthoses
 
     def escaped_rbs
       rbs = original_rbs
-      rbs.gsub!(/def\s*(self\??\.)?(.+?):/) { "def #{$1}`#{$2}`:" }
-      rbs.gsub!(/alias\s*(self\.)?(.+?)\s+(self\.)?(.+)$/) { "alias #{$1}`#{$2}` #{$3}`#{$4}`" }
-      rbs.gsub!(/attr_(reader|writer|accessor)\s*(self\.)?(.+)\s*:\s*(.+)$/) { "attr_#{$1} #{$2}`#{$3}`: #{$4}" }
+      rbs.gsub!(/def\s+(self\??\.)?(.+?):/) { "def #{$1}`#{$2}`:" }
+      rbs.gsub!(/alias\s+(self\.)?(.+?)\s+(self\.)?(.+)$/) { "alias #{$1}`#{$2}` #{$3}`#{$4}`" }
+      rbs.gsub!(/attr_(reader|writer|accessor)\s+(self\.)?(.+)\s*:\s*(.+)$/) { "attr_#{$1} #{$2}`#{$3}`: #{$4}" }
       rbs
     end
 

data/lib/orthoses/rbs_prototype_runtime.rb

@@ -32,7 +32,7 @@ module Orthoses
         )
 
         patterns = @patterns || store.keys
-        env = RBS::Environment.new
+        env = Utils.rbs_environment
         merge = false
         owners_included = []
         RBS::Prototype::Runtime.new(

data/lib/orthoses/utils/type_list.rb

@@ -8,19 +8,15 @@ module Orthoses
       NIL_TYPE = ::RBS::Types::Bases::Nil.new(location: nil)
       TRUE_TYPE = ::RBS::Types::Literal.new(literal: true, location: nil)
       FALSE_TYPE = ::RBS::Types::Literal.new(literal: false, location: nil)
+      BOOL_TYPE = ::RBS::Types::Bases::Bool.new(location: nil)
 
       def initialize(types)
-        @types = types.map do |type|
-          case type
-          when String
-            ::RBS::Parser.parse_type(type)
-          else
-            type
-          end
-        end
+        @types = types
       end
 
       def inject
+        normalize
+
         uniqed = @types.uniq
 
         return UNTYPED if uniqed.find { |t| t == UNTYPED }
@@ -28,7 +24,7 @@ module Orthoses
         has_true = uniqed.delete(TRUE_TYPE)
         has_false = uniqed.delete(FALSE_TYPE)
         if has_true || has_false
-          uniqed << ::RBS::Types::Bases::Bool.new(location: nil)
+          uniqed << BOOL_TYPE
         end
 
         return UNTYPED if uniqed.empty?
@@ -68,6 +64,37 @@ module Orthoses
 
         injected
       end
+
+      private
+
+      def normalize
+        @types = @types.map do |type|
+          case type
+          when String
+            ::RBS::Parser.parse_type(type)
+          else
+            type
+          end
+        end
+
+        @types = @types.map do |rbs_type|
+          case rbs_type
+          when ::RBS::Types::ClassInstance
+            case rbs_type.name.to_s
+            when 'TrueClass', '::TrueClass', 'FalseClass', '::FalseClass'
+              BOOL_TYPE
+            when 'NilClass', '::NilClass'
+              NIL_TYPE
+            else
+              rbs_type
+            end
+          else
+            rbs_type
+          end
+        end
+
+        self
+      end
     end
   end
 end

data/lib/orthoses/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Orthoses
-  VERSION = "1.11.0"
+  VERSION = "1.12.0"
 end

data/sig/orthoses/utils/type_list.rbs

@@ -5,6 +5,8 @@ class Orthoses::Utils::TypeList
   @types: untyped
   def initialize: (untyped types) -> void
   def inject: () -> untyped
+  private def normalize: () -> self
+  BOOL_TYPE: RBS::Types::Bases::Bool
   FALSE_TYPE: RBS::Types::Literal
   NIL_TYPE: RBS::Types::Bases::Nil
   TRUE_TYPE: RBS::Types::Literal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orthoses
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.0
 platform: ruby
 authors:
 - ksss
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-02 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs