Skip to content

Commit 4077ee6

Browse files
committed
do not perform the same check twice
1 parent d0b6a67 commit 4077ee6

2 files changed

Lines changed: 15 additions & 7 deletions

File tree

github.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const CURRENT_VERSION = require("./package.json").version;
33

44
const {
55
init,
6-
extractChangedOrDeletedFiles,
6+
checkChangedOrDeletedFiles,
77
createCommitOnBranch,
88
checkIfBranchExists,
99
} = require("./index");
@@ -58,8 +58,7 @@ yargs
5858
"Missing required argument: either specify changed or deleted files."
5959
);
6060
}
61-
extractChangedOrDeletedFiles(argv.changed, argv.deleted);
62-
return true;
61+
return checkChangedOrDeletedFiles(argv.changed, argv.deleted);
6362
});
6463
},
6564
(argv) => {

index.js

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,29 @@ function init(token, apiUrl) {
3737
});
3838
}
3939

40+
function arrayIsArray(array) {
41+
return !!array && Array.isArray(array);
42+
}
43+
4044
function arrayHasElements(array) {
41-
return array && Array.isArray(array) && array.length > 0;
45+
return arrayIsArray(array) && array.length > 0;
4246
}
4347

44-
function extractChangedOrDeletedFiles(changedFiles, deletedFiles) {
48+
function checkChangedOrDeletedFiles(changedFiles, deletedFiles) {
4549
const changedFilesExist = arrayHasElements(changedFiles);
4650
const deletedFilesExist = arrayHasElements(deletedFiles);
4751

4852
if (!changedFilesExist && !deletedFilesExist) {
4953
throw new Error("No files specified as changed or deleted. Quitting.");
5054
}
5155

56+
return true;
57+
}
58+
59+
function extractChangedOrDeletedFiles(changedFiles, deletedFiles) {
5260
return {
53-
changedFiles: changedFilesExist ? changedFiles : [],
54-
deletedFiles: deletedFilesExist ? deletedFiles : [],
61+
changedFiles: arrayIsArray(changedFiles) ? changedFiles : [],
62+
deletedFiles: arrayIsArray(deletedFiles) ? deletedFiles : [],
5563
};
5664
}
5765

@@ -181,6 +189,7 @@ async function createCommitOnBranch(
181189

182190
module.exports = {
183191
init,
192+
checkChangedOrDeletedFiles,
184193
extractChangedOrDeletedFiles,
185194
createCommitOnBranch,
186195
checkIfBranchExists,

0 commit comments

Comments
 (0)