From 659f993dabb1285ca5116d5344e34bffb23fc1b0 Mon Sep 17 00:00:00 2001
From: Douglas Eichelberger <dduugg@gmail.com>
Date: Fri, 6 Dec 2024 20:08:02 -0800
Subject: [PATCH] Avoid exposing table

---
 Library/Homebrew/cli/args.rb                  | 52 +++++++++++--------
 Library/Homebrew/cli/parser.rb                |  6 +--
 .../Homebrew/extend/os/linux/cli/parser.rb    |  2 +-
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/Library/Homebrew/cli/args.rb b/Library/Homebrew/cli/args.rb
index 82be6cd740..e17712a1c4 100644
--- a/Library/Homebrew/cli/args.rb
+++ b/Library/Homebrew/cli/args.rb
@@ -14,9 +14,6 @@ module Homebrew
       sig { returns(T::Array[String]) }
       attr_reader :options_only, :flags_only, :remaining
 
-      sig { returns(T::Hash[Symbol, T.untyped]) }
-      attr_accessor :table
-
       sig { void }
       def initialize
         require "cli/named_args"
@@ -26,7 +23,13 @@ module Homebrew
         @options_only = T.let([], T::Array[String])
         @flags_only = T.let([], T::Array[String])
         @cask_options = T.let(false, T::Boolean)
-        @table = T.let({}, T::Hash[Symbol, T.untyped])
+        @table = T.let({
+          build_bottle?:      false,
+          build_from_source?: false,
+          force_bottle?:      false,
+          HEAD?:              false,
+          include_test?:      false,
+        }, T::Hash[Symbol, T.untyped])
 
         # Can set these because they will be overwritten by freeze_named_args!
         # (whereas other values below will only be overwritten if passed).
@@ -39,38 +42,47 @@ module Homebrew
 
       sig { params(named_args: T::Array[String], cask_options: T::Boolean, without_api: T::Boolean).void }
       def freeze_named_args!(named_args, cask_options:, without_api:)
-        options = {}
-        options[:force_bottle] = true if force_bottle?
-        options[:override_spec] = :head if self.HEAD?
-        options[:flags] = flags_only unless flags_only.empty?
         @named = T.let(
-          NamedArgs.new(*named_args.freeze, parent: self, cask_options:, without_api:, **options),
+          NamedArgs.new(
+            *named_args.freeze,
+            cask_options:,
+            flags:         flags_only,
+            force_bottle:  force_bottle?,
+            override_spec: self.HEAD? ? :head : nil,
+            parent:        self,
+            without_api:,
+          ),
           T.nilable(NamedArgs),
         )
       end
 
       sig { returns(T.nilable(String)) }
-      def arch = table[:arch]
+      def arch = @table[:arch]
 
       sig { returns(T::Boolean) }
-      def build_bottle? = table[:build_bottle?] || false
+      def build_bottle? = @table.fetch(:build_bottle?)
 
       sig { returns(T::Boolean) }
-      def build_from_source? = table[:build_from_source?] || false
+      def build_from_source? = @table.fetch(:build_from_source?)
 
       sig { returns(T::Boolean) }
-      def force_bottle? = table[:force_bottle?] || false
+      def force_bottle? = @table.fetch(:force_bottle?)
 
       sig { returns(T::Boolean) }
-      def HEAD? = table[:HEAD?] || false
+      def HEAD? = @table.fetch(:HEAD?)
 
       sig { returns(T::Boolean) }
-      def include_test? = table[:include_test?] || false
+      def include_test? = @table.fetch(:include_test?)
 
       sig { returns(T.nilable(String)) }
-      def os = table[:os]
+      def os = @table[:os]
 
-      sig { params(_blk: T.untyped).returns(T.untyped) }
+      sig { params(name: Symbol, value: T.untyped).void }
+      def set_arg(name, value)
+        @table[name] = value
+      end
+
+      sig { params(_blk: T.nilable(T.proc.params(x: T.untyped).void)).returns(T.untyped) }
       def tap(&_blk)
         return super if block_given? # Object#tap
 
@@ -132,11 +144,9 @@ module Homebrew
 
       sig { returns(T.nilable(Symbol)) }
       def only_formula_or_cask
-        return if !respond_to?(:formula?) && !respond_to?(:cask?)
-
-        if T.unsafe(self).formula? && !T.unsafe(self).cask?
+        if @table[:formula?] && !@table[:cask?]
           :formula
-        elsif T.unsafe(self).cask? && !T.unsafe(self).formula?
+        elsif @table[:cask?] && !@table[:formula?]
           :cask
         end
       end
diff --git a/Library/Homebrew/cli/parser.rb b/Library/Homebrew/cli/parser.rb
index daae55e9b5..d74ad34cbe 100644
--- a/Library/Homebrew/cli/parser.rb
+++ b/Library/Homebrew/cli/parser.rb
@@ -288,12 +288,12 @@ module Homebrew
 
       sig { params(name: Symbol, value: T.untyped).void }
       def set_args_method(name, value)
-        @args.table[name] = value
+        @args.set_arg(name, value)
         return if @args.respond_to?(name)
 
         @args.define_singleton_method(name) do
-          T.bind(self, Args)
-          table.fetch(name)
+          # We cannot reference the ivar directly due to https://github.com/sorbet/sorbet/issues/8106
+          instance_variable_get(:@table).fetch(name)
         end
       end
 
diff --git a/Library/Homebrew/extend/os/linux/cli/parser.rb b/Library/Homebrew/extend/os/linux/cli/parser.rb
index b8de7c5aa1..feb4eb2aab 100644
--- a/Library/Homebrew/extend/os/linux/cli/parser.rb
+++ b/Library/Homebrew/extend/os/linux/cli/parser.rb
@@ -11,7 +11,7 @@ module OS
 
         sig { void }
         def set_default_options
-          args.table[:formula?] = true
+          args.set_arg(:formula?, true)
         end
 
         sig { void }