@joshuafolkken/kit 1.1050.0 → 1.1128.0

package/scripts/observations/observations-flush.ts

@@ -1,5 +1,5 @@
+import { git_gh_command } from '#scripts/gh/git-gh-command'
 import { git_command } from '#scripts/git/git-command'
-import { git_gh_command } from '#scripts/git/git-gh-command'
 import { main_sync } from '#scripts/git/main-sync'
 import { error_text } from '#scripts/lib/error-message'
 import { observation_ledger, OBSERVATION_LEDGER_DIRECTORY } from './observation-ledger'
@@ -308,6 +308,7 @@ async function stage_ledger(): Promise<void> {
 	const ledger_paths = observation_ledger.ledger_paths(await git_command.status())
 
 	for (const file_path of ledger_paths) {
+		// eslint-disable-next-line no-await-in-loop -- git add holds the index lock, so two at once fail
 		await git_command.add_path(file_path)
 	}
 }
@@ -423,7 +424,6 @@ const observations_flush = {
 	broken_lines_message,
 	CLEAN_MESSAGE,
 	COMMIT_MESSAGE,
-	empty_flush_message,
 	flush,
 	flush_branch_message,
 	has_ledger_change,

package/scripts/overrides/lockfile-overrides.ts

@@ -1,4 +1,4 @@
-import { yaml_document } from '#scripts/yaml/yaml-document'
+import { yaml_document } from '#scripts/lib/yaml-document'
 import { overrides_check } from './overrides-logic'
 import { lockfile_importers_schema, type LockfileImporter } from './schemas'
 

package/scripts/overrides/overrides-logic.ts

@@ -1,4 +1,4 @@
-import { yaml_document } from '#scripts/yaml/yaml-document'
+import { yaml_document } from '#scripts/lib/yaml-document'
 import {
 	package_pnpm_schema,
 	package_with_deps_schema,

package/scripts/package/package-scout-cli.ts

@@ -1,6 +1,7 @@
 #!/usr/bin/env tsx
 import { fileURLToPath } from 'node:url'
 import { cli_flags } from '#scripts/lib/cli-flags'
+import { timed_fetch } from '#scripts/lib/timed-fetch'
 import { z } from 'zod'
 import {
 	package_scout,
@@ -23,7 +24,6 @@ const SUCCESS_EXIT_CODE = 0
 const FAILURE_EXIT_CODE = 1
 const ARGV_OFFSET = 2
 const DEFAULT_SIZE = 10
-const FETCH_TIMEOUT_MS = 10_000
 const REGISTRY = 'https://registry.npmjs.org'
 const DOWNLOADS_API = 'https://api.npmjs.org/downloads/point/last-week'
 const USAGE = 'Usage: josh pkg:scout <keywords> [--size <n>]'
@@ -51,7 +51,7 @@ type Latest = z.infer<typeof latest_schema>
 
 async function fetch_json<T>(url: string, schema: z.ZodType<T>): Promise<T | undefined> {
 	try {
-		const response = await fetch(url, { signal: AbortSignal.timeout(FETCH_TIMEOUT_MS) })
+		const response = await timed_fetch(url)
 		if (!response.ok) return undefined
 
 		return schema.parse(await response.json())
@@ -172,14 +172,9 @@ async function main(argv: ReadonlyArray<string>): Promise<void> {
 
 const package_scout_cli = {
 	USAGE,
-	SEARCH_FAILED_MESSAGE,
 	DEFAULT_SIZE,
 	read_arguments,
-	facts_of,
-	license_of,
-	to_candidate,
 	run,
-	main,
 }
 
 if (process.argv[1] === fileURLToPath(import.meta.url)) await main(process.argv.slice(ARGV_OFFSET))

package/scripts/package/package-scout.ts

@@ -112,8 +112,6 @@ const package_scout = {
 	NEAR_TIE_THRESHOLD,
 	to_metrics,
 	rank,
-	tie_gap,
-	verdict_of,
 	build_table,
 }
 

package/scripts/propagate/propagate-git-failure.ts

@@ -178,7 +178,6 @@ const propagate_git_failure = {
 	NO_COMMIT,
 	NOT_OPENED,
 	PUSH_FAILED,
-	TAIL_LINE_COUNT,
 	UNCOMMITTED,
 	attribute,
 	describe_failure,

package/scripts/propagate/propagate-git.ts

@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs'
 import path from 'node:path'
 import { git_location_environment } from '#scripts/git/git-location-environment'
 import { ls_remote_branch_arguments } from '#scripts/git/git-ls-remote'
-import { execaSync } from 'execa'
+import { git_spawn_sync } from '#scripts/git/git-spawn-sync'
 
 // The git probes propagation needs before it writes anything into a working tree.
 //
@@ -16,7 +16,6 @@ const GIT_TIMEOUT_MS = 10_000
 // `rev-parse` and tight for an ssh handshake, and a probe that times out answers "no" — which for
 // the two below would report a push that never reached origin as a push nobody attempted.
 const REMOTE_TIMEOUT_MS = 60_000
-const SUCCESS_EXIT_CODE = 0
 const DEFAULT_BRANCH_REF = 'refs/remotes/origin/HEAD'
 const FALLBACK_DEFAULT_BRANCH = 'main'
 const ORIGIN_PREFIX = 'refs/remotes/origin/'
@@ -54,15 +53,11 @@ function run_git(
 	args: ReadonlyArray<string>,
 	timeout_ms: number = GIT_TIMEOUT_MS,
 ): string | undefined {
-	const result = execaSync('git', args, {
+	return git_spawn_sync.read(args, {
 		cwd: repository_path,
-		reject: false,
 		timeout: timeout_ms,
-		env: { LC_ALL: 'C', LANGUAGE: 'C', ...git_location_environment.location_free_environment() },
-		extendEnv: true,
+		env: { ...git_spawn_sync.C_LOCALE, ...git_location_environment.location_free_environment() },
 	})
-
-	return result.exitCode === SUCCESS_EXIT_CODE ? result.stdout.trim() : undefined
 }
 
 // The repository's default branch, from the remote's own HEAD. Falls back to `main` when the ref is
@@ -207,7 +202,6 @@ function return_to_default_branch(repository_path: string): boolean {
 
 const propagate_git = {
 	default_branch,
-	fetch_branch,
 	return_to_default_branch,
 	current_branch,
 	commit_ahead,
@@ -215,7 +209,6 @@ const propagate_git = {
 	has_pre_push_hook,
 	can_push_without_hooks,
 	is_clean,
-	is_up_to_date,
 	decide_tree_state,
 	tree_state,
 }

package/scripts/propagate/propagate-publish.ts

@@ -1,4 +1,4 @@
-import { git_gh_exec } from '#scripts/git/git-gh-exec'
+import { git_gh_exec } from '#scripts/gh/git-gh-exec'
 import { poll } from '#scripts/lib/poll'
 import { with_page_size } from '#scripts/version/version-remote'
 
@@ -161,6 +161,7 @@ async function wait_for_publish(
 		const { state } = probe_once(resolved, versions_endpoint, target_version, progress)
 
 		if (state !== undefined) return finish(state, target_version, progress.attempts)
+		// eslint-disable-next-line no-await-in-loop -- polling: each read waits on the state the previous one saw
 		await resolved.sleep(resolved.interval_ms)
 	}
 
@@ -168,8 +169,6 @@ async function wait_for_publish(
 }
 
 const propagate_publish = {
-	DEFAULT_TIMEOUT_MS,
-	DEFAULT_INTERVAL_MS,
 	UNREADABLE_THRESHOLD,
 	is_version_published,
 	should_keep_waiting,

package/scripts/propagate/propagate-run.ts

@@ -189,8 +189,6 @@ function format_report(results: ReadonlyArray<TargetResult>): string {
 const propagate_run = {
 	PROPAGATED_REASON,
 	LEFTOVER_NOTE,
-	has_leftover_changes,
-	leftover_of,
 	STEP_RETURN,
 	STEP_PRECHECK,
 	STEP_ISSUE,

package/scripts/propagate/propagate-steps.ts

@@ -1,7 +1,7 @@
 import { pr_classification } from '#scripts/ci/pr-classification'
-import { git_gh_exec } from '#scripts/git/git-gh-exec'
-import { git_gh_issue_write } from '#scripts/git/git-gh-issue-write'
-import { OTHER_CHANGE_LABEL } from '#scripts/git/issue-labels'
+import { git_gh_exec } from '#scripts/gh/git-gh-exec'
+import { git_gh_issue_write } from '#scripts/gh/git-gh-issue-write'
+import { OTHER_CHANGE_LABEL } from '#scripts/issue/issue-labels'
 import { GATE_COMMAND } from '#scripts/josh/josh-command-types'
 import { error_text } from '#scripts/lib/error-message'
 import { build_upgrade_shell_command } from '#scripts/version/upgrade-shell-command'
@@ -428,14 +428,12 @@ function describe_step(target: PropagateTarget, step: string): StepResult {
 }
 
 const propagate_steps = {
-	STEP_COMMANDS,
 	JOSH_BIN,
 	PROPAGATE_ORIGIN,
 	sync_command,
 	upgrade_command,
 	upgrade_commands,
 	sync_commands,
-	return_step,
 	VERIFY_SCRIPT,
 	issue_title,
 	issue_body,

package/scripts/propagate/propagate-targets.ts

@@ -159,11 +159,7 @@ function resolve_targets(
 }
 
 const propagate_targets = {
-	has_checkout,
 	read_manifest,
-	classify_manifest_absence,
-	classify_before_dependency,
-	declared_range,
 	installed_version,
 	classify_target,
 	resolve_targets,

package/scripts/propagate/propagate.ts

@@ -279,16 +279,12 @@ async function main(argv: ReadonlyArray<string>): Promise<void> {
 }
 
 const propagate = {
-	DRY_RUN_REASON,
 	KNOWN_FLAGS,
 	TARGET_FLAG,
 	parse_options,
 	refuse_outside_source_repository,
 	resolve_target_version,
 	resolve_run_version,
-	announce_run_version,
-	run,
-	main,
 }
 
 if (process.argv[1] === fileURLToPath(import.meta.url)) await main(process.argv.slice(ARGV_OFFSET))

package/scripts/refactor/import-graph.ts

@@ -173,7 +173,6 @@ const import_graph = {
 	expand,
 	expand_scope,
 	invert,
-	neighbors_of,
 	parse_imports,
 	resolve_spec,
 	MAX_STAGES,

package/scripts/refactor/refactor-lint.ts

@@ -241,8 +241,6 @@ const refactor_lint = {
 	parse_results,
 	scan_categories,
 	CATEGORIES,
-	HIGH,
-	MEDIUM,
 	LOW,
 }
 

package/scripts/refactor/refactor-scan.ts

@@ -1,3 +1,4 @@
+import { git_command } from '#scripts/git/git-command'
 import { line_targets } from '#scripts/lines/line-targets'
 import { import_graph } from './import-graph'
 import { refactor_lint, type CategoryResult } from './refactor-lint'
@@ -97,7 +98,7 @@ async function scan(root: string): Promise<ScanResult> {
 }
 
 async function run_scan(): Promise<number> {
-	const root = await line_targets.repo_root()
+	const root = await git_command.repository_root()
 	const result = await scan(root)
 
 	process.stdout.write(`${render_result(result)}\n`)
@@ -111,7 +112,6 @@ const refactor_scan = {
 	render,
 	render_result,
 	run_scan,
-	scan,
 	convergence_candidates,
 	verdict_line,
 	verdict_token,

package/scripts/refactor/refactor-targets.ts

@@ -95,7 +95,6 @@ const refactor_targets = {
 	collect_targets,
 	has_ignore_marker,
 	is_path_excluded,
-	keep_target,
 	scripts_files,
 	select_scope,
 }

package/scripts/registry-migration/migrate-logic.ts

@@ -99,25 +99,33 @@ function is_github_tarball_line(line: string): boolean {
 	return line.trimStart().startsWith('tarball: https://npm.pkg.github.com/')
 }
 
-function clean_kit_line(
+// Integrities are keyed by `name@version`, so two scoped packages sharing a version never collide.
+function package_id(key: string): string {
+	const name = fix_gh_packages_logic.package_path_from_key(key)
+
+	return `${name}@${fix_gh_packages_logic.package_version_from_key(key)}`
+}
+
+function clean_scoped_line(
 	line: string,
-	version: string,
+	id: string,
 	integrities: ReadonlyMap<string, IntegrityPair>,
 ): string | undefined {
-	if (!version) return line
+	if (!id) return line
 	if (is_github_tarball_line(line)) return undefined
 	const cleaned = remove_flow_tarball(line)
-	const pair = integrities.get(version)
+	const pair = integrities.get(id)
 	if (pair === undefined) return cleaned
 
 	return cleaned.split(`integrity: ${pair[0]}`).join(`integrity: ${pair[1]}`)
 }
 
-function next_kit_version(line: string, version: string): string {
-	if (!is_package_entry(line)) return version
-	const prefix = "  '@joshuafolkken/kit@"
+function next_scoped_id(line: string, id: string): string {
+	if (!is_package_entry(line)) return id
+	const prefix = `  '${SCOPE}/`
+	if (!line.startsWith(prefix)) return ''
 
-	return line.startsWith(prefix) ? (line.slice(prefix.length).split("'", 1)[0] ?? '') : ''
+	return package_id(line.slice("  '".length).split("'", 1)[0] ?? '')
 }
 
 function integrity_pair(
@@ -135,12 +143,12 @@ function lock_integrities(
 ): Map<string, IntegrityPair> {
 	const packages = fix_gh_packages_logic.parse_lockfile_packages(lockfile)
 	const pairs = new Map<string, IntegrityPair>()
-	const kit_entries = Object.entries(packages).filter(([key]) => key.startsWith(`${SCOPE}/kit@`))
+	const scoped_entries = Object.entries(packages).filter(([key]) => key.startsWith(`${SCOPE}/`))
 
-	for (const [key, entry] of kit_entries) {
-		const version = fix_gh_packages_logic.package_version_from_key(key)
-		const pair = integrity_pair(entry.resolution?.integrity, npm_integrities.get(version))
-		if (pair !== undefined) pairs.set(version, pair)
+	for (const [key, entry] of scoped_entries) {
+		const id = package_id(key)
+		const pair = integrity_pair(entry.resolution?.integrity, npm_integrities.get(id))
+		if (pair !== undefined) pairs.set(id, pair)
 	}
 
 	return pairs
@@ -150,17 +158,17 @@ function push_if_defined(lines: Array<string>, cleaned: string | undefined): voi
 	if (cleaned !== undefined) lines.push(cleaned)
 }
 
-function rewrite_kit_lockfile(
+function rewrite_scoped_lockfile(
 	lockfile: string,
 	npm_integrities: ReadonlyMap<string, string>,
 ): string {
-	let kit_version = ''
+	let id = ''
 	const lines: Array<string> = []
 	const integrities = lock_integrities(lockfile, npm_integrities)
 
 	for (const line of lockfile.split('\n')) {
-		kit_version = next_kit_version(line, kit_version)
-		const cleaned = clean_kit_line(line, kit_version, integrities)
+		id = next_scoped_id(line, id)
+		const cleaned = clean_scoped_line(line, id, integrities)
 
 		push_if_defined(lines, cleaned)
 	}
@@ -206,7 +214,8 @@ function previous_registry(project_npmrc: string, user_npmrc: string): string {
 
 function plan(project_npmrc: string, user_npmrc: string, lockfile: string): MigrationPlan {
 	const packages = scoped_packages(lockfile)
-	const blocked = packages.filter((name) => name !== `${SCOPE}/kit`)
+	// Every scoped package may migrate; `migrate` blocks any whose locked version is not on public npm.
+	const blocked: Array<string> = []
 	if (has_duplicate_mapping(project_npmrc, user_npmrc)) blocked.push('duplicate registry mappings')
 	const unsupported = unsupported_registry(project_npmrc)
 	if (unsupported !== undefined) blocked.push(unsupported)
@@ -220,9 +229,7 @@ const migrate_logic = {
 	plan,
 	github_tarballs,
 	is_github_tarball,
-	rewrite_kit_lockfile,
-	registry_of,
-	scoped_packages,
+	rewrite_scoped_lockfile,
 	scoped_versions,
 }
 

package/scripts/registry-migration/migrate.ts

@@ -2,6 +2,8 @@ import { existsSync, rmSync, writeFileSync } from 'node:fs'
 import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { file_reader } from '#scripts/lib/read-file'
+import { timed_fetch } from '#scripts/lib/timed-fetch'
+import { COMMAND_TIMEOUT_MS, INSTALL_TIMEOUT_MS } from '#scripts/lib/timeouts'
 import { execa } from 'execa'
 import { z } from 'zod'
 import { migrate_logic, type MigrationPlan } from './migrate-logic'
@@ -11,7 +13,6 @@ const NPMRC = '.npmrc'
 const LOCKFILE = 'pnpm-lock.yaml'
 const WORKSPACE = 'pnpm-workspace.yaml'
 const PUBLIC_REGISTRY = 'https://registry.npmjs.org/'
-const FETCH_TIMEOUT_MS = 10_000
 const SCOPE = '@joshuafolkken/'
 const manifest_schema = z.looseObject({
 	dependencies: z.record(z.string(), z.string()).optional(),
@@ -104,13 +105,19 @@ async function verify_public_versions(
 	lockfile: string,
 	probe_version: MigrationDependencies['fetch_version'],
 ): Promise<VersionCheck> {
+	const versions = migrate_logic.scoped_versions(lockfile)
+	// Each probe reads its own package, so they run together; the report keeps the lockfile's order.
+	const probed = await Promise.all(
+		versions.map(async ([name, version]) => await probe_integrity(name, version, probe_version)),
+	)
 	const missing: Array<string> = []
 	const integrities = new Map<string, string>()
 
-	for (const [name, version] of migrate_logic.scoped_versions(lockfile)) {
-		const integrity = await probe_integrity(name, version, probe_version)
-		if (integrity === undefined) missing.push(`${name}@${version}`)
-		else integrities.set(version, integrity)
+	for (const [index, [name, version]] of versions.entries()) {
+		const integrity = probed[index]
+		const id = `${name}@${version}`
+		if (integrity === undefined) missing.push(id)
+		else integrities.set(id, integrity)
 	}
 
 	return { missing, integrities }
@@ -177,7 +184,7 @@ async function verify_resolution(
 	const old_tarballs = migrate_logic.github_tarballs(lockfile)
 	if (old_tarballs.length > 0) throw new Error(`GitHub tarballs remain: ${old_tarballs.join(', ')}`)
 
-	if (migrate_logic.rewrite_kit_lockfile(lockfile, integrities) !== lockfile) {
+	if (migrate_logic.rewrite_scoped_lockfile(lockfile, integrities) !== lockfile) {
 		throw new Error('lockfile integrity does not match public npm')
 	}
 }
@@ -191,7 +198,7 @@ async function apply(
 		writeFileSync(context.npmrc_path, context.plan.content)
 		writeFileSync(
 			context.lockfile_path,
-			migrate_logic.rewrite_kit_lockfile(context.original_lockfile, integrities),
+			migrate_logic.rewrite_scoped_lockfile(context.original_lockfile, integrities),
 		)
 		await verify_resolution(context, dependencies, integrities)
 	} catch (error) {
@@ -209,7 +216,7 @@ function is_already_migrated(
 ): boolean {
 	return (
 		context.plan.content === context.original_npmrc &&
-		migrate_logic.rewrite_kit_lockfile(context.original_lockfile, integrities) ===
+		migrate_logic.rewrite_scoped_lockfile(context.original_lockfile, integrities) ===
 			context.original_lockfile
 	)
 }
@@ -238,9 +245,7 @@ async function migrate(cwd: string, dependencies: MigrationDependencies): Promis
 
 async function fetch_version(name: string, version: string): Promise<string | undefined> {
 	const encoded = encodeURIComponent(name)
-	const response = await fetch(`${PUBLIC_REGISTRY}${encoded}/${encodeURIComponent(version)}`, {
-		signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
-	})
+	const response = await timed_fetch(`${PUBLIC_REGISTRY}${encoded}/${encodeURIComponent(version)}`)
 
 	if (!response.ok) return undefined
 	const parsed = version_schema.safeParse(await response.json())
@@ -250,11 +255,17 @@ async function fetch_version(name: string, version: string): Promise<string | un
 }
 
 async function install(cwd: string): Promise<void> {
-	await execa('pnpm', ['install', '--lockfile-only', '--ignore-scripts', '--force'], { cwd })
+	await execa('pnpm', ['install', '--lockfile-only', '--ignore-scripts', '--force'], {
+		cwd,
+		timeout: INSTALL_TIMEOUT_MS,
+	})
 }
 
 async function effective_registry(cwd: string): Promise<string> {
-	const result = await execa('pnpm', ['config', 'get', '@joshuafolkken:registry'], { cwd })
+	const result = await execa('pnpm', ['config', 'get', '@joshuafolkken:registry'], {
+		cwd,
+		timeout: COMMAND_TIMEOUT_MS,
+	})
 
 	return result.stdout.trim()
 }
@@ -275,7 +286,7 @@ async function main(): Promise<void> {
 
 if (process.argv[1] === fileURLToPath(import.meta.url)) await main()
 
-const registry_migration = { migrate }
+const registry_migration = { migrate, install, effective_registry }
 
 export { registry_migration }
 export type { MigrationDependencies }

package/scripts/release/github-release-cli.ts

@@ -1,11 +1,24 @@
-import { execFileSync } from 'node:child_process'
+import { fileURLToPath } from 'node:url'
+import { git_spawn_sync } from '#scripts/git/git-spawn-sync'
 import { github_release } from './github-release'
+import { github_release_environment } from './github-release-environment'
 
-const token = process.env['GH_TOKEN']
-const tag = process.env['RELEASE_TAG']
+// A release published without the tag list would pick its previous tag from nothing, so a failed
+// `git tag` stops the run rather than reading as "no tags".
+function local_tags(): Array<string> {
+	const output = git_spawn_sync.read(['tag', '--list'])
+	if (output === undefined) throw new Error('git tag --list failed')
 
-if (!token || !tag) throw new Error('GH_TOKEN and RELEASE_TAG are required')
+	return output.split('\n')
+}
 
-const tags = execFileSync('git', ['tag', '--list'], { encoding: 'utf8' }).trim().split('\n')
+async function main(): Promise<void> {
+	const { token, tag, settings } = github_release_environment.read_release_input(process.env)
 
-console.info(await github_release.publish(fetch, token, tag, { tags }))
+	console.info(await github_release.publish(fetch, token, tag, { ...settings, tags: local_tags() }))
+}
+
+if (process.argv[1] === fileURLToPath(import.meta.url)) await main()
+
+const github_release_cli = { local_tags }
+export { github_release_cli }

package/scripts/release/github-release-environment.ts

@@ -0,0 +1,46 @@
+import type { ReleaseSettings } from './github-release'
+
+interface ReleaseInput {
+	token: string
+	tag: string
+	settings: ReleaseSettings
+}
+
+type Environment = Readonly<Record<string, string | undefined>>
+
+// A workflow expression renders an unset input as the empty string, so empty means "not given".
+function optional(value: string | undefined): string | undefined {
+	return value === undefined || value === '' ? undefined : value
+}
+
+function job_names(value: string | undefined): ReadonlyArray<string> {
+	return (optional(value) ?? '')
+		.split(',')
+		.map((name) => name.trim())
+		.filter((name) => name !== '')
+}
+
+function read_release_input(environment: Environment): ReleaseInput {
+	const token = optional(environment['GH_TOKEN'])
+	const tag = optional(environment['RELEASE_TAG'])
+	const repository = optional(environment['GITHUB_REPOSITORY'])
+
+	if (!token || !tag || !repository) {
+		throw new Error('GH_TOKEN, RELEASE_TAG and GITHUB_REPOSITORY are required')
+	}
+
+	return {
+		token,
+		tag,
+		settings: {
+			repository,
+			start_tag: optional(environment['RELEASE_START_TAG']),
+			workflow: optional(environment['RELEASE_WORKFLOW']),
+			jobs: job_names(environment['RELEASE_JOBS']),
+		},
+	}
+}
+
+const github_release_environment = { read_release_input }
+
+export { github_release_environment }