sorbet-runtime 0.4.4972 → 0.4.4997

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53211ac8c4d54178673a7fb13f499fea6e0808239266f249027303fedab70fb7
-  data.tar.gz: b5952024c57f88f975fb689e8b921b283eb4a20bf56b04380b6c8cf3236a968e
+  metadata.gz: 56172454398482546a7fab9463bf8e293f3edcb551e324148a030da45d9cce04
+  data.tar.gz: 20bb28765140390c4616c0d6dddf118588a360fe8c4a2b8b8b5c07d044c7e37c
 SHA512:
-  metadata.gz: f0aed40e7e7617d289e77544f30a2ed8335ea1a4480159b75194622cd777897c64630f417b9f35dc99571e9c8818e3e76f9227ea0ed90ba3625463524e3fc75a
-  data.tar.gz: 2f21287bacccc1557d1fb5c4c257c7c34259724e2306a5db27c98620841af4a643e004913a79f421ca2d760003cdf1b88081346c4c2b85184eeb5eef8582b90b
+  metadata.gz: 4b161f44c8fff272feec1721fd94e0afb3701e1cd34daca9c42baf9116cc88c9e9483398ddc7332b3eaa5d31b1b8b4a3afa777f481eb860e590aea82421f5d20
+  data.tar.gz: a47d57c995bea22fcdd2d8db826c9977d739f2d322c6acf2204c29147df46aa2ecb33c27daf45d37a0835e8962a28ebea747a334f4fbf0c548bcf77072d4d7a6

data/lib/sorbet-runtime.rb

@@ -45,7 +45,7 @@ require_relative 'types/types/proc'
 require_relative 'types/types/attached_class'
 require_relative 'types/types/self_type'
 require_relative 'types/types/simple'
-require_relative 'types/types/opus_enum'
+require_relative 'types/types/t_enum'
 require_relative 'types/types/type_parameter'
 require_relative 'types/types/typed_array'
 require_relative 'types/types/typed_enumerator'

data/lib/types/enum.rb

@@ -12,17 +12,17 @@
 # @example Declaring an Enum:
 #   class Suit < T::Enum
 #     enums do
-#       CLUB = T.let(new, Suit)
-#       SPADE = T.let(new, Suit)
-#       DIAMOND = T.let(new, Suit)
-#       HEART = T.let(new, Suit)
+#       CLUB = new
+#       SPADE = new
+#       DIAMOND = new
+#       HEART = new
 #     end
 #   end
 #
 # @example Custom serialization value:
 #   class Status < T::Enum
 #     enums do
-#       READY = T.let(new('rdy'), Status)
+#       READY = new('rdy')
 #       ...
 #     end
 #   end
@@ -31,7 +31,7 @@
 #   Suit::SPADE
 #
 # @example Converting from serialized value to enum instance:
-#   Suit.from_serialized('club') == Suit::CLUB
+#   Suit.deserialize('club') == Suit::CLUB
 #
 # @example Using enums in type signatures:
 #   sig {params(suit: Suit).returns(Boolean)}
@@ -57,6 +57,19 @@ class T::Enum
     @values
   end
 
+  # Convert from serialized value to enum instance
+  #
+  # Note: It would have been nice to make this method final before people started overriding it.
+  # Note: Failed CriticalMethodsNoRuntimeTypingTest
+  sig {params(serialized_val: SerializedVal).returns(T.nilable(T.experimental_attached_class)).checked(:never)}
+  def self.try_deserialize(serialized_val)
+    if @mapping.nil?
+      raise "Attempting to access serialization map of #{self.class} before it has been initialized." \
+        " Enums are not initialized until the 'enums do' block they are defined in has finished running."
+    end
+    @mapping[serialized_val]
+  end
+
   # Convert from serialized value to enum instance.
   #
   # Note: It would have been nice to make this method final before people started overriding it.
@@ -66,11 +79,7 @@ class T::Enum
   # @raise [KeyError] if serialized value does not match any instance.
   sig {overridable.params(serialized_val: SerializedVal).returns(T.experimental_attached_class).checked(:never)}
   def self.from_serialized(serialized_val)
-    if @mapping.nil?
-      raise "Attempting to access serialization map of #{self.class} before it has been initialized." \
-        " Enums are not initialized until the 'enums do' block they are defined in has finished running."
-    end
-    res = @mapping[serialized_val]
+    res = try_deserialize(serialized_val)
     if res.nil?
       raise KeyError.new("Enum #{self} key not found: #{serialized_val.inspect}")
     end

data/lib/types/props/decorator.rb

@@ -552,7 +552,7 @@ class T::Props::Decorator
     nil
   end
 
-  # returns the type of the hash key, or nil. Any CustomType could be a key, but we only expect Opus::Enum right now.
+  # returns the type of the hash key, or nil. Any CustomType could be a key, but we only expect T::Enum right now.
   sig do
     params(type: PropType)
     .returns(T.nilable(Module))
@@ -571,12 +571,6 @@ class T::Props::Decorator
 
   # From T::Props::Utils.deep_clone_object, plus String
   TYPES_NOT_NEEDING_CLONE = [TrueClass, FalseClass, NilClass, Symbol, String, Numeric]
-  if defined?(Opus) && defined?(Opus::Enum)
-    TYPES_NOT_NEEDING_CLONE << Opus::Enum
-  end
-  if defined?(T::Enum)
-    TYPES_NOT_NEEDING_CLONE << T::Enum
-  end
 
   sig {params(type: PropType).returns(T::Boolean)}
   private def shallow_clone_ok(type)

data/lib/types/props/utils.rb

@@ -23,16 +23,10 @@ module T::Props::Utils
       h
     when Regexp
       what.dup
+    when T::Enum
+      what
     else
-      # Some unfortunate nastiness to get around Opus::Enum potentially not
-      # being defined.
-      if defined?(Opus) && defined?(Opus::Enum) && what.class == Opus::Enum
-        what
-      elsif defined?(T::Enum) && what.class == T::Enum
-        what
-      else
-        what.clone
-      end
+      what.clone
     end
     freeze ? result.freeze : result
   end

data/lib/types/types/{opus_enum.rb → t_enum.rb}

@@ -2,8 +2,8 @@
 # typed: true
 
 module T::Types
-  # Validates that an object is equal to another Opus::Enum singleton value.
-  class OpusEnum < Base
+  # Validates that an object is equal to another T::Enum singleton value.
+  class TEnum < Base
     attr_reader :val
 
     def initialize(val)
@@ -23,7 +23,7 @@ module T::Types
     # @override Base
     private def subtype_of_single?(other)
       case other
-      when OpusEnum
+      when TEnum
         @val == other.val
       else
         false

data/lib/types/utils.rb

@@ -28,10 +28,8 @@ module T::Utils
       T::Types::FixedHash.new(val) # rubocop:disable PrisonGuard/UseOpusTypesShortcut
     elsif val.is_a?(T::Private::Methods::DeclBuilder)
       T::Private::Methods.finalize_proc(val.decl)
-    elsif defined?(::Opus) && defined?(::Opus::Enum) && val.is_a?(::Opus::Enum)
-      T::Types::OpusEnum.new(val) # rubocop:disable PrisonGuard/UseOpusTypesShortcut
-    elsif defined?(::T::Enum) && val.is_a?(::T::Enum)
-      T::Types::OpusEnum.new(val) # rubocop:disable PrisonGuard/UseOpusTypesShortcut
+    elsif val.is_a?(::T::Enum)
+      T::Types::TEnum.new(val) # rubocop:disable PrisonGuard/UseOpusTypesShortcut
     elsif val.is_a?(::String)
       raise "Invalid String literal for type constraint. Must be an #{T::Types::Base}, a " \
             "class/module, or an array. Got a String with value `#{val}`."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.4.4972
+  version: 0.4.4997
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -127,10 +127,10 @@ files:
 - lib/types/types/fixed_hash.rb
 - lib/types/types/intersection.rb
 - lib/types/types/noreturn.rb
-- lib/types/types/opus_enum.rb
 - lib/types/types/proc.rb
 - lib/types/types/self_type.rb
 - lib/types/types/simple.rb
+- lib/types/types/t_enum.rb
 - lib/types/types/type_member.rb
 - lib/types/types/type_parameter.rb
 - lib/types/types/type_template.rb