sorbet-runtime 0.5.9396 → 0.5.9431

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db6f94496ff3fced3bccb2121c3001cc15c4e56b5ff73b9e8485e24f6d0b598c
-  data.tar.gz: 638489971b430deca99fa8e1c52e406700d4284ecee747b89880994307b1340a
+  metadata.gz: 9208d78f8055eb2c5ebf6d665728d898c5ae7895bb59dce20e57cfbcb7491d08
+  data.tar.gz: '0957123248c7d548d8a25c7c5aae395be8506e01c0b1dfb87b307797bc9777c4'
 SHA512:
-  metadata.gz: 076e7977a7468ea6f1a8ef071b379e736732360ad15afa20121e6d146d52905b57fce0370f5da76e17ab8e1c9f5113e77d092baa6408b41673519eeab0ee2bad
-  data.tar.gz: f2320ca7136f8bf0ca67ea9c434beaae2737cac0a0908722fd899d741ce3666750c6ba618589086b04c4620e5b46757d1c69fc4065a55316d61275e2ac67d439
+  metadata.gz: 97dcd774b64c2d9621a1c235c3d53aa286a51fd76af26d6b018ea9e44943d1c3fe771e2fd206153f77e3cc96502f8b7f9bd78d5d06d920a627a506200c17ef9d
+  data.tar.gz: 0f5f87a751301cac4bd14984e2e570472a1b94a76c28aac05ad3a3ed16608271c70bcbb0b01b6ccc14eee4013b130ebf1c84393830fa14fa51dffaf567cf52f2

data/lib/sorbet-runtime.rb

@@ -22,8 +22,6 @@ require_relative 'types/private/decl_state'
 require_relative 'types/private/class_utils'
 require_relative 'types/private/runtime_levels'
 require_relative 'types/private/methods/_methods'
-require_relative 'types/private/methods/modes'
-require_relative 'types/private/methods/decl_builder'
 require_relative 'types/sig'
 require_relative 'types/helpers'
 require_relative 'types/private/final'
@@ -62,6 +60,7 @@ require_relative 'types/types/type_member'
 require_relative 'types/types/type_template'
 
 # Call validation
+require_relative 'types/private/methods/modes'
 require_relative 'types/private/methods/call_validation'
 
 # Signature validation
@@ -75,6 +74,7 @@ require_relative 'types/interface_wrapper'
 require_relative 'types/private/abstract/declare'
 require_relative 'types/private/abstract/hooks'
 require_relative 'types/private/casts'
+require_relative 'types/private/methods/decl_builder'
 require_relative 'types/private/methods/signature'
 require_relative 'types/private/retry'
 require_relative 'types/utils'

data/lib/types/private/methods/_methods.rb

@@ -29,13 +29,12 @@ module T::Private::Methods
   ARG_NOT_PROVIDED = Object.new
   PROC_TYPE = Object.new
 
-  DeclarationBlock = Struct.new(:mod, :loc, :blk, :raw, :decl_builder)
+  DeclarationBlock = Struct.new(:mod, :loc, :blk, :final, :raw)
 
   def self.declare_sig(mod, loc, arg, &blk)
-    declaration = _declare_sig_internal(mod, loc, arg, &blk)
-    T::Private::DeclState.current.active_declaration = declaration
+    T::Private::DeclState.current.active_declaration = _declare_sig_internal(mod, loc, arg, &blk)
 
-    declaration.decl_builder
+    nil
   end
 
   # See tests for how to use this.  But you shouldn't be using this.
@@ -55,10 +54,7 @@ module T::Private::Methods
       raise "Invalid argument to `sig`: #{arg}"
     end
 
-    decl_builder = DeclBuilder.new(mod, raw)
-    decl_builder.final if arg == :final # needed for backwards compatibility with sig(:final) {...}
-
-    DeclarationBlock.new(mod, loc, blk, raw, decl_builder)
+    DeclarationBlock.new(mod, loc, blk, arg == :final, raw)
   end
 
   def self._with_declared_signature(mod, declblock, &blk)
@@ -217,7 +213,7 @@ module T::Private::Methods
     current_declaration = T::Private::DeclState.current.active_declaration
     mod = is_singleton_method ? hook_mod.singleton_class : hook_mod
 
-    if T::Private::Final.final_module?(mod) && (current_declaration.nil? || !current_declaration.decl_builder.final?)
+    if T::Private::Final.final_module?(mod) && (current_declaration.nil? || !current_declaration.final)
       raise "#{mod} was declared as final but its method `#{method_name}` was not declared as final"
     end
     # Don't compute mod.ancestors if we don't need to bother checking final-ness.
@@ -281,7 +277,7 @@ module T::Private::Methods
     end
 
     @sig_wrappers[key] = sig_block
-    if current_declaration.decl_builder.final?
+    if current_declaration.final
       @was_ever_final_names[method_name] = true
       # use hook_mod, not mod, because for example, we want class C to be marked as having final if we def C.foo as
       # final. change this to mod to see some final_method tests fail.
@@ -350,9 +346,10 @@ module T::Private::Methods
   end
 
   def self.run_builder(declaration_block)
-    declaration_block
-      .decl_builder
-      .run!(&declaration_block.blk)
+    builder = DeclBuilder.new(declaration_block.mod, declaration_block.raw)
+    builder
+      .instance_exec(&declaration_block.blk)
+      .finalize!
       .decl
   end
 

data/lib/types/private/methods/decl_builder.rb

@@ -2,23 +2,9 @@
 # typed: true
 
 module T::Private::Methods
-  Declaration = Struct.new(
-    :mod,
-    :params,
-    :returns,
-    :bind,
-    :mode,
-    :checked,
-    :finalized,
-    :on_failure,
-    :override_allow_incompatible,
-    :type_parameters,
-    :raw,
-    :final
-  )
+  Declaration = Struct.new(:mod, :params, :returns, :bind, :mode, :checked, :finalized, :on_failure, :override_allow_incompatible, :type_parameters, :raw)
 
   class DeclBuilder
-    # The signature declaration the builder is composing (class `Declaration`)
     attr_reader :decl
 
     class BuilderError < StandardError; end
@@ -29,24 +15,6 @@ module T::Private::Methods
       end
     end
 
-    private def check_sig_block_is_unset!
-      if T::Private::DeclState.current.active_declaration&.blk
-        raise BuilderError.new(
-          "Cannot add more signature statements after the declaration block."
-        )
-      end
-    end
-
-    # Verify if we're trying to invoke the method outside of a signature block. Notice that we need to check if it's a
-    # proc, because this is valid and would lead to a false positive: `T.type_alias { T.proc.params(a: Integer).void }`
-    private def check_running_inside_block!(method_name)
-      unless @inside_sig_block || decl.mod == T::Private::Methods::PROC_TYPE
-        raise BuilderError.new(
-          "Can't invoke #{method_name} outside of a signature declaration block"
-        )
-      end
-    end
-
     def initialize(mod, raw)
       # TODO RUBYPLAT-1278 - with ruby 2.5, use kwargs here
       @decl = Declaration.new(
@@ -60,23 +28,12 @@ module T::Private::Methods
         ARG_NOT_PROVIDED, # on_failure
         nil, # override_allow_incompatible
         ARG_NOT_PROVIDED, # type_parameters
-        raw,
-        ARG_NOT_PROVIDED, # final
+        raw
       )
-      @inside_sig_block = false
-    end
-
-    def run!(&block)
-      @inside_sig_block = true
-      instance_exec(&block)
-      finalize!
-      self
     end
 
     def params(**params)
       check_live!
-      check_running_inside_block!(__method__)
-
       if !decl.params.equal?(ARG_NOT_PROVIDED)
         raise BuilderError.new("You can't call .params twice")
       end
@@ -91,8 +48,6 @@ module T::Private::Methods
 
     def returns(type)
       check_live!
-      check_running_inside_block!(__method__)
-
       if decl.returns.is_a?(T::Private::Types::Void)
         raise BuilderError.new("You can't call .returns after calling .void.")
       end
@@ -107,8 +62,6 @@ module T::Private::Methods
 
     def void
       check_live!
-      check_running_inside_block!(__method__)
-
       if !decl.returns.equal?(ARG_NOT_PROVIDED)
         raise BuilderError.new("You can't call .void after calling .returns.")
       end
@@ -120,8 +73,6 @@ module T::Private::Methods
 
     def bind(type)
       check_live!
-      check_running_inside_block!(__method__)
-
       if !decl.bind.equal?(ARG_NOT_PROVIDED)
         raise BuilderError.new("You can't call .bind multiple times in a signature.")
       end
@@ -133,7 +84,6 @@ module T::Private::Methods
 
     def checked(level)
       check_live!
-      check_running_inside_block!(__method__)
 
       if !decl.checked.equal?(ARG_NOT_PROVIDED)
         raise BuilderError.new("You can't call .checked multiple times in a signature.")
@@ -152,7 +102,6 @@ module T::Private::Methods
 
     def on_failure(*args)
       check_live!
-      check_running_inside_block!(__method__)
 
       if !decl.on_failure.equal?(ARG_NOT_PROVIDED)
         raise BuilderError.new("You can't call .on_failure multiple times in a signature.")
@@ -166,7 +115,7 @@ module T::Private::Methods
       self
     end
 
-    def abstract(&blk)
+    def abstract
       check_live!
 
       case decl.mode
@@ -178,47 +127,15 @@ module T::Private::Methods
         raise BuilderError.new("`.abstract` cannot be combined with `.override` or `.overridable`.")
       end
 
-      check_sig_block_is_unset!
-
-      if blk
-        T::Private::DeclState.current.active_declaration.blk = blk
-      end
-
       self
     end
 
-    def final(&blk)
+    def final
       check_live!
-
-      if !decl.final.equal?(ARG_NOT_PROVIDED)
-        raise BuilderError.new("You can't call .final multiple times in a signature.")
-      end
-
-      if @inside_sig_block
-        raise BuilderError.new(
-          "Unlike other sig annotations, the `final` annotation must remain outside the sig block, " \
-          "using either `sig(:final) {...}` or `sig.final {...}`, not `sig {final. ...}"
-        )
-      end
-
-      raise BuilderError.new(".final cannot be repeated in a single signature") if final?
-
-      decl.final = true
-
-      check_sig_block_is_unset!
-
-      if blk
-        T::Private::DeclState.current.active_declaration.blk = blk
-      end
-
-      self
+      raise BuilderError.new("The syntax for declaring a method final is `sig(:final) {...}`, not `sig {final. ...}`")
     end
 
-    def final?
-      !decl.final.equal?(ARG_NOT_PROVIDED) && decl.final
-    end
-
-    def override(allow_incompatible: false, &blk)
+    def override(allow_incompatible: false)
       check_live!
 
       case decl.mode
@@ -233,16 +150,10 @@ module T::Private::Methods
         raise BuilderError.new("`.override` cannot be combined with `.abstract`.")
       end
 
-      check_sig_block_is_unset!
-
-      if blk
-        T::Private::DeclState.current.active_declaration.blk = blk
-      end
-
       self
     end
 
-    def overridable(&blk)
+    def overridable
       check_live!
 
       case decl.mode
@@ -256,12 +167,6 @@ module T::Private::Methods
         raise BuilderError.new(".overridable cannot be repeated in a single signature")
       end
 
-      check_sig_block_is_unset!
-
-      if blk
-        T::Private::DeclState.current.active_declaration.blk = blk
-      end
-
       self
     end
 
@@ -278,7 +183,6 @@ module T::Private::Methods
     #  def map(&blk); end
     def type_parameters(*names)
       check_live!
-      check_running_inside_block!(__method__)
 
       names.each do |name|
         raise BuilderError.new("not a symbol: #{name}") unless name.is_a?(Symbol)

data/lib/types/sig.rb

@@ -12,53 +12,10 @@ module T::Sig
     original_verbose = $VERBOSE
     $VERBOSE = false
 
-    # At runtime, only returns a fake declaration builder to allow chaining methods, but statically it is treated
-    # exactly the same as T::Sig#sig. Only use it in cases where you can't use T::Sig#sig.
+    # At runtime, does nothing, but statically it is treated exactly the same
+    # as T::Sig#sig. Only use it in cases where you can't use T::Sig#sig.
     T::Sig::WithoutRuntime.sig {params(arg0: T.nilable(Symbol), blk: T.proc.bind(T::Private::Methods::DeclBuilder).void).void}
-    def self.sig(arg0=nil, &blk) # rubocop:disable Lint/DuplicateMethods
-      DeclBuilder.new
-    end
-
-    # This fake version of DeclBuilder exists so that signatures without runtime don't have to pay the cost associated
-    # with using the actual DeclBuilder
-    class DeclBuilder
-      T::Sig::WithoutRuntime.sig do
-        params(
-          _blk: T.nilable(T.proc.bind(T::Private::Methods::DeclBuilder).void)
-        ).returns(DeclBuilder)
-      end
-      def abstract(&_blk)
-        self
-      end
-
-      T::Sig::WithoutRuntime.sig do
-        params(
-          _blk: T.nilable(T.proc.bind(T::Private::Methods::DeclBuilder).void)
-        ).returns(DeclBuilder)
-      end
-      def final(&_blk)
-        self
-      end
-
-      T::Sig::WithoutRuntime.sig do
-        params(
-          _allow_incompatible: T::Boolean,
-          _blk: T.nilable(T.proc.bind(T::Private::Methods::DeclBuilder).void)
-        ).returns(DeclBuilder)
-      end
-      def override(_allow_incompatible: false, &_blk)
-        self
-      end
-
-      T::Sig::WithoutRuntime.sig do
-        params(
-          _blk: T.nilable(T.proc.bind(T::Private::Methods::DeclBuilder).void)
-        ).returns(DeclBuilder)
-      end
-      def overridable(&_blk)
-        self
-      end
-    end
+    def self.sig(arg0=nil, &blk); end # rubocop:disable Lint/DuplicateMethods
 
     $VERBOSE = original_verbose
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet-runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.9396
+  version: 0.5.9431
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-01 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest