Skip to content

Commit 3fac6cf

Browse files
pngwnpngwn
committed
changes
1 parent 72c285d commit 3fac6cf

File tree

3 files changed

+101
-0
lines changed

3 files changed

+101
-0
lines changed

‎actions/generate-changeset/dist/index.js‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119577,7 +119577,17 @@ function check_for_manual_selection_and_approval(md_src, wasEdited, editor) {
119577119577
let was_checkbox_edit = false;
119578119578
if (wasEdited && editor) {
119579119579
was_checkbox_edit = true;
119580+
console.log(`[check_for_manual_selection_and_approval] Detected checkbox edit by ${editor}`);
119581+
} else if (wasEdited) {
119582+
console.log(`[check_for_manual_selection_and_approval] Edit detected but no editor field`);
119583+
} else {
119584+
console.log(`[check_for_manual_selection_and_approval] No edit detected`);
119580119585
}
119586+
console.log(`[check_for_manual_selection_and_approval] Checkbox states:`, {
119587+
manual_package_selection: !!(manual_node == null ? void 0 : manual_node.checked),
119588+
approved: !!(approved_node == null ? void 0 : approved_node.checked),
119589+
was_checkbox_edit
119590+
});
119581119591
return {
119582119592
manual_package_selection: !!(manual_node == null ? void 0 : manual_node.checked),
119583119593
versions: manual_node ? versions : void 0,
@@ -119818,23 +119828,40 @@ async function run() {
119818119828
let approved_by2 = void 0;
119819119829
if (comment == null ? void 0 : comment.body) {
119820119830
const wasEdited = comment.lastEditedAt !== null;
119831+
coreExports.info(`[Manual Mode] Comment edit status:`);
119832+
coreExports.info(` - Was edited: ${wasEdited}`);
119833+
coreExports.info(` - Last edited at: ${comment.lastEditedAt || "never"}`);
119834+
coreExports.info(` - Editor: ${comment.editor || "N/A"}`);
119835+
coreExports.info(` - Original author: ${comment.author}`);
119821119836
const selection = check_for_manual_selection_and_approval(
119822119837
comment.body,
119823119838
wasEdited,
119824119839
comment.editor
119825119840
);
119841+
coreExports.info(`[Manual Mode] Checkbox detection results:`);
119842+
coreExports.info(` - Was checkbox edit: ${selection.was_checkbox_edit}`);
119843+
coreExports.info(` - Approved checkbox state: ${selection.approved}`);
119844+
coreExports.info(` - Existing approved_by: ${selection.approved_by || "none"}`);
119826119845
if (selection.was_checkbox_edit || !wasEdited) {
119827119846
approved2 = selection.approved;
119828119847
if (approved2 && selection.was_checkbox_edit) {
119829119848
const actor = coreExports.getInput("actor");
119830119849
approved_by2 = actor && actor.length && actor !== "false" ? actor : comment.editor || selection.approved_by;
119850+
coreExports.info(`[Manual Mode] Checkbox edit approved - using approver: ${approved_by2}`);
119831119851
} else if (approved2) {
119832119852
approved_by2 = selection.approved_by;
119853+
coreExports.info(`[Manual Mode] Already approved - keeping approver: ${approved_by2}`);
119833119854
}
119834119855
} else {
119835119856
approved2 = selection.approved;
119836119857
approved_by2 = selection.approved_by;
119858+
coreExports.info(`[Manual Mode] Non-checkbox edit detected - preserving state:`);
119859+
coreExports.info(` - Approved: ${approved2}`);
119860+
coreExports.info(` - Approved by: ${approved_by2 || "none"}`);
119837119861
}
119862+
coreExports.info(`[Manual Mode] Final state:`);
119863+
coreExports.info(` - Approved: ${approved2}`);
119864+
coreExports.info(` - Approved by: ${approved_by2 || "none"}`);
119838119865
}
119839119866
const versions = get_frontmatter_versions(old_changeset_content) || [];
119840119867
const changelog_entry = old_changeset_content.split("---")[2].trim();
@@ -119882,27 +119909,46 @@ async function run() {
119882119909
let approved_by = void 0;
119883119910
if (comment == null ? void 0 : comment.body) {
119884119911
const wasEdited = comment.lastEditedAt !== null;
119912+
coreExports.info(`[Normal Mode] Comment edit status:`);
119913+
coreExports.info(` - Was edited: ${wasEdited}`);
119914+
coreExports.info(` - Last edited at: ${comment.lastEditedAt || "never"}`);
119915+
coreExports.info(` - Editor: ${comment.editor || "N/A"}`);
119916+
coreExports.info(` - Original author: ${comment.author}`);
119885119917
const selection = check_for_manual_selection_and_approval(
119886119918
comment.body,
119887119919
wasEdited,
119888119920
comment.editor
119889119921
);
119922+
coreExports.info(`[Normal Mode] Checkbox detection results:`);
119923+
coreExports.info(` - Was checkbox edit: ${selection.was_checkbox_edit}`);
119924+
coreExports.info(` - Manual package selection: ${selection.manual_package_selection}`);
119925+
coreExports.info(` - Approved checkbox state: ${selection.approved}`);
119926+
coreExports.info(` - Existing approved_by: ${selection.approved_by || "none"}`);
119890119927
manual_package_selection = selection.manual_package_selection;
119891119928
if (manual_package_selection && selection.versions && selection.versions.length) {
119892119929
packages_versions = selection.versions;
119930+
coreExports.info(`[Normal Mode] Using manual package versions from comment`);
119893119931
}
119894119932
if (selection.was_checkbox_edit || !wasEdited) {
119895119933
approved = selection.approved;
119896119934
if (approved && selection.was_checkbox_edit) {
119897119935
const actor = coreExports.getInput("actor");
119898119936
approved_by = actor && actor.length && actor !== "false" ? actor : comment.editor || selection.approved_by;
119937+
coreExports.info(`[Normal Mode] Checkbox edit approved - using approver: ${approved_by}`);
119899119938
} else if (approved) {
119900119939
approved_by = selection.approved_by;
119940+
coreExports.info(`[Normal Mode] Already approved - keeping approver: ${approved_by}`);
119901119941
}
119902119942
} else {
119903119943
approved = selection.approved;
119904119944
approved_by = selection.approved_by;
119945+
coreExports.info(`[Normal Mode] Non-checkbox edit detected - preserving state:`);
119946+
coreExports.info(` - Approved: ${approved}`);
119947+
coreExports.info(` - Approved by: ${approved_by || "none"}`);
119905119948
}
119949+
coreExports.info(`[Normal Mode] Final state:`);
119950+
coreExports.info(` - Approved: ${approved}`);
119951+
coreExports.info(` - Approved by: ${approved_by || "none"}`);
119906119952
}
119907119953
let version2 = get_version_from_label(labels) || get_version_from_linked_issues(closes);
119908119954
if (!packages_versions) {

‎packages/generate-changeset/index.ts‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,23 @@ async function run() {
9797

9898
if (comment?.body) {
9999
const wasEdited = comment.lastEditedAt !== null;
100+
101+
info(`[Manual Mode] Comment edit status:`);
102+
info(` - Was edited: ${wasEdited}`);
103+
info(` - Last edited at: ${comment.lastEditedAt || 'never'}`);
104+
info(` - Editor: ${comment.editor || 'N/A'}`);
105+
info(` - Original author: ${comment.author}`);
106+
100107
const selection = check_for_manual_selection_and_approval(
101108
comment.body,
102109
wasEdited,
103110
comment.editor
104111
);
112+
113+
info(`[Manual Mode] Checkbox detection results:`);
114+
info(` - Was checkbox edit: ${selection.was_checkbox_edit}`);
115+
info(` - Approved checkbox state: ${selection.approved}`);
116+
info(` - Existing approved_by: ${selection.approved_by || 'none'}`);
105117

106118
if (selection.was_checkbox_edit || !wasEdited) {
107119
approved = selection.approved;
@@ -112,13 +124,22 @@ async function run() {
112124
actor && actor.length && actor !== "false"
113125
? actor
114126
: comment.editor || selection.approved_by;
127+
info(`[Manual Mode] Checkbox edit approved - using approver: ${approved_by}`);
115128
} else if (approved) {
116129
approved_by = selection.approved_by;
130+
info(`[Manual Mode] Already approved - keeping approver: ${approved_by}`);
117131
}
118132
} else {
119133
approved = selection.approved;
120134
approved_by = selection.approved_by;
135+
info(`[Manual Mode] Non-checkbox edit detected - preserving state:`);
136+
info(` - Approved: ${approved}`);
137+
info(` - Approved by: ${approved_by || 'none'}`);
121138
}
139+
140+
info(`[Manual Mode] Final state:`);
141+
info(` - Approved: ${approved}`);
142+
info(` - Approved by: ${approved_by || 'none'}`);
122143
}
123144

124145
const versions = get_frontmatter_versions(old_changeset_content) || [];
@@ -183,11 +204,24 @@ async function run() {
183204

184205
if (comment?.body) {
185206
const wasEdited = comment.lastEditedAt !== null;
207+
208+
info(`[Normal Mode] Comment edit status:`);
209+
info(` - Was edited: ${wasEdited}`);
210+
info(` - Last edited at: ${comment.lastEditedAt || 'never'}`);
211+
info(` - Editor: ${comment.editor || 'N/A'}`);
212+
info(` - Original author: ${comment.author}`);
213+
186214
const selection = check_for_manual_selection_and_approval(
187215
comment.body,
188216
wasEdited,
189217
comment.editor
190218
);
219+
220+
info(`[Normal Mode] Checkbox detection results:`);
221+
info(` - Was checkbox edit: ${selection.was_checkbox_edit}`);
222+
info(` - Manual package selection: ${selection.manual_package_selection}`);
223+
info(` - Approved checkbox state: ${selection.approved}`);
224+
info(` - Existing approved_by: ${selection.approved_by || 'none'}`);
191225

192226
manual_package_selection = selection.manual_package_selection;
193227

@@ -197,6 +231,7 @@ async function run() {
197231
selection.versions.length
198232
) {
199233
packages_versions = selection.versions;
234+
info(`[Normal Mode] Using manual package versions from comment`);
200235
}
201236

202237
if (selection.was_checkbox_edit || !wasEdited) {
@@ -208,13 +243,22 @@ async function run() {
208243
actor && actor.length && actor !== "false"
209244
? actor
210245
: comment.editor || selection.approved_by;
246+
info(`[Normal Mode] Checkbox edit approved - using approver: ${approved_by}`);
211247
} else if (approved) {
212248
approved_by = selection.approved_by;
249+
info(`[Normal Mode] Already approved - keeping approver: ${approved_by}`);
213250
}
214251
} else {
215252
approved = selection.approved;
216253
approved_by = selection.approved_by;
254+
info(`[Normal Mode] Non-checkbox edit detected - preserving state:`);
255+
info(` - Approved: ${approved}`);
256+
info(` - Approved by: ${approved_by || 'none'}`);
217257
}
258+
259+
info(`[Normal Mode] Final state:`);
260+
info(` - Approved: ${approved}`);
261+
info(` - Approved by: ${approved_by || 'none'}`);
218262
}
219263

220264
let version =

‎packages/generate-changeset/utils.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,18 @@ export function check_for_manual_selection_and_approval(
350350
let was_checkbox_edit = false;
351351
if (wasEdited && editor) {
352352
was_checkbox_edit = true;
353+
console.log(`[check_for_manual_selection_and_approval] Detected checkbox edit by ${editor}`);
354+
} else if (wasEdited) {
355+
console.log(`[check_for_manual_selection_and_approval] Edit detected but no editor field`);
356+
} else {
357+
console.log(`[check_for_manual_selection_and_approval] No edit detected`);
353358
}
359+
360+
console.log(`[check_for_manual_selection_and_approval] Checkbox states:`, {
361+
manual_package_selection: !!manual_node?.checked,
362+
approved: !!approved_node?.checked,
363+
was_checkbox_edit
364+
});
354365

355366
return {
356367
manual_package_selection: !!manual_node?.checked,

0 commit comments

Comments
 (0)