@vizzly-testing/cli 0.35.3-beta.2 → 0.35.3-beta.4

package/dist/tdd/tdd-service.js

@@ -9,19 +9,16 @@
  */
 
 import { existsSync as defaultExistsSync, mkdirSync as defaultMkdirSync, readFileSync as defaultReadFileSync, writeFileSync as defaultWriteFileSync } from 'node:fs';
-import { createApiClient as defaultCreateApiClient, getBatchHotspots as defaultGetBatchHotspots, getBuilds as defaultGetBuilds, getComparison as defaultGetComparison, getComparisonContext as defaultGetComparisonContext, getTddBaselines as defaultGetTddBaselines } from '../api/index.js';
+import { createApiClient as defaultCreateApiClient, getBuilds as defaultGetBuilds, getComparison as defaultGetComparison, getTddBaselines as defaultGetTddBaselines } from '../api/index.js';
 import { NetworkError } from '../errors/vizzly-error.js';
 import { colors as defaultColors } from '../utils/colors.js';
 import { fetchWithTimeout as defaultFetchWithTimeout } from '../utils/fetch-utils.js';
 import { getDefaultBranch as defaultGetDefaultBranch } from '../utils/git.js';
 import * as defaultOutput from '../utils/output.js';
 import { safePath as defaultSafePath, sanitizeScreenshotName as defaultSanitizeScreenshotName, validatePathSecurity as defaultValidatePathSecurity, validateScreenshotProperties as defaultValidateScreenshotProperties } from '../utils/security.js';
-import { calculateHotspotCoverage as defaultCalculateHotspotCoverage } from './core/hotspot-coverage.js';
 // Import from extracted modules
 import { generateBaselineFilename as defaultGenerateBaselineFilename, generateComparisonId as defaultGenerateComparisonId, generateScreenshotSignature as defaultGenerateScreenshotSignature } from './core/signature.js';
 import { createEmptyBaselineMetadata as defaultCreateEmptyBaselineMetadata, loadBaselineMetadata as defaultLoadBaselineMetadata, saveBaselineMetadata as defaultSaveBaselineMetadata, upsertScreenshotInMetadata as defaultUpsertScreenshotInMetadata } from './metadata/baseline-metadata.js';
-import { loadHotspotMetadata as defaultLoadHotspotMetadata, saveHotspotMetadata as defaultSaveHotspotMetadata } from './metadata/hotspot-metadata.js';
-import { loadRegionMetadata as defaultLoadRegionMetadata, saveRegionMetadata as defaultSaveRegionMetadata } from './metadata/region-metadata.js';
 import { buildTddDependencyOps, resolveTddPaths, resolveTddWorkingDirectory } from './runtime-context.js';
 import { baselineExists as defaultBaselineExists, clearBaselineData as defaultClearBaselineData, clearRunData as defaultClearRunData, getBaselinePath as defaultGetBaselinePath, getCurrentPath as defaultGetCurrentPath, getDiffPath as defaultGetDiffPath, initializeDirectories as defaultInitializeDirectories, saveBaseline as defaultSaveBaseline, saveCurrent as defaultSaveCurrent } from './services/baseline-manager.js';
 import { buildErrorComparison as defaultBuildErrorComparison, buildFailedComparison as defaultBuildFailedComparison, buildNewComparison as defaultBuildNewComparison, buildPassedComparison as defaultBuildPassedComparison, compareImages as defaultCompareImages, isDimensionMismatchError as defaultIsDimensionMismatchError } from './services/comparison-service.js';
@@ -46,7 +43,6 @@ export class TddService {
       colors: defaultColors,
       validatePathSecurity: defaultValidatePathSecurity,
       initializeDirectories: defaultInitializeDirectories,
-      calculateHotspotCoverage: defaultCalculateHotspotCoverage,
       fs: {
         existsSync: defaultExistsSync,
         mkdirSync: defaultMkdirSync,
@@ -58,8 +54,6 @@ export class TddService {
         getTddBaselines: defaultGetTddBaselines,
         getBuilds: defaultGetBuilds,
         getComparison: defaultGetComparison,
-        getComparisonContext: defaultGetComparisonContext,
-        getBatchHotspots: defaultGetBatchHotspots,
         fetchWithTimeout: defaultFetchWithTimeout,
         getDefaultBranch: defaultGetDefaultBranch
       },
@@ -67,11 +61,7 @@ export class TddService {
         loadBaselineMetadata: defaultLoadBaselineMetadata,
         saveBaselineMetadata: defaultSaveBaselineMetadata,
         createEmptyBaselineMetadata: defaultCreateEmptyBaselineMetadata,
-        upsertScreenshotInMetadata: defaultUpsertScreenshotInMetadata,
-        loadHotspotMetadata: defaultLoadHotspotMetadata,
-        saveHotspotMetadata: defaultSaveHotspotMetadata,
-        loadRegionMetadata: defaultLoadRegionMetadata,
-        saveRegionMetadata: defaultSaveRegionMetadata
+        upsertScreenshotInMetadata: defaultUpsertScreenshotInMetadata
       },
       baseline: {
         baselineExists: defaultBaselineExists,
@@ -139,12 +129,6 @@ export class TddService {
     this.minClusterSize = config.comparison?.minClusterSize ?? 2;
     this.signatureProperties = config.signatureProperties ?? [];
 
-    // Hotspot data (loaded lazily from disk or downloaded from cloud)
-    this.hotspotData = null;
-
-    // Region data (user-defined 2D bounding boxes, loaded lazily)
-    this.regionData = null;
-
     // Track whether results have been printed (to avoid duplicate output)
     this._resultsPrinted = false;
     if (this.setBaseline) {
@@ -170,7 +154,6 @@ export class TddService {
       getTddBaselines,
       getBuilds,
       getComparison,
-      getComparisonContext,
       clearBaselineData,
       generateScreenshotSignature,
       generateBaselineFilename,
@@ -223,19 +206,10 @@ export class TddService {
           output.warn(`Build ${buildId} has status: ${baselineBuild.status} (expected: completed)`);
         }
         baselineBuild.screenshots = apiResponse.screenshots;
-        this.saveDynamicMetadataFromBaselineResponse(apiResponse);
       } else if (comparisonId) {
         // Handle specific comparison download
         output.info(`Using comparison: ${comparisonId}`);
         let comparison = await getComparison(this.client, comparisonId);
-        let comparisonContext = null;
-        if (!comparison.dynamic_content && getComparisonContext) {
-          try {
-            comparisonContext = await getComparisonContext(this.client, comparisonId);
-          } catch (error) {
-            output.debug('tdd', `comparison context unavailable for ${comparisonId}: ${error.message}`);
-          }
-        }
         if (!comparison.baseline_screenshot) {
           throw new Error(`Comparison ${comparisonId} has no baseline screenshot. This comparison may be a "new" screenshot.`);
         }
@@ -266,11 +240,6 @@ export class TddService {
           }
         }
         let screenshotName = comparison.baseline_name || comparison.current_name;
-        let dynamicContent = comparison.dynamic_content || {
-          hotspot_analysis: comparisonContext?.history?.hotspot_analysis,
-          confirmed_regions: comparisonContext?.history?.confirmed_regions
-        };
-        this.saveDynamicMetadataForScreenshot(screenshotName, dynamicContent);
         let signature = generateScreenshotSignature(screenshotName, screenshotProperties, this.signatureProperties);
         let filename = generateBaselineFilename(screenshotName, signature);
         baselineBuild = {
@@ -310,7 +279,6 @@ export class TddService {
         }
         baselineBuild = apiResponse.build;
         baselineBuild.screenshots = apiResponse.screenshots;
-        this.saveDynamicMetadataFromBaselineResponse(apiResponse);
       }
       let buildDetails = baselineBuild;
       if (!buildDetails.screenshots || buildDetails.screenshots.length === 0) {
@@ -436,7 +404,7 @@ export class TddService {
         buildInfo: {
           commitSha: baselineBuild.commit_sha,
           commitMessage: baselineBuild.commit_message,
-          approvalStatus: baselineBuild.approval_status,
+          visual_review: baselineBuild.visual_review || null,
           completedAt: baselineBuild.completed_at
         },
         screenshots: buildDetails.screenshots.filter(s => s.filename).map(s => ({
@@ -458,9 +426,6 @@ export class TddService {
       };
       saveBaselineMetadata(this.baselinePath, this.baselineData);
 
-      // Hotspots and regions are now bundled in the tdd-baselines API response
-      // and saved earlier when processing the API response
-
       // Save baseline build metadata for MCP plugin
       let baselineMetadataPath = safePath(this.workingDir, '.vizzly', 'baseline-metadata.json');
       writeFileSync(baselineMetadataPath, JSON.stringify({
@@ -470,7 +435,7 @@ export class TddService {
         environment,
         commitSha: baselineBuild.commit_sha,
         commitMessage: baselineBuild.commit_message,
-        approvalStatus: baselineBuild.approval_status,
+        visual_review: baselineBuild.visual_review || null,
         completedAt: baselineBuild.completed_at,
         downloadedAt: new Date().toISOString()
       }, null, 2));
@@ -495,49 +460,6 @@ export class TddService {
       throw error;
     }
   }
-  saveDynamicMetadataFromBaselineResponse(apiResponse = {}) {
-    let {
-      saveHotspotMetadata,
-      saveRegionMetadata
-    } = this._deps;
-    let hasHotspots = Object.keys(apiResponse.hotspots || {}).length > 0;
-    let hasRegions = Object.keys(apiResponse.regions || {}).length > 0;
-    if (hasHotspots) {
-      this.hotspotData = apiResponse.hotspots;
-      saveHotspotMetadata(this.workingDir, apiResponse.hotspots, apiResponse.summary);
-    }
-    if (hasRegions) {
-      this.regionData = apiResponse.regions;
-      saveRegionMetadata(this.workingDir, apiResponse.regions, apiResponse.summary);
-    }
-  }
-  saveDynamicMetadataForScreenshot(screenshotName, dynamicContent = {}) {
-    if (!screenshotName) {
-      return;
-    }
-    let hotspotAnalysis = dynamicContent.hotspot_analysis;
-    let confirmedRegions = dynamicContent.confirmed_regions || [];
-    let hasHotspotAnalysis = hotspotAnalysis?.total_builds_analyzed > 0;
-    let hasConfirmedRegions = confirmedRegions.length > 0;
-    let summary = {
-      screenshots: 1,
-      hotspots: hasHotspotAnalysis ? 1 : 0,
-      regions: hasConfirmedRegions ? 1 : 0,
-      total_regions: confirmedRegions.length
-    };
-    this.saveDynamicMetadataFromBaselineResponse({
-      hotspots: hasHotspotAnalysis ? {
-        [screenshotName]: hotspotAnalysis
-      } : {},
-      regions: hasConfirmedRegions ? {
-        [screenshotName]: {
-          confirmed: confirmedRegions,
-          candidates: []
-        }
-      } : {},
-      summary
-    });
-  }
 
   /**
    * Process already-fetched baseline data (for use when caller handles auth)
@@ -576,7 +498,6 @@ export class TddService {
       }
     }
     let baselineBuild = apiResponse.build;
-    this.saveDynamicMetadataFromBaselineResponse(apiResponse);
     if (baselineBuild.status === 'failed') {
       output.warn(`Build ${buildId} is marked as FAILED - falling back to local baselines`);
       return await this.handleLocalBaselines();
@@ -708,7 +629,7 @@ export class TddService {
       buildInfo: {
         commitSha: baselineBuild.commit_sha,
         commitMessage: baselineBuild.commit_message,
-        approvalStatus: baselineBuild.approval_status,
+        visual_review: baselineBuild.visual_review || null,
         completedAt: baselineBuild.completed_at
       },
       screenshots: buildDetails.screenshots.filter(s => s.filename).map(s => ({
@@ -730,9 +651,6 @@ export class TddService {
     };
     saveBaselineMetadata(this.baselinePath, this.baselineData);
 
-    // Hotspots and regions are now bundled in the tdd-baselines API response
-    // and saved earlier when processing the API response
-
     // Save baseline build metadata for MCP plugin
     let baselineMetadataPath = safePath(this.workingDir, '.vizzly', 'baseline-metadata.json');
     writeFileSync(baselineMetadataPath, JSON.stringify({
@@ -742,7 +660,7 @@ export class TddService {
       environment: 'test',
       commitSha: baselineBuild.commit_sha,
       commitMessage: baselineBuild.commit_message,
-      approvalStatus: baselineBuild.approval_status,
+      visual_review: baselineBuild.visual_review || null,
       completedAt: baselineBuild.completed_at,
       downloadedAt: new Date().toISOString()
     }, null, 2));
@@ -764,118 +682,6 @@ export class TddService {
     return this.baselineData;
   }
 
-  /**
-   * Download hotspot data for screenshots
-   */
-  async downloadHotspots(screenshots) {
-    let {
-      output,
-      getBatchHotspots,
-      saveHotspotMetadata
-    } = this._deps;
-    if (!this.config.apiKey) {
-      output.debug('tdd', 'Skipping hotspot download - no API token configured');
-      return;
-    }
-    try {
-      let screenshotNames = [...new Set(screenshots.map(s => s.name))];
-      if (screenshotNames.length === 0) {
-        return;
-      }
-      output.info(`🔥 Fetching hotspot data for ${screenshotNames.length} screenshots...`);
-      let response = await getBatchHotspots(this.client, screenshotNames);
-      if (!response.hotspots || Object.keys(response.hotspots).length === 0) {
-        output.debug('tdd', 'No hotspot data available from cloud');
-        return;
-      }
-
-      // Update memory cache
-      this.hotspotData = response.hotspots;
-
-      // Save to disk using extracted module
-      saveHotspotMetadata(this.workingDir, response.hotspots, response.summary);
-      let hotspotCount = Object.keys(response.hotspots).length;
-      let totalRegions = Object.values(response.hotspots).reduce((sum, h) => sum + (h.regions?.length || 0), 0);
-      output.info(`Downloaded hotspot data for ${hotspotCount} screenshots (${totalRegions} regions total)`);
-    } catch (error) {
-      output.debug('tdd', `Hotspot download failed: ${error.message}`);
-      output.warn('Could not fetch hotspot data - comparisons will run without noise filtering');
-    }
-  }
-
-  /**
-   * Load hotspot data from disk
-   */
-  loadHotspots() {
-    let {
-      loadHotspotMetadata
-    } = this._deps;
-    return loadHotspotMetadata(this.workingDir);
-  }
-
-  /**
-   * Get hotspot for a specific screenshot
-   *
-   * Note: Once hotspotData is loaded (from disk or cloud), we don't reload.
-   * This is intentional - hotspots are downloaded once per session and cached.
-   * If a screenshot isn't in the cache, it means no hotspot data exists for it.
-   */
-  getHotspotForScreenshot(screenshotName) {
-    // Check memory cache first
-    if (this.hotspotData?.[screenshotName]) {
-      return this.hotspotData[screenshotName];
-    }
-
-    // Try loading from disk (only if we haven't loaded yet)
-    if (!this.hotspotData) {
-      this.hotspotData = this.loadHotspots();
-    }
-    return this.hotspotData?.[screenshotName] || null;
-  }
-
-  /**
-   * Load region data from disk
-   */
-  loadRegions() {
-    let {
-      loadRegionMetadata
-    } = this._deps;
-    return loadRegionMetadata(this.workingDir);
-  }
-
-  /**
-   * Get user-defined regions for a specific screenshot
-   *
-   * Note: Once regionData is loaded (from disk or cloud), we don't reload.
-   * This is intentional - regions are downloaded once per session and cached.
-   * If a screenshot isn't in the cache, it means no region data exists for it.
-   *
-   * @param {string} screenshotName - Name of the screenshot
-   * @returns {Object|null} Region data { confirmed: [], candidates: [] } or null
-   */
-  getRegionsForScreenshot(screenshotName) {
-    // Check memory cache first
-    if (this.regionData?.[screenshotName]) {
-      return this.regionData[screenshotName];
-    }
-
-    // Try loading from disk (only if we haven't loaded yet)
-    if (!this.regionData) {
-      this.regionData = this.loadRegions();
-    }
-    return this.regionData?.[screenshotName] || null;
-  }
-
-  /**
-   * Calculate hotspot coverage (delegating to pure function)
-   */
-  calculateHotspotCoverage(diffClusters, hotspotAnalysis) {
-    let {
-      calculateHotspotCoverage
-    } = this._deps;
-    return calculateHotspotCoverage(diffClusters, hotspotAnalysis);
-  }
-
   /**
    * Handle local baselines logic
    */
@@ -946,7 +752,7 @@ export class TddService {
   /**
    * Compare a screenshot against baseline
    */
-  async compareScreenshot(name, imageBuffer, properties = {}) {
+  async compareScreenshot(name, imageBuffer, properties = {}, screenshotOptions = {}) {
     // Destructure dependencies
     let {
       output,
@@ -1044,8 +850,8 @@ export class TddService {
     }
 
     // Baseline exists - compare
-    let effectiveThreshold = typeof validatedProperties.threshold === 'number' && validatedProperties.threshold >= 0 ? validatedProperties.threshold : this.threshold;
-    let effectiveMinClusterSize = Number.isInteger(validatedProperties.minClusterSize) && validatedProperties.minClusterSize >= 1 ? validatedProperties.minClusterSize : this.minClusterSize;
+    let effectiveThreshold = typeof screenshotOptions.threshold === 'number' && screenshotOptions.threshold >= 0 ? screenshotOptions.threshold : this.threshold;
+    let effectiveMinClusterSize = Number.isInteger(screenshotOptions.minClusterSize) && screenshotOptions.minClusterSize >= 1 ? screenshotOptions.minClusterSize : this.minClusterSize;
     try {
       let honeydiffResult = await compareImages(baselineImagePath, currentImagePath, diffImagePath, {
         threshold: effectiveThreshold,
@@ -1065,8 +871,6 @@ export class TddService {
         this._upsertComparison(result);
         return result;
       } else {
-        let hotspotAnalysis = this.getHotspotForScreenshot(name);
-        let regionData = this.getRegionsForScreenshot(name);
         let result = buildFailedComparison({
           name: sanitizedName,
           signature,
@@ -1076,9 +880,7 @@ export class TddService {
           properties: validatedProperties,
           threshold: effectiveThreshold,
           minClusterSize: effectiveMinClusterSize,
-          honeydiffResult,
-          hotspotAnalysis,
-          regionData
+          honeydiffResult
         });
 
         // Log at debug level only (shown with --verbose)

package/dist/types/index.d.ts

@@ -210,7 +210,7 @@ export interface BuildResult {
   failedComparisons?: number;
   newComparisons?: number;
   identicalComparisons?: number;
-  approvalStatus?: string;
+  visual_review: unknown | null;
   url?: string;
 }
 
@@ -401,7 +401,11 @@ export interface TddService {
   compareScreenshot(
     name: string,
     imageBuffer: Buffer,
-    properties?: Record<string, unknown>
+    properties?: Record<string, unknown>,
+    screenshotOptions?: Pick<
+      ScreenshotOptions,
+      'threshold' | 'minClusterSize' | 'fullPage'
+    >
   ): Promise<ComparisonResult>;
 
   getResults(): TddResults;

package/dist/uploader/core.js

@@ -340,13 +340,12 @@ export function buildUploadResult({
  * @returns {Object} Wait result
  */
 export function buildWaitResult(build) {
-  let totalComparisons = build.comparisonsTotal ?? build.total_comparisons;
-  let passedComparisons = build.comparisonsPassed ?? build.passed_comparisons ?? build.identicalComparisons ?? build.identical_comparisons;
-  let failedComparisons = build.comparisonsFailed ?? build.failed_comparisons ?? build.changedComparisons ?? build.changed_comparisons;
-  let newComparisons = build.comparisonsNew ?? build.newComparisons ?? build.new_comparisons;
-  let identicalComparisons = build.identicalComparisons ?? build.identical_comparisons ?? passedComparisons;
-  let approvalStatus = build.approvalStatus ?? build.approval_status;
-  let hasComparisonCounts = build.comparisonsTotal !== undefined || build.total_comparisons !== undefined || build.comparisonsPassed !== undefined || build.passed_comparisons !== undefined || build.comparisonsFailed !== undefined || build.failed_comparisons !== undefined || build.comparisonsNew !== undefined || build.new_comparisons !== undefined || build.identicalComparisons !== undefined || build.identical_comparisons !== undefined;
+  let totalComparisons = build.total_comparisons;
+  let passedComparisons = build.identical_comparisons;
+  let failedComparisons = build.changed_comparisons;
+  let newComparisons = build.new_comparisons;
+  let identicalComparisons = build.identical_comparisons;
+  let hasComparisonCounts = build.total_comparisons !== undefined || build.new_comparisons !== undefined || build.changed_comparisons !== undefined || build.identical_comparisons !== undefined;
   let result = {
     status: build.status,
     build,
@@ -354,7 +353,7 @@ export function buildWaitResult(build) {
     failedComparisons,
     newComparisons,
     identicalComparisons,
-    approvalStatus,
+    visual_review: build.visual_review || null,
     totalComparisons
   };
   if (hasComparisonCounts) {

package/dist/utils/screenshot-options.js

@@ -9,16 +9,62 @@ export let RESERVED_PROPERTY_OPTIONS = Object.freeze({
   minClusterSize: {
     message: 'Move "minClusterSize" out of properties; properties is only for user metadata.'
   },
+  min_cluster_size: {
+    message: 'Move "min_cluster_size" out of properties; properties is only for user metadata.'
+  },
   fullPage: {
     message: 'Move "fullPage" out of properties; properties is only for user metadata.'
   },
+  full_page: {
+    message: 'Move "full_page" out of properties; properties is only for user metadata.'
+  },
+  captureMode: {
+    message: 'Move "captureMode" out of properties; properties is only for user metadata.'
+  },
+  capture_mode: {
+    message: 'Move "capture_mode" out of properties; properties is only for user metadata.'
+  },
+  deviceScaleFactor: {
+    message: 'Move "deviceScaleFactor" out of properties; properties is only for user metadata.'
+  },
+  device_scale_factor: {
+    message: 'Move "device_scale_factor" out of properties; properties is only for user metadata.'
+  },
+  pixelRatio: {
+    message: 'Move "pixelRatio" out of properties; properties is only for user metadata.'
+  },
+  dpr: {
+    message: 'Move "dpr" out of properties; properties is only for user metadata.'
+  },
+  selector: {
+    message: 'Move "selector" out of properties; properties is only for user metadata.'
+  },
+  component: {
+    message: 'Move "component" out of properties; properties is only for user metadata.'
+  },
+  elementSelector: {
+    message: 'Move "elementSelector" out of properties; properties is only for user metadata.'
+  },
+  element_selector: {
+    message: 'Move "element_selector" out of properties; properties is only for user metadata.'
+  },
   buildId: {
     message: 'Move "buildId" out of properties; properties is only for user metadata.'
   },
+  build_id: {
+    message: 'Move "build_id" out of properties; properties is only for user metadata.'
+  },
   requestTimeout: {
     message: 'Move "requestTimeout" out of properties; properties is only for user metadata.'
+  },
+  request_timeout: {
+    message: 'Move "request_timeout" out of properties; properties is only for user metadata.'
   }
 });
+export let SCREENSHOT_OPTION_NAMES = Object.freeze(['threshold', 'minClusterSize', 'fullPage', 'captureMode', 'deviceScaleFactor', 'selector']);
+export function getScreenshotOptionsPayload(options = {}) {
+  return Object.fromEntries(SCREENSHOT_OPTION_NAMES.filter(option => options[option] !== undefined).map(option => [option, options[option]]));
+}
 function createReservedPropertyWarning(option) {
   return {
     code: 'reserved-property-option',
@@ -28,8 +74,9 @@ function createReservedPropertyWarning(option) {
 }
 
 /**
- * Normalize screenshot SDK options into the properties payload consumed by the
- * local TDD server and cloud-compatible comparison path.
+ * Normalize screenshot SDK options into the local and cloud upload payload.
+ * Reserved names found inside properties are discarded instead of being promoted
+ * into options.
  */
 export function normalizeScreenshotOptions(options = {}) {
   let {
@@ -38,38 +85,30 @@ export function normalizeScreenshotOptions(options = {}) {
     requestTimeout,
     threshold,
     minClusterSize,
-    fullPage
+    fullPage,
+    captureMode,
+    deviceScaleFactor,
+    selector
   } = options;
   let warnings = [];
   let normalizedProperties = {};
-  for (let [key, value] of Object.entries(properties || {})) {
+  let sourceProperties = properties && typeof properties === 'object' && !Array.isArray(properties) ? properties : {};
+  for (let [key, value] of Object.entries(sourceProperties)) {
     if (RESERVED_PROPERTY_OPTIONS[key]) {
       warnings.push(createReservedPropertyWarning(key));
-      if (key === 'threshold' && threshold === undefined) threshold = value;
-      if (key === 'minClusterSize' && minClusterSize === undefined) {
-        minClusterSize = value;
-      }
-      if (key === 'fullPage' && fullPage === undefined) fullPage = value;
-      if (key === 'buildId' && buildId === undefined) buildId = value;
-      if (key === 'requestTimeout' && requestTimeout === undefined) {
-        requestTimeout = value;
-      }
       continue;
     }
     normalizedProperties[key] = value;
   }
-  if (threshold !== undefined) {
-    normalizedProperties.threshold = threshold;
-  }
-  if (minClusterSize !== undefined) {
-    normalizedProperties.minClusterSize = minClusterSize;
-  }
-  if (fullPage !== undefined) {
-    normalizedProperties.fullPage = fullPage;
-  }
   return {
     buildId,
     requestTimeout,
+    threshold,
+    minClusterSize,
+    fullPage,
+    captureMode,
+    deviceScaleFactor,
+    selector,
     properties: normalizedProperties,
     warnings
   };