modify changeset generation

Author: pngwn

.gitignore

@@ -1,2 +1,3 @@
 node_modules
-packages/*/dist
+packages/*/dist
+CLAUDE.md

packages/generate-changeset/index.ts

@@ -15,7 +15,7 @@ import * as human_id from "human-id";
 import {
 	create_changeset_comment,
 	get_frontmatter_versions,
-	check_for_manual_selection,
+	check_for_manual_selection_and_approval,
 	get_type_from_linked_issues,
 	get_version_from_linked_issues,
 	get_version_from_label,
@@ -91,6 +91,14 @@ async function run() {
 			`Changeset file was edited manually. Skipping changeset generation.`
 		);
 
+		let approved = false;
+
+		if (comment?.body) {
+			approved = check_for_manual_selection_and_approval(
+				comment?.body
+			).approved;
+		}
+
 		const versions = get_frontmatter_versions(old_changeset_content) || [];
 
 		const changelog_entry = old_changeset_content
@@ -116,6 +124,7 @@ async function run() {
 			changeset_content: old_changeset_content,
 			changeset_url: `https://github.com/${source_repo_name}/edit/${source_branch_name}/${changeset_path}`,
 			previous_comment: comment?.body,
+			approved,
 		});
 
 		if (changes) {
@@ -142,9 +151,9 @@ async function run() {
 
 	let packages_versions: undefined | [string, string | boolean][] = undefined;
 	let manual_package_selection = false;
-
+	let approved = false;
 	if (comment?.body) {
-		const selection = check_for_manual_selection(comment.body);
+		const selection = check_for_manual_selection_and_approval(comment.body);
 
 		manual_package_selection = selection.manual_package_selection;
 
@@ -155,6 +164,8 @@ async function run() {
 		) {
 			packages_versions = selection.versions;
 		}
+
+		approved = selection.approved;
 	}
 
 	let version =
@@ -225,6 +236,7 @@ async function run() {
 		manual_package_selection,
 		changeset_content,
 		changeset_url: `https://github.com/${source_repo_name}/edit/${source_branch_name}/${changeset_path}`,
+		approved,
 	});
 
 	// is pr body and generate body different?
@@ -243,6 +255,7 @@ async function run() {
 
 	// this always happens
 	setOutput("skipped", "false");
+	setOutput("approved", approved.toString());
 }
 
 run();

packages/generate-changeset/utils.ts

@@ -169,6 +169,7 @@ export function create_changeset_comment({
 	changeset_content,
 	changeset_url,
 	previous_comment,
+	approved,
 }: {
 	packages: [string, string | boolean][];
 	changelog: string;
@@ -177,6 +178,7 @@ export function create_changeset_comment({
 	changeset_content: string;
 	changeset_url: string;
 	previous_comment?: string;
+	approved: boolean;
 }) {
 	const new_comment = `<!-- tag=changesets_gradio -->
 
@@ -189,21 +191,35 @@ export function create_changeset_comment({
 	}
 
 ${create_version_table(packages)}
-${manual_package_selection ? create_package_checklist(packages) : ""}
-${generate_mode_description(manual_package_selection, manual_mode)}
 
-
-#### ${packages.length ? "With the following changelog entry." : ""}
+---
 
 ${format_changelog_preview(changelog, packages)}
 
+---
+
 ${
 	packages.length
 		? manual_mode
 			? "⚠️ _The changeset file for this pull request has been modified manually, so the changeset generation bot has been disabled. To go back into automatic mode, delete the changeset file._"
 			: "_Maintainers or the PR author can modify the PR title to modify this entry._"
 		: ""
 }
+
+---
+
+${
+	approved
+		? "✅ Approved by maintainers."
+		: "‼️ Changeset not approved by maintainers."
+}
+
+${
+	approved
+		? "- [x] Maintainers can unapprove the changeset by selecting this checkbox."
+		: "- [ ] Maintainers can approve the changeset by selecting this checkbox."
+}
+
 <details><summary>
 
 #### Something isn't right?</summary>
@@ -252,11 +268,12 @@ export function get_frontmatter_versions(
 	return false;
 }
 
-export function check_for_manual_selection(md_src: string): {
+export function check_for_manual_selection_and_approval(md_src: string): {
 	manual_package_selection: boolean;
 	versions?: [string, boolean][];
+	approved: boolean;
 } {
-	if (!md_src) return { manual_package_selection: false };
+	if (!md_src) return { manual_package_selection: false, approved: false };
 
 	const new_ast = md_parser.parse(md_src);
 
@@ -288,9 +305,30 @@ export function check_for_manual_selection(md_src: string): {
 		});
 	}
 
+	const approved_node: ListItem | undefined = find(new_ast, (node) => {
+		return (
+			node.type === "listItem" &&
+			(node as ListItem)?.checked != null &&
+			!!find(
+				//@ts-ignore
+				(node as ListItem)?.children[0],
+				(inner_node) =>
+					(inner_node as Text)?.value
+						?.trim()
+						?.startsWith("Maintainers can approve the changeset") ||
+					(inner_node as Text)?.value
+						?.trim()
+						?.startsWith(
+							"Maintainers can unnaprove the changeset by selecting this checkbox."
+						)
+			)
+		);
+	}) as ListItem | undefined;
+
 	return {
 		manual_package_selection: !!manual_node?.checked,
 		versions: manual_node ? versions : undefined,
+		approved: !!approved_node?.checked,
 	};
 }