@realfavicongenerator/check-favicon 0.4.0 → 0.4.5

package/dist/desktop/desktop.js

@@ -143,7 +143,7 @@ const checkPngFavicon = (baseUrl_2, head_2, ...args_2) => __awaiter(void 0, [bas
                 id: types_1.MessageId.desktopPngFaviconDeclared,
                 text: `The ${size} desktop PNG favicon is declared`
             });
-            const href = icons[0].attributes.href;
+            const href = sizedIconMarkup[0].attributes.href;
             if (!href) {
                 messages.push({
                     status: types_1.CheckerStatus.Error,

package/dist/desktop/desktop.test.js

@@ -14,26 +14,26 @@ const desktop_1 = require("./desktop");
 const types_1 = require("../types");
 const helper_1 = require("../helper");
 const test_helper_1 = require("../test-helper");
-const runTest = (headFragment_1, output_1, ...args_1) => __awaiter(void 0, [headFragment_1, output_1, ...args_1], void 0, function* (headFragment, output, fetchDatabase = {}) {
+const runSvgTest = (headFragment_1, output_1, ...args_1) => __awaiter(void 0, [headFragment_1, output_1, ...args_1], void 0, function* (headFragment, output, fetchDatabase = {}) {
     const root = headFragment ? (0, node_html_parser_1.parse)(headFragment) : null;
     const result = yield (0, desktop_1.checkSvgFavicon)('https://example.com/', root, (0, test_helper_1.testFetcher)(fetchDatabase));
     const filteredMessages = result.map(m => ({ status: m.status, id: m.id }));
     expect(filteredMessages).toEqual(output);
 });
 test('checkSvgFavicon - noHead', () => __awaiter(void 0, void 0, void 0, function* () {
-    yield runTest(null, [{
+    yield runSvgTest(null, [{
             status: types_1.CheckerStatus.Error,
             id: types_1.MessageId.noHead,
         }]);
 }));
 test('checkSvgFavicon - noSvgFavicon', () => __awaiter(void 0, void 0, void 0, function* () {
-    yield runTest(`<title>SOme text</title>`, [{
+    yield runSvgTest(`<title>SOme text</title>`, [{
             status: types_1.CheckerStatus.Error,
             id: types_1.MessageId.noSvgFavicon,
         }]);
 }));
 test('checkSvgFavicon - multipleSvgFavicons', () => __awaiter(void 0, void 0, void 0, function* () {
-    yield runTest(`
+    yield runSvgTest(`
   <link rel="icon" type="image/svg+xml" href="/the-icon.svg" />
   <link rel="icon" type="image/svg+xml" href="/another-icon.svg" />
   `, [{
@@ -42,7 +42,7 @@ test('checkSvgFavicon - multipleSvgFavicons', () => __awaiter(void 0, void 0, vo
         }]);
 }));
 test('checkSvgFavicon - svgFaviconDeclared & noSvgFaviconHref', () => __awaiter(void 0, void 0, void 0, function* () {
-    yield runTest(`<link rel="icon" type="image/svg+xml" />`, [{
+    yield runSvgTest(`<link rel="icon" type="image/svg+xml" />`, [{
             status: types_1.CheckerStatus.Ok,
             id: types_1.MessageId.svgFaviconDeclared,
         }, {
@@ -51,7 +51,7 @@ test('checkSvgFavicon - svgFaviconDeclared & noSvgFaviconHref', () => __awaiter(
         }]);
 }));
 test('checkSvgFavicon - svgFaviconDeclared & svgFavicon404', () => __awaiter(void 0, void 0, void 0, function* () {
-    yield runTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [{
+    yield runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [{
             status: types_1.CheckerStatus.Ok,
             id: types_1.MessageId.svgFaviconDeclared,
         }, {
@@ -60,7 +60,7 @@ test('checkSvgFavicon - svgFaviconDeclared & svgFavicon404', () => __awaiter(voi
         }]);
 }));
 test('checkSvgFavicon - svgFaviconDeclared & svgFaviconCannotGet', () => __awaiter(void 0, void 0, void 0, function* () {
-    yield runTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [{
+    yield runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [{
             status: types_1.CheckerStatus.Ok,
             id: types_1.MessageId.svgFaviconDeclared,
         }, {
@@ -76,7 +76,7 @@ test('checkSvgFavicon - svgFaviconDeclared & svgFaviconCannotGet', () => __await
 test('checkSvgFavicon - svgFaviconDeclared & svgFaviconDownloadable & svgFaviconSquare', () => __awaiter(void 0, void 0, void 0, function* () {
     const testIconPath = './fixtures/happy-face.svg';
     const serpIcon = yield (0, helper_1.filePathToString)(testIconPath);
-    yield runTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [
+    yield runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [
         {
             status: types_1.CheckerStatus.Ok,
             id: types_1.MessageId.svgFaviconDeclared,
@@ -95,3 +95,44 @@ test('checkSvgFavicon - svgFaviconDeclared & svgFaviconDownloadable & svgFavicon
         }
     });
 }));
+const runPngTest = (headFragment_2, output_2, ...args_2) => __awaiter(void 0, [headFragment_2, output_2, ...args_2], void 0, function* (headFragment, output, fetchDatabase = {}) {
+    const root = headFragment ? (0, node_html_parser_1.parse)(headFragment) : null;
+    const result = yield (0, desktop_1.checkPngFavicon)('https://example.com/', root, (0, test_helper_1.testFetcher)(fetchDatabase));
+    const filteredMessages = result.messages.map(m => ({ status: m.status, id: m.id }));
+    expect(filteredMessages).toEqual(output);
+});
+const testIcon16 = './fixtures/16x16.png';
+const testIcon32 = './fixtures/32x32.png';
+const testIcon48 = './fixtures/48x48.png';
+test('checkSvgFavicon - Three PNG icons with different sizes', () => __awaiter(void 0, void 0, void 0, function* () {
+    yield runPngTest(`
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="48x48" href="/favicon/favicon-48x48.png">
+  `, [{
+            status: types_1.CheckerStatus.Ok,
+            id: types_1.MessageId.desktopPngFaviconDeclared,
+        }, {
+            status: types_1.CheckerStatus.Ok,
+            id: types_1.MessageId.desktopPngFaviconDownloadable,
+        }, {
+            status: types_1.CheckerStatus.Ok,
+            id: types_1.MessageId.desktopPngFaviconRightSize,
+        }], {
+        'https://example.com/favicon/favicon-16x16.png': {
+            status: 200,
+            contentType: 'image/png',
+            readableStream: yield (0, helper_1.filePathToReadableStream)(testIcon16),
+        },
+        'https://example.com/favicon/favicon-32x32.png': {
+            status: 200,
+            contentType: 'image/png',
+            readableStream: yield (0, helper_1.filePathToReadableStream)(testIcon32),
+        },
+        'https://example.com/favicon/favicon-48x48.png': {
+            status: 200,
+            contentType: 'image/png',
+            readableStream: yield (0, helper_1.filePathToReadableStream)(testIcon48),
+        }
+    });
+}));

package/dist/touch-icon.js

@@ -82,14 +82,6 @@ const checkTouchIconIcon = (baseUrl_2, head_2, ...args_2) => __awaiter(void 0, [
         id: types_1.MessageId.touchIconDeclared,
         text: 'The touch icon is declared'
     });
-    const sizes = iconMarkup.map(icon => icon.getAttribute('sizes')).filter(size => size);
-    if (sizes.length > 0) {
-        messages.push({
-            status: types_1.CheckerStatus.Warning,
-            id: types_1.MessageId.touchIconWithSize,
-            text: `Some Touch icon have a specific size (${sizes.join(', ')})`
-        });
-    }
     const duplicatedSizes = (0, exports.getDuplicatedSizes)(iconMarkup.map(icon => icon.getAttribute('sizes')));
     if (duplicatedSizes.length > 0) {
         messages.push({

package/dist/touch-icon.test.js

@@ -73,23 +73,6 @@ test('checkTouchIcon - noTouchIcon', () => __awaiter(void 0, void 0, void 0, fun
                 id: types_1.MessageId.noTouchIcon,
             }] });
 }));
-test('checkTouchIcon - touchIconWithSize', () => __awaiter(void 0, void 0, void 0, function* () {
-    yield runCheckTouchIconTest(`
-    <link rel="apple-touch-icon" sizes="152x152" href="some-other-icon.png">
-  `, { messages: [{
-                status: types_1.CheckerStatus.Ok,
-                id: types_1.MessageId.touchIconDeclared,
-            }, {
-                status: types_1.CheckerStatus.Warning,
-                id: types_1.MessageId.touchIconWithSize,
-            }] }, {
-        'https://example.com/some-other-icon.png': {
-            status: 200,
-            contentType: 'image/png',
-            readableStream: null
-        }
-    });
-}));
 test('checkTouchIcon - multipleTouchIcon - no size', () => __awaiter(void 0, void 0, void 0, function* () {
     yield runCheckTouchIconTest(`
     <link rel="apple-touch-icon" href="some-icon.png">
@@ -120,9 +103,6 @@ test('checkTouchIcon - multipleTouchIcon - specific size', () => __awaiter(void
   `, { messages: [{
                 status: types_1.CheckerStatus.Ok,
                 id: types_1.MessageId.touchIconDeclared,
-            }, {
-                status: types_1.CheckerStatus.Warning,
-                id: types_1.MessageId.touchIconWithSize,
             }, {
                 status: types_1.CheckerStatus.Error,
                 id: types_1.MessageId.duplicatedTouchIconSizes,
@@ -139,23 +119,6 @@ test('checkTouchIcon - multipleTouchIcon - specific size', () => __awaiter(void
         }
     });
 }));
-test('checkTouchIcon - touchIconWithSize', () => __awaiter(void 0, void 0, void 0, function* () {
-    yield runCheckTouchIconTest(`
-    <link rel="apple-touch-icon" sizes="180x180" href="some-other-icon.png">
-  `, { messages: [{
-                status: types_1.CheckerStatus.Ok,
-                id: types_1.MessageId.touchIconDeclared,
-            }, {
-                status: types_1.CheckerStatus.Warning,
-                id: types_1.MessageId.touchIconWithSize,
-            }] }, {
-        'https://example.com/some-other-icon.png': {
-            status: 200,
-            contentType: 'image/png',
-            readableStream: null
-        }
-    });
-}));
 const testIcon = './fixtures/180x180.png';
 test('checkTouchIcon - Regular case', () => __awaiter(void 0, void 0, void 0, function* () {
     yield runCheckTouchIconTest(`

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@realfavicongenerator/check-favicon",
-  "version": "0.4.0",
+  "version": "0.4.5",
   "description": "Check the favicon of a website",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "test": "jest",
+    "test:watch": "jest --watch",
     "build": "tsc",
     "prepublishOnly": "npm run build"
   },
@@ -38,5 +39,5 @@
     "node-html-parser": "^6.1.13",
     "sharp": "^0.32.6"
   },
-  "gitHead": "4abed5dcaa62ba02e111a31c295eb5fc5bef98c5"
+  "gitHead": "ff517731a374ff42747e65aa036b064d1a1f1aa1"
 }

package/src/desktop/desktop.test.ts

@@ -1,12 +1,12 @@
 import { parse } from 'node-html-parser'
-import { checkSvgFavicon } from "./desktop";
+import { checkPngFavicon, checkSvgFavicon } from "./desktop";
 import { CheckerMessage, CheckerStatus, FetchResponse, MessageId } from '../types';
 import { filePathToReadableStream, filePathToString, stringToReadableStream } from '../helper';
 import { testFetcher } from '../test-helper';
 
 type TestOutput = Pick<CheckerMessage, 'id' | 'status'>[];
 
-const runTest = async (
+const runSvgTest = async (
   headFragment: string | null,
   output: TestOutput,
   fetchDatabase: { [url: string]: FetchResponse } = {}
@@ -18,21 +18,21 @@ const runTest = async (
 }
 
 test('checkSvgFavicon - noHead', async () => {
-  await runTest(null, [{
+  await runSvgTest(null, [{
     status: CheckerStatus.Error,
     id: MessageId.noHead,
   }]);
 })
 
 test('checkSvgFavicon - noSvgFavicon', async () => {
-  await runTest(`<title>SOme text</title>`, [{
+  await runSvgTest(`<title>SOme text</title>`, [{
     status: CheckerStatus.Error,
     id: MessageId.noSvgFavicon,
   }]);
 })
 
 test('checkSvgFavicon - multipleSvgFavicons', async () => {
-  await runTest(`
+  await runSvgTest(`
   <link rel="icon" type="image/svg+xml" href="/the-icon.svg" />
   <link rel="icon" type="image/svg+xml" href="/another-icon.svg" />
   `, [{
@@ -42,7 +42,7 @@ test('checkSvgFavicon - multipleSvgFavicons', async () => {
 })
 
 test('checkSvgFavicon - svgFaviconDeclared & noSvgFaviconHref', async () => {
-  await runTest(`<link rel="icon" type="image/svg+xml" />`, [{
+  await runSvgTest(`<link rel="icon" type="image/svg+xml" />`, [{
     status: CheckerStatus.Ok,
     id: MessageId.svgFaviconDeclared,
   }, {
@@ -52,7 +52,7 @@ test('checkSvgFavicon - svgFaviconDeclared & noSvgFaviconHref', async () => {
 })
 
 test('checkSvgFavicon - svgFaviconDeclared & svgFavicon404', async () => {
-  await runTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [{
+  await runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [{
     status: CheckerStatus.Ok,
     id: MessageId.svgFaviconDeclared,
   }, {
@@ -62,7 +62,7 @@ test('checkSvgFavicon - svgFaviconDeclared & svgFavicon404', async () => {
 })
 
 test('checkSvgFavicon - svgFaviconDeclared & svgFaviconCannotGet', async () => {
-  await runTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [{
+  await runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [{
     status: CheckerStatus.Ok,
     id: MessageId.svgFaviconDeclared,
   }, {
@@ -81,7 +81,7 @@ test('checkSvgFavicon - svgFaviconDeclared & svgFaviconDownloadable & svgFavicon
 
   const serpIcon = await filePathToString(testIconPath);
 
-  await runTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [
+  await runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [
     {
       status: CheckerStatus.Ok,
       id: MessageId.svgFaviconDeclared,
@@ -99,3 +99,52 @@ test('checkSvgFavicon - svgFaviconDeclared & svgFaviconDownloadable & svgFavicon
     }
   });
 })
+
+const runPngTest = async (
+  headFragment: string | null,
+  output: TestOutput,
+  fetchDatabase: { [url: string]: FetchResponse } = {}
+) => {
+  const root = headFragment ? parse(headFragment) : null;
+  const result = await checkPngFavicon('https://example.com/', root, testFetcher(fetchDatabase));
+  const filteredMessages = result.messages.map(m => ({ status: m.status, id: m.id }));
+  expect(filteredMessages).toEqual(output);
+}
+
+const testIcon16 = './fixtures/16x16.png';
+const testIcon32 = './fixtures/32x32.png';
+const testIcon48 = './fixtures/48x48.png';
+
+test('checkSvgFavicon - Three PNG icons with different sizes', async () => {
+  await runPngTest(`
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="48x48" href="/favicon/favicon-48x48.png">
+  `, [{
+    status: CheckerStatus.Ok,
+    id: MessageId.desktopPngFaviconDeclared,
+  }, {
+    status: CheckerStatus.Ok,
+    id: MessageId.desktopPngFaviconDownloadable,
+  }, {
+    status: CheckerStatus.Ok,
+    id: MessageId.desktopPngFaviconRightSize,
+  }],
+  {
+    'https://example.com/favicon/favicon-16x16.png': {
+      status: 200,
+      contentType: 'image/png',
+      readableStream: await filePathToReadableStream(testIcon16),
+    },
+    'https://example.com/favicon/favicon-32x32.png': {
+      status: 200,
+      contentType: 'image/png',
+      readableStream: await filePathToReadableStream(testIcon32),
+    },
+    'https://example.com/favicon/favicon-48x48.png': {
+      status: 200,
+      contentType: 'image/png',
+      readableStream: await filePathToReadableStream(testIcon48),
+    }
+  });
+})

package/src/desktop/desktop.ts

@@ -137,8 +137,8 @@ export const checkPngFavicon = async (baseUrl: string, head: HTMLElement | null,
         id: MessageId.desktopPngFaviconDeclared,
         text: `The ${size} desktop PNG favicon is declared`
       });
-  
-      const href = icons[0].attributes.href;
+
+      const href = sizedIconMarkup[0].attributes.href;
       if (!href) {
         messages.push({
           status: CheckerStatus.Error,

package/src/touch-icon.test.ts

@@ -88,24 +88,6 @@ test('checkTouchIcon - noTouchIcon', async () => {
   }]});
 })
 
-test('checkTouchIcon - touchIconWithSize', async () => {
-  await runCheckTouchIconTest(`
-    <link rel="apple-touch-icon" sizes="152x152" href="some-other-icon.png">
-  `, { messages: [{
-    status: CheckerStatus.Ok,
-    id: MessageId.touchIconDeclared,
-  }, {
-    status: CheckerStatus.Warning,
-    id: MessageId.touchIconWithSize,
-  }]}, {
-    'https://example.com/some-other-icon.png': {
-      status: 200,
-      contentType: 'image/png',
-      readableStream: null
-    }
-  });
-})
-
 test('checkTouchIcon - multipleTouchIcon - no size', async () => {
   await runCheckTouchIconTest(`
     <link rel="apple-touch-icon" href="some-icon.png">
@@ -137,9 +119,6 @@ test('checkTouchIcon - multipleTouchIcon - specific size', async () => {
   `, { messages: [{
     status: CheckerStatus.Ok,
     id: MessageId.touchIconDeclared,
-  }, {
-    status: CheckerStatus.Warning,
-    id: MessageId.touchIconWithSize,
   }, {
     status: CheckerStatus.Error,
     id: MessageId.duplicatedTouchIconSizes,
@@ -157,24 +136,6 @@ test('checkTouchIcon - multipleTouchIcon - specific size', async () => {
   });
 })
 
-test('checkTouchIcon - touchIconWithSize', async () => {
-  await runCheckTouchIconTest(`
-    <link rel="apple-touch-icon" sizes="180x180" href="some-other-icon.png">
-  `, { messages: [{
-    status: CheckerStatus.Ok,
-    id: MessageId.touchIconDeclared,
-  }, {
-    status: CheckerStatus.Warning,
-    id: MessageId.touchIconWithSize,
-  }]}, {
-    'https://example.com/some-other-icon.png': {
-      status: 200,
-      contentType: 'image/png',
-      readableStream: null
-    }
-  });
-})
-
 const testIcon = './fixtures/180x180.png';
 
 test('checkTouchIcon - Regular case', async () => {

package/src/touch-icon.ts

@@ -88,15 +88,6 @@ export const checkTouchIconIcon = async (baseUrl: string, head: HTMLElement | nu
     text: 'The touch icon is declared'
   });
 
-  const sizes = iconMarkup.map(icon => icon.getAttribute('sizes')).filter(size => size);
-  if (sizes.length > 0) {
-    messages.push({
-      status: CheckerStatus.Warning,
-      id: MessageId.touchIconWithSize,
-      text: `Some Touch icon have a specific size (${sizes.join(', ')})`
-    });
-  }
-
   const duplicatedSizes = getDuplicatedSizes(iconMarkup.map(icon => icon.getAttribute('sizes')));
   if (duplicatedSizes.length > 0) {
     messages.push({