@vizzly-testing/cli 0.2.0 → 0.3.2

package/dist/cli.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+import 'dotenv/config';
 import { program } from 'commander';
 import { init } from './commands/init.js';
 import { uploadCommand, validateUploadOptions } from './commands/upload.js';

package/dist/index.js

@@ -1,3 +1,5 @@
+import 'dotenv/config';
+
 /**
  * Vizzly CLI & SDK - Main exports
  *

package/dist/services/api-service.js

@@ -111,9 +111,10 @@ export class ApiService {
   /**
    * Check if SHAs already exist on the server
    * @param {string[]} shas - Array of SHA256 hashes to check
-   * @returns {Promise<string[]>} Array of existing SHAs
+   * @param {string} buildId - Build ID for screenshot record creation
+   * @returns {Promise<Object>} Response with existing SHAs and screenshot data
    */
-  async checkShas(shas) {
+  async checkShas(shas, buildId) {
     try {
       const response = await this.request('/api/sdk/check-shas', {
         method: 'POST',
@@ -121,14 +122,19 @@ export class ApiService {
           'Content-Type': 'application/json'
         },
         body: JSON.stringify({
-          shas
+          shas,
+          buildId
         })
       });
-      return response.existing || [];
+      return response;
     } catch (error) {
       // Continue without deduplication on error
       console.debug('SHA check failed, continuing without deduplication:', error.message);
-      return [];
+      return {
+        existing: [],
+        missing: shas,
+        screenshots: []
+      };
     }
   }
 
@@ -145,13 +151,16 @@ export class ApiService {
     const sha256 = crypto.createHash('sha256').update(buffer).digest('hex');
 
     // Check if this SHA already exists
-    const existingShas = await this.checkShas([sha256]);
-    if (existingShas.includes(sha256)) {
-      // File already exists, skip upload but still register the screenshot
+    const checkResult = await this.checkShas([sha256], buildId);
+    if (checkResult.existing && checkResult.existing.includes(sha256)) {
+      // File already exists, screenshot record was automatically created
+      const screenshot = checkResult.screenshots?.find(s => s.sha256 === sha256);
       return {
         message: 'Screenshot already exists, skipped upload',
         sha256,
-        skipped: true
+        skipped: true,
+        screenshot,
+        fromExisting: true
       };
     }
 

package/dist/services/uploader.js

@@ -90,11 +90,24 @@ export function createUploader({
         total: files.length
       }));
 
-      // Check which files need uploading
+      // Create build first to get buildId for SHA checking
+      const buildInfo = {
+        name: buildName || `Upload ${new Date().toISOString()}`,
+        branch: branch || (await getDefaultBranch()) || 'main',
+        commitSha: commit,
+        commitMessage: message,
+        environment,
+        threshold
+      };
+      const build = await api.createBuild(buildInfo);
+      const buildId = build.id;
+
+      // Check which files need uploading (now with buildId)
       const {
         toUpload,
-        existing
-      } = await checkExistingFiles(fileMetadata, api, signal);
+        existing,
+        screenshots
+      } = await checkExistingFiles(fileMetadata, api, signal, buildId);
       onProgress({
         phase: 'deduplication',
         toUpload: toUpload.length,
@@ -102,18 +115,13 @@ export function createUploader({
         total: files.length
       });
 
-      // Create build and upload files
+      // Upload remaining files
       const result = await uploadFiles({
         toUpload,
         existing,
-        buildInfo: {
-          name: buildName || `Upload ${new Date().toISOString()}`,
-          branch: branch || (await getDefaultBranch()) || 'main',
-          commitSha: commit,
-          commitMessage: message,
-          environment,
-          threshold
-        },
+        screenshots,
+        buildId,
+        buildInfo,
         api,
         signal,
         batchSize: batchSize,
@@ -260,9 +268,10 @@ async function processFiles(files, signal, onProgress) {
 /**
  * Check which files already exist on the server
  */
-async function checkExistingFiles(fileMetadata, api, signal) {
+async function checkExistingFiles(fileMetadata, api, signal, buildId) {
   const allShas = fileMetadata.map(f => f.sha256);
   const existingShas = new Set();
+  const allScreenshots = [];
 
   // Check in batches
   for (let i = 0; i < allShas.length; i += DEFAULT_SHA_CHECK_BATCH_SIZE) {
@@ -275,14 +284,17 @@ async function checkExistingFiles(fileMetadata, api, signal) {
           'Content-Type': 'application/json'
         },
         body: JSON.stringify({
-          shas: batch
+          shas: batch,
+          buildId
         }),
         signal
       });
       const {
-        existing = []
+        existing = [],
+        screenshots = []
       } = res || {};
       existing.forEach(sha => existingShas.add(sha));
+      allScreenshots.push(...screenshots);
     } catch (error) {
       // Continue without deduplication on error
       console.debug('SHA check failed, continuing without deduplication:', error.message);
@@ -290,7 +302,8 @@ async function checkExistingFiles(fileMetadata, api, signal) {
   }
   return {
     toUpload: fileMetadata.filter(f => !existingShas.has(f.sha256)),
-    existing: fileMetadata.filter(f => existingShas.has(f.sha256))
+    existing: fileMetadata.filter(f => existingShas.has(f.sha256)),
+    screenshots: allScreenshots
   };
 }
 
@@ -299,49 +312,30 @@ async function checkExistingFiles(fileMetadata, api, signal) {
  */
 async function uploadFiles({
   toUpload,
-  existing,
-  buildInfo,
+  buildId,
   api,
   signal,
   batchSize,
   onProgress
 }) {
-  let buildId = null;
   let result = null;
 
-  // If all files exist, just create a build
+  // If all files exist, screenshot records were already created during SHA check
   if (toUpload.length === 0) {
-    return createBuildWithExisting({
-      existing,
-      buildInfo,
-      api,
-      signal
-    });
+    return {
+      buildId,
+      url: null
+    }; // Build was already created
   }
 
   // Upload in batches
   for (let i = 0; i < toUpload.length; i += batchSize) {
     if (signal.aborted) throw new UploadError('Operation cancelled');
     const batch = toUpload.slice(i, i + batchSize);
-    const isFirstBatch = i === 0;
     const form = new FormData();
-    if (isFirstBatch) {
-      // First batch creates the build
-      form.append('build_name', buildInfo.name);
-      form.append('branch', buildInfo.branch);
-      form.append('environment', buildInfo.environment);
-      if (buildInfo.commitSha) form.append('commit_sha', buildInfo.commitSha);
-      if (buildInfo.commitMessage) form.append('commit_message', buildInfo.commitMessage);
-      if (buildInfo.threshold !== undefined) form.append('threshold', buildInfo.threshold.toString());
 
-      // Include existing SHAs
-      if (existing.length > 0) {
-        form.append('existing_shas', JSON.stringify(existing.map(f => f.sha256)));
-      }
-    } else {
-      // Subsequent batches add to existing build
-      form.append('build_id', buildId);
-    }
+    // All batches add to existing build (build was created earlier)
+    form.append('build_id', buildId);
 
     // Add files
     for (const file of batch) {
@@ -362,50 +356,16 @@ async function uploadFiles({
         batch: i / batchSize + 1
       });
     }
-    if (isFirstBatch && result.build?.id) {
-      buildId = result.build.id;
-    }
     onProgress(i + batch.length);
   }
   return {
-    buildId: result.build?.id || buildId,
-    url: result.build?.url || result.url
+    buildId,
+    url: result?.build?.url || result?.url
   };
 }
 
-/**
- * Create a build with only existing files
- */
-async function createBuildWithExisting({
-  existing,
-  buildInfo,
-  api,
-  signal
-}) {
-  const form = new FormData();
-  form.append('build_name', buildInfo.name);
-  form.append('branch', buildInfo.branch);
-  form.append('environment', buildInfo.environment);
-  form.append('existing_shas', JSON.stringify(existing.map(f => f.sha256)));
-  if (buildInfo.commitSha) form.append('commit_sha', buildInfo.commitSha);
-  if (buildInfo.commitMessage) form.append('commit_message', buildInfo.commitMessage);
-  if (buildInfo.threshold !== undefined) form.append('threshold', buildInfo.threshold.toString());
-  let result;
-  try {
-    result = await api.request('/api/sdk/upload', {
-      method: 'POST',
-      body: form,
-      signal,
-      headers: {}
-    });
-  } catch (err) {
-    throw new UploadError(`Failed to create build: ${err.message}`);
-  }
-  return {
-    buildId: result.build?.id,
-    url: result.build?.url || result.url
-  };
-}
+// createBuildWithExisting function removed - no longer needed since
+// builds are created first and /check-shas automatically creates screenshot records
 
 /**
  * Uploader class for handling screenshot uploads

package/dist/types/services/api-service.d.ts

@@ -41,9 +41,10 @@ export class ApiService {
     /**
      * Check if SHAs already exist on the server
      * @param {string[]} shas - Array of SHA256 hashes to check
-     * @returns {Promise<string[]>} Array of existing SHAs
+     * @param {string} buildId - Build ID for screenshot record creation
+     * @returns {Promise<Object>} Response with existing SHAs and screenshot data
      */
-    checkShas(shas: string[]): Promise<string[]>;
+    checkShas(shas: string[], buildId: string): Promise<any>;
     /**
      * Upload a screenshot with SHA checking
      * @param {string} buildId - Build ID

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vizzly-testing/cli",
-  "version": "0.2.0",
+  "version": "0.3.2",
   "description": "Visual review platform for UI developers and designers",
   "keywords": [
     "visual-testing",
@@ -75,6 +75,7 @@
   "dependencies": {
     "commander": "^11.1.0",
     "cosmiconfig": "^9.0.0",
+    "dotenv": "^17.2.1",
     "form-data": "^4.0.0",
     "glob": "^10.3.10",
     "odiff-bin": "^3.2.1"