Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Library/Homebrew/api/cask_struct.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class CaskStruct < T::Struct
def self.from_hash(cask_hash, ignore_types: false)
return super(cask_hash) if ignore_types

cask_hash = ::Cask::Cask.deep_remove_placeholders(cask_hash)
cask_hash = cask_hash.transform_keys(&:to_sym)
.slice(*decorator.all_props)
.compact_blank
Expand Down
1 change: 1 addition & 0 deletions Library/Homebrew/api/formula_struct.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ module API
class FormulaStruct < T::Struct
sig { params(formula_hash: T::Hash[String, T.untyped]).returns(FormulaStruct) }
def self.from_hash(formula_hash)
formula_hash = ::Formula.deep_remove_placeholders(formula_hash)
formula_hash = formula_hash.transform_keys(&:to_sym)
.slice(*decorator.all_props)
.compact_blank
Expand Down
20 changes: 20 additions & 0 deletions Library/Homebrew/api_hashable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,24 @@ def generating_hash?
@generating_hash ||= false
@generating_hash == true
end

sig { type_parameters(:U).params(value: T.type_parameter(:U)).returns(T.type_parameter(:U)) }
def deep_remove_placeholders(value)
return value if generating_hash?

value = case value
when Hash
value.transform_values { |v| deep_remove_placeholders(v) }
when Array
value.map { |v| deep_remove_placeholders(v) }
when String
value.gsub(HOMEBREW_HOME_PLACEHOLDER, Dir.home)
.gsub(HOMEBREW_PREFIX_PLACEHOLDER, HOMEBREW_PREFIX)
.gsub(HOMEBREW_CELLAR_PLACEHOLDER, HOMEBREW_CELLAR)
else
value
end

T.cast(value, T.type_parameter(:U))
end
end
Loading