Merge pull request #19288 from Homebrew/cask-delegation

Use delegation to create Cask DSL methods

Library/Homebrew/cask/cask.rb

@@ -117,9 +117,7 @@ def refresh
       @dsl.language_eval
     end
 
-    ::Cask::DSL::DSL_METHODS.each do |method_name|
-      define_method(method_name) { |*args, &block| @dsl.send(method_name, *args, &block) }
-    end
+    def_delegators :@dsl, *::Cask::DSL::DSL_METHODS
 
     sig { params(caskroom_path: Pathname).returns(T::Array[[String, String]]) }
     def timestamped_versions(caskroom_path: self.caskroom_path)

Library/Homebrew/sorbet/tapioca/compilers/delegators.rb

@@ -7,7 +7,7 @@
 module Tapioca
   module Compilers
     # A compiler for subclasses of Delegator.
-    # To add a new delegator: require it above add add it to the DELEGATIONS hash below.
+    # To add a new delegator: require it above and add it to the DELEGATIONS hash below.
     class Delegators < Tapioca::Dsl::Compiler
       # Mapping of delegator classes to the classes they delegate to (as defined in `__getobj__`).
       DELEGATIONS = T.let({

Library/Homebrew/sorbet/tapioca/compilers/forwardables.rb

@@ -12,6 +12,13 @@ class Forwardables < Tapioca::Dsl::Compiler
       ARRAY_METHODS = T.let(["to_a", "to_ary"].freeze, T::Array[String])
       HASH_METHODS = T.let(["to_h", "to_hash"].freeze, T::Array[String])
       STRING_METHODS = T.let(["to_s", "to_str", "to_json"].freeze, T::Array[String])
+      # Use this to override the default return type of a forwarded method:
+      RETURN_TYPE_OVERRIDES = T.let({
+        "::Cask::Cask" => {
+          "on_system_block_min_os" => "T.nilable(MacOSVersion)",
+          "url"                    => "T.nilable(::Cask::URL)",
+        },
+      }.freeze, T::Hash[String, T::Hash[String, String]])
 
       ConstantType = type_member { { fixed: Module } }
 
@@ -38,7 +45,7 @@ def decorate
       sig { params(klass: RBI::Scope, method: T.any(Method, UnboundMethod), class_method: T::Boolean).void }
       def compile_forwardable_method(klass, method, class_method: false)
         name = method.name.to_s
-        return_type = return_type(name)
+        return_type = return_type(klass.to_s, name)
         klass.create_method(
           name,
           parameters:   [
@@ -50,16 +57,13 @@ def compile_forwardable_method(klass, method, class_method: false)
         )
       end
 
-      sig { params(name: String).returns(String) }
-      def return_type(name)
-        if name.end_with?("?")
-          "T::Boolean"
-        elsif ARRAY_METHODS.include?(name)
-          "Array"
-        elsif HASH_METHODS.include?(name)
-          "Hash"
-        elsif STRING_METHODS.include?(name)
-          "String"
+      sig { params(klass: String, name: String).returns(String) }
+      def return_type(klass, name)
+        if (override = RETURN_TYPE_OVERRIDES.dig(klass, name)) then override
+        elsif name.end_with?("?") then "T::Boolean"
+        elsif ARRAY_METHODS.include?(name) then "Array"
+        elsif HASH_METHODS.include?(name) then "Hash"
+        elsif STRING_METHODS.include?(name) then "String"
         else
           "T.untyped"
         end