Skip to content

add support for export default defineMessages #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

add support for export default defineMessages #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@ function isMethodCall(
);
}

function isExportMethodCall(
el: ts.Declaration,
methodName: string,
): el is ts.ExportAssignment {
return (
ts.isExportAssignment(el) &&
!!el.expression &&
ts.isCallExpression(el.expression) &&
!!el.expression.expression &&
el.expression.expression.escapedText === methodName
);
}

/**
* Represents a react-intl message descriptor
*/
Expand Down Expand Up @@ -124,7 +137,7 @@ function forAllVarDecls(
node: ts.Node,
cb: (decl: ts.VariableDeclaration) => void,
) {
if (ts.isVariableDeclaration(node)) {
if (ts.isVariableDeclaration(node) || ts.isExportAssignment(node)) {
cb(node);
} else {
ts.forEachChild(node, (n) => forAllVarDecls(n, cb));
Expand Down Expand Up @@ -158,7 +171,7 @@ function findMethodCallsWithName(
) {
let messages: Message[] = [];
forAllVarDecls(sourceFile, (decl: ts.Declaration) => {
if (isMethodCall(decl, methodName)) {
if (isMethodCall(decl, methodName) || isExportMethodCall(decl, methodName)) {
if (
decl.initializer &&
ts.isCallExpression(decl.initializer) &&
Expand All @@ -167,6 +180,14 @@ function findMethodCallsWithName(
const nodeProps = decl.initializer.arguments[0];
const declMessages = extractMessagesForNode(nodeProps, extractMessages);
messages = messages.concat(declMessages);
} else if (
decl.expression &&
ts.isCallExpression(decl.expression) &&
decl.expression.arguments.length
) {
const nodeProps = decl.expression.arguments[0];
const declMessages = extractMessagesForNode(nodeProps, extractMessages);
messages = messages.concat(declMessages);
}
}
});
Expand Down