Enforce remove/Recently Merged on close/merge

DefinitelyTyped · Feb 1, 2021 · 5105d41 · 5105d41
1 parent 617c945
commit 5105d41
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/src/compute-pr-actions.ts b/src/compute-pr-actions.ts
@@ -48,13 +48,24 @@ export const LabelNames = [
     ...StalenessKinds,
 ] as const;
 
-export interface Actions {
-    projectColumn?: ColumnName | "*REMOVE*";
+export type Actions = {
     labels: LabelName[];
     responseComments: Comments.Comment[];
-    state?: "close" | "merge";
     shouldUpdateLabels: boolean;
-}
+} & (
+    | {
+          state?: never;
+          projectColumn?: ColumnName | "*REMOVE*";
+      }
+    | {
+          state: "close";
+          projectColumn: "*REMOVE*";
+      }
+    | {
+          state: "merge";
+          projectColumn: "Recently Merged";
+      }
+);
 
 function createDefaultActions(): Actions {
     return {
@@ -65,14 +76,6 @@ function createDefaultActions(): Actions {
     };
 }
 
-function createEmptyActions(): Actions {
-    return {
-        labels: [],
-        responseComments: [],
-        shouldUpdateLabels: false,
-    };
-}
-
 type Staleness = {
     readonly kind: StalenessKind;
     readonly days: number;
@@ -223,7 +226,9 @@ export function process(prInfo: BotResult,
                         extendedCallback: (info: ExtendedPrInfo) => void = _i => {}): Actions {
     if (prInfo.type === "remove") {
         return {
-            ...createEmptyActions(),
+            labels: [],
+            responseComments: [],
+            shouldUpdateLabels: false,
             projectColumn: prInfo.isDraft ? "Needs Author Action" : "*REMOVE*",
         };
     }