@theholocron/cli 5.0.0-alpha.149 → 5.0.0-alpha.151

package/dist/cli.mjs

@@ -18,12 +18,12 @@ import { createLogger, isCI, parseLogLevel, resolveAxiomFromEnv } from "@theholo
 import chalk from "chalk";
 import ora from "ora";
 import { execFileSync, spawn, spawnSync } from "node:child_process";
+import { findRootSync, walkFilesSync } from "@theholocron/fs-utils";
 import { stringifyJson } from "@theholocron/json-utils";
+import { listWorkspacePackagesSync, readPackageJson, readPackageJsonSync } from "@theholocron/pkg-utils";
 import { readGitRemote, updateGitignore } from "@theholocron/git-utils";
-import { readPackageJson } from "@theholocron/pkg-utils";
 import { access, copyFile, mkdir, readFile, readdir, rename, rm, stat, symlink, unlink, writeFile } from "node:fs/promises";
 import { createHash, randomUUID } from "node:crypto";
-import { findRootSync } from "@theholocron/fs-utils";
 import { generateReadme } from "@theholocron/components-doc/markdown";
 import { getClients, getConfigs, getDocs, getPlugins, getSkills, getThemes, getUtils } from "@theholocron/registry-doc";
 import { createGitHubClient } from "@theholocron/github-client";
@@ -1571,23 +1571,12 @@ async function runDeploy(input) {
 		};
 	}
 }
-const SKIP_DIRS$2 = /* @__PURE__ */ new Set([
+const SKIP_DIRS$2 = [
 	".git",
 	"node_modules",
 	".turbo"
-]);
-/** Recursively lists absolute file paths under `dir`, skipping VCS/tooling noise. */
-function defaultWalkFiles$2(dir) {
-	const results = [];
-	for (const entry of readdirSync(dir)) {
-		if (SKIP_DIRS$2.has(entry)) continue;
-		const full = join(dir, entry);
-		const stat = statSync(full);
-		if (stat.isDirectory()) results.push(...defaultWalkFiles$2(full));
-		else if (stat.isFile()) results.push(full);
-	}
-	return results;
-}
+];
+const defaultWalkFiles$2 = (dir) => walkFilesSync(dir, { skip: SKIP_DIRS$2 });
 /** `holocron deploy --files <dir>` — the non-git counterpart to `runDeploy`. */
 async function runDeployFromFiles(input) {
 	const print = input.print ?? ((line) => console.log(line));
@@ -2113,23 +2102,13 @@ function generateHolocronConfig(opts) {
 	lines.push(``);
 	return lines.join("\n");
 }
-const SKIP_DIRS$1 = /* @__PURE__ */ new Set([
+const SKIP_DIRS$1 = [
 	".git",
 	"node_modules",
 	"dist",
 	".turbo"
-]);
-function defaultWalkFiles$1(dir) {
-	const results = [];
-	for (const entry of readdirSync(dir)) {
-		if (SKIP_DIRS$1.has(entry)) continue;
-		const full = path.join(dir, entry);
-		const stat = statSync(full);
-		if (stat.isDirectory()) results.push(...defaultWalkFiles$1(full));
-		else if (stat.isFile()) results.push(full);
-	}
-	return results;
-}
+];
+const defaultWalkFiles$1 = (dir) => walkFilesSync(dir, { skip: SKIP_DIRS$1 });
 function isBinary(content) {
 	for (let i = 0; i < Math.min(content.length, 8e3); i++) if (content.charCodeAt(i) === 0) return true;
 	return false;
@@ -2429,39 +2408,37 @@ async function runNpmBumpVersions(input) {
 		bumped.push(label);
 	}
 	bumpFile(join(cwd, "package.json"), "root");
-	function bumpWorkspaceDir(dirName) {
-		const dirPath = join(cwd, dirName);
-		let entries;
-		try {
-			entries = listDir(dirPath);
-		} catch {
-			return;
-		}
-		for (const entry of entries) {
-			const pkgDir = join(dirPath, entry);
-			try {
-				if (!isDir(pkgDir)) continue;
-			} catch {
-				continue;
-			}
-			const pkgFile = join(pkgDir, "package.json");
-			let pkg;
+	const listed = /* @__PURE__ */ new Set();
+	const workspace = listWorkspacePackagesSync(cwd, {
+		readFile,
+		listDirs: (dir) => {
+			let names;
 			try {
-				pkg = JSON.parse(readFile(pkgFile));
+				names = listDir(dir);
 			} catch {
-				print(`  ! skipping ${dirName}/${entry}: no package.json or malformed JSON`);
-				continue;
-			}
-			if (pkg.private) {
-				print(`  · skipping private package ${dirName}/${entry}`);
-				skipped.push(`${dirName}/${entry}`);
-				continue;
+				throw Object.assign(/* @__PURE__ */ new Error(`ENOENT: ${dir}`), { code: "ENOENT" });
 			}
-			bumpFile(pkgFile, `${dirName}/${entry}`);
+			return names.filter((name) => {
+				try {
+					if (!isDir(join(dir, name))) return false;
+				} catch {
+					return false;
+				}
+				listed.add(join(dir, name));
+				return true;
+			});
 		}
+	});
+	const found = new Set(workspace.map((entry) => entry.dir));
+	for (const dir of listed) if (!found.has(dir)) print(`  ! skipping ${relative(resolve(cwd), dir)}: no package.json or malformed JSON`);
+	for (const { dir, relativeDir, manifest } of workspace) {
+		if (manifest.private) {
+			print(`  · skipping private package ${relativeDir}`);
+			skipped.push(relativeDir);
+			continue;
+		}
+		bumpFile(join(dir, "package.json"), relativeDir);
 	}
-	bumpWorkspaceDir("packages");
-	bumpWorkspaceDir("plugins");
 	const status = dryRun ? "dry-run" : "ok";
 	logger.info({
 		version,
@@ -4094,71 +4071,40 @@ function workspaceFilterArgs(cwd) {
 	if (hasPluginsDir(cwd)) filters.push("--filter=./plugins/*");
 	return filters.length > 0 ? ["-r", ...filters] : [];
 }
-/** Read a `package.json`'s `name`, when it's public (`!private && name`). */
-function publicPackageName(pkgPath) {
-	if (!existsSync(pkgPath)) return void 0;
-	try {
-		const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
-		return !pkg.private && pkg.name ? pkg.name : void 0;
-	} catch {
-		return;
-	}
-}
-/** Read a `package.json`'s `name` + `version`, when it's public (`!private && name`). */
-function publicPackageEntry(pkgPath, dir) {
-	if (!existsSync(pkgPath)) return void 0;
-	try {
-		const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
-		return !pkg.private && pkg.name && pkg.version ? {
-			name: pkg.name,
-			version: pkg.version,
-			dir
-		} : void 0;
-	} catch {
-		return;
-	}
-}
 /**
-* Same repo-layout detection as {@link discoverPublicPackages}, but carrying
-* version + a `pnpm --filter`-ready path — {@link runSteadyPublish}'s
-* `skipAlreadyPublished` mode needs both to check `npm view <pkg>@<version>`
-* and publish one workspace at a time.
+* Monorepo (`packages/` and/or `plugins/` present): every workspace under
+* either. Single package (neither dir present): the root `package.json`.
+* Callers keep the public ones.
 */
-function discoverPublicPackageEntries(cwd) {
+function discoverManifests(cwd) {
 	if (!hasPackagesDir(cwd) && !hasPluginsDir(cwd)) {
-		const entry = publicPackageEntry(join(cwd, "package.json"), ".");
-		return entry ? [entry] : [];
-	}
-	return [...entriesInWorkspaceDir(cwd, "packages"), ...entriesInWorkspaceDir(cwd, "plugins")];
-}
-function entriesInWorkspaceDir(cwd, dirName) {
-	const dirPath = join(cwd, dirName);
-	if (!existsSync(dirPath)) return [];
-	return readdirSync(dirPath, { withFileTypes: true }).filter((e) => e.isDirectory()).flatMap((e) => {
-		const entry = publicPackageEntry(join(dirPath, e.name, "package.json"), `./${dirName}/${e.name}`);
-		return entry ? [entry] : [];
-	});
+		const manifest = readPackageJsonSync(cwd);
+		return manifest ? [{
+			manifest,
+			dir: "."
+		}] : [];
+	}
+	return listWorkspacePackagesSync(cwd).map(({ manifest, relativeDir }) => ({
+		manifest,
+		dir: `./${relativeDir}`
+	}));
 }
 /**
-* Monorepo (`packages/` and/or `plugins/` present): every public workspace
-* under either. Single package (neither dir present): the root
-* `package.json`, if it's public — most `node-template` scaffolds are one
-* package at the repo root.
+* Every public package (`!private && name`) with its version and a
+* `pnpm --filter`-ready path — {@link runSteadyPublish}'s `skipAlreadyPublished`
+* mode needs both to check `npm view <pkg>@<version>` and publish one
+* workspace at a time.
 */
-function discoverPublicPackages(cwd) {
-	if (!hasPackagesDir(cwd) && !hasPluginsDir(cwd)) {
-		const name = publicPackageName(join(cwd, "package.json"));
-		return name ? [name] : [];
-	}
-	return [...namesInWorkspaceDir(cwd, "packages"), ...namesInWorkspaceDir(cwd, "plugins")];
+function discoverPublicPackageEntries(cwd) {
+	return discoverManifests(cwd).flatMap(({ manifest, dir }) => !manifest.private && manifest.name && manifest.version ? [{
+		name: manifest.name,
+		version: manifest.version,
+		dir
+	}] : []);
 }
-function namesInWorkspaceDir(cwd, dirName) {
-	const dirPath = join(cwd, dirName);
-	if (!existsSync(dirPath)) return [];
-	return readdirSync(dirPath, { withFileTypes: true }).filter((e) => e.isDirectory()).flatMap((e) => {
-		const name = publicPackageName(join(dirPath, e.name, "package.json"));
-		return name ? [name] : [];
-	});
+/** The names of {@link discoverPublicPackageEntries}' packages, without requiring a version. */
+function discoverPublicPackages(cwd) {
+	return discoverManifests(cwd).flatMap(({ manifest }) => !manifest.private && manifest.name ? [manifest.name] : []);
 }
 async function resolveRepoName(cwd, exec) {
 	return (await readGitRemote(cwd, { exec: async (args, options) => {
@@ -8062,7 +8008,7 @@ async function runUpgradeDeps(input = {}) {
 }
 //#endregion
 //#region src/commands/upgrade-node.ts
-const SKIP_DIRS = /* @__PURE__ */ new Set([
+const SKIP_DIRS = [
 	"node_modules",
 	".git",
 	"dist",
@@ -8071,7 +8017,7 @@ const SKIP_DIRS = /* @__PURE__ */ new Set([
 	".turbo",
 	".next",
 	"out"
-]);
+];
 function patchPackageJson(content, from, to) {
 	let pkg;
 	try {
@@ -8150,27 +8096,7 @@ function detectFrom(cwd, _readFile) {
 	} catch {}
 	return null;
 }
-function defaultWalkFiles(dir) {
-	const results = [];
-	function walk(current) {
-		let entries;
-		try {
-			entries = readdirSync(current);
-		} catch {
-			return;
-		}
-		for (const entry of entries) {
-			if (SKIP_DIRS.has(entry)) continue;
-			const abs = join(current, entry);
-			try {
-				if (statSync(abs).isDirectory()) walk(abs);
-				else results.push(abs);
-			} catch {}
-		}
-	}
-	walk(dir);
-	return results;
-}
+const defaultWalkFiles = (dir) => walkFilesSync(dir, { skip: SKIP_DIRS });
 async function runUpgradeNode(input) {
 	const print = input.print ?? ((line) => console.log(line));
 	const logger = input.logger ?? getLogger();
@@ -8179,6 +8105,21 @@ async function runUpgradeNode(input) {
 	const _readFile = input.readFile ?? ((p) => readFileSync(p, "utf8"));
 	const _writeFile = input.writeFile ?? ((p, c) => writeFileSync(p, c));
 	const _walkFiles = input.walkFiles ?? defaultWalkFiles;
+	let walked;
+	try {
+		walked = _walkFiles(cwd);
+	} catch (error) {
+		const message = `could not read ${cwd}: ${errorMessage(error)}`;
+		logger.warn({
+			to,
+			reason: message
+		}, "upgrade node: done");
+		return {
+			status: "fail",
+			updated: [],
+			message
+		};
+	}
 	const from = input.from ?? detectFrom(cwd, _readFile);
 	if (from === null) {
 		const message = "could not detect current Node version — pass --from <major>";
@@ -8212,7 +8153,8 @@ async function runUpgradeNode(input) {
 	}
 	print(`Upgrading Node.js ${from} → ${to}${dryRun ? " (dry-run)" : ""}…`);
 	const updated = [];
-	const scanned = [..._walkFiles(cwd), ...extra.map((p) => join(cwd, p))];
+	const root = resolve(cwd);
+	const scanned = [...walked, ...extra.map((p) => join(cwd, p))];
 	for (const abs of scanned) {
 		const name = basename(abs);
 		const pattern = PATTERNS.find((p) => p.matches(name));
@@ -8225,7 +8167,8 @@ async function runUpgradeNode(input) {
 		}
 		const patched = pattern.patch(content, from, to);
 		if (patched === null) continue;
-		const rel = abs.startsWith(cwd + "/") ? abs.slice(cwd.length + 1) : abs;
+		const absolute = resolve(abs);
+		const rel = absolute.startsWith(root + sep) ? absolute.slice(root.length + 1) : abs;
 		if (!dryRun) _writeFile(abs, patched);
 		print(`  ${dryRun ? "~" : "✓"} ${rel}`);
 		logger.debug({