@@ -37,29 +37,43 @@ const { parseXml } = requireFromUpdater("builder-util-runtime") as {
3737} ;
3838const semver = requireFromUpdater ( "semver" ) as { parse : ( version : string ) => RunningVersion } ;
3939
40+ const releaseTitle = ( version : string ) =>
41+ version . includes ( "-nightly." )
42+ ? `T3 Code Nightly ${ version } (0123456789ab)`
43+ : `T3 Code v${ version } ` ;
44+
4045const releaseFeed = ( ...versions : ReadonlyArray < string > ) =>
4146 parseXml (
4247 `<feed xmlns="http://www.w3.org/2005/Atom">${ versions
4348 . map (
4449 ( version ) =>
45- `<entry><link rel="alternate" type="text/html" href="https://github.com/pingdotgg/t3code/releases/tag/v${ version } "/><title>v ${ version } </title><content type="html"><ul><li>${ version } change</li></ul></content></entry>` ,
50+ `<entry><link rel="alternate" type="text/html" href="https://github.com/pingdotgg/t3code/releases/tag/v${ version } "/><title>${ releaseTitle ( version ) } </title><content type="html"><ul><li>${ version } change</li></ul></content></entry>` ,
4651 )
4752 . join ( "" ) } </feed>`,
4853 ) ;
4954
50- /** The notes electron-updater's GitHub provider reports when /releases/latest names `offeredVersion `. */
51- const stableReleaseNotes = (
55+ /** The update info electron-updater's GitHub provider reports when /releases/latest names `version `. */
56+ const stableUpdateInfo = (
5257 feed : ReleaseFeed ,
53- offeredVersion : string ,
58+ version : string ,
5459 runningVersion : string ,
5560 fullChangelog : boolean ,
5661) => {
57- const entries = feed . getElements ( "entry" ) ;
5862 const latestRelease =
59- entries . find ( ( entry ) =>
60- entry . element ( "link" ) . attribute ( "href" ) . endsWith ( `/tag/v${ offeredVersion } ` ) ,
61- ) ?? feed . element ( "entry" ) ;
62- return computeReleaseNotes ( semver . parse ( runningVersion ) , fullChangelog , feed , latestRelease ) ;
63+ feed
64+ . getElements ( "entry" )
65+ . find ( ( entry ) => entry . element ( "link" ) . attribute ( "href" ) . endsWith ( `/tag/v${ version } ` ) ) ??
66+ feed . element ( "entry" ) ;
67+ return {
68+ version,
69+ releaseName : latestRelease . elementValueOrEmpty ( "title" ) ,
70+ releaseNotes : computeReleaseNotes (
71+ semver . parse ( runningVersion ) ,
72+ fullChangelog ,
73+ feed ,
74+ latestRelease ,
75+ ) ,
76+ } ;
6377} ;
6478
6579describe ( "DesktopUpdates" , ( ) => {
@@ -149,46 +163,47 @@ describe("DesktopUpdates", () => {
149163 ) . pipe ( Effect . provide ( Layer . merge ( TestClock . layer ( ) , harness . layer ) ) ) ;
150164 } ) ;
151165
152- it . effect ( "shows no notes for a Stable release missing from the releases feed" , ( ) => {
166+ it . effect . each ( [
167+ {
168+ name : "shows no notes for a Stable release missing from the releases feed" ,
169+ runningVersion : "1.2.3" ,
170+ feedVersions : [ "1.2.5-nightly.20261102.1" , "1.2.5-nightly.20261101.1" ] ,
171+ expected : [ ] ,
172+ } ,
173+ {
174+ name : "shows a Stable release's own notes from the releases feed" ,
175+ runningVersion : "1.2.3" ,
176+ feedVersions : [ "1.2.5-nightly.20261102.1" , "1.2.4" , "1.2.4-nightly.20261030.1" ] ,
177+ expected : [ { version : "1.2.4" , items : [ "1.2.4 change" ] , totalItems : 1 } ] ,
178+ } ,
179+ {
180+ name : "shows a Stable release's notes when switching down from a newer Nightly" ,
181+ runningVersion : "1.2.5-nightly.20261027.1" ,
182+ feedVersions : [ "1.2.5-nightly.20261102.1" , "1.2.4" ] ,
183+ expected : [ { version : "1.2.4" , items : [ "1.2.4 change" ] , totalItems : 1 } ] ,
184+ } ,
185+ ] ) ( "$name" , ( { runningVersion, feedVersions, expected } ) => {
153186 const harness = makeHarness ( ) ;
154- const feed = releaseFeed ( "1.2.5-nightly.20261102.1" , "1.2.5-nightly.20261101.1" ) ;
155187
156188 return Effect . scoped (
157189 Effect . gen ( function * ( ) {
158190 const updates = yield * DesktopUpdates . DesktopUpdates ;
159191 yield * updates . configure ;
160192
161- harness . emit ( "update-available" , {
162- version : "1.2.4" ,
163- releaseNotes : stableReleaseNotes ( feed , "1.2.4" , "1.2.3" , harness . fullChangelog ( ) ) ,
164- } ) ;
193+ harness . emit (
194+ "update-available" ,
195+ stableUpdateInfo (
196+ releaseFeed ( ...feedVersions ) ,
197+ "1.2.4" ,
198+ runningVersion ,
199+ harness . fullChangelog ( ) ,
200+ ) ,
201+ ) ;
165202 yield * flushCallbacks ;
166203
167204 const state = yield * updates . getState ;
168205 assert . equal ( state . availableVersion , "1.2.4" ) ;
169- assert . deepEqual ( state . releaseNotes , [ ] , "Stable release shows a Nightly's notes" ) ;
170- } ) ,
171- ) . pipe ( Effect . provide ( Layer . merge ( TestClock . layer ( ) , harness . layer ) ) ) ;
172- } ) ;
173-
174- it . effect ( "shows a Stable release's own notes from the releases feed" , ( ) => {
175- const harness = makeHarness ( ) ;
176- const feed = releaseFeed ( "1.2.5-nightly.20261102.1" , "1.2.4" , "1.2.4-nightly.20261030.1" ) ;
177-
178- return Effect . scoped (
179- Effect . gen ( function * ( ) {
180- const updates = yield * DesktopUpdates . DesktopUpdates ;
181- yield * updates . configure ;
182-
183- harness . emit ( "update-available" , {
184- version : "1.2.4" ,
185- releaseNotes : stableReleaseNotes ( feed , "1.2.4" , "1.2.3" , harness . fullChangelog ( ) ) ,
186- } ) ;
187- yield * flushCallbacks ;
188-
189- assert . deepEqual ( ( yield * updates . getState ) . releaseNotes , [
190- { version : "1.2.4" , items : [ "1.2.4 change" ] , totalItems : 1 } ,
191- ] ) ;
206+ assert . deepEqual ( state . releaseNotes , expected ) ;
192207 } ) ,
193208 ) . pipe ( Effect . provide ( Layer . merge ( TestClock . layer ( ) , harness . layer ) ) ) ;
194209 } ) ;
0 commit comments