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

package/dist/cli.mjs

@@ -20,6 +20,7 @@ import ora from "ora";
 import { execFileSync, spawn, spawnSync } from "node:child_process";
 import { stringifyJson } from "@theholocron/json-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";
@@ -4554,10 +4555,10 @@ function deriveCompliance(capabilities) {
 */
 async function readWorkspacePackageJsons(repoRoot, workspacePackages) {
 	const results = [];
-	for (const { slug, dir = "packages" } of workspacePackages) try {
-		const raw = await readFile(join(repoRoot, dir, slug, "package.json"), "utf8");
-		results.push(JSON.parse(raw));
-	} catch {}
+	for (const { slug, dir = "packages" } of workspacePackages) {
+		const pkg = await readPackageJson(join(repoRoot, dir, slug));
+		if (pkg) results.push(pkg);
+	}
 	return results;
 }
 //#endregion
@@ -8334,12 +8335,13 @@ async function loadConfig(cwd) {
 	});
 	if (!found) throw new ConfigFileError(`no holocron.config.{ts,js,mjs,cjs,json} found in ${cwd}. Create one — see the README for the schema.`);
 	return {
-		resolved: resolveConfig(await deriveDefaults(dirname(found.filepath), found.config)),
+		resolved: resolveConfig(await deriveDefaults(found)),
 		filepath: found.filepath
 	};
 }
-async function deriveDefaults(configDir, raw) {
-	const result = { ...raw };
+async function deriveDefaults(found) {
+	const configDir = dirname(found.filepath);
+	const result = { ...found.config };
 	if (!result.name) result.name = await readPackageJsonName(configDir) ?? basename(configDir);
 	if (result.repo && !result.repo.name) {
 		const remote = await readGitRemote(configDir);
@@ -8348,7 +8350,7 @@ async function deriveDefaults(configDir, raw) {
 			name: remote.slug
 		};
 	}
-	const manifest = await loadTasksConfig(configDir);
+	const manifest = await loadTasksConfig(configDir, { holocron: found });
 	if (manifest.tasks) result.tasks = manifest.tasks;
 	if (manifest.syncScripts !== void 0) result.syncScripts = manifest.syncScripts;
 	if (manifest.holocronScript !== void 0) result.holocronScript = manifest.holocronScript;
@@ -8357,13 +8359,8 @@ async function deriveDefaults(configDir, raw) {
 	return result;
 }
 async function readPackageJsonName(dir) {
-	try {
-		const content = await readFile(join(dir, "package.json"), "utf8");
-		const pkg = JSON.parse(content);
-		return typeof pkg.name === "string" ? pkg.name.replace(/^@[^/]+\//, "") : void 0;
-	} catch {
-		return;
-	}
+	const name = (await readPackageJson(dir))?.name;
+	return name === void 0 ? void 0 : name.replace(/^@[^/]+\//, "");
 }
 //#endregion
 //#region src/interactive-menu.ts