diff --git a/packages/utils/src/emoji/regex/create.ts b/packages/utils/src/emoji/regex/create.ts index b5e8f73..a2c5646 100644 --- a/packages/utils/src/emoji/regex/create.ts +++ b/packages/utils/src/emoji/regex/create.ts @@ -1,6 +1,6 @@ import { getEmojiSequenceFromString } from '../cleanup'; import { convertEmojiSequenceToUTF32 } from '../convert'; -import { addOptionalEmojiVariations } from '../test/variations'; +import { addQualifiedEmojiVariations } from '../test/variations'; import { createEmojisTree, parseEmojiTree } from './tree'; /** @@ -46,7 +46,7 @@ export function createOptimisedRegex( ); // Add variations - sequences = addOptionalEmojiVariations(sequences, testData); + sequences = addQualifiedEmojiVariations(sequences, testData); // Parse return createOptimisedRegexForEmojiSequences(sequences); diff --git a/packages/utils/src/emoji/test/parse.ts b/packages/utils/src/emoji/test/parse.ts index 88dda10..2f1a0b6 100644 --- a/packages/utils/src/emoji/test/parse.ts +++ b/packages/utils/src/emoji/test/parse.ts @@ -10,7 +10,7 @@ type EmojiStatus = | 'fully-qualified' | 'minimally-qualified' | 'unqualified'; -const componentStatus: EmojiStatus = 'component'; +export const componentStatus: EmojiStatus = 'component'; // Allowed status values, in order of conversion const allowedStatus: Set = new Set([ diff --git a/packages/utils/src/emoji/test/variations.ts b/packages/utils/src/emoji/test/variations.ts index ac34192..b4fb2d5 100644 --- a/packages/utils/src/emoji/test/variations.ts +++ b/packages/utils/src/emoji/test/variations.ts @@ -37,7 +37,7 @@ export function guessQualifiedEmojiSequence(sequence: number[]): number[] { } /** - * Add optional variations to emojis + * Add qualified variations to emojis * * Also converts list to UTF-32 as needed * @@ -45,16 +45,16 @@ export function guessQualifiedEmojiSequence(sequence: number[]): number[] { * If missing or emoji is missing in test data, `FE0F` is added to every single code emoji. * It can also be an array of sequences. */ -export function addOptionalEmojiVariations( +export function addQualifiedEmojiVariations( sequences: number[][], testData?: (number[] | EmojiTestDataItem)[] ): number[][]; -export function addOptionalEmojiVariations( +export function addQualifiedEmojiVariations( sequences: number[][], testData: (number[] | EmojiTestDataItem)[], toString: (value: number[]) => string ): string[]; -export function addOptionalEmojiVariations( +export function addQualifiedEmojiVariations( sequences: number[][], testData: (number[] | EmojiTestDataItem)[] = [], toString?: (value: number[]) => string diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index ef1310b..437bdaf 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -105,7 +105,7 @@ export { parseEmojiTestFile, getQualifiedEmojiSequencesMap, } from './emoji/test/parse'; -export { addOptionalEmojiVariations } from './emoji/test/variations'; +export { addQualifiedEmojiVariations as addOptionalEmojiVariations } from './emoji/test/variations'; export { createOptimisedRegex, createOptimisedRegexForEmojiSequences, diff --git a/packages/utils/tests/emoji-optional-variations-test.ts b/packages/utils/tests/emoji-optional-variations-test.ts index bdbbeb6..efda51d 100644 --- a/packages/utils/tests/emoji-optional-variations-test.ts +++ b/packages/utils/tests/emoji-optional-variations-test.ts @@ -5,9 +5,9 @@ import { getQualifiedEmojiSequencesMap, parseEmojiTestFile, } from '../lib/emoji/test/parse'; -import { addOptionalEmojiVariations } from '../lib/emoji/test/variations'; +import { addQualifiedEmojiVariations } from '../lib/emoji/test/variations'; -describe('Optional variations of emoji sequences', () => { +describe('Qualified variations of emoji sequences', () => { it('Variations without data', () => { const sequences = [ // simple emoji, twice to check duplicates @@ -27,7 +27,7 @@ describe('Optional variations of emoji sequences', () => { '1F9D7 1F3FE 200D 2640 FE0F', '1F9D7 1F3FF 200D 2642 ', ].map(getEmojiSequenceFromString); - const results = addOptionalEmojiVariations(sequences); + const results = addQualifiedEmojiVariations(sequences); expect( results.map((sequence) => getEmojiSequenceString(sequence, { @@ -124,7 +124,7 @@ describe('Optional variations of emoji sequences', () => { // fake keycap, not in test file '2345 20E3 200D 1235', ].map(getEmojiSequenceFromString); - const results = addOptionalEmojiVariations( + const results = addQualifiedEmojiVariations( sequences, testDataSequences );