refactor: one JSON item head for the app and the installer page

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

CHANGELOG.md

@@ -11,6 +11,7 @@ one per merged pull request.
 - **refactor: the rules between menu items are three tables (`REQUIRES`, `FOLLOWS`, `EXCLUDES` in `lib/menu.sh`) used by the menu's toggles and, as `normalize_wanted`, by the app's selection (it had its own copy of the rules). The app now also ticks the Steamify shortcut for "Add as non-Steam game" and unticks the game entry with it, like the menu**
 - **refactor: the entry point picks its mode once (`MODE`) and `--defaults` and `--boot` are functions with one failure report, instead of four booleans and two copies of the apply-and-report code; `NO_COLOR` gives plain output**
 - **refactor: `is_wanted` and `is_current` instead of repeated `[[ "${WANTED[x]}" == 1 ]]` checks in the menu, the app's backend and the entry point**
+- **refactor: the start of every item's JSON (id, label, hint, kind, parent) is built in one place (`json_item_head`) for the app and the installer page, and `json_bool` replaces the `&& echo true || echo false` copies**
 - **test: the menu rules, the plan and the app's and installer's JSON are checked against a golden file (`tests/menu-test.sh` in steamify-cachyos-dev); `make check`, `.editorconfig`, `.shellcheckrc`**
 - **docs: README lists the sources and projects Steamify builds on, with licences and thanks**
 

lib/backend.sh

@@ -31,13 +31,28 @@ json_list() {
     printf '[%s]' "$out"
 }
 
+json_bool() {
+    # json_bool <command>...: true or false by the command's exit status.
+    if "$@"; then printf true; else printf false; fi
+}
+
+json_item_head() {
+    # json_item_head <id> <kind>: the start of an item's object (no closing
+    # brace) with what the app and the installer page both read: id, label,
+    # hint (the part of the label after the colon), kind, parent.
+    local c="$1" hint=""
+    [[ "${LABEL[$c]}" == *:* ]] && hint="${LABEL[$c]#*: }"
+    printf '{"id":%s,"label":%s,"hint":%s,"kind":"%s","parent":%s,"needs":""' \
+        "$(json_str "$c")" "$(json_str "${LABEL[$c]%%:*}")" "$(json_str "$hint")" "$2" "$(json_str "${PARENT[$c]:-}")"
+}
+
 backend_event() {
     # backend_event <event> [<json fields without braces>]
     printf '{"event":%s%s}\n' "$(json_str "$1")" "${2:+,$2}"
 }
 
 backend_status() {
-    local c first_run=true items="" kind parent now
+    local c first_run=true items="" kind
     detect_components
     for c in "${COMPONENTS[@]}"; do
         component_available "$c" && ! is_action "$c" && is_current "$c" && first_run=false
@@ -45,17 +60,12 @@ backend_status() {
     for c in "${COMPONENTS[@]}"; do
         component_available "$c" || continue
         kind=toggle; is_action "$c" && kind=action; [[ "$c" == boot ]] && kind=choice
-        parent="${PARENT[$c]:-}"
-        now="${CURRENT[$c]:-0}"
-        items+="${items:+,}{\"id\":$(json_str "$c"),\"label\":$(json_str "${LABEL[$c]%%:*}")"
-        items+=",\"hint\":$(json_str "$( [[ "${LABEL[$c]}" == *:* ]] && echo "${LABEL[$c]#*: }")")"
-        items+=",\"kind\":\"$kind\",\"parent\":$(json_str "$parent")"
-        items+=",\"needs\":\"\""
-        items+=",\"on\":$( [[ "$now" == 1 ]] && echo true || echo false)"
-        items+=",\"wanted\":$( is_wanted "$c" && echo true || echo false)"
-        items+=",\"update\":$(feature_outdated "$c" && echo true || echo false)"
-        items+=",\"new\":$({ feature_new "$c" || feature_new_optin "$c"; } && echo true || echo false)"
-        items+=",\"selectable\":$(component_selectable "$c" && echo true || echo false)"
+        items+="${items:+,}$(json_item_head "$c" "$kind")"
+        items+=",\"on\":$(json_bool is_current "$c")"
+        items+=",\"wanted\":$(json_bool is_wanted "$c")"
+        items+=",\"update\":$(json_bool feature_outdated "$c")"
+        items+=",\"new\":$(json_bool feature_any_new "$c")"
+        items+=",\"selectable\":$(json_bool component_selectable "$c")"
         # Why it can't be turned on, for the app's explanation.
         [[ "$c" == vram && -n "${VRAM_NVIDIA_CASE:-}" ]] &&
             items+=",\"note\":$(json_str "$(vram_nvidia_note "$VRAM_NVIDIA_CASE")")"
@@ -65,11 +75,11 @@ backend_status() {
     for f in /dev/cec*; do [[ -e "$f" ]] && cec+="${cec:+ }$(basename "$f")"; done
     local bios='null'
     if bios_available; then
-        bios="{\"current\":$(json_str "$(bios_current)"),\"newest\":$(json_str "${BIOS_NEWEST:-}"),\"selectable\":$(bios_selectable && echo true || echo false),\"dryRun\":$([[ -n "$BIOS_DRY_RUN" ]] && echo true || echo false)}"
+        bios="{\"current\":$(json_str "$(bios_current)"),\"newest\":$(json_str "${BIOS_NEWEST:-}"),\"selectable\":$(json_bool bios_selectable),\"dryRun\":$([[ -n "$BIOS_DRY_RUN" ]] && echo true || echo false)}"
     fi
     printf '{"version":%s,"firstRun":%s,"steamMachine":%s,"kernel":%s,"pinnedKernel":%s,"cecDevices":%s,"leds":%s,"bios":%s,"items":[%s]}\n' \
         "$(json_str "$VERSION")" "$first_run" \
-        "$(detect_valve_fremont && echo true || echo false)" \
+        "$(json_bool detect_valve_fremont)" \
         "$(json_str "$(uname -r)")" "$(json_str "${PINNED_KERNEL_VER:-}")" \
         "$(json_str "$cec")" \
         "$(compgen -G '/sys/class/leds/valve-leds*' | wc -l)" \

lib/menu.sh

@@ -170,6 +170,8 @@ feature_new() {
     feature_added "$1" && [[ " ${NO_PRESELECT[*]} " != *" $1 "* ]]
 }
 
+feature_any_new() { feature_new "$1" || feature_new_optin "$1"; }
+
 feature_new_optin() {
     # A new opt-in option (unticked by default): the "new" badge only, it stays
     # unticked. Boot into is a choice row of the conversion, not an item.
@@ -300,9 +302,7 @@ defaults_list() {
         on=false
         [[ "$sel" == true && " ${NO_PRESELECT[*]} " != *" $c "* ]] && on=true
         [[ "$c" == cec ]] && machine_available && on=true
-        items+="${items:+,}{\"id\":$(json_str "$c"),\"label\":$(json_str "${LABEL[$c]%%:*}")"
-        items+=",\"hint\":$(json_str "$( [[ "${LABEL[$c]}" == *:* ]] && echo "${LABEL[$c]#*: }")")"
-        items+=",\"kind\":\"$kind\",\"parent\":$(json_str "${PARENT[$c]:-}"),\"needs\":\"\",\"hideWhen\":$(json_str "$([[ "$c" == nvsilent ]] && echo bigpicture)"),\"on\":$on,\"selectable\":$sel}"
+        items+="${items:+,}$(json_item_head "$c" "$kind"),\"hideWhen\":$(json_str "$([[ "$c" == nvsilent ]] && echo bigpicture)"),\"on\":$on,\"selectable\":$sel}"
     done
     printf '[%s]\n' "$items"
 }