@@ -49,20 +49,24 @@ interface FileSaveSession {
4949 */
5050export function createFileSaveSessions ( deps : FileSaveSessionDeps ) {
5151 const sessions = new Map < string , FileSaveSession > ( ) ;
52- // The draft a disposed session will write last. A replacement session must
53- // not queue that same draft a second time, but must queue any other draft:
54- // the retired session would otherwise overwrite it.
55- const retiring = new Map < string , string > ( ) ;
52+ // A disposed session that was left with an unwritten draft. A replacement
53+ // skips a recovered draft only while that session is writing it and it is
54+ // the session's last draft; a disposed session that is not writing never
55+ // writes again, and any other draft would be overwritten by its last one.
56+ const retiring = new Map < string , FileSaveCoordinator > ( ) ;
5657
5758 const recover = ( key : string , target : FileSaveTarget , coordinator : FileSaveCoordinator ) => {
5859 if ( ! deps . canPersist ( target ) ) return ;
5960 const unsaved = deps . readUnsaved ( target ) ;
60- if ( unsaved !== null && retiring . get ( key ) !== unsaved ) coordinator . change ( unsaved ) ;
61+ if ( unsaved === null ) return ;
62+ const retired = retiring . get ( key ) ;
63+ if ( retired && ! retired . writing ) retiring . delete ( key ) ;
64+ else if ( retired ?. unconfirmedContents === unsaved ) return ;
65+ coordinator . change ( unsaved ) ;
6166 } ;
6267
6368 const create = ( key : string , target : FileSaveTarget ) : FileSaveSession => {
6469 const listeners = new Map < FilePendingListener , number > ( ) ;
65- let session : FileSaveSession | undefined ;
6670 const coordinator = new FileSaveCoordinator ( {
6771 debounceMs : deps . debounceMs ,
6872 canPersist : ( ) => deps . canPersist ( target ) ,
@@ -78,11 +82,12 @@ export function createFileSaveSessions(deps: FileSaveSessionDeps) {
7882 succeeded = result . _tag === "Success" ;
7983 return result ;
8084 } finally {
81- const live = sessions . get ( key ) ;
82- if ( live !== session && retiring . get ( key ) === contents ) {
85+ // This was the retired session's last draft. A replacement skipped
86+ // it, and a disposed session never retries, so the live one picks
87+ // it up.
88+ if ( retiring . get ( key ) === coordinator && coordinator . unconfirmedContents === contents ) {
8389 retiring . delete ( key ) ;
84- // A replacement session skipped this draft, and a disposed session
85- // never retries, so the live one picks it up.
90+ const live = sessions . get ( key ) ;
8691 if ( ! succeeded && live ) recover ( key , target , live . coordinator ) ;
8792 }
8893 }
@@ -92,8 +97,7 @@ export function createFileSaveSessions(deps: FileSaveSessionDeps) {
9297 const unsubscribeWritable = deps . subscribeWritable ( target , ( ) =>
9398 recover ( key , target , coordinator ) ,
9499 ) ;
95- session = { coordinator, listeners, unsubscribeWritable, leases : 0 } ;
96- return session ;
100+ return { coordinator, listeners, unsubscribeWritable, leases : 0 } ;
97101 } ;
98102
99103 const acquire = ( target : FileSaveTarget , onPendingChange : FilePendingListener ) : ( ( ) => void ) => {
@@ -118,8 +122,7 @@ export function createFileSaveSessions(deps: FileSaveSessionDeps) {
118122 }
119123 sessions . delete ( key ) ;
120124 session . unsubscribeWritable ( ) ;
121- const last = session . coordinator . unconfirmedContents ;
122- if ( last !== null && deps . canPersist ( target ) ) retiring . set ( key , last ) ;
125+ if ( session . coordinator . unconfirmedContents !== null ) retiring . set ( key , session . coordinator ) ;
123126 session . coordinator . dispose ( ) ;
124127 } ;
125128 } ;
0 commit comments