0.2 framework: bug fixes, performance, emit and config filters, CI isolation for timing tests

.github/workflows/ci.yml

@@ -24,7 +24,9 @@ jobs:
           - name: Intel
             runner: macos-26-intel
     runs-on: ${{ matrix.runner }}
-    timeout-minutes: 30
+    timeout-minutes: 45
+    env:
+      TIMING_TESTS: MainBlockObserverTests|longChainWithReaderIsFast|EachBudgetTests|HostileConfigTests|ReloadBudgetTests|loadsDefaultSizedConfigInBudget|largeListReadsWithinBudget|largeListWithOneChangedEntryWithinBudget
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
 
@@ -38,7 +40,11 @@ jobs:
         run: swift build -c release --product ApolloShell && swift build -c release --product apollo
 
       - name: Test
-        run: ./test.sh
+        run: ./test.sh --skip "$TIMING_TESTS"
+
+      - name: Timing budgets, one test at a time
+        if: success() || failure()
+        run: ./test.sh --no-parallel --filter "$TIMING_TESTS"
 
       - name: Assemble and verify the app bundle
         run: |

README.md

@@ -129,7 +129,8 @@ apollo config select mine
 apollo check ~/.config/apolloshell/configs/mine
 ```
 
-Every node, action, provider, filter and event is in
+New to configs? [docs/GUIDE.md](docs/GUIDE.md) builds one in five small,
+tested steps. Every node, action, provider, filter and event is in
 [docs/CONFIG.md](docs/CONFIG.md), generated by `apollo schema --markdown`.
 Coming from 0.1? [docs/release-notes-0.2.0.md](docs/release-notes-0.2.0.md)
 says where your settings went.

Resources/configs/apolloshell-default/dashboard.kdl

@@ -1,13 +1,13 @@
-var dashboard-tabs "{dashboard-caelestia.tabs}" type="list" persist=#true
-var dashboard-cards-top "{dashboard-caelestia.top}" type="list" persist=#true
-var dashboard-cards-bottom "{dashboard-caelestia.bottom}" type="list" persist=#true
-var dashboard-cards-side "{dashboard-caelestia.side}" type="list" persist=#true
+var dashboard-tabs "{var.dashboard-caelestia.tabs}" type="list" persist=#true
+var dashboard-cards-top "{var.dashboard-caelestia.top}" type="list" persist=#true
+var dashboard-cards-bottom "{var.dashboard-caelestia.bottom}" type="list" persist=#true
+var dashboard-cards-side "{var.dashboard-caelestia.side}" type="list" persist=#true
 var dashboard-tab "dashboard"
 var calendar-offset 0
 var dashboard-visible-tabs from="{var.dashboard-tabs | where 'visible' true}"
 var dashboard-active-tab from="{(var.dashboard-visible-tabs | where 'id' var.dashboard-tab | count) > 0 ? var.dashboard-tab : (var.dashboard-visible-tabs | first).id}"
 
-let dashboard-tab-looks {
+var dashboard-tab-looks {
     - id="dashboard" title="Dashboard" icon="bar-dashboard" symbol="square.grid.2x2" selected=".fill"
     - id="media" title="Media" icon="panel-media" symbol="music.note.list" selected=""
     - id="performance" title="Performance" icon="panel-performance" symbol="gauge.with.dots.needle.67percent" selected=""
@@ -66,8 +66,8 @@ popup "dashboard" anchor="top" motion="slide" hover-edge=#true overhang=#true ar
                 button class="dashboard-tab" checked="{tab.id == var.dashboard-active-tab}" {
                     on-click { set "dashboard-tab" "{tab.id}" }
                     column class="dashboard-tab-label" {
-                        icon "{(dashboard-tab-looks | where 'id' tab.id | first).icon}" fallback="{(dashboard-tab-looks | where 'id' tab.id | first).symbol}{tab.id == var.dashboard-active-tab ? (dashboard-tab-looks | where 'id' tab.id | first).selected : ''}" class="dashboard-tab-glyph"
-                        text "{(dashboard-tab-looks | where 'id' tab.id | first).title}" class="dashboard-tab-title"
+                        icon "{(var.dashboard-tab-looks | where 'id' tab.id | first).icon}" fallback="{(var.dashboard-tab-looks | where 'id' tab.id | first).symbol}{tab.id == var.dashboard-active-tab ? (var.dashboard-tab-looks | where 'id' tab.id | first).selected : ''}" class="dashboard-tab-glyph"
+                        text "{(var.dashboard-tab-looks | where 'id' tab.id | first).title}" class="dashboard-tab-title"
                     }
                     when "{tab.id == var.dashboard-active-tab}" { stack class="dashboard-tab-pill" match-id="dashboard-tab" }
                 }

Resources/configs/apolloshell-default/onboarding.kdl

@@ -1,6 +1,6 @@
 var onboarding-step 0
 
-let onboarding-features {
+var onboarding-features {
     - symbol="sidebar.left" tint="blue" title="Bar" text="Spaces, Dock, clock and status on the left edge"
     - symbol="magnifyingglass" tint="purple" title="Launcher" text="Search and open apps – with a keyboard shortcut"
     - symbol="square.grid.2x2.fill" tint="indigo" title="Dashboard" text="Weather, calendar, media and performance"
@@ -72,7 +72,7 @@ window "onboarding" title="Welcome to ApolloShell" resizable=#false {
                 column class="onboarding-page" {
                     use "onboarding-header" symbol="sidebar.left" tint="indigo" title="Welcome to ApolloShell" text="A desktop shell for macOS modelled on Caelestia. It complements the Mac instead of replacing it – everything can be set up in Settings."
                     column class="onboarding-features" {
-                        each feature in="{onboarding-features}" {
+                        each feature in="{var.onboarding-features}" {
                             row class="onboarding-feature" {
                                 icon "{feature.symbol}" class="onboarding-feature-glyph tint-{feature.tint}"
                                 column class="onboarding-feature-text" {

Resources/configs/apolloshell-default/presets.kdl

@@ -1,4 +1,4 @@
-let sidebar-caelestia {
+var sidebar-caelestia {
     - id="dashboard-button" kind="dashboard-button"
     - id="spaces" kind="spaces" style="dots"
     - id="dock" kind="dock" show-running=#true icon-size="medium"
@@ -8,18 +8,18 @@ let sidebar-caelestia {
     - id="power" kind="power"
 }
 
-let sidebar-minimal {
+var sidebar-minimal {
     - id="spaces" kind="spaces" style="dots"
     - id="spacer" kind="spacer"
     - id="clock" kind="clock" show-icon=#false show-date=#false
     - id="power" kind="power"
 }
 
-let sidebar-dock-only {
+var sidebar-dock-only {
     - id="dock" kind="dock" show-running=#true icon-size="medium"
 }
 
-let sidebar-everything {
+var sidebar-everything {
     - id="dashboard-button" kind="dashboard-button"
     - id="media-button" kind="media-button"
     - id="spaces" kind="spaces" style="dots"
@@ -36,14 +36,14 @@ let sidebar-everything {
     - id="power" kind="power"
 }
 
-let dashboard-tabs-all {
+var dashboard-tabs-all {
     - id="dashboard" visible=#true
     - id="media" visible=#true
     - id="performance" visible=#true
     - id="weather" visible=#true
 }
 
-let dashboard-caelestia {
+var dashboard-caelestia {
     tabs {
         - id="dashboard" visible=#true
         - id="media" visible=#true
@@ -64,7 +64,7 @@ let dashboard-caelestia {
     }
 }
 
-let dashboard-compact {
+var dashboard-compact {
     tabs {
         - id="dashboard" visible=#true
         - id="media" visible=#true
@@ -83,7 +83,7 @@ let dashboard-compact {
     side "{[]}"
 }
 
-let dashboard-calendar-weather {
+var dashboard-calendar-weather {
     tabs {
         - id="dashboard" visible=#true
         - id="weather" visible=#true
@@ -100,7 +100,7 @@ let dashboard-calendar-weather {
     }
 }
 
-let utilities-standard {
+var utilities-standard {
     cards {
         - kind="keep-awake" enabled=#true
         - kind="audio" enabled=#true
@@ -120,7 +120,7 @@ let utilities-standard {
     }
 }
 
-let utilities-minimal {
+var utilities-minimal {
     cards {
         - kind="quick-toggles" enabled=#true
         - kind="keep-awake" enabled=#false
@@ -135,7 +135,7 @@ let utilities-minimal {
     }
 }
 
-let utilities-audio {
+var utilities-audio {
     cards {
         - kind="audio" enabled=#true
         - kind="quick-toggles" enabled=#true
@@ -150,7 +150,7 @@ let utilities-audio {
     }
 }
 
-let utilities-everything {
+var utilities-everything {
     cards {
         - kind="keep-awake" enabled=#true
         - kind="audio" enabled=#true
@@ -172,13 +172,13 @@ let utilities-everything {
     }
 }
 
-let hotkeys-default {
+var hotkeys-default {
     launcher "alt+space"
     dashboard "ctrl+alt+d"
     utilities "ctrl+alt+u"
     settings "ctrl+alt+comma"
 }
-let hotkeys-hyper {
+var hotkeys-hyper {
     launcher "f20"
     dashboard "hyper+d"
     utilities "hyper+u"

Resources/configs/apolloshell-default/session.kdl

@@ -1,4 +1,4 @@
-let session-actions {
+var session-actions {
     - id="logout" title="Log Out" icon="session-logout" symbol="rectangle.portrait.and.arrow.right" mood="think"
     - id="shutdown" title="Shut Down" icon="session-shutdown" symbol="power" mood="farewell"
     - id="sleep" title="Sleep" icon="session-sleep" symbol="moon.zzz" mood="sleep"
@@ -7,7 +7,7 @@ let session-actions {
 
 var session-selection #null type="any"
 var session-hover #null type="any"
-var session-mood from="{var.session-hover != null ? (session-actions | where 'id' var.session-hover | first).mood : (var.session-selection != null ? (session-actions | at var.session-selection).mood : 'idle')}"
+var session-mood from="{var.session-hover != null ? (var.session-actions | where 'id' var.session-hover | first).mood : (var.session-selection != null ? (var.session-actions | at var.session-selection).mood : 'idle')}"
 
 define "session-button" {
     param "action"
@@ -40,12 +40,12 @@ popup "session" anchor="right" scrim=0.15 overhang=#true {
         }
     }
     column class="session" {
-        use "session-button" action="{session-actions | at 0}" index=0
-        use "session-button" action="{session-actions | at 1}" index=1
+        use "session-button" action="{var.session-actions | at 0}" index=0
+        use "session-button" action="{var.session-actions | at 1}" index=1
         stack class="session-emblem" {
             mark state="{var.session-mood}" greet=#true class="session-mark"
         }
-        use "session-button" action="{session-actions | at 2}" index=2
-        use "session-button" action="{session-actions | at 3}" index=3
+        use "session-button" action="{var.session-actions | at 2}" index=2
+        use "session-button" action="{var.session-actions | at 3}" index=3
     }
 }