agerix/iconify
2
0
Fork 0
mirror of https://github.com/iconify/iconify.git synced 2024-09-19 16:59:02 +00:00
Code Issues Releases Activity

Parse icons tree only once when parsing icon set

Browse Source
This commit is contained in:
Vjacheslav Trushkin 2022-06-20 20:39:06 +03:00
parent 89a2def126
commit 7b4409665a
3 changed files with 180 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
packages/utils/src/icon-set/get-icon.ts
View File

@ -4,6 +4,57 @@ import type { IconifyIcon, FullIconifyIcon } from '../icon/defaults';
import { mergeIconData } from '../icon/merge';
import { getIconsTree } from './tree';
/**
* Get icon data, using prepared aliases tree
*/
export function internalGetIconData(
data: IconifyJSON,
name: string,
tree: string[],
full: true
): FullIconifyIcon;
export function internalGetIconData(
data: IconifyJSON,
name: string,
tree: string[],
full: false
): IconifyIcon;
export function internalGetIconData(
data: IconifyJSON,
name: string,
tree: string[],
full: boolean
): FullIconifyIcon | IconifyIcon {
const icons = data.icons;
const aliases = data.aliases || {};
let currentProps = {} as IconifyIcon;
// Parse parent item
function parse(name: string) {
currentProps = mergeIconData(
icons[name] || aliases[name],
currentProps,
false
);
}
parse(name);
tree.forEach(parse);
// Add default values
currentProps = mergeIconData(
data,
currentProps,
false
) as unknown as IconifyIcon;
// Return icon
return full
? Object.assign({}, defaultIconProps, currentProps)
: currentProps;
}
/**
* Get data for icon
*/
@ -22,43 +73,12 @@ export function getIconData(
name: string,
full = false
): FullIconifyIcon | IconifyIcon | null {
const icons = data.icons;
const aliases = data.aliases || {};
let currentProps = {} as IconifyIcon;
// Parse parent item
function parse(name: string) {
currentProps = mergeIconData(
icons[name] || aliases[name],
currentProps,
false
);
if (data.icons[name]) {
// Parse only icon
return internalGetIconData(data, name, [], full as true);
}
const icon = icons[name];
if (icon) {
// Parse only icon
parse(name);
} else {
// Resolve tree
const tree = getIconsTree(data, [name])[name];
if (!tree) {
return null;
}
parse(name);
tree.forEach(parse);
}
// Add default values
currentProps = mergeIconData(
data,
currentProps,
false
) as unknown as IconifyIcon;
// Return icon
return full
? Object.assign({}, defaultIconProps, currentProps)
: currentProps;
return tree ? internalGetIconData(data, name, tree, full as true) : null;
}

29
packages/utils/src/icon-set/parse.ts
View File

@ -1,6 +1,7 @@
import type { IconifyJSON } from '@iconify/types';
import type { FullIconifyIcon } from '../icon/defaults';
import { getIconData } from './get-icon';
import { internalGetIconData } from './get-icon';
import { getIconsTree } from './tree';
/**
* Callback to call for each icon.
@ -37,29 +38,15 @@ export function parseIconSet(
});
}
// Get icons
const icons = data.icons;
for (const name in icons) {
const iconData = getIconData(data, name, true);
if (iconData) {
// Call callback
callback(name, iconData);
// Get tree
const tree = getIconsTree(data);
for (const name in tree) {
const item = tree[name];
if (item) {
callback(name, internalGetIconData(data, name, item, true));
names.push(name);
}
}
// Get aliases
const aliases = data.aliases;
if (aliases) {
for (const name in aliases) {
const iconData = icons[name] ? null : getIconData(data, name, true);
if (iconData) {
// Call callback
callback(name, iconData);
names.push(name);
}
}
}
return names;
}

42
packages/utils/tests/parse-icons-test.ts
View File

@ -66,8 +66,8 @@ describe('Testing parsing icon set', () => {
test('Aliases', () => {
// Names list
const names: string[] = ['icon1', 'icon2', 'alias1', 'alias2'];
const namesCopy = names.slice(0);
let names: string[] = ['icon1', 'icon2', 'alias1', 'alias2'];
const expectedNames = names.slice(0).sort((a, b) => a.localeCompare(b));
// Resolved data
const expected: Record<string, FullIconifyIcon | null> = {
@ -114,8 +114,7 @@ describe('Testing parsing icon set', () => {
};
// Do stuff
expect(
parseIconSet(
const parsedNames = parseIconSet(
{
prefix: 'foo',
icons: {
@ -147,23 +146,25 @@ describe('Testing parsing icon set', () => {
height: 24,
},
(name, data) => {
// Make sure name matches
expect(names.length).toBeGreaterThanOrEqual(1);
expect(name).toBe(names.shift());
// Make sure name exists in array of pending names
const index = names.indexOf(name);
expect(index).not.toBe(-1);
names = names.slice(0, index).concat(names.slice(index + 1));
// Check icon data
expect(data).toEqual(expected[name]);
}
)
).toEqual(namesCopy);
);
// All names should have been parsed
// All names should have been parsed, not necessary in expected order
expect(names).toEqual([]);
parsedNames.sort((a, b) => a.localeCompare(b));
expect(parsedNames).toEqual(expectedNames);
});
test('Nested aliases', () => {
// Names list
const names: string[] = [
let names: string[] = [
'icon1',
'icon2',
'alias2a',
@ -175,7 +176,7 @@ describe('Testing parsing icon set', () => {
'alias2z6',
'alias2z7',
];
const namesCopy = names.slice(0);
const expectedNames = names.slice(0).sort((a, b) => a.localeCompare(b));
// Resolved data
const expected: Record<string, FullIconifyIcon | null> = {
@ -290,8 +291,7 @@ describe('Testing parsing icon set', () => {
};
// Do stuff
expect(
parseIconSet(
const parsedNames = parseIconSet(
{
prefix: 'foo',
icons: {
@ -355,17 +355,19 @@ describe('Testing parsing icon set', () => {
height: 24,
},
(name, data) => {
// Make sure name matches
expect(names.length).toBeGreaterThanOrEqual(1);
expect(name).toBe(names.shift());
// Make sure name exists in array of pending names
const index = names.indexOf(name);
expect(index).not.toBe(-1);
names = names.slice(0, index).concat(names.slice(index + 1));
// Check icon data
expect(data).toEqual(expected[name]);
}
)
).toEqual(namesCopy);
);
// All names should have been parsed
// All names should have been parsed, not necessary in expected order
expect(names).toEqual([]);
parsedNames.sort((a, b) => a.localeCompare(b));
expect(parsedNames).toEqual(expectedNames);
});
});