@@ -44,78 +44,99 @@ const makeElectronTrayLayer = (
4444 destroy : Effect . void ,
4545 } satisfies ElectronTray . ElectronTray [ "Service" ] ) ;
4646
47- const electronAppLayer = Layer . succeed ( ElectronApp . ElectronApp , {
48- metadata : Effect . die ( "unexpected metadata read" ) ,
49- name : Effect . succeed ( "T3 Code" ) ,
50- systemLocale : Effect . succeed ( "en-US" ) ,
51- whenReady : Effect . void ,
52- quit : Effect . void ,
53- exit : ( ) => Effect . void ,
54- relaunch : ( ) => Effect . void ,
55- setPath : ( ) => Effect . void ,
56- setName : ( ) => Effect . void ,
57- setAboutPanelOptions : ( ) => Effect . void ,
58- setAppUserModelId : ( ) => Effect . void ,
59- getAppMetrics : Effect . succeed ( [ ] ) ,
60- isDefaultProtocolClient : ( ) => Effect . succeed ( false ) ,
61- setAsDefaultProtocolClient : ( ) => Effect . succeed ( true ) ,
62- setDesktopName : ( ) => Effect . void ,
63- setDockIcon : ( ) => Effect . void ,
64- appendCommandLineSwitch : ( ) => Effect . void ,
65- onBeforeQuitForUpdate : ( ) => Effect . void ,
66- removeCommandLineSwitch : ( ) => Effect . void ,
67- on : ( ) => Effect . void ,
68- } satisfies ElectronApp . ElectronApp [ "Service" ] ) ;
69-
70- const desktopWindowLayer = Layer . succeed ( DesktopWindow . DesktopWindow , {
71- createMain : Effect . die ( "unexpected createMain" ) ,
72- ensureMain : Effect . die ( "unexpected ensureMain" ) ,
73- revealOrCreateMain : Effect . die ( "unexpected revealOrCreateMain" ) ,
74- activate : Effect . void ,
75- createMainIfBackendReady : Effect . void ,
76- showConnectingSplash : Effect . void ,
77- handleBackendReady : ( ) => Effect . void ,
78- handleBackendNotReady : Effect . void ,
79- flushMainWindowBounds : Effect . void ,
80- prepareCaptureReveal : Effect . void ,
81- dispatchMenuAction : ( ) => Effect . void ,
82- dispatchSnapShotEvent : ( ) => Effect . void ,
83- zoomMain : ( ) => Effect . void ,
84- syncAppearance : Effect . void ,
85- } satisfies DesktopWindow . DesktopWindow [ "Service" ] ) ;
47+ const makeElectronAppLayer = ( onQuit ?: ( ) => Effect . Effect < void > ) =>
48+ Layer . succeed ( ElectronApp . ElectronApp , {
49+ metadata : Effect . die ( "unexpected metadata read" ) ,
50+ name : Effect . succeed ( "T3 Code" ) ,
51+ systemLocale : Effect . succeed ( "en-US" ) ,
52+ whenReady : Effect . void ,
53+ quit : onQuit ? onQuit ( ) : Effect . void ,
54+ exit : ( ) => Effect . void ,
55+ relaunch : ( ) => Effect . void ,
56+ setPath : ( ) => Effect . void ,
57+ setName : ( ) => Effect . void ,
58+ setAboutPanelOptions : ( ) => Effect . void ,
59+ setAppUserModelId : ( ) => Effect . void ,
60+ getAppMetrics : Effect . succeed ( [ ] ) ,
61+ isDefaultProtocolClient : ( ) => Effect . succeed ( false ) ,
62+ setAsDefaultProtocolClient : ( ) => Effect . succeed ( true ) ,
63+ setDesktopName : ( ) => Effect . void ,
64+ setDockIcon : ( ) => Effect . void ,
65+ appendCommandLineSwitch : ( ) => Effect . void ,
66+ onBeforeQuitForUpdate : ( ) => Effect . void ,
67+ removeCommandLineSwitch : ( ) => Effect . void ,
68+ on : ( ) => Effect . void ,
69+ } satisfies ElectronApp . ElectronApp [ "Service" ] ) ;
70+
71+ const makeDesktopWindowLayer = ( onRevealOrCreateMain ?: ( ) => Effect . Effect < void > ) =>
72+ Layer . succeed ( DesktopWindow . DesktopWindow , {
73+ createMain : Effect . die ( "unexpected createMain" ) ,
74+ ensureMain : Effect . die ( "unexpected ensureMain" ) ,
75+ revealOrCreateMain : onRevealOrCreateMain ? onRevealOrCreateMain ( ) : Effect . succeed ( { } as any ) ,
76+ activate : Effect . void ,
77+ createMainIfBackendReady : Effect . void ,
78+ showConnectingSplash : Effect . void ,
79+ handleBackendReady : ( ) => Effect . void ,
80+ handleBackendNotReady : Effect . void ,
81+ flushMainWindowBounds : Effect . void ,
82+ prepareCaptureReveal : Effect . void ,
83+ dispatchMenuAction : ( ) => Effect . void ,
84+ dispatchSnapShotEvent : ( ) => Effect . void ,
85+ zoomMain : ( ) => Effect . void ,
86+ syncAppearance : Effect . void ,
87+ } satisfies DesktopWindow . DesktopWindow [ "Service" ] ) ;
8688
8789describe ( "DesktopTray" , ( ) => {
88- it . effect ( "configures tray icon and menu on win32" , ( ) =>
89- Effect . gen ( function * ( ) {
90- const createdOptions = yield * Deferred . make < ElectronTray . ElectronTrayCreateOptions > ( ) ;
91- const testLayer = DesktopTray . layer . pipe (
92- Layer . provideMerge ( makeElectronTrayLayer ( createdOptions ) ) ,
93- Layer . provideMerge ( desktopAssetsLayer ) ,
94- Layer . provideMerge ( makeEnvironmentLayer ( "win32" ) ) ,
95- Layer . provideMerge ( electronAppLayer ) ,
96- Layer . provideMerge ( desktopWindowLayer ) ,
97- Layer . provideMerge ( NodeServices . layer ) ,
98- ) ;
90+ it . effect (
91+ "configures tray icon and menu on win32 and invokes revealOrCreateMain on open actions" ,
92+ ( ) =>
93+ Effect . gen ( function * ( ) {
94+ const createdOptions = yield * Deferred . make < ElectronTray . ElectronTrayCreateOptions > ( ) ;
95+ const clickDeferred = yield * Deferred . make < void > ( ) ;
96+ const quitDeferred = yield * Deferred . make < void > ( ) ;
9997
100- yield * Effect . scoped (
101- Effect . gen ( function * ( ) {
102- const tray = yield * DesktopTray . DesktopTray ;
103- assert . isFalse ( yield * tray . isAvailable ) ;
98+ const testLayer = DesktopTray . layer . pipe (
99+ Layer . provideMerge ( makeElectronTrayLayer ( createdOptions ) ) ,
100+ Layer . provideMerge ( desktopAssetsLayer ) ,
101+ Layer . provideMerge ( makeEnvironmentLayer ( "win32" ) ) ,
102+ Layer . provideMerge (
103+ makeElectronAppLayer ( ( ) => Deferred . succeed ( quitDeferred , void 0 ) . pipe ( Effect . asVoid ) ) ,
104+ ) ,
105+ Layer . provideMerge (
106+ makeDesktopWindowLayer ( ( ) =>
107+ Deferred . succeed ( clickDeferred , void 0 ) . pipe ( Effect . asVoid ) ,
108+ ) ,
109+ ) ,
110+ Layer . provideMerge ( NodeServices . layer ) ,
111+ ) ;
104112
105- yield * tray . configure ;
113+ yield * Effect . scoped (
114+ Effect . gen ( function * ( ) {
115+ const tray = yield * DesktopTray . DesktopTray ;
116+ assert . isFalse ( yield * tray . isAvailable ) ;
106117
107- const options = yield * Deferred . await ( createdOptions ) ;
108- assert . equal ( options . iconPath , "C:/path/to/icon.ico" ) ;
109- assert . equal ( options . tooltip , "T3 Code" ) ;
110- assert . isDefined ( options . menuItems ) ;
111- const menuItems = options . menuItems ?? [ ] ;
112- assert . equal ( menuItems . length , 3 ) ;
113- assert . equal ( menuItems [ 0 ] ?. label , "Open T3 Code" ) ;
114- assert . equal ( menuItems [ 2 ] ?. label , "Quit T3 Code" ) ;
115- assert . isTrue ( yield * tray . isAvailable ) ;
116- } ) ,
117- ) . pipe ( Effect . provide ( testLayer ) ) ;
118- } ) ,
118+ yield * tray . configure ;
119+
120+ const options = yield * Deferred . await ( createdOptions ) ;
121+ assert . equal ( options . iconPath , "C:/path/to/icon.ico" ) ;
122+ assert . equal ( options . tooltip , "T3 Code" ) ;
123+ assert . isDefined ( options . menuItems ) ;
124+ const menuItems = options . menuItems ?? [ ] ;
125+ assert . equal ( menuItems . length , 3 ) ;
126+ assert . equal ( menuItems [ 0 ] ?. label , "Open T3 Code" ) ;
127+ assert . equal ( menuItems [ 2 ] ?. label , "Quit T3 Code" ) ;
128+ assert . isTrue ( yield * tray . isAvailable ) ;
129+
130+ // Click on tray invokes revealOrCreateMain
131+ options . onClick ?.( ) ;
132+ yield * Deferred . await ( clickDeferred ) ;
133+
134+ // Click on Quit invokes electronApp.quit
135+ menuItems [ 2 ] ?. click ?.( ) ;
136+ yield * Deferred . await ( quitDeferred ) ;
137+ } ) ,
138+ ) . pipe ( Effect . provide ( testLayer ) ) ;
139+ } ) ,
119140 ) ;
120141
121142 it . effect ( "skips configuring tray on darwin" , ( ) =>
@@ -125,8 +146,8 @@ describe("DesktopTray", () => {
125146 Layer . provideMerge ( makeElectronTrayLayer ( createdOptions ) ) ,
126147 Layer . provideMerge ( desktopAssetsLayer ) ,
127148 Layer . provideMerge ( makeEnvironmentLayer ( "darwin" ) ) ,
128- Layer . provideMerge ( electronAppLayer ) ,
129- Layer . provideMerge ( desktopWindowLayer ) ,
149+ Layer . provideMerge ( makeElectronAppLayer ( ) ) ,
150+ Layer . provideMerge ( makeDesktopWindowLayer ( ) ) ,
130151 Layer . provideMerge ( NodeServices . layer ) ,
131152 ) ;
132153
0 commit comments