Mibew/simple-icons
1
0
Fork 0
mirror of https://github.com/Mibew/simple-icons.git synced 2025-02-07 01:34:43 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Standarize locale comparisons and sort icons by title in package (#7854)

Browse Source 
* Use Intl.Collator for locale comparisons

* Sort icons by title in package
This commit is contained in:
Álvaro Mondéjar 2022-09-24 17:29:43 +02:00 committed by GitHub
parent fdc707bf81
commit ad7de0434e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.svglintrc.mjs
View File

@ -3,6 +3,7 @@ import path from 'node:path';
import { import {
getDirnameFromImportMeta, getDirnameFromImportMeta,
htmlFriendlyToTitle, htmlFriendlyToTitle,
collator,
} from './scripts/utils.js'; } from './scripts/utils.js';
import svgpath from 'svgpath'; import svgpath from 'svgpath';
import svgPathBbox from 'svg-path-bbox'; import svgPathBbox from 'svg-path-bbox';
@ -46,7 +47,7 @@ const sortObjectByKey = (obj) => {
const sortObjectByValue = (obj) => { const sortObjectByValue = (obj) => {
return Object.keys(obj) return Object.keys(obj)
.sort((a, b) => ('' + obj[a]).localeCompare(obj[b])) .sort((a, b) => collator.compare(obj[a], obj[b]))
.reduce((r, k) => Object.assign(r, { [k]: obj[k] }), {}); .reduce((r, k) => Object.assign(r, { [k]: obj[k] }), {});
}; };

4
scripts/build/package.js
View File

@ -18,6 +18,7 @@ import {
slugToVariableName, slugToVariableName,
getIconsData, getIconsData,
getDirnameFromImportMeta, getDirnameFromImportMeta,
collator,
} from '../utils.js'; } from '../utils.js';
const __dirname = getDirnameFromImportMeta(import.meta.url); const __dirname = getDirnameFromImportMeta(import.meta.url);
@ -98,7 +99,8 @@ const build = async () => {
const iconsBarrelJs = []; const iconsBarrelJs = [];
const iconsBarrelMjs = []; const iconsBarrelMjs = [];
buildIcons.forEach(({ icon, iconObject, iconExportName }) => { buildIcons.sort((a, b) => collator.compare(a.icon.title, b.icon.title));
buildIcons.forEach(({ iconObject, iconExportName }) => {
iconsBarrelDts.push(`export const ${iconExportName}:I;`); iconsBarrelDts.push(`export const ${iconExportName}:I;`);
iconsBarrelJs.push(`${iconExportName}:${iconObject},`); iconsBarrelJs.push(`${iconExportName}:${iconObject},`);
iconsBarrelMjs.push(`export const ${iconExportName}=${iconObject}`); iconsBarrelMjs.push(`export const ${iconExportName}=${iconObject}`);

10
scripts/lint/ourlint.js
View File

@ -6,7 +6,7 @@
*/ */
import fakeDiff from 'fake-diff'; import fakeDiff from 'fake-diff';
import { getIconsDataString, normalizeNewlines } from '../utils.js'; import { getIconsDataString, normalizeNewlines, collator } from '../utils.js';
/** /**
* Contains our tests so they can be isolated from each other. * Contains our tests so they can be isolated from each other.
@ -18,12 +18,12 @@ const TESTS = {
const collector = (invalidEntries, icon, index, array) => { const collector = (invalidEntries, icon, index, array) => {
if (index > 0) { if (index > 0) {
const prev = array[index - 1]; const prev = array[index - 1];
const compare = icon.title.localeCompare(prev.title); const comparison = collator.compare(icon.title, prev.title);
if (compare < 0) { if (comparison < 0) {
invalidEntries.push(icon); invalidEntries.push(icon);
} else if (compare === 0) { } else if (comparison === 0) {
if (prev.slug) { if (prev.slug) {
if (!icon.slug || icon.slug.localeCompare(prev.slug) < 0) { if (!icon.slug || collator.compare(icon.slug, prev.slug) < 0) {
invalidEntries.push(icon); invalidEntries.push(icon);
} }
} }

10
scripts/utils.js
View File

@ -153,3 +153,13 @@ export const getThirdPartyExtensions = async (readmePath) =>
}, },
}; };
}); });
/**
* `Intl.Collator` object ready to be used for icon titles sorting.
* @type {Intl.Collator}
* @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Collator
**/
export const collator = new Intl.Collator('en', {
usage: 'search',
caseFirst: 'upper',
});