@theholocron/cli 4.16.3 → 4.16.5

package/dist/cli.mjs

@@ -1340,10 +1340,11 @@ function parseTopics(raw) {
 function generateHolocronConfig(opts) {
 	const lines = [
 		`import { defineConfig } from "@theholocron/cli";`,
-		`import { node } from "@theholocron/holocron-config";`,
+		`import { compose, node, typecheck } from "@theholocron/holocron-config";`,
 		``,
-		`const { repo, workflows, providers } = node();`,
-		`export default defineConfig({`
+		`const preset = compose(node(), typecheck());`,
+		`export default defineConfig({`,
+		`\t...preset,`
 	];
 	if (opts.description) lines.push(`\tdescription: ${JSON.stringify(opts.description)},`);
 	if (opts.homepage) lines.push(`\thomepage: ${JSON.stringify(opts.homepage)},`);
@@ -1352,30 +1353,29 @@ function generateHolocronConfig(opts) {
 	if (opts.org != null) {
 		const repoName = `${opts.org}/${opts.name}`;
 		lines.push(`\trepo: {`);
+		lines.push(`\t\t...preset.repo,`);
 		lines.push(`\t\tname: ${JSON.stringify(repoName)},`);
 		lines.push(`\t\tteams: [{ slug: "gatekeepers", permission: "maintain" }],`);
 		lines.push(`\t\ttopics: ${JSON.stringify(topics)},`);
-		lines.push(`\t\t...repo,`);
 		if (opts.protection && opts.protection !== "strict") lines.push(`\t\tprotection: ${JSON.stringify(opts.protection)},`);
 		const propParts = [];
 		if (hasRuntimeOverride) propParts.push(`runtime_environment: ${JSON.stringify(opts.runtimeEnvironment)}`);
 		if (opts.openSource === false) propParts.push(`open_source: false`);
 		if (opts.usesExternalPackages === false) propParts.push(`uses_external_packages: false`);
-		if (propParts.length > 0) lines.push(`\t\tproperties: { ...repo.properties, ${propParts.join(", ")} },`);
+		if (propParts.length > 0) lines.push(`\t\tproperties: { ...preset.repo?.properties, ${propParts.join(", ")} },`);
 		lines.push(`\t},`);
 	} else if (topics.length > 0 || hasRuntimeOverride) {
 		lines.push(`\trepo: {`);
+		lines.push(`\t\t...preset.repo,`);
 		if (topics.length > 0) lines.push(`\t\ttopics: ${JSON.stringify(topics)},`);
-		lines.push(`\t\t...repo,`);
-		if (hasRuntimeOverride) lines.push(`\t\tproperties: { ...repo.properties, runtime_environment: ${JSON.stringify(opts.runtimeEnvironment)} },`);
+		if (hasRuntimeOverride) lines.push(`\t\tproperties: { ...preset.repo?.properties, runtime_environment: ${JSON.stringify(opts.runtimeEnvironment)} },`);
 		lines.push(`\t},`);
-	} else lines.push(`\trepo,`);
-	lines.push(`\tworkflows,`);
+	}
 	const hasVault = opts.vaultProvider && opts.vaultProvider !== "none";
 	const hasDeployment = opts.deploymentProvider && opts.deploymentProvider !== "none";
 	if (hasVault || hasDeployment) {
 		lines.push(`\tproviders: {`);
-		lines.push(`\t\t...providers,`);
+		lines.push(`\t\t...preset.providers,`);
 		if (opts.vaultProvider === "doppler") {
 			const proj = JSON.stringify(opts.vaultProject ?? opts.name);
 			const cfg = JSON.stringify(opts.vaultConfig ?? "dev");
@@ -1389,7 +1389,7 @@ function generateHolocronConfig(opts) {
 		}
 		if (opts.deploymentProvider === "vercel") lines.push(`\t\tdeployment: "vercel",`);
 		lines.push(`\t},`);
-	} else lines.push(`\tproviders,`);
+	}
 	if (opts.agent && opts.agent !== "none") lines.push(`\tagent: ${JSON.stringify(opts.agent)},`);
 	if (opts.skills?.length) lines.push(`\tskills: ${JSON.stringify(opts.skills)},`);
 	lines.push(`});`);
@@ -4512,7 +4512,7 @@ async function runSetup(input) {
 			print(formatStep(steps[steps.length - 1]));
 			if (config.syncScripts !== false) {
 				steps.push(await runStep("source", "set package.json prepare script", dryRun, async () => {
-					return await ensurePrepareScript(input.context.repoRoot) ? "prepare = \"husky\"" : "already set";
+					return await ensurePrepareScript(input.context.repoRoot) ? "prepare now runs husky" : "already runs husky";
 				}));
 				print(formatStep(steps[steps.length - 1]));
 			}
@@ -4911,9 +4911,12 @@ async function runSetup(input) {
 	};
 }
 /**
-* Ensure `package.json#scripts.prepare` is `"husky"` so git hooks register on
-* install. Merge-only: leaves every other script untouched. Returns `true` when
-* it wrote a change, `false` when already set or there is no `package.json`.
+* Ensure `package.json#scripts.prepare` runs `husky` so git hooks register on
+* install. Merge-only: an existing `prepare` that does more than husky (e.g.
+* `turbo run build` — needed where root config files import a workspace
+* package's `dist/`, theholocron/holocron#654) is preserved and husky is
+* appended. Leaves every other script untouched. Returns `true` when it wrote
+* a change, `false` when already runs husky or there is no `package.json`.
 */
 async function ensurePrepareScript(repoRoot) {
 	const pkgPath = join(repoRoot, "package.json");
@@ -4925,8 +4928,9 @@ async function ensurePrepareScript(repoRoot) {
 	}
 	const pkg = JSON.parse(content);
 	const scripts = pkg.scripts ?? {};
-	if (scripts.prepare === "husky") return false;
-	scripts.prepare = "husky";
+	const current = scripts.prepare?.trim() ?? "";
+	if (/(^|[\s&|;])husky($|[\s&|;])/.test(current)) return false;
+	scripts.prepare = current ? `${current} && husky` : "husky";
 	pkg.scripts = scripts;
 	await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n", "utf8");
 	return true;