Alternative to the quote-aware string fix: represent committed To/Cc/Bcc
recipients as Recipient[] ({name?, email}) with a separate input-text
string per field, instead of a single comma-joined string parsed with
split(','). Structured recipients can never be torn apart on a delimiter,
so a display name containing a comma ("Doo, John <john@doo.org>", as
produced on Reply-All) stays a single chip.
- email-composer-utils: add Recipient type, parseRecipient/formatRecipient,
and parseRecipientList/formatRecipientList for the (de)serialization
boundary (ComposerDraftData stays a string; quoting keeps it lossless).
Remove the now-unused string-chip helpers.
- email-composer: to/cc/bcc are Recipient[]; toInput/ccInput/bccInput hold
the in-progress text. Reply/forward init, autocomplete, chip edit, drag &
drop (payload now carries the structured recipient), send/draft/validation
and template paths all operate on arrays. withInput() folds uncommitted
typed text into the send/validation set.
- Tests updated for the array contract; add comma-in-name chip coverage.
201 lines
6.2 KiB
TypeScript
201 lines
6.2 KiB
TypeScript
import { describe, expect, it } from "vitest";
|
|
import {
|
|
plainTextToComposerBody,
|
|
rewriteCidImagesForEditor,
|
|
replaceInlineImagePlaceholders,
|
|
INLINE_IMAGE_PLACEHOLDER,
|
|
splitRecipients,
|
|
formatRecipient,
|
|
parseRecipient,
|
|
parseRecipientList,
|
|
formatRecipientList,
|
|
} from "../email-composer-utils";
|
|
|
|
describe("plainTextToComposerBody", () => {
|
|
it("returns an empty string for empty input", () => {
|
|
expect(plainTextToComposerBody("")).toBe("");
|
|
});
|
|
|
|
it("escapes HTML before building composer paragraphs", () => {
|
|
expect(plainTextToComposerBody("<script>alert('x') & \"q\"</script>")).toBe(
|
|
"<p><script>alert('x') & "q"</script></p>"
|
|
);
|
|
});
|
|
|
|
it("normalizes line endings and preserves single line breaks", () => {
|
|
expect(plainTextToComposerBody("line1\r\nline2\rline3")).toBe(
|
|
"<p>line1<br>line2<br>line3</p>"
|
|
);
|
|
});
|
|
|
|
it("splits paragraphs on blank lines", () => {
|
|
expect(plainTextToComposerBody("first\n\nsecond\nthird")).toBe(
|
|
"<p>first</p><p>second<br>third</p>"
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("rewriteCidImagesForEditor", () => {
|
|
it("returns input unchanged when no cid: refs are present", () => {
|
|
const html = '<p>hi</p><img src="https://example.com/x.png">';
|
|
expect(rewriteCidImagesForEditor(html)).toBe(html);
|
|
});
|
|
|
|
it("handles empty input", () => {
|
|
expect(rewriteCidImagesForEditor("")).toBe("");
|
|
});
|
|
|
|
it("rewrites a cid: src to placeholder + data-cid", () => {
|
|
const out = rewriteCidImagesForEditor(
|
|
'<img src="cid:abc@x" alt="logo">'
|
|
);
|
|
expect(out).toContain('data-cid="abc@x"');
|
|
expect(out).toContain(`src="${INLINE_IMAGE_PLACEHOLDER}"`);
|
|
expect(out).toContain('alt="logo"');
|
|
expect(out).not.toContain('src="cid:');
|
|
});
|
|
|
|
it("preserves an existing data-cid attribute", () => {
|
|
const out = rewriteCidImagesForEditor(
|
|
'<img src="cid:abc" data-cid="kept">'
|
|
);
|
|
expect(out).toContain('data-cid="kept"');
|
|
expect(out).not.toContain('data-cid="abc"');
|
|
});
|
|
|
|
it("leaves non-cid images alone", () => {
|
|
const out = rewriteCidImagesForEditor(
|
|
'<img src="https://example.com/x.png"><img src="cid:y">'
|
|
);
|
|
expect(out).toContain('src="https://example.com/x.png"');
|
|
expect(out).toContain('data-cid="y"');
|
|
});
|
|
});
|
|
|
|
describe("replaceInlineImagePlaceholders", () => {
|
|
it("returns input unchanged when the map is empty", () => {
|
|
const html = '<img src="..." data-cid="x">';
|
|
expect(replaceInlineImagePlaceholders(html, new Map())).toBe(html);
|
|
});
|
|
|
|
it("swaps the placeholder src to the data URL for matching cids", () => {
|
|
const html = `<img src="${INLINE_IMAGE_PLACEHOLDER}" data-cid="abc">`;
|
|
const out = replaceInlineImagePlaceholders(
|
|
html,
|
|
new Map([["abc", "data:image/png;base64,AAAA"]])
|
|
);
|
|
expect(out).toContain('src="data:image/png;base64,AAAA"');
|
|
expect(out).toContain('data-cid="abc"');
|
|
});
|
|
|
|
it("also rewrites raw cid: src refs that lack a placeholder", () => {
|
|
const html = '<img src="cid:abc" data-cid="abc">';
|
|
const out = replaceInlineImagePlaceholders(
|
|
html,
|
|
new Map([["abc", "data:image/png;base64,AAAA"]])
|
|
);
|
|
expect(out).toContain('src="data:image/png;base64,AAAA"');
|
|
});
|
|
|
|
it("does not overwrite images the user has re-pointed away from the cid", () => {
|
|
const html =
|
|
'<img src="https://example.com/other.png" data-cid="abc">';
|
|
const out = replaceInlineImagePlaceholders(
|
|
html,
|
|
new Map([["abc", "data:image/png;base64,AAAA"]])
|
|
);
|
|
expect(out).toContain('src="https://example.com/other.png"');
|
|
expect(out).not.toContain("data:image/png;base64,AAAA");
|
|
});
|
|
|
|
it("leaves unknown cids untouched", () => {
|
|
const html = `<img src="${INLINE_IMAGE_PLACEHOLDER}" data-cid="missing">`;
|
|
const out = replaceInlineImagePlaceholders(
|
|
html,
|
|
new Map([["abc", "data:image/png;base64,AAAA"]])
|
|
);
|
|
expect(out).toBe(html);
|
|
});
|
|
});
|
|
|
|
describe("splitRecipients", () => {
|
|
it("splits a plain comma-separated list", () => {
|
|
expect(splitRecipients("alice@x.com, bob@x.com")).toEqual([
|
|
"alice@x.com",
|
|
"bob@x.com",
|
|
]);
|
|
});
|
|
|
|
it("trims whitespace and drops empty segments", () => {
|
|
expect(splitRecipients(" alice@x.com ,, bob@x.com ,")).toEqual([
|
|
"alice@x.com",
|
|
"bob@x.com",
|
|
]);
|
|
});
|
|
|
|
it("keeps a quoted display name containing a comma intact", () => {
|
|
expect(splitRecipients('"Doo, John" <john@doo.org>, alice@x.com')).toEqual([
|
|
'"Doo, John" <john@doo.org>',
|
|
"alice@x.com",
|
|
]);
|
|
});
|
|
|
|
it("does not split on a comma inside angle brackets", () => {
|
|
expect(splitRecipients("Group <a,b@x.com>, c@x.com")).toEqual([
|
|
"Group <a,b@x.com>",
|
|
"c@x.com",
|
|
]);
|
|
});
|
|
|
|
it("returns an empty array for an empty string", () => {
|
|
expect(splitRecipients("")).toEqual([]);
|
|
});
|
|
});
|
|
|
|
describe("formatRecipient / parseRecipient", () => {
|
|
it("returns a bare email when there is no name", () => {
|
|
expect(formatRecipient(undefined, "a@x.com")).toBe("a@x.com");
|
|
});
|
|
|
|
it("returns a bare email when the name equals the email", () => {
|
|
expect(formatRecipient("a@x.com", "a@x.com")).toBe("a@x.com");
|
|
});
|
|
|
|
it("formats a simple name without quoting", () => {
|
|
expect(formatRecipient("Alice", "a@x.com")).toBe("Alice <a@x.com>");
|
|
});
|
|
|
|
it("quotes a name containing a comma", () => {
|
|
expect(formatRecipient("Doo, John", "john@doo.org")).toBe(
|
|
'"Doo, John" <john@doo.org>'
|
|
);
|
|
});
|
|
|
|
it("parses a bare email", () => {
|
|
expect(parseRecipient("a@x.com")).toEqual({ email: "a@x.com" });
|
|
});
|
|
|
|
it("parses and unquotes a quoted comma name", () => {
|
|
expect(parseRecipient('"Doo, John" <john@doo.org>')).toEqual({
|
|
name: "Doo, John",
|
|
email: "john@doo.org",
|
|
});
|
|
});
|
|
});
|
|
|
|
describe("parseRecipientList / formatRecipientList", () => {
|
|
it("round-trips a comma-name recipient through serialize + parse", () => {
|
|
const list = [
|
|
{ name: "Doo, John", email: "john@doo.org" },
|
|
{ email: "alice@x.com" },
|
|
];
|
|
const serialized = formatRecipientList(list);
|
|
expect(serialized).toBe('"Doo, John" <john@doo.org>, alice@x.com');
|
|
expect(parseRecipientList(serialized)).toEqual(list);
|
|
});
|
|
|
|
it("parses an empty string to an empty array", () => {
|
|
expect(parseRecipientList("")).toEqual([]);
|
|
});
|
|
});
|