@argos-ci/core 0.1.0 → 0.4.0

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import * as sharp from 'sharp';
+
 interface UploadParameters {
     /** Globs matching image file paths to upload */
     files?: string[];
@@ -33,6 +35,7 @@ declare const upload: (params: UploadParameters) => Promise<{
     };
     screenshots: {
         optimizedPath: string;
+        format: keyof sharp.FormatEnum;
         hash: any;
         name: string;
         path: string;

package/dist/index.mjs

@@ -200,12 +200,33 @@ const discoverScreenshots = async (patterns, { root =process.cwd() , ignore  } =
 };
 
 const tmpFile = promisify(tmp.file);
-const optimizeScreenshot = async (filepath)=>{
+const getImageFormat = async (filepath)=>{
+    const metadata = await sharp(filepath).metadata();
+    if (!metadata.format) {
+        throw new Error(`Could not get image format for ${filepath}`);
+    }
+    return metadata.format;
+};
+const optimizeScreenshot = async (filepath, format)=>{
     const resultFilePath = await tmpFile();
-    await sharp(filepath).resize(1024, 1024, {
+    const optimization = sharp(filepath).resize(2048, 20480, {
         fit: "inside",
         withoutEnlargement: true
-    }).jpeg().toFile(resultFilePath);
+    });
+    switch(format){
+        case "jpeg":
+        case "jpg":
+            {
+                optimization.jpeg();
+                break;
+            }
+        case "png":
+            {
+                optimization.png();
+                break;
+            }
+    }
+    await optimization.toFile(resultFilePath);
     return resultFilePath;
 };
 
@@ -239,6 +260,12 @@ const createArgosApiClient = (options)=>{
             });
             return response.data;
         } catch (error) {
+            if (error?.response?.data?.error?.message) {
+                // @ts-ignore
+                throw new Error(error.response.data.error.message, {
+                    cause: error
+                });
+            }
             throw error;
         }
     };
@@ -253,6 +280,17 @@ const createArgosApiClient = (options)=>{
     };
 };
 
+const formatToContentType = (format)=>{
+    switch(format){
+        case "jpeg":
+        case "jpg":
+            return "image/jpeg";
+        case "png":
+            return "image/png";
+        default:
+            throw new Error(`Unsupported format ${format}`);
+    }
+};
 const upload$1 = async (input)=>{
     const file = await readFile(input.path);
     await axios({
@@ -260,7 +298,7 @@ const upload$1 = async (input)=>{
         url: input.url,
         data: file,
         headers: {
-            "Content-Type": "image/png"
+            "Content-Type": formatToContentType(input.format)
         }
     });
 };
@@ -308,11 +346,13 @@ const getConfigFromOptions = (options)=>{
     });
     // Optimize & compute hashes
     const screenshots = await Promise.all(foundScreenshots.map(async (screenshot)=>{
-        const optimizedPath = await optimizeScreenshot(screenshot.path);
+        const format = await getImageFormat(screenshot.path);
+        const optimizedPath = await optimizeScreenshot(screenshot.path, format);
         const hash = await hashFile(optimizedPath);
         return {
             ...screenshot,
             optimizedPath,
+            format,
             hash
         };
     }));
@@ -328,7 +368,7 @@ const getConfigFromOptions = (options)=>{
         name: config.buildName,
         parallel: config.parallel,
         parallelNonce: config.parallelNonce,
-        screenshotKeys: screenshots.map((screenshot)=>screenshot.hash)
+        screenshotKeys: Array.from(new Set(screenshots.map((screenshot)=>screenshot.hash)))
     });
     debug("Got screenshots", result);
     // Upload screenshots
@@ -340,7 +380,8 @@ const getConfigFromOptions = (options)=>{
         }
         await upload$1({
             url: putUrl,
-            path: screenshot.optimizedPath
+            path: screenshot.optimizedPath,
+            format: screenshot.format
         });
     }));
     // Update build

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/core",
   "description": "Visual testing solution to avoid visual regression. The core component of Argos SDK that handles build creation.",
-  "version": "0.1.0",
+  "version": "0.4.0",
   "scripts": {
     "prebuild": "rm -rf dist",
     "build": "rollup -c",
@@ -29,7 +29,7 @@
     "url": "https://github.com/argos-ci/argos-javascript/issues"
   },
   "engines": {
-    "node": ">=16.14.0"
+    "node": ">=14.0.0"
   },
   "license": "MIT",
   "keywords": [
@@ -60,5 +60,5 @@
     "rollup-plugin-dts": "^4.2.2",
     "rollup-plugin-swc3": "^0.3.0"
   },
-  "gitHead": "ff22c7f1ecf8cbbd1468440b3247d10b3b7b7310"
+  "gitHead": "e0f6d67663b59b5f00180988ccbb0736a8755aa4"
 }