Skip to content
Merged
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
3 changes: 3 additions & 0 deletions projects/common/src/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,6 @@ export * from './time/time-range.service';
export * from './time/time-range.type';
export * from './time/time-unit.type';
export * from './time/time';

// Validators
export * from './utilities/validators/email-validator';
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { displayString, titleCaseFromKebabCase, titleCaseFromSnakeCase } from './string-formatter';
import {
displayString,
getStringsFromCommaSeparatedList,
titleCaseFromKebabCase,
titleCaseFromSnakeCase
} from './string-formatter';

describe('String formatter', () => {
test('can convert from kebab case to title case', () => {
Expand Down Expand Up @@ -26,4 +31,12 @@ describe('String formatter', () => {
expect(displayString(Symbol('test symbol'))).toBe('Symbol(test symbol)');
expect(displayString(false)).toBe('false');
});

test('creates string array correctly from comma separated list', () => {
expect(getStringsFromCommaSeparatedList('first,second, third ')).toEqual(
expect.arrayContaining(['first', 'second', 'third'])
);
expect(getStringsFromCommaSeparatedList('first,second, ')).toEqual(expect.arrayContaining(['first', 'second']));
expect(getStringsFromCommaSeparatedList('first')).toEqual(expect.arrayContaining(['first']));
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,10 @@ export const displayString = (provided?: unknown): string => {
export const collapseWhitespace = (str: string): string =>
// Replace all whitespace with a single space
str.replace(/\s\s+/g, ' ');

export const getStringsFromCommaSeparatedList = (text: string): string[] =>
text
.trim()
.split(',')
.map(part => part.trim())
.filter(part => part !== '');
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { areEmailAddressesValid, isEmailAddressValid } from '@hypertrace/common';

describe('Email validator', () => {
test('can validate email correctly', () => {
expect(isEmailAddressValid('test@test.ai')).toBe(true);
expect(isEmailAddressValid('test.email@test.ai')).toBe(true);
expect(isEmailAddressValid('test+983tonq@test.ai')).toBe(true);
expect(isEmailAddressValid('test@test.')).toBe(false);
expect(isEmailAddressValid('test')).toBe(false);
expect(isEmailAddressValid('test@test-')).toBe(false);
expect(isEmailAddressValid('tes\t@test-')).toBe(false);
expect(isEmailAddressValid('test@@test.ai')).toBe(false);
expect(isEmailAddressValid('test@@test.ai')).toBe(false);
});

test('can validate email lists correctly', () => {
expect(areEmailAddressesValid(['test@test.ai', 'test.email@test.ai'])).toBe(true);
expect(areEmailAddressesValid(['test@test.ai', 'test.email@@test.ai'])).toBe(false);
});
});
10 changes: 10 additions & 0 deletions projects/common/src/utilities/validators/email-validator.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export const isEmailAddressValid = (emailAddress: string) => {
// Regex as per W3C spec for email field
// Source: https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
const regex: RegExp = /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;

return regex.test(emailAddress);
};

export const areEmailAddressesValid = (emailAddresses: string[]) =>
emailAddresses.filter(emailAddress => !isEmailAddressValid(emailAddress)).length === 0;