@theholocron/cli 2.0.0-alpha.38 → 2.0.0-alpha.40

package/dist/cli.mjs

@@ -1964,20 +1964,86 @@ const WORKFLOW_CHECK_CONTEXTS = {
 	typecheck: "Typecheck / tsc --noEmit"
 };
 /**
-* Generate the thin caller content for a workflow, optionally injecting
-* `with:` inputs before `secrets: inherit` in the jobs block.
+* Generate the thin caller content for a workflow, optionally injecting or
+* merging `with:` overrides into the jobs block.
+*
+* Two strategies are used depending on the template:
+* - Templates that already have a `with:` block (e.g. lint, sync-github):
+*   the override entries are merged in, replacing existing keys and appending
+*   new ones.
+* - Templates that end with `    secrets: inherit`: a new `with:` block is
+*   injected immediately before `secrets: inherit`.
+* If neither pattern matches the template, a warning is emitted and the
+* base template is returned unchanged.
 */
 function generateThinCallerContent(name, withOverrides) {
 	const base = WORKFLOW_TEMPLATES[name];
 	if (!base) return "";
 	if (!withOverrides || Object.keys(withOverrides).length === 0) return base;
-	const withBlock = Object.entries(withOverrides).map(([k, v]) => `      ${k}: ${v === true ? "true" : v === false ? "false" : String(v)}`).join("\n");
-	return base.replace(/ {4}secrets: inherit\n$/, `    with:\n${withBlock}\n    secrets: inherit\n`);
+	const fmt = (k, v) => `      ${k}: ${v === true ? "true" : v === false ? "false" : String(v)}`;
+	const withBlockRe = /( {4}with:\n)((?:[ ]{6}[^\n]+\n)*)/;
+	const existingMatch = base.match(withBlockRe);
+	if (existingMatch) {
+		const existingEntries = new Map(existingMatch[2].split("\n").filter(Boolean).map((line) => {
+			const m = line.match(/^ {6}([^:]+):\s*(.*)/);
+			return m ? [m[1].trim(), m[2].trim()] : null;
+		}).filter((e) => e !== null));
+		for (const [k, v] of Object.entries(withOverrides)) existingEntries.set(k, v === true ? "true" : v === false ? "false" : String(v));
+		const merged = [...existingEntries.entries()].map(([k, v]) => `      ${k}: ${v}`).join("\n");
+		return base.replace(withBlockRe, `    with:\n${merged}\n`);
+	}
+	const withBlock = Object.entries(withOverrides).map(([k, v]) => fmt(k, v)).join("\n");
+	const result = base.replace(/ {4}secrets: inherit\n$/, `    with:\n${withBlock}\n    secrets: inherit\n`);
+	if (result === base) console.warn(`[generateThinCallerContent] could not inject with: overrides into "${name}" template`);
+	return result;
 }
 //#endregion
 //#region src/commands/sync-github.ts
 const DEFAULT_REPO = "theholocron/.github";
 const API_BASE = "https://api.github.com";
+/**
+* Extracts the `project.workflows` array from a `holocron.config.ts` source string.
+* Handles both plain string entries and `{ name, with }` object entries.
+* Falls back to an empty array if the array cannot be found or parsed.
+*/
+function parseWorkflowsFromTs(source) {
+	const keyMatch = source.match(/\bworkflows\s*:\s*\[/);
+	if (!keyMatch) return [];
+	const start = keyMatch.index + keyMatch[0].length;
+	let depth = 1;
+	let i = start;
+	while (i < source.length && depth > 0) {
+		if (source[i] === "[") depth++;
+		else if (source[i] === "]") depth--;
+		i++;
+	}
+	const body = source.slice(start, i - 1);
+	const entries = [];
+	const objSpans = [];
+	const objRe = /\{\s*name\s*:\s*"([^"]+)"(?:\s*,\s*with\s*:\s*(\{[^}]*\}))?\s*\}/g;
+	let m;
+	while ((m = objRe.exec(body)) !== null) {
+		objSpans.push([m.index, m.index + m[0].length]);
+		let withObj;
+		if (m[2]) try {
+			withObj = JSON.parse(m[2]);
+		} catch {}
+		entries.push({
+			pos: m.index,
+			entry: {
+				name: m[1],
+				...withObj && { with: withObj }
+			}
+		});
+	}
+	const strRe = /"([^"]+)"/g;
+	while ((m = strRe.exec(body)) !== null) if (!objSpans.some(([s, e]) => m.index >= s && m.index < e)) entries.push({
+		pos: m.index,
+		entry: { name: m[1] }
+	});
+	entries.sort((a, b) => a.pos - b.pos);
+	return entries.map(({ entry }) => entry);
+}
 function reusableHeader(source) {
 	return [
 		`# AUTO-GENERATED — do not edit in theholocron/.github directly.`,
@@ -1988,40 +2054,47 @@ function reusableHeader(source) {
 		``
 	].join("\n");
 }
-function thinCallerHeader() {
+function thinCallerHeader(forPrimary = false) {
 	return [
-		`# AUTO-GENERATED — do not edit in theholocron/.github directly.`,
+		forPrimary ? `# AUTO-GENERATED — do not edit in theholocron/.github directly.` : `# AUTO-GENERATED — do not edit directly.`,
 		`# Source:  theholocron/holocron · packages/cli/src/commands/setup-workflows.ts`,
 		`# Synced:  ${(/* @__PURE__ */ new Date()).toISOString()}`,
 		`# Tool:    holocron sync-github`,
-		`# Changes: edit setup-workflows.ts in theholocron/holocron and push.`,
+		`# Changes: edit source in theholocron/holocron and push to alpha or main.`,
 		``
 	].join("\n");
 }
-function buildBatch(repo, allowedWorkflows) {
+function buildBatch(repo, allowedWorkflows, withOverrides) {
 	const files = [];
 	const isPrimaryGithubRepo = repo === DEFAULT_REPO;
 	if (isPrimaryGithubRepo) for (const [name, content] of Object.entries(ACTIONS)) files.push({
 		path: `.github/actions/${name}.yml`,
 		content: reusableHeader(`packages/cli/src/templates/index.ts`) + content
 	});
-	for (const [name, content] of Object.entries(REUSABLE_WORKFLOWS)) {
-		if (allowedWorkflows && !allowedWorkflows.has(name)) continue;
-		files.push({
+	if (isPrimaryGithubRepo) {
+		for (const [name, content] of Object.entries(REUSABLE_WORKFLOWS)) files.push({
 			path: `.github/workflows/${name}.yml`,
 			content: reusableHeader(`packages/cli/src/templates/index.ts`) + content
 		});
-	}
-	if (isPrimaryGithubRepo) for (const [name, content] of Object.entries(WORKFLOW_TEMPLATES)) {
+		for (const [name, content] of Object.entries(WORKFLOW_TEMPLATES)) {
+			files.push({
+				path: `workflow-templates/${name}.yml`,
+				content: thinCallerHeader(true) + content
+			});
+			const props = WORKFLOW_TEMPLATE_PROPERTIES[name];
+			if (props) files.push({
+				path: `workflow-templates/${name}.properties.json`,
+				content: props
+			});
+		}
+	} else for (const name of Object.keys(REUSABLE_WORKFLOWS)) {
+		if (allowedWorkflows && !allowedWorkflows.has(name)) continue;
+		const content = generateThinCallerContent(name, withOverrides?.get(name));
+		if (!content) continue;
 		files.push({
-			path: `workflow-templates/${name}.yml`,
+			path: `.github/workflows/${name}.yml`,
 			content: thinCallerHeader() + content
 		});
-		const props = WORKFLOW_TEMPLATE_PROPERTIES[name];
-		if (props) files.push({
-			path: `workflow-templates/${name}.properties.json`,
-			content: props
-		});
 	}
 	return files;
 }
@@ -2098,15 +2171,27 @@ async function runSyncGithub(input) {
 	const { tree: existingTree } = await (await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/git/trees/${baseTreeSha}?recursive=1`, { headers })).json();
 	const existingBlobs = new Map(existingTree.filter((i) => i.type === "blob").map((i) => [i.path, i.sha]));
 	let allowedWorkflows;
+	let withOverrides;
 	if (repo !== DEFAULT_REPO) try {
-		const configRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/contents/holocron.config.json`, { headers });
-		if (configRes.ok) {
-			const configData = await configRes.json();
-			const workflows = JSON.parse(Buffer.from(configData.content.replace(/\n/g, ""), "base64").toString("utf8"))?.project?.workflows ?? [];
-			if (workflows.length > 0) allowedWorkflows = new Set(workflows.map((w) => typeof w === "string" ? w : w.name));
+		let entries = [];
+		const jsonRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/contents/holocron.config.json`, { headers });
+		if (jsonRes.ok) {
+			const data = await jsonRes.json();
+			entries = (JSON.parse(Buffer.from(data.content.replace(/\n/g, ""), "base64").toString("utf8"))?.project?.workflows ?? []).map((w) => typeof w === "string" ? { name: w } : w);
+		} else {
+			const tsRes = await fetchFn(`${API_BASE}/repos/${owner}/${repoName}/contents/holocron.config.ts`, { headers });
+			if (tsRes.ok) {
+				const data = await tsRes.json();
+				entries = parseWorkflowsFromTs(Buffer.from(data.content.replace(/\n/g, ""), "base64").toString("utf8"));
+			}
+		}
+		if (entries.length > 0) {
+			allowedWorkflows = new Set(entries.map((e) => e.name));
+			const overrideEntries = entries.filter((e) => e.with != null).map((e) => [e.name, e.with]);
+			if (overrideEntries.length > 0) withOverrides = new Map(overrideEntries);
 		}
 	} catch {}
-	const batch = buildBatch(repo, allowedWorkflows);
+	const batch = buildBatch(repo, allowedWorkflows, withOverrides);
 	let created = 0;
 	let updated = 0;
 	let unchanged = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theholocron/cli",
-  "version": "2.0.0-alpha.38",
+  "version": "2.0.0-alpha.40",
   "description": "The Holocron CLI — a pluggable, capability-based orchestrator for spinning up and operating software projects.",
   "homepage": "https://github.com/theholocron/holocron/tree/main/packages/cli#readme",
   "bugs": "https://github.com/theholocron/holocron/issues",