Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions src/broadcasts/broadcasts.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,26 @@ describe('Broadcasts', () => {
`);
});

it('does not mutate payload when using React component', async () => {
const mockReact = { type: 'div', props: { children: 'Hi' } };
const payload: CreateBroadcastOptions = {
from: 'bu@resend.com',
segmentId: '0192f4ed-c2e9-7112-9c13-b04a043e23ee',
subject: 'React Broadcast',
react: mockReact as React.ReactElement,
};
const originalPayload = { ...payload };

fetchMock.mockOnce(JSON.stringify({ id: 'id-123' }), {
status: 200,
headers: { 'content-type': 'application/json' },
});

await resend.broadcasts.create(payload);

expect(payload).toEqual(originalPayload);
});

it('creates and sends a broadcast', async () => {
const response: CreateBroadcastResponseSuccess = {
id: '71cdfe68-cf79-473a-a9d7-21f91db6a526',
Expand Down
12 changes: 4 additions & 8 deletions src/broadcasts/broadcasts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ export class Broadcasts {
payload: CreateBroadcastOptions,
options: CreateBroadcastRequestOptions = {},
): Promise<SendBroadcastResponse> {
if (payload.react) {
payload.html = await render(payload.react);
}
const html = payload.react ? await render(payload.react) : payload.html;

const data = await this.resend.post<SendBroadcastResponseSuccess>(
'/broadcasts',
Expand All @@ -48,7 +46,7 @@ export class Broadcasts {
audience_id: payload.audienceId,
preview_text: payload.previewText,
from: payload.from,
html: payload.html,
html,
reply_to: payload.replyTo,
subject: payload.subject,
text: payload.text,
Expand Down Expand Up @@ -102,9 +100,7 @@ export class Broadcasts {
id: string,
payload: UpdateBroadcastOptions,
): Promise<UpdateBroadcastResponse> {
if (payload.react) {
payload.html = await render(payload.react);
}
const html = payload.react ? await render(payload.react) : payload.html;

const data = await this.resend.patch<UpdateBroadcastResponseSuccess>(
`/broadcasts/${id}`,
Expand All @@ -113,7 +109,7 @@ export class Broadcasts {
segment_id: payload.segmentId,
audience_id: payload.audienceId,
from: payload.from,
html: payload.html,
html,
text: payload.text,
subject: payload.subject,
reply_to: payload.replyTo,
Expand Down
20 changes: 20 additions & 0 deletions src/emails/emails.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,26 @@ describe('Emails', () => {
expect(headers.has('Idempotency-Key')).toBe(true);
expect(headers.get('Idempotency-Key')).toBe(idempotencyKey);
});

it('does not mutate payload when using React component', async () => {
const mockReact = { type: 'div', props: { children: 'Hi' } };
const payload: CreateEmailOptions = {
from: 'admin@resend.com',
to: 'user@resend.com',
subject: 'React Email',
react: mockReact as React.ReactElement,
};
const originalPayload = { ...payload };

fetchMock.mockOnce(JSON.stringify({ id: 'id-123' }), {
status: 200,
headers: { 'content-type': 'application/json' },
});

await resend.emails.create(payload);

expect(payload).toEqual(originalPayload);
});
});

describe('send', () => {
Expand Down
6 changes: 4 additions & 2 deletions src/emails/emails.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,15 @@ export class Emails {
payload: CreateEmailOptions,
options: CreateEmailRequestOptions = {},
): Promise<CreateEmailResponse> {
const body: CreateEmailOptions = { ...payload };

if (payload.react) {
payload.html = await render(payload.react as React.ReactElement);
body.html = await render(payload.react as React.ReactElement);
}

const data = await this.resend.post<CreateEmailResponseSuccess>(
'/emails',
parseEmailToApiOptions(payload),
parseEmailToApiOptions(body),
options,
);

Expand Down
28 changes: 28 additions & 0 deletions src/templates/templates.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,34 @@ describe('Templates', () => {
expect(mockRenderAsync).toHaveBeenCalledWith(mockReactComponent);
});

it('does not mutate payload when using React component', async () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you also add tests to email.ts and @broadcasts.ts for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added. thanks for review.

const mockReactComponent = {
type: 'div',
props: { children: 'Welcome!' },
} as React.ReactElement;

mockRenderAsync.mockResolvedValueOnce('<div>Welcome!</div>');

const payload: CreateTemplateOptions = {
name: 'Welcome Email',
react: mockReactComponent,
};

const originalPayload = { ...payload };

const response: CreateTemplateResponseSuccess = {
object: 'template',
id: 'non-mutating-payload-id',
};

mockSuccessResponse(response);

const resend = new Resend(TEST_API_KEY);
await resend.templates.create(payload);

expect(payload).toEqual(originalPayload);
});

it('throws error when React renderer fails to load', async () => {
const mockReactComponent = {
type: 'div',
Expand Down
8 changes: 4 additions & 4 deletions src/templates/templates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ export class Templates {
private async performCreate(
payload: CreateTemplateOptions,
): Promise<CreateTemplateResponse> {
const body: CreateTemplateOptions = { ...payload };

if (payload.react) {
if (!this.renderAsync) {
try {
Expand All @@ -63,14 +65,12 @@ export class Templates {
}
}

payload.html = await this.renderAsync(
payload.react as React.ReactElement,
);
body.html = await this.renderAsync(payload.react as React.ReactElement);
}

return this.resend.post<CreateTemplateResponseSuccess>(
'/templates',
parseTemplateToApiOptions(payload),
parseTemplateToApiOptions(body),
);
}

Expand Down
Loading