Merge pull request #111

Improve icon matching logic with labeled loop

Author: andrey-helldar

src/utils/icons.ts

@@ -24,6 +24,7 @@ const find = (
 ): string | undefined => {
     const names: string[] = Object.keys(dependencies);
 
+    outer:
     for (const name of names) {
         for (const icon of icons) {
             if (!name.includes(icon.query)) {
@@ -36,9 +37,11 @@ const find = (
 
             for (const exclude of icon.exclude) {
                 if (name.includes(exclude)) {
-                    return icon.icon;
+                    break outer;
                 }
             }
+
+            return icon.icon;
         }
     }
 

…/fixtures/packages/composer-symfony.json …packages/composer-symfony-framework.jsontests/fixtures/packages/composer-symfony.json renamed to tests/fixtures/packages/composer-symfony-framework.json tests/fixtures/packages/composer-symfony.json renamed to tests/fixtures/packages/composer-symfony-framework.json

@@ -0,0 +1,8 @@
+{
+    "name": "dragon-code/any",
+    "description": "Performing any actions during the deployment process",
+    "require": {
+        "php": "^8.5",
+        "symfony/polyfill-php85": "^1.33"
+    }
+}

tests/fixtures/packages/composer-symfony-polyfill.json

@@ -18,12 +18,18 @@ test("composer illuminate", () => {
     expect(detectIcon(undefined, data)).toBe(phpIcons[1].icon);
 });
 
-test("composer symfony", () => {
-    const data = getPackage("tests/fixtures/packages/composer-symfony.json");
+test("composer symfony framework", () => {
+    const data = getPackage("tests/fixtures/packages/composer-symfony-framework.json");
 
     expect(detectIcon(undefined, data)).toBe(phpIcons[2].icon);
 });
 
+test("composer symfony polyfill", () => {
+    const data = getPackage("tests/fixtures/packages/composer-symfony-polyfill.json");
+
+    expect(detectIcon(undefined, data)).toBe(defaultPhpIcon);
+});
+
 test("composer default", () => {
     const data = getPackage("tests/fixtures/packages/composer-default.json");