$mol_file lock watcher while running dirty command

build/build.node.ts

@@ -655,7 +655,7 @@ namespace $ {
 				// fatal: unable to set up work tree using invalid config
 				command.push( this.gitDeepenSupported() ? '--deepen=1' : '--depth=1' )
 			}
-			return this.run_safe( { command, dir: path, affects: [ path ] } )
+			return this.run_safe( { command, dir: path, dirty: true } )
 		}
 
 		static git_enabled = true
@@ -748,7 +748,7 @@ namespace $ {
 			if( repo ) {
 				this._clone_stack = new $mol_error_mix('clone stack', { path })
 				const command = ['git', 'clone' , '--depth', '1' , repo.text() , mod.relate( this.root() ) ]
-				this.$.$mol_run( { command, dir: this.root().path(), affects: [ path ] })
+				this.$.$mol_run( { command, dir: this.root().path(), dirty: true })
 				this._clone_stack = null
 				mod.reset()
 				return true

file/file.node.ts

@@ -53,7 +53,6 @@ namespace $ {
 
 		@ $mol_mem
 		override watcher() {
-
 			const watcher = $node.chokidar.watch( this.path() , {
 				persistent : true ,
 				ignored: path => /([\/\\]\.|___$)/.test( path ),
@@ -65,7 +64,7 @@ namespace $ {
 			} )
 
 			watcher
-				.on( 'all' , (type, path) => this.watcher_event(type, path) )
+				.on( 'all' , (type, path) => this.watch_event(type, path) )
 				.on( 'error' , $mol_fail_log )
 
 			return {
@@ -76,34 +75,50 @@ namespace $ {
 
 		}
 
-		protected watcher_event(type: string, path: string) {
-			let part = path
-			const affected = this.$.$mol_run_affected
-			do {
-				if (affected[part]) return
-				part = part.slice(0, part.lastIndexOf('/'))
-			} while(part)
+		protected watch_changed = null as null | Set<string>
+		protected watch_affected = null as null | Set<string>
 
-			const file = $mol_file.relative( path.replace( /\\/g , '/' ) )
+		protected watch_event(type: string, path: string) {
+			const locked = this.$.$mol_run_locks.locked()
+			if (locked) {
+				if (type === 'change') {
+					( this.watch_changed = this.watch_changed ?? new Set() ).add(path)
+				} else {
+					( this.watch_affected = this.watch_changed ?? new Set() ).add(path)
+				}
 
+				return
+			}
+
+			const file = $mol_file.relative( path.replace( /\\/g , '/' ) )
+
 			file.reset()
 
 			if( type === 'change' ) {
-				this.stat( null )
+				this.reset()
 			} else {
 				file.parent().reset()
 			}
 		}
 
+		override lock_sync(  ) {
+			if (! this.$.$mol_run_locks.locked()) {
+				this.watch_changed?.forEach(path => this.watch_event('change', path))
+				this.watch_changed = null
+				this.watch_affected?.forEach(path => this.watch_event('', path))
+				this.watch_affected = null
+			}
+			return null
+		}
+
 		@ $mol_mem
-		stat( next? : $mol_file_stat | null, virt?: 'virt' ) {
-
+		override stat_actual( next? : $mol_file_stat | null, virt?: 'virt' ) {
 			let stat = next
 			const path = this.path()
 
 			this.parent().watcher()
 
-			if( virt ) return next!
+			if( virt ) return next ?? null
 
 			try {
 				stat = next ?? stat_convert($node.fs.statSync( path, { throwIfNoEntry: false } ))
@@ -170,7 +185,7 @@ namespace $ {
 			this.parent().exists( true )
 
 			const now = new Date
-			this.stat( {
+			this.stat_actual( {
 				type: 'file',
 				size: next.length,
 				atime: now,

file/file.ts

@@ -33,11 +33,19 @@ namespace $ {
 			return this.resolve( '..' )
 		}
 
-		abstract stat( next? : $mol_file_stat | null, virt?: 'virt' ): $mol_file_stat | null
+		abstract lock_sync(): void
 
-		reset(): void {
+		@ $mol_mem
+		stat() {
+			this.lock_sync()
+			return this.stat_actual()
+		}
+
+		abstract stat_actual( next? : $mol_file_stat | null, virt?: 'virt' ): $mol_file_stat | null
+
+		reset() {
 			try {
-				this.stat( null )
+				this.stat_actual( null )
 			} catch( error: any ) {
 				if (error instanceof $mol_file_not_found) return
 				return $mol_fail_hidden(error)
@@ -99,7 +107,7 @@ namespace $ {
 		text(next?: string, virt?: 'virt') {
 			if( virt ) {
 				const now = new Date
-				this.stat( {
+				this.stat_actual( {
 					type: 'file',
 					size: 0,
 					atime: now,

run/run.node.ts

@@ -18,17 +18,30 @@ namespace $ {
 		command : readonly string[] | string
 		dir : string
 		timeout?: number
-		affects?: readonly string[]
+		dirty?: boolean
 		env?: Record<string, string | undefined>
 	}
 
-	export const $mol_run_affected = {} as Record<string, number | undefined>
+	export class $mol_run_locks extends $mol_object {
+		protected static counter = 0
+		static increase() {
+			this.counter++
+			this.locked(null)
+		}
+
+		static decrease() {
+			this.counter--
+			this.locked(null)
+		}
+
+		@ $mol_mem
+		static locked(reset?: null) { return this.counter > 0 }
+	}
 
 	export function $mol_run_async(
 		this : $ ,
-		{ dir, timeout, command, env, affects }: $mol_run_options
+		{ dir, timeout, command, env, dirty }: $mol_run_options
 	) {
-		const affected = this.$mol_run_affected
 		const args_raw = typeof command === 'string' ? command.split( ' ' ) : command
 		const [ app, ...args ] = args_raw
 
@@ -84,14 +97,12 @@ namespace $ {
 		sub.stdout?.on('data', data => add(data) )
 		sub.stderr?.on('data', data => add(undefined, data) )
 
-		affects?.forEach(path => affected[path] = (affected[path] ?? 0) + 1)
+		if (dirty) this.$mol_run_locks.increase()
 
 		const promise = new Promise<$mol_run_error_context>((done, fail) => {
 			const close = (error: Error | null, status: number | null = null, signal: NodeJS.Signals | null = null) => {
-				for (const path of affects ?? []) {
-					if (! --affected[path]! ) delete affected[path]
-				}
 				if (! timer && timeout) return
+				if (dirty) this.$mol_run_locks.decrease()
 
 				clearTimeout(timer)
 				timer = undefined