@d-zero/archaeologist 1.1.0 → 1.1.1

package/dist/analyze.js

@@ -37,40 +37,7 @@ export async function analyze(list, options) {
             for (const url of urlPair) {
                 const data = await getData(page, url, {
                     ...options,
-                }, (phase, data) => {
-                    const outputUrl = c.gray(url);
-                    const sizeName = label(data.name);
-                    switch (phase) {
-                        case 'setViewport': {
-                            const { width } = data;
-                            update(`%braille% ${outputUrl} ${sizeName}: ↔️ Change viewport size to ${width}px`);
-                            break;
-                        }
-                        case 'load': {
-                            const { type } = data;
-                            update(`%braille% ${outputUrl} ${sizeName}: %earth% ${type === 'open' ? 'Open' : 'Reload'} page`);
-                            break;
-                        }
-                        case 'hook': {
-                            const { message } = data;
-                            update(`%braille% ${outputUrl} ${sizeName}: ${message}`);
-                            break;
-                        }
-                        case 'scroll': {
-                            update(`%braille% ${outputUrl} ${sizeName}: %propeller% Scroll the page`);
-                            break;
-                        }
-                        case 'screenshotStart': {
-                            update(`%braille% ${outputUrl} ${sizeName}: 📸 Take a screenshot`);
-                            break;
-                        }
-                        case 'screenshotEnd': {
-                            const { binary } = data;
-                            update(`%braille% ${outputUrl} ${sizeName}: 📸 Screenshot taken (${binary.length} bytes)`);
-                            break;
-                        }
-                    }
-                });
+                }, update);
                 dataPair.push(data);
                 await delay(600);
             }

package/dist/cli.js

@@ -7,7 +7,7 @@ const cli = minimist(process.argv.slice(2), {
         f: 'listfile',
     },
 });
-if (cli.listfile) {
+if (cli.listfile?.length) {
     const { pairList, hooks } = await readConfig(cli.listfile);
     await archaeologist(pairList, {
         hooks,
@@ -17,5 +17,5 @@ if (cli.listfile) {
     });
     process.exit(0);
 }
-process.stdout.write('Usage: archaeologist -f <listfile> [--limit <number>]');
+process.stderr.write('Usage: archaeologist -f <listfile> [--limit <number>]\n');
 process.exit(1);

package/dist/diff-images.d.ts

@@ -1,18 +1,18 @@
 import type { Screenshot } from '@d-zero/puppeteer-screenshot';
 export type DiffImagesPhase = {
     create: {
-        a: Buffer;
-        b: Buffer;
+        a: Uint8Array;
+        b: Uint8Array;
     };
     resize: {
-        a: Buffer;
-        b: Buffer;
+        a: Uint8Array;
+        b: Uint8Array;
         width: number;
         height: number;
     };
     diff: {
-        a: Buffer;
-        b: Buffer;
+        a: Uint8Array;
+        b: Uint8Array;
     };
 };
 type DiffImagesListener = (phase: keyof DiffImagesPhase, data: DiffImagesPhase[keyof DiffImagesPhase]) => void;

package/dist/diff-images.js

@@ -1,4 +1,4 @@
-import Jimp from 'jimp';
+import { Jimp, HorizontalAlign, VerticalAlign, JimpMime } from 'jimp';
 import pixelmatch from 'pixelmatch';
 import { PNG } from 'pngjs';
 export async function diffImages(dataA, dataB, listener) {
@@ -6,13 +6,13 @@ export async function diffImages(dataA, dataB, listener) {
         return null;
     }
     listener('create', { a: dataA.binary, b: dataB.binary });
-    const imgA = PNG.sync.read(dataA.binary);
-    const imgB = PNG.sync.read(dataB.binary);
+    const imgA = PNG.sync.read(Buffer.from(dataA.binary));
+    const imgB = PNG.sync.read(Buffer.from(dataB.binary));
     const width = Math.max(imgA.width, imgB.width);
     const height = Math.max(imgA.height, imgB.height);
     listener('resize', { a: dataA.binary, b: dataB.binary, width, height });
-    const resizedA = await resizeImg(dataA.binary, width, height);
-    const resizedB = await resizeImg(dataB.binary, width, height);
+    const resizedA = await resizeImg(Buffer.from(dataA.binary), width, height);
+    const resizedB = await resizeImg(Buffer.from(dataB.binary), width, height);
     listener('diff', { a: resizedA, b: resizedB });
     const imgA_ = PNG.sync.read(resizedA);
     const imgB_ = PNG.sync.read(resizedB);
@@ -33,12 +33,10 @@ export async function diffImages(dataA, dataB, listener) {
 }
 async function resizeImg(bin, width, height) {
     const img = await Jimp.read(bin);
-    img.contain(width, height, Jimp.HORIZONTAL_ALIGN_LEFT | Jimp.VERTICAL_ALIGN_TOP);
-    return new Promise((resolve, reject) => {
-        img.getBuffer(Jimp.MIME_PNG, (err, buffer) => {
-            if (err)
-                reject(err);
-            resolve(buffer);
-        });
+    img.contain({
+        w: width,
+        h: height,
+        align: HorizontalAlign.LEFT | VerticalAlign.TOP,
     });
+    return img.getBuffer(JimpMime.png);
 }

package/dist/get-data.d.ts

@@ -1,8 +1,8 @@
 import type { PageData } from './types.js';
-import type { Listener, PageHook } from '@d-zero/puppeteer-screenshot';
+import type { PageHook } from '@d-zero/puppeteer-screenshot';
 import type { Page } from 'puppeteer';
 export interface GetDataOptions {
     readonly hooks?: readonly PageHook[];
     readonly htmlDiffOnly?: boolean;
 }
-export declare function getData(page: Page, url: string, options: GetDataOptions, listener: Listener): Promise<PageData>;
+export declare function getData(page: Page, url: string, options: GetDataOptions, update: (log: string) => void): Promise<PageData>;

package/dist/get-data.js

@@ -1,6 +1,6 @@
 import { distill } from '@d-zero/html-distiller';
-import { screenshot } from '@d-zero/puppeteer-screenshot';
-export async function getData(page, url, options, listener) {
+import { screenshotListener, screenshot } from '@d-zero/puppeteer-screenshot';
+export async function getData(page, url, options, update) {
     const htmlDiffOnly = options.htmlDiffOnly ?? false;
     const screenshots = await screenshot(page, url, {
         sizes: {
@@ -13,7 +13,7 @@ export async function getData(page, url, options, listener) {
             },
         },
         hooks: options?.hooks ?? [],
-        listener,
+        listener: screenshotListener(update),
         domOnly: htmlDiffOnly,
     });
     const data = { url, screenshots: {} };

package/dist/read-config.d.ts

@@ -1,4 +1,4 @@
 export declare function readConfig(filePath: string): Promise<{
     pairList: [string, string][];
-    hooks: import("@d-zero/puppeteer-screenshot").PageHook[];
+    hooks: import("@d-zero/puppeteer-page-scan").PageHook[];
 }>;

package/dist/read-config.js

@@ -1,7 +1,8 @@
 import fs from 'node:fs/promises';
+import path from 'node:path';
+import { readPageHooks } from '@d-zero/puppeteer-page-scan';
 import { toList } from '@d-zero/readtext/list';
 import fm from 'front-matter';
-import { readHooks } from './read-hooks.js';
 export async function readConfig(filePath) {
     const fileContent = await fs.readFile(filePath, 'utf8');
     const content = 
@@ -15,7 +16,8 @@ export async function readConfig(filePath) {
             `${content.attributes.comparisonHost}${url.pathname}${url.search}`,
         ];
     });
-    const hooks = await readHooks(content.attributes?.hooks ?? [], filePath);
+    const baseDir = path.dirname(filePath);
+    const hooks = await readPageHooks(content.attributes?.hooks ?? [], baseDir);
     return {
         pairList,
         hooks,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@d-zero/archaeologist",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"description": "Uncover visual and HTML differences in web pages with precision",
 	"author": "D-ZERO",
 	"license": "MIT",
@@ -26,25 +26,25 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@d-zero/dealer": "1.0.2",
+		"@d-zero/dealer": "1.1.0",
 		"@d-zero/html-distiller": "1.0.0",
-		"@d-zero/puppeteer-screenshot": "1.1.0",
-		"@d-zero/readtext": "1.0.3",
+		"@d-zero/puppeteer-page-scan": "1.0.0",
+		"@d-zero/puppeteer-screenshot": "1.2.0",
+		"@d-zero/readtext": "1.1.0",
 		"ansi-colors": "4.1.3",
-		"diff": "5.2.0",
+		"diff": "7.0.0",
 		"front-matter": "4.0.2",
-		"jimp": "0.22.12",
+		"jimp": "1.6.0",
 		"minimist": "1.2.8",
 		"parse-diff": "0.11.1",
-		"pixelmatch": "5.3.0",
+		"pixelmatch": "6.0.0",
 		"pngjs": "7.0.0",
-		"puppeteer": "22.12.0"
+		"puppeteer": "23.5.0"
 	},
 	"devDependencies": {
-		"@types/diff": "5.2.1",
+		"@types/diff": "5.2.2",
 		"@types/pixelmatch": "5.2.6",
-		"@types/pngjs": "6.0.5",
-		"puppeteer": "22.12.0"
+		"@types/pngjs": "6.0.5"
 	},
-	"gitHead": "9b4c167933f33237bb688e4835f17b499dc4c48d"
+	"gitHead": "e8f65086bf7c316dda6667f1173da8585a5ef19c"
 }