Make Action.res more idiomatic

brettcannon · May 19, 2024 · dcd2c40 · dcd2c40
1 parent ffe662c
commit dcd2c40
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 24 deletions.
diff --git a/src/Action.res b/src/Action.res
@@ -1,9 +1,9 @@
 type inputsType = {
   filePattern: string,
   preReqPattern: string,
-  skipLabel: string,
+  skipLabel: option<string>,
   failureMessage: string,
-  token: string,
+  token: option<string>,
 }
 
 // Could use a `.resi` file to control visibility, but it requires repeating
@@ -14,10 +14,19 @@ type inputsType = {
 )
 
 let inputs = () => {
-  filePattern: getInput("file-pattern"),
-  preReqPattern: getInput("prereq-pattern"),
-  failureMessage: getInput("failure-message"),
-  // Optional
-  skipLabel: getInput("skip-label"),
-  token: getInput("token"),
+  let maybe = val => {
+    if val != "" {
+      Some(val)
+    } else {
+      None
+    }
+  }
+
+  {
+    filePattern: getInput("file-pattern"),
+    preReqPattern: getInput("prereq-pattern"),
+    failureMessage: getInput("failure-message"),
+    skipLabel: getInput("skip-label")->maybe,
+    token: getInput("token")->maybe,
+  }
 }
diff --git a/src/GH.res b/src/GH.res
@@ -166,9 +166,9 @@ let pullRequestLabels = payload =>
  */
 let changedFiles = async (payload, inputs: Action.inputsType) => {
   let octokit: octokitType = switch inputs.token {
-  | "" => %raw(`new (Octokit.plugin(paginateRest))()`)
+  | None => %raw(`new (Octokit.plugin(paginateRest))()`)
   // While marked as ignored, `_token` is used inside the %raw() call.
-  | _token => %raw(`new (Octokit.plugin(paginateRest))({ auth: _token })`)
+  | Some(_token) => %raw(`new (Octokit.plugin(paginateRest))({ auth: _token })`)
   }
 
   await octokit->paginate(

diff --git a/src/Main.res b/src/Main.res
@@ -15,7 +15,7 @@ let formatFailureMessage = (inputs: Action.inputsType) =>
   inputs.failureMessage
   ->String.replaceAll("${prereq-pattern}", repr(inputs.preReqPattern))
   ->String.replaceAll("${file-pattern}", repr(inputs.filePattern))
-  ->String.replaceAll("${skip-label}", repr(inputs.skipLabel))
+  ->String.replaceAll("${skip-label}", repr(inputs.skipLabel->Option.getOr("")))
 
 /**
  Check if the workflow has succeeded in passing the check.
@@ -33,10 +33,10 @@ let checkforChangedFiles = async (
         )} is not a full 'pull_request' event; skipping`,
     )
   | Some(payload) =>
-    // Because `skip-label` defaults to `""`,
-    // this check will implicitly fail if no label is specified.
-    switch payload->GH.pullRequestLabels->Matching.hasLabelMatch(inputs.skipLabel) {
-    | true => Ok(`the skip label ${repr(inputs.skipLabel)} is set`)
+    let prLabels = payload->GH.pullRequestLabels
+    let hasLabelMatch = inputs.skipLabel->Option.mapOr(false, Matching.hasLabelMatch(prLabels, _))
+    switch hasLabelMatch {
+    | true => Ok(`the skip label ${repr(inputs.skipLabel->Option.getOr(""))} is set`)
     | false => {
         let filePaths = await payload->_changedFilesImpl(inputs)
 

diff --git a/tests/Action_test.res b/tests/Action_test.res
@@ -38,8 +38,8 @@ zora("action.yml", async t => {
       failureMessage: template,
       preReqPattern,
       filePattern,
-      skipLabel,
-      token: "",
+      skipLabel: Some(skipLabel),
+      token: None,
     }
 
     let errorMessage = inputs->Main.formatFailureMessage

diff --git a/tests/Main_test.res b/tests/Main_test.res
@@ -11,8 +11,8 @@ zora("formatFailureMessage()", async t => {
       failureMessage: template,
       preReqPattern,
       filePattern,
-      skipLabel,
-      token: "",
+      skipLabel: Some(skipLabel),
+      token: None,
     }
 
     let errorMessage = inputs->Main.formatFailureMessage
@@ -54,9 +54,9 @@ zora("checkForChangedFiles()", async t => {
   let inputs: Action.inputsType = {
     filePattern: "Dir2/B",
     preReqPattern: "**",
-    skipLabel: "Label B",
+    skipLabel: Some("Label B"),
     failureMessage: "${prereq-pattern} ${file-pattern} ${skip-label}",
-    token: "",
+    token: None,
   }
 
   let fakeChangedFiles = async (_, _) => ["Dir3/C"]
@@ -65,17 +65,17 @@ zora("checkForChangedFiles()", async t => {
     let inputs: Action.inputsType = {
       filePattern: "Dir1/B",
       preReqPattern: "**",
-      skipLabel: "",
+      skipLabel: None,
       failureMessage: "${prereq-pattern} ${file-pattern} ${skip-label}",
-      token: "",
+      token: None,
     }
 
     t->okContains(await None->Main.checkforChangedFiles(inputs), "pull_request")
   })
 
   t->test("skip label set", async t => {
     let skipLabel = "Label A"
-    let inputs = {...inputs, skipLabel}
+    let inputs = {...inputs, skipLabel: Some(skipLabel)}
 
     t->okContains(
       await payload->Main.checkforChangedFiles(inputs, ~_changedFilesImpl=fakeChangedFiles),