@theholocron/cli 3.24.1 → 3.24.3

package/dist/cli.mjs

@@ -2808,6 +2808,65 @@ function generateThinCallerContent(name, withOverrides, additionalPaths) {
 	if (injected === result) console.warn(`[generateThinCallerContent] could not inject with: overrides into "${name}" template`);
 	return injected;
 }
+/**
+* Expand structured with-values to flat GitHub Actions inputs before
+* generating the thin caller. Handles:
+*   - deploy shorthand: docs/storybook → type + storybook-projects
+*   - run-chromatic object → run-chromatic: true + chromatic-projects
+*   - plain arrays → JSON-stringified for YAML scalar quoting
+*
+* Used by both `holocron setup` and `sync-workflow-templates`.
+*/
+function normalizeWorkflowWith(raw) {
+	const result = { ...raw };
+	const hasDocs = raw["docs"] === true || raw["docs"] !== null && typeof raw["docs"] === "object";
+	const storybookProjects = raw["storybook"];
+	if (hasDocs) {
+		result["type"] = "docs";
+		delete result["docs"];
+	}
+	if (Array.isArray(storybookProjects)) {
+		if (!hasDocs) result["type"] = "storybook";
+		result["storybook-projects"] = JSON.stringify(storybookProjects.map(({ name, path = "." }) => ({
+			name,
+			workingDir: path
+		})));
+		delete result["storybook"];
+	}
+	const runChromatic = raw["run-chromatic"];
+	if (runChromatic !== null && typeof runChromatic === "object" && "projects" in runChromatic) {
+		result["run-chromatic"] = true;
+		const projects = runChromatic.projects.map((p) => ({
+			...p,
+			...Array.isArray(p.untraced) ? { untraced: p.untraced.join("\n") } : {}
+		}));
+		result["chromatic-projects"] = JSON.stringify(projects);
+	}
+	for (const [k, v] of Object.entries(result)) if (Array.isArray(v)) result[k] = JSON.stringify(v);
+	return result;
+}
+/**
+* Derive on.push.paths entries from the deploy with: shorthand.
+* Used by both `holocron setup` and `sync-workflow-templates`.
+*/
+function deriveDeployPaths(raw) {
+	const paths = [];
+	const docs = raw["docs"];
+	if (docs === true) paths.push("docs/**");
+	else if (docs !== null && typeof docs === "object" && "path" in docs) {
+		const p = docs.path;
+		if (p && p !== ".") paths.push(`${p}/**`);
+	}
+	const storybookProjects = raw["storybook"];
+	if (Array.isArray(storybookProjects)) for (const s of storybookProjects) {
+		const p = s.path || ".";
+		if (p === ".") {
+			paths.push("src/**");
+			paths.push(".storybook/**");
+		} else paths.push(`${p}/**`);
+	}
+	return paths;
+}
 //#endregion
 //#region src/commands/setup.ts
 /**
@@ -3264,52 +3323,6 @@ async function runSetup(input) {
 			print(formatStep(steps[steps.length - 1]));
 		}
 	}
-	function normalizeWorkflowWith(raw) {
-		const result = { ...raw };
-		const hasDocs = raw["docs"] === true || raw["docs"] !== null && typeof raw["docs"] === "object";
-		const storybookProjects = raw["storybook"];
-		if (hasDocs) {
-			result["type"] = "docs";
-			delete result["docs"];
-		}
-		if (Array.isArray(storybookProjects)) {
-			if (!hasDocs) result["type"] = "storybook";
-			result["storybook-projects"] = JSON.stringify(storybookProjects.map(({ name, path = "." }) => ({
-				name,
-				workingDir: path
-			})));
-			delete result["storybook"];
-		}
-		const runChromatic = raw["run-chromatic"];
-		if (runChromatic !== null && typeof runChromatic === "object" && "projects" in runChromatic) {
-			result["run-chromatic"] = true;
-			const projects = runChromatic.projects.map((p) => ({
-				...p,
-				...Array.isArray(p.untraced) ? { untraced: p.untraced.join("\n") } : {}
-			}));
-			result["chromatic-projects"] = JSON.stringify(projects);
-		}
-		for (const [k, v] of Object.entries(result)) if (Array.isArray(v)) result[k] = JSON.stringify(v);
-		return result;
-	}
-	function deriveDeployPaths(raw) {
-		const paths = [];
-		const docs = raw["docs"];
-		if (docs === true) paths.push("docs/**");
-		else if (docs !== null && typeof docs === "object" && "path" in docs) {
-			const p = docs.path;
-			if (p && p !== ".") paths.push(`${p}/**`);
-		}
-		const storybookProjects = raw["storybook"];
-		if (Array.isArray(storybookProjects)) for (const s of storybookProjects) {
-			const p = s.path || ".";
-			if (p === ".") {
-				paths.push("src/**");
-				paths.push(".storybook/**");
-			} else paths.push(`${p}/**`);
-		}
-		return paths;
-	}
 	const workflows = config.workflows;
 	if (loader.has("source") && workflows && workflows.length > 0) {
 		const source = loader.get("source");
@@ -4327,13 +4340,14 @@ function parseWorkflowsFromTs(source) {
 	const body = source.slice(start, i - 1);
 	const entries = [];
 	const objSpans = [];
-	const objRe = /\{\s*name\s*:\s*"([^"]+)"(?:\s*,\s*with\s*:\s*(\{[^}]*\}))?\s*,?\s*\}/g;
+	const objRe = /\{\s*name\s*:\s*"([^"]+)"(?:\s*,\s*with\s*:\s*(\{[^}]*\}))?(?:\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]);
+			const jsonSafe = m[2].replace(/([{,]\s*)([a-zA-Z_$][a-zA-Z0-9_$]*)\s*:/g, "$1\"$2\":");
+			withObj = JSON.parse(jsonSafe);
 		} catch {}
 		entries.push({
 			pos: m.index,
@@ -4395,7 +4409,8 @@ function buildBatch(repo, allowedWorkflows, withOverrides) {
 		}
 	} else for (const name of Object.keys(REUSABLE_WORKFLOWS)) {
 		if (allowedWorkflows && !allowedWorkflows.has(name)) continue;
-		const content = generateThinCallerContent(name, withOverrides?.get(name));
+		const rawWith = withOverrides?.get(name);
+		const content = generateThinCallerContent(name, rawWith ? normalizeWorkflowWith(rawWith) : void 0, name === "deploy" && rawWith ? deriveDeployPaths(rawWith) : void 0);
 		if (!content) continue;
 		files.push({
 			path: `.github/workflows/${name}.yml`,