From 837b2d37cfee01e404f565376a41c442b60f5b98 Mon Sep 17 00:00:00 2001 From: Andreas Amsenius Date: Sat, 3 Feb 2024 04:33:37 +0100 Subject: [PATCH] fix(@formatjs/cli-lib): onMsgExtracted / onMetaExtracted not getting called (#4345) * fix(cli-lib): call onMsgExtracted in extract if provided * fix(cli-lib): call onMetaExtracted in extract if provided --- packages/cli-lib/src/extract.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/cli-lib/src/extract.ts b/packages/cli-lib/src/extract.ts index ab3462759d..ba0297bb19 100644 --- a/packages/cli-lib/src/extract.ts +++ b/packages/cli-lib/src/extract.ts @@ -97,13 +97,16 @@ async function processFile( let messages: ExtractedMessageDescriptor[] = [] let meta: Record | undefined + const onMsgExtracted = opts.onMsgExtracted + const onMetaExtracted = opts.onMetaExtracted + opts = { ...opts, additionalComponentNames: [ '$formatMessage', ...(opts.additionalComponentNames || []), ], - onMsgExtracted(_, msgs) { + onMsgExtracted(filePath, msgs) { if (opts.extractSourceLocation) { msgs = msgs.map(msg => ({ ...msg, @@ -111,9 +114,17 @@ async function processFile( })) } messages = messages.concat(msgs) + + if (onMsgExtracted) { + onMsgExtracted(filePath, msgs) + } }, - onMetaExtracted(_, m) { + onMetaExtracted(filePath, m) { meta = m + + if (onMetaExtracted) { + onMetaExtracted(filePath, m) + } }, }