Improve logs format

rematocorp · Sep 24, 2024 · 05a45f8 · 05a45f8
1 parent b920cdc
commit 05a45f8
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 31 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -33960,7 +33960,7 @@ const trello_1 = __nccwpck_require__(9763);
 const logger_1 = __importDefault(__nccwpck_require__(2358));
 const matchCardIds_1 = __importDefault(__nccwpck_require__(9812));
 async function addCardLinksToPullRequest(conf, cardIds) {
-    logger_1.default.logStep('ADD CARD LINKS TO PR');
+    logger_1.default.log('🔗 ADD CARD LINKS TO PR');
     const bodyCardIds = await getCardIdsFromBody(conf);
     const commentsCardIds = await getCardIdsFromComments(conf);
     const linkedCardIds = [...bodyCardIds, ...commentsCardIds];
@@ -34005,11 +34005,10 @@ const github_1 = __nccwpck_require__(2649);
 const trello_1 = __nccwpck_require__(9763);
 const logger_1 = __importDefault(__nccwpck_require__(2358));
 async function addLabelToCards(conf, cardIds, head) {
-    logger_1.default.logStep('ADD LABEL TO CARDS');
     if (!conf.trelloAddLabelsToCards) {
-        logger_1.default.log('Skipping label adding');
         return;
     }
+    logger_1.default.log('🏷️ ADD LABELS TO CARDS');
     const branchLabel = await getBranchLabel(head);
     if (!branchLabel) {
         logger_1.default.log('Could not find branch label');
@@ -34077,7 +34076,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const trello_1 = __nccwpck_require__(9763);
 const logger_1 = __importDefault(__nccwpck_require__(2358));
 async function addPullRequestLinkToCards(cardIds, pr) {
-    logger_1.default.logStep('ADD PR LINK TO CARDS');
+    logger_1.default.log('🔗 ADD PR LINK TO CARDS');
     const link = pr.html_url || pr.url;
     return Promise.all(cardIds.map(async (cardId) => {
         const existingAttachments = await (0, trello_1.getCardAttachments)(cardId);
@@ -34387,7 +34386,7 @@ const matchCardIds_1 = __importDefault(__nccwpck_require__(9812));
 const isPullRequestInDraft_1 = __importDefault(__nccwpck_require__(3031));
 const logger_1 = __importDefault(__nccwpck_require__(2358));
 async function getCardIds(conf, head) {
-    logger_1.default.logStep('FIND CARDS');
+    logger_1.default.log('🔎 FIND CARDS');
     const pr = await (0, github_1.getPullRequest)();
     let cardIds = (0, matchCardIds_1.default)(conf, pr.body || '');
     if (conf.githubIncludeNewCardCommand) {
@@ -34575,7 +34574,7 @@ const isPullRequestInDraft_1 = __importDefault(__nccwpck_require__(3031));
 const isPullRequestApproved_1 = __importDefault(__nccwpck_require__(4414));
 const logger_1 = __importDefault(__nccwpck_require__(2358));
 async function moveOrArchiveCards(conf, cardIds, pr) {
-    logger_1.default.logStep('MOVE OR ARCHIVE CARDS');
+    logger_1.default.log('🕺 MOVE OR ARCHIVE CARDS');
     const isDraft = (0, isPullRequestInDraft_1.default)(pr);
     const isChangesRequested = await (0, isChangesRequestedInReview_1.default)();
     const isApproved = await (0, isPullRequestApproved_1.default)();
@@ -34649,10 +34648,10 @@ const isPullRequestInDraft_1 = __importDefault(__nccwpck_require__(3031));
 const isPullRequestApproved_1 = __importDefault(__nccwpck_require__(4414));
 const logger_1 = __importDefault(__nccwpck_require__(2358));
 async function updateCardMembers(conf, cardIds, pr) {
-    logger_1.default.logStep('UPDATE CARD MEMBERS');
     if (!conf.trelloAddMembersToCards) {
-        return logger_1.default.log('Skipping members updating');
+        return;
     }
+    logger_1.default.log('👩‍💻 UPDATE CARD MEMBERS');
     const inReview = await isPullRequestInReview(conf, pr);
     if (inReview) {
         await assignReviewers(conf, cardIds);
@@ -34933,14 +34932,9 @@ exports["default"] = isPullRequestInDraft;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports["default"] = {
-    logStep: (...message) => {
-        if (!process.env.JEST_WORKER_ID) {
-            console.log(...message); // eslint-disable-line no-console
-        }
-    },
     log: (...message) => {
         if (!process.env.JEST_WORKER_ID) {
-            console.log('\t', ...message); // eslint-disable-line no-console
+            console.log(...message); // eslint-disable-line no-console
         }
     },
     error: (...message) => {

diff --git a/src/actions/addCardLinksToPullRequest.ts b/src/actions/addCardLinksToPullRequest.ts
@@ -5,7 +5,7 @@ import logger from './utils/logger'
 import matchCardIds from './utils/matchCardIds'
 
 export default async function addCardLinksToPullRequest(conf: Conf, cardIds: string[]) {
-	logger.logStep('ADD CARD LINKS TO PR')
+	logger.log('🔗 ADD CARD LINKS TO PR')
 
 	const bodyCardIds = await getCardIdsFromBody(conf)
 	const commentsCardIds = await getCardIdsFromComments(conf)

diff --git a/src/actions/addLabelToCards.ts b/src/actions/addLabelToCards.ts
@@ -4,13 +4,11 @@ import { addLabelToCard, getBoardLabels, getCardInfo } from './api/trello'
 import logger from './utils/logger'
 
 export default async function addLabelToCards(conf: Conf, cardIds: string[], head?: PRHead) {
-	logger.logStep('ADD LABEL TO CARDS')
-
 	if (!conf.trelloAddLabelsToCards) {
-		logger.log('Skipping label adding')
-
 		return
 	}
+	logger.log('🏷️ ADD LABELS TO CARDS')
+
 	const branchLabel = await getBranchLabel(head)
 
 	if (!branchLabel) {

diff --git a/src/actions/addPullRequestLinkToCards.ts b/src/actions/addPullRequestLinkToCards.ts
@@ -3,7 +3,7 @@ import { addAttachmentToCard, getCardAttachments } from './api/trello'
 import logger from './utils/logger'
 
 export default async function addPullRequestLinkToCards(cardIds: string[], pr: PR) {
-	logger.logStep('ADD PR LINK TO CARDS')
+	logger.log('🔗 ADD PR LINK TO CARDS')
 
 	const link = pr.html_url || pr.url
 

diff --git a/src/actions/getCardIds.ts b/src/actions/getCardIds.ts
@@ -7,7 +7,7 @@ import isPullRequestInDraft from './utils/isPullRequestInDraft'
 import logger from './utils/logger'
 
 export default async function getCardIds(conf: Conf, head?: PRHead) {
-	logger.logStep('FIND CARDS')
+	logger.log('🔎 FIND CARDS')
 
 	const pr = await getPullRequest()
 	let cardIds = matchCardIds(conf, pr.body || '')

diff --git a/src/actions/moveOrArchiveCards.ts b/src/actions/moveOrArchiveCards.ts
@@ -7,7 +7,7 @@ import isPullRequestApproved from './utils/isPullRequestApproved'
 import logger from './utils/logger'
 
 export default async function moveOrArchiveCards(conf: Conf, cardIds: string[], pr: PR) {
-	logger.logStep('MOVE OR ARCHIVE CARDS')
+	logger.log('🕺 MOVE OR ARCHIVE CARDS')
 
 	const isDraft = isPullRequestInDraft(pr)
 	const isChangesRequested = await isChangesRequestedInReview()

diff --git a/src/actions/updateCardMembers.ts b/src/actions/updateCardMembers.ts
@@ -7,11 +7,11 @@ import isPullRequestApproved from './utils/isPullRequestApproved'
 import logger from './utils/logger'
 
 export default async function updateCardMembers(conf: Conf, cardIds: string[], pr: PR) {
-	logger.logStep('UPDATE CARD MEMBERS')
-
 	if (!conf.trelloAddMembersToCards) {
-		return logger.log('Skipping members updating')
+		return
 	}
+	logger.log('👩‍💻 UPDATE CARD MEMBERS')
+
 	const inReview = await isPullRequestInReview(conf, pr)
 
 	if (inReview) {

diff --git a/src/actions/utils/logger.ts b/src/actions/utils/logger.ts
@@ -1,12 +1,7 @@
 export default {
-	logStep: (...message: any[]) => {
-		if (!process.env.JEST_WORKER_ID) {
-			console.log(...message) // eslint-disable-line no-console
-		}
-	},
 	log: (...message: any[]) => {
 		if (!process.env.JEST_WORKER_ID) {
-			console.log('\t', ...message) // eslint-disable-line no-console
+			console.log(...message) // eslint-disable-line no-console
 		}
 	},
 	error: (...message: any[]) => {