Use FormulaStruct when loading formulae from the API
#21176
Draft
+119
−48
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MikeMcQuaid
approved these changes
Dec 4, 2025
Member
MikeMcQuaid
left a comment
MikeMcQuaid
left a comment
There was a problem hiding this comment.
Looks great so far! Goal here would be to simplify the formulary logic as much as possible while still making it responsible for actually calling the relevant DSL methods.
Feel free to punt on the map comments etc.: that could be instead done in another, later PR/pass.
Comment on lines
+238
to
242
| uses_from_macos_names = formula_struct.uses_from_macos.map do |dep| | ||
| next dep unless dep.is_a? Hash | ||
|
|
||
| dep.keys.first | ||
| end |
Member
There was a problem hiding this comment.
I think ideally this (and others below) wouldn't need mapped (or filtered/nexted) but are instead already in the format needed for the DSL.
Comment on lines
+400
to
405
| if (disable_date = formula_struct.disable_date.presence) | ||
| reason = DeprecateDisable.to_reason_string_or_symbol formula_struct.disable_reason, type: :formula | ||
| replacement_formula = formula_struct.disable_replacement_formula | ||
| replacement_cask = formula_struct.disable_replacement_cask | ||
| disable! date: disable_date, because: reason, replacement_formula:, replacement_cask: | ||
| end |
Member
There was a problem hiding this comment.
Similarly this looks perhaps like a formula_struct.disable or something should contain all relevant detail but also be nilable.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds a new
FormulaStructto serve as an intermediary between the API and the formula loading inFormulary.This doesn't do much right now, but it is a good starting point to show that this idea will work. Eventually, this will be able to load from the internal API, and will be a bit more robust. Also, nested hashes should, ideally, become nested structs so we can do things like
formula_struct.urls.stable.checksum.Also, there are likely several optimizations that can happen here to make the
Formularylogic much cleaner, which I will continue to explore.