$mol_build refactor extracted graph

build/client/client.js

@@ -1,19 +1,31 @@
-function $mol_build_client() {
-
-	const origin = document.location.origin.replace( /^http/ , 'ws' )
-	const path = document.location.pathname
-	const uri = origin + path
+// @ts-check
 
-	const socket = new WebSocket( uri )
-
-	socket.onclose = ()=> setTimeout( ()=> $mol_build_client() , 1000 )
-
-	socket.onmessage = message => {
-		if( message.data !== '$mol_build_obsolete' ) return
-		location.reload()
-	}
+class $mol_build_client {
+	static closed = false
+	static run() {
+		const origin = document.location.origin.replace( /^http/ , 'ws' )
+		const path = document.location.pathname
+		const uri = origin + path
+
+		const socket = new WebSocket( uri )
+
+		socket.onclose = ()=> {
+			this.closed = true
+			setTimeout( ()=> $mol_build_client.run() , 1000 )
+		}
 
+		socket.onopen = () => {
+			if (this.closed) location.reload()
+			this.closed = false
+		}
+
+		socket.onmessage = message => {
+			if( message.data !== '$mol_build_obsolete' ) return
+			location.reload()
+		}
+
+	}
 }
 
-$mol_build_client()
+$mol_build_client.run()
 

build/ensure/ensure.ts

@@ -0,0 +1,72 @@
+namespace $ {
+	export interface $mol_build_ensure_plugin {
+		ensure(path: string): boolean
+	}
+
+	export class $mol_build_ensure extends $mol_object {
+		root() { return $mol_file.absolute('') }
+
+		interactive() { return process.stdout.isTTY }
+		pull_timeout() { return 120000 }
+
+		@ $mol_mem_key
+		meta( path : string ) {
+
+			let decls = [] as $mol_tree2[]
+
+			const pack = this.$.$mol_file.absolute( path )
+
+			for( const file of pack.sub() ) {
+				if( !/\.meta\.tree$/.test( file.name() ) ) continue
+				decls = decls.concat( this.$.$mol_tree2_from_string( file.text() , file.path() ).kids )
+			}
+
+			return decls.length ? this.$.$mol_tree2.list(decls, decls[0]?.span) : null
+		}
+
+		@ $mol_mem
+		ensurer_git(): $mol_build_ensure_plugin {
+			return this.$.$mol_build_ensure_git.make({
+				root: () => this.root(),
+				meta: path => this.meta(path),
+				pull_timeout: () => this.pull_timeout(),
+				interactive: () => this.interactive(),
+			})
+		}
+
+		@ $mol_mem
+		ensurer_fallback(): $mol_build_ensure_plugin {
+			return this.$.$mol_build_ensure_npm.make({
+				root: () => this.root(),
+			})
+		}
+
+		@ $mol_mem
+		ensurers() {
+			return [
+				this.ensurer_git()
+			] as readonly ($mol_build_ensure_plugin | null)[]
+		}
+
+		@ $mol_mem_key
+		ensure( path : string ): boolean {
+			const mod = $mol_file.absolute( path )
+			const parent = mod.parent()
+
+			if( mod !== this.root() ) this.ensure( parent.path() )
+
+			if (mod.exists() && mod.type() !== 'dir') return false
+
+			for (const ensurer of this.ensurers()) {
+				if (ensurer?.ensure(path)) return true
+			}
+			if (mod.exists()) return false
+
+			if( parent === this.root() ) {
+				throw new Error( `Root package "${ mod.relate( this.root() ) }" not found` )
+			}
+
+			return this.ensurer_fallback().ensure(path)
+		}
+	}
+}

build/ensure/git/git.ts

@@ -0,0 +1,118 @@
+namespace $ {
+	export class $mol_build_ensure_git extends $mol_build_ensure_vcs {
+		override vcs_type() { return 'git' }
+		override root_repo() { return 'https://github.com/hyoo-ru/mam.git' }
+
+		@ $mol_mem
+		protected version() {
+			$mol_wire_solid()
+			return this.$.$mol_run.spawn({ command: 'git version', dir: this.root().path() })
+				.stdout.toString().trim().match(/.*\s+([\d\.]+\d+)/)?.[1] ?? ''
+		}
+
+		protected deepen_supported() {
+			return $mol_compare_text()(this.version(), '2.42.0') >= 0
+		}
+
+		protected override update(dir: string) {
+			const out = this.$.$mol_run.spawn({
+				command: 'git rev-parse --abbrev-ref --symbolic-full-name HEAD', dir,
+			})
+			const current_branch = out.stdout.toString().trim()
+			// когда не на ветке - не надо пулить, например сборка во время git bisect
+			if (! current_branch) return false
+
+			const command = ['git', 'pull']
+
+			if ( ! this.interactive() && this.deepen_supported()) {
+				/**
+				depth и deepen не годятся для локальной разработки, поэтому оставляем ограничение глубины пула только для CI
+
+				--depth=1 в сочетании с сабмодулями обрезает историю, кроме первого коммита
+
+				--deepen=1 если не сделать unset GIT_DIR
+				в git-конфиге сабмодуля выставляет bare=true, после этого все команды падают с сообщением
+				warning: core.bare and core.worktree do not make sense
+				fatal: unable to set up work tree using invalid config
+				 */
+				command.push( '--deepen=1' )
+			}
+
+			const timeout = this.pull_timeout()
+			this.$.$mol_run.spawn( { command, dir, timeout }).stdout.toString().trim()
+			return true
+		}
+
+		protected is_git(path: string) {
+			const mod = this.$.$mol_file.absolute( path )
+			const git_dir = mod.resolve( '.git' )
+
+			return git_dir.exists() && git_dir.type() === 'dir'
+		}
+
+		@ $mol_mem
+		protected submodules() {
+			const dir = this.root().path()
+			if (! this.is_git( dir ) ) return new Set<string>()
+
+			const command = 'git submodule status --recursive'
+			const output = this.$.$mol_run.spawn({ command, dir }).stdout.toString().trim()
+
+			const dirs = output
+				.split('\n')
+				.map( str => str.match( /^\s*[^ ]+\s+([^ ]*).*/ )?.[1]?.trim() )
+				.filter($mol_guard_defined)
+				.map(str => `${dir}/${str}`)
+
+			return new Set(dirs)
+		}
+
+		protected override inited(path: string) {
+			return this.is_git(path) || this.submodules().has(path)
+		}
+
+		@ $mol_mem_key
+		protected branch_remote(dir: string) {
+			const repo = this.repo(dir)
+			if (! repo) return 'master'
+
+			const res = this.$.$mol_run.spawn( { command: ['git', 'remote', 'show', repo.url ],  dir } )
+
+			return res.stdout.toString().match( /HEAD branch: (.*?)\n/ )?.[1] ?? 'master'
+		}
+
+		protected override init_existing(dir: string) {
+			const repo = this.repo(dir)
+			if (! repo) throw new Error(`"${dir}" not a repo`)
+			const { url, branch } = repo
+			this.$.$mol_run.spawn( { command: ['git', 'init'], dir } )
+
+			const branch_norm = branch ?? this.branch_remote(dir)
+
+			this.$.$mol_run.spawn( { command: ['git', 'remote', 'add', '--track', branch_norm, 'origin' , url ], dir } )
+			this.$.$mol_run.spawn( { command: [ 'git', 'pull', 'origin', branch_norm ], dir } )
+
+			return null
+		}
+
+		protected override init(path: string) {
+			const mod = this.$.$mol_file.absolute( path )
+			const repo = this.repo(path)
+			if (! repo) throw new Error(`"${path}" not a repo`)
+
+			const command = [
+				'git', 'clone' , '--depth', '1',
+				...( repo.branch ? [ '-b', repo.branch ] : [] ),
+				' --single-branch',
+				repo.url ,
+				mod.relate( this.root() )
+			]
+
+			const dir = this.root().path()
+			this.$.$mol_run.spawn( { command, dir } )
+
+			return null
+		}
+
+	}
+}

build/ensure/npm/npm.ts

@@ -0,0 +1,33 @@
+namespace $ {
+	export class $mol_build_ensure_npm extends $mol_object implements $mol_build_ensure_plugin {
+		root() { return $mol_file.absolute('') }
+
+		@ $mol_mem_key
+		ensure( path : string ) {
+			const mod = this.$.$mol_file.absolute( path )
+			const parent = mod.parent()
+			const node = this.root().resolve( 'node' )
+			const node_modules = this.root().resolve( 'node_modules' )
+
+			if(
+				[ node, node_modules ].includes( parent )
+				&& mod.name() !== 'node'
+				&& ! mod.name().startsWith('@')
+			) {
+				$node [ mod.name() ] // force autoinstall through npm
+				return true
+			}
+
+			if(
+				[ node, node_modules ].includes( parent.parent() )
+				&& parent.name().startsWith('@')
+			) {
+				$node [ `${parent.name()}/${mod.name()}` ] // force autoinstall through npm
+				return true
+			}
+			return false
+		}
+
+	}
+}
+

build/ensure/vcs/vcs.ts

@@ -0,0 +1,103 @@
+namespace $ {
+	export class $mol_build_ensure_vcs extends $mol_object implements $mol_build_ensure_plugin {
+		root() { return $mol_file.absolute('') }
+		interactive() { return process.stdout.isTTY }
+		pull_timeout() { return 120000 }
+
+		root_repo() { return null as null | string }
+		vcs_type() { return null as null | string }
+
+		protected inited(path: string) { return false }
+		protected init_existing(path: string) { return null }
+		protected update(path: string) { return false }
+		protected init(path: string) { return null }
+
+		@ $mol_mem_key
+		meta( path : string )  {
+			return null as $mol_tree2 | null
+		}
+
+		@ $mol_mem_key
+		protected repo( path : string ) {
+			const vcs_type = this.vcs_type()
+			if (! vcs_type) return null
+
+			const mod = $mol_file.absolute( path )
+			const root_url = this.root_repo()
+			if (mod === this.root()) return ! root_url ? null : { url: root_url, branch: null as null | string }
+
+			const parent = mod.parent()
+			const mapping = this.meta( parent.path() )
+
+			const url_branch = mapping?.select( 'pack' , mod.name(), vcs_type).kids
+				.find($mol_guard_defined)?.kids[0]
+
+			const url = url_branch?.value ?? null
+			const branch = url_branch?.kids[0]?.value ?? null
+
+			return url ? { url, branch } : null
+		}
+
+		protected update_disabled = false
+
+		@ $mol_action
+		protected update_safe(dir: string) {
+			if (this.update_disabled) return false
+
+			try {
+				return this.$.$mol_file.unwatched(() => this.update(dir), dir)
+			} catch (e) {
+				if (e instanceof $mol_run_error && e.cause.timeout_kill) {
+
+					this.$.$mol_log3_warn({
+						place: `${this}.update_safe()`,
+						message: `Timeout - pull disabled`,
+						hint: 'Check connection',
+					})
+
+					this.update_disabled = true
+					return true
+				}
+
+				if (e instanceof Error) {
+					this.$.$mol_fail_log(e)
+					return false
+				}
+
+				$mol_fail_hidden(e)
+			}
+		}
+
+		@ $mol_mem_key
+		ensure( path : string ) {
+			const mod = $mol_file.absolute( path )
+
+			if( mod.exists()) {
+				if (! this.inited(path)) {
+					if (! this.repo(path) ) return false
+
+					this.$.$mol_file.unwatched(() => this.init_existing(path), path)
+					return true
+				}
+
+				this.update_safe( path )
+
+				// mod.reset()
+				// for ( const sub of mod.sub() ) sub.reset()
+
+				return true
+			}
+
+			if (this.repo(path)) {
+
+				this.$.$mol_file.unwatched(() => this.init(path), path)
+
+				// mod.reset()
+				// for ( const sub of mod.sub() ) sub.reset()
+				return true
+			}
+
+			return false
+		}
+	}
+}