@vizzly-testing/cli 0.39.0 → 0.39.2

package/dist/{uploader/operations.js → domains/uploads/upload.service.js}

@@ -1,10 +1,91 @@
+import { readFile, stat } from 'node:fs/promises';
+import { glob } from 'glob';
+import { getDefaultBranch } from '../../shared/git.js';
+import * as output from '../../shared/output.js';
+import { TimeoutError, UploadError, ValidationError } from '../../shared/vizzly-error.js';
+import { createApiClient } from '../auth/cloud-client.js';
+import { createBuild } from '../builds/build.service.js';
+import { checkShas } from '../screenshots/cloud-screenshots.js';
+import { buildFileMetadata, extractStatusCodeFromError, fileToScreenshotFormat } from './upload.normalizers.js';
+import { buildBuildInfo, buildCompletedProgress, buildDeduplicationProgress, buildProcessingProgress, buildScanningProgress, buildUploadingProgress, buildUploadResult, buildWaitResult } from './upload.serializers.js';
+import { validateApiKey, validateDirectoryStats, validateFilesFound, validateScreenshotsDir } from './upload.validations.js';
+import { DEFAULT_BUILD_POLL_INTERVAL, DEFAULT_SHA_CHECK_BATCH_SIZE } from './upload-defaults.js';
+import { buildScreenshotPattern, partitionFilesByExistence } from './upload-files.js';
+import { resolveBatchSize, resolveTimeout } from './upload-settings.js';
+import { getElapsedTime, isTimedOut } from './upload-timing.js';
+
 /**
- * Uploader Operations - I/O operations with dependency injection
- *
- * Each operation takes its dependencies as parameters for testability.
+ * Screenshot upload operations and the public uploader factory.
+ * Dependencies are explicit so callers can choose external integrations.
  */
 
-import { buildBuildInfo, buildCompletedProgress, buildDeduplicationProgress, buildFileMetadata, buildProcessingProgress, buildScanningProgress, buildScreenshotPattern, buildUploadingProgress, buildUploadResult, buildWaitResult, DEFAULT_BUILD_POLL_INTERVAL, DEFAULT_SHA_CHECK_BATCH_SIZE, extractStatusCodeFromError, fileToScreenshotFormat, getElapsedTime, isTimedOut, partitionFilesByExistence, validateApiKey, validateDirectoryStats, validateFilesFound, validateScreenshotsDir } from './core.js';
+export function createUploader({
+  apiKey,
+  apiUrl,
+  userAgent,
+  command,
+  upload: uploadConfig = {}
+} = {}, options = {}) {
+  let signal = options.signal || new AbortController().signal;
+  let client = createApiClient({
+    baseUrl: apiUrl,
+    token: apiKey,
+    command: command || 'upload',
+    sdkUserAgent: userAgent,
+    allowNoToken: true
+  });
+  let batchSize = resolveBatchSize(options, uploadConfig);
+  let timeout = resolveTimeout(options, uploadConfig);
+  let deps = options.deps || {
+    client,
+    createBuild,
+    getDefaultBranch,
+    glob,
+    readFile,
+    stat,
+    checkShas,
+    createError: (message, code, context) => {
+      let error = new UploadError(message, context);
+      error.code = code;
+      return error;
+    },
+    createValidationError: (message, context) => new ValidationError(message, context),
+    createUploadError: (message, context) => new UploadError(message, context),
+    createTimeoutError: (message, context) => new TimeoutError(message, context),
+    output
+  };
+  async function uploadScreenshots(uploadOptions) {
+    return upload({
+      uploadOptions,
+      config: {
+        apiKey,
+        apiUrl
+      },
+      signal,
+      batchSize,
+      deps: {
+        ...deps,
+        client: deps.client || client
+      }
+    });
+  }
+  async function waitForUploadedBuild(buildId, waitTimeout = timeout) {
+    return waitForBuild({
+      buildId,
+      timeout: waitTimeout,
+      signal,
+      client: deps.client || client,
+      deps: {
+        createError: deps.createError,
+        createTimeoutError: deps.createTimeoutError
+      }
+    });
+  }
+  return {
+    upload: uploadScreenshots,
+    waitForBuild: waitForUploadedBuild
+  };
+}
 function delay(ms, signal) {
   if (ms <= 0) {
     return Promise.resolve();
@@ -33,10 +114,6 @@ function delay(ms, signal) {
   });
 }
 
-// ============================================================================
-// File Discovery
-// ============================================================================
-
 /**
  * Find all PNG screenshots in a directory
  * @param {Object} options - Options
@@ -58,10 +135,6 @@ export async function findScreenshots({
   });
 }
 
-// ============================================================================
-// File Processing
-// ============================================================================
-
 /**
  * Process files to extract metadata and compute hashes
  * @param {Object} options - Options
@@ -100,10 +173,6 @@ export async function processFiles({
   return results;
 }
 
-// ============================================================================
-// SHA Checking / Deduplication
-// ============================================================================
-
 /**
  * Check which files already exist on the server
  * @param {Object} options - Options
@@ -161,10 +230,6 @@ export async function checkExistingFiles({
   };
 }
 
-// ============================================================================
-// File Upload
-// ============================================================================
-
 /**
  * Upload files to Vizzly
  * @param {Object} options - Options
@@ -230,10 +295,6 @@ export async function uploadFiles({
   };
 }
 
-// ============================================================================
-// Build Waiting
-// ============================================================================
-
 /**
  * Wait for a build to complete
  * @param {Object} options - Options
@@ -299,10 +360,6 @@ export async function waitForBuild({
   });
 }
 
-// ============================================================================
-// Main Upload Operation
-// ============================================================================
-
 /**
  * Upload screenshots to Vizzly
  * @param {Object} options - Options

package/dist/domains/uploads/upload.validations.js

@@ -0,0 +1,77 @@
+/**
+ * Validate API key is present
+ * @param {string|undefined} apiKey - API key to validate
+ * @returns {{ valid: boolean, error: string|null }}
+ */
+export function validateApiKey(apiKey) {
+  if (!apiKey) {
+    return {
+      valid: false,
+      error: 'API key is required'
+    };
+  }
+  return {
+    valid: true,
+    error: null
+  };
+}
+
+/**
+ * Validate screenshots directory path
+ * @param {string|undefined} screenshotsDir - Directory path
+ * @returns {{ valid: boolean, error: string|null }}
+ */
+export function validateScreenshotsDir(screenshotsDir) {
+  if (!screenshotsDir) {
+    return {
+      valid: false,
+      error: 'Screenshots directory is required'
+    };
+  }
+  return {
+    valid: true,
+    error: null
+  };
+}
+
+/**
+ * Validate directory stats
+ * @param {Object} stats - fs.stat result
+ * @param {string} path - Directory path for error message
+ * @returns {{ valid: boolean, error: string|null }}
+ */
+export function validateDirectoryStats(stats, path) {
+  if (!stats.isDirectory()) {
+    return {
+      valid: false,
+      error: `${path} is not a directory`
+    };
+  }
+  return {
+    valid: true,
+    error: null
+  };
+}
+
+/**
+ * Validate files were found
+ * @param {Array} files - Array of file paths
+ * @param {string} directory - Directory that was searched
+ * @returns {{ valid: boolean, error: string|null, context?: Object }}
+ */
+export function validateFilesFound(files, directory) {
+  if (!files || files.length === 0) {
+    return {
+      valid: false,
+      error: 'No screenshot files found',
+      context: {
+        directory,
+        pattern: '**/*.png'
+      }
+    };
+  }
+  return {
+    valid: true,
+    error: null
+  };
+}

package/dist/index.js

@@ -9,18 +9,18 @@ import 'dotenv/config';
  */
 
 // Client exports for convenience
-export { configure, setEnabled, vizzlyScreenshot } from './client/index.js';
-// Errors
-export { AuthError, BuildError, ConfigError, NetworkError, ScreenshotError, TimeoutError, UploadError, ValidationError, VizzlyError } from './errors/vizzly-error.js';
-export { createPluginServices } from './plugin-api.js';
+export { configure, setEnabled, vizzlyScreenshot } from './adapters/client/index.js';
+export { createPluginServices } from './adapters/plugins/plugin-api.js';
+export { createServices } from './adapters/plugins/services.js';
 // Primary SDK export
-export { createVizzly, VizzlySDK } from './sdk/index.js';
-export { createServices } from './services/index.js';
-export { createTDDService } from './tdd/tdd-service.js';
-// Core services (for advanced usage)
-export { createUploader } from './uploader/index.js';
+export { createVizzly, VizzlySDK } from './adapters/sdk/index.js';
 // Configuration helper
-export { defineConfig } from './utils/config-helpers.js';
+export { defineConfig } from './domains/config/config.js';
 // Utilities
-export { loadConfig } from './utils/config-loader.js';
-export * as output from './utils/output.js';
+export { loadConfig } from './domains/config/config-loader.js';
+export { createTDDService } from './domains/tdd/tdd.service.js';
+// Core services (for advanced usage)
+export { createUploader } from './domains/uploads/upload.service.js';
+export * as output from './shared/output.js';
+// Errors
+export { AuthError, BuildError, ConfigError, NetworkError, ScreenshotError, TimeoutError, UploadError, ValidationError, VizzlyError } from './shared/vizzly-error.js';