From 091590d566de3ca7432f0cb2a0b57b616434b272 Mon Sep 17 00:00:00 2001 From: Snickbit Date: Fri, 3 Jun 2022 20:33:52 -0400 Subject: [PATCH] fix: improve existing icon matching with regex --- package.json | 2 ++ src/actions/add.ts | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0becfd9e..3aa95f71 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,8 @@ "watch": "concurrently -n lib,cli \"pnpm run watch:lib\" \"pnpm run watch:cli\"", "watch:cli": "pnpm run dev:cli --watch", "watch:lib": "pnpm run dev:lib --watch" + "watch:lib": "pnpm run dev:lib --watch", + "schema": "pnpx get-graphql-schema https://api.fontawesome.com > schema.graphql" }, "jest": { "preset": "ts-jest", diff --git a/src/actions/add.ts b/src/actions/add.ts index 72bd1304..b084d8e8 100644 --- a/src/actions/add.ts +++ b/src/actions/add.ts @@ -24,8 +24,9 @@ export default async argv => cli(argv) for (let item of args.icons) { let [icon, ...aliases] = item.split(',') - let iconName = normalizeIconName(icon.replace(/(fa[a-z]?)-/, `$1:`)) - if (!config.icons.includes(iconName)) { + let iconName = cleanIconName(icon) + const reg = new RegExp(`^fa[a-z]?:(${iconName})$`) + if (!config.icons.find(i => reg.test(i))) { const iconQuery = gql` query ($query: String) { search(version: "6.1.1", query: $query, first: 15) {id}