Add type signatures.

Homebrew · Feb 8, 2024 · 76d8d6c · 76d8d6c
1 parent a37afcb
commit 76d8d6c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Library/Homebrew/api/cask.rb b/Library/Homebrew/api/cask.rb
@@ -60,7 +60,7 @@ def download_and_cache_data!
         end
         private :download_and_cache_data!
 
-        sig { returns(Hash) }
+        sig { returns(T::Hash[String, Hash]) }
         def all_casks
           unless cache.key?("casks")
             json_updated = download_and_cache_data!

diff --git a/Library/Homebrew/cask/cask_loader.rb b/Library/Homebrew/cask/cask_loader.rb
@@ -281,7 +281,11 @@ def load(config:)
     class FromAPILoader
       include ILoader
 
-      attr_reader :token, :path
+      sig { returns(String) }
+      attr_reader :token
+
+      sig { returns(Pathname) }
+      attr_reader :path
 
       sig { returns(T.nilable(Hash)) }
       attr_reader :from_json
@@ -296,7 +300,7 @@ def self.try_new(ref, warn: false)
 
         return unless (match = ref.match(HOMEBREW_MAIN_TAP_CASK_REGEX))
 
-        token = match[:token]
+        token = T.cast(match[:token], String)
         return if !Homebrew::API::Cask.all_casks.key?(token) && !Homebrew::API::Cask.all_renames.key?(token)
 
         ref = "#{CoreCaskTap.instance}/#{token}"
@@ -313,7 +317,7 @@ def initialize(token, from_json: T.unsafe(nil))
       end
 
       def load(config:)
-        json_cask = from_json || Homebrew::API::Cask.all_casks[token]
+        json_cask = from_json || Homebrew::API::Cask.all_casks.fetch(token)
 
         cask_options = {
           loaded_from_api: true,

diff --git a/Library/Homebrew/cli/named_args.rb b/Library/Homebrew/cli/named_args.rb
@@ -256,11 +256,11 @@ def to_paths(only: parent&.only_formula_or_cask, recurse_tap: false)
               paths = []
 
               if formula_path.exist? ||
-                 (!CoreTap.instance.installed? && Homebrew::API::Formula.all_formulae.key?(path.basename))
+                 (!CoreTap.instance.installed? && Homebrew::API::Formula.all_formulae.key?(path.basename.to_s))
                 paths << formula_path
               end
               if cask_path.exist? ||
-                 (!CoreCaskTap.instance.installed? && Homebrew::API::Cask.all_casks.key?(path.basename))
+                 (!CoreCaskTap.instance.installed? && Homebrew::API::Cask.all_casks.key?(path.basename.to_s))
                 paths << cask_path
               end