@lambdatest/smartui-cli 4.1.57 → 4.1.58

package/dist/index.cjs

@@ -306,6 +306,15 @@ var constants_default = {
   // Disallowed file extension
   FILE_EXTENSION_ZIP: ".zip",
   FILE_EXTENSION_GIFS: "gif",
+  // command types
+  COMMAND_TYPE_EXEC: "exec",
+  COMMAND_TYPE_EXEC_START: "exec-start",
+  COMMAND_TYPE_CAPTURE: "capture",
+  COMMAND_TYPE_UPLOAD: "upload",
+  COMMAND_TYPE_UPLOAD_FIGMA: "upload-figma",
+  COMMAND_TYPE_UPLOAD_PDF: "upload-pdf",
+  COMMAND_TYPE_MERGE: "merge",
+  ALLOWED_CUSTOM_VIEWPORT_COMMANDS: ["exec", "exec-start"],
   // Default scrollTime
   DEFAULT_SCROLL_TIME: 8,
   // Default page load time
@@ -631,11 +640,16 @@ var ConfigSchema = {
           type: "array",
           items: { type: "string", enum: [constants_default.CHROME, constants_default.FIREFOX, constants_default.SAFARI, constants_default.EDGE] },
           uniqueItems: true,
+          minItems: 1,
           maxItems: 4,
-          errorMessage: `Invalid config; allowed browsers - ${constants_default.CHROME}, ${constants_default.FIREFOX}, ${constants_default.SAFARI}, ${constants_default.EDGE}`
+          errorMessage: {
+            minItems: "Invalid config; browsers must have at least one entry",
+            _: `Invalid config; allowed browsers - ${constants_default.CHROME}, ${constants_default.FIREFOX}, ${constants_default.SAFARI}, ${constants_default.EDGE}`
+          }
         },
         viewports: {
           type: "array",
+          minItems: 1,
           items: {
             type: "array",
             oneOf: [
@@ -657,11 +671,51 @@ var ConfigSchema = {
           },
           uniqueItems: true,
           maxItems: 5,
-          errorMessage: "Invalid config; max unique viewports allowed - 5"
+          errorMessage: {
+            minItems: "Invalid config; viewports must have at least one entry",
+            maxItems: "Invalid config; max unique viewports allowed - 5"
+          }
+        },
+        customViewports: {
+          type: "array",
+          minItems: 1,
+          items: {
+            type: "object",
+            properties: {
+              browser: {
+                type: "string",
+                enum: [constants_default.CHROME, constants_default.FIREFOX, constants_default.SAFARI, constants_default.EDGE],
+                errorMessage: `Invalid config; allowed browsers - ${constants_default.CHROME}, ${constants_default.FIREFOX}, ${constants_default.SAFARI}, ${constants_default.EDGE}`
+              },
+              viewport: {
+                type: "array",
+                oneOf: [
+                  {
+                    items: [{ type: "number", minimum: 320, maximum: 7680 }],
+                    minItems: 1,
+                    maxItems: 1
+                  },
+                  {
+                    items: [
+                      { type: "number", minimum: 320, maximum: 7680 },
+                      { type: "number", minimum: 320, maximum: 7680 }
+                    ],
+                    minItems: 2,
+                    maxItems: 2
+                  }
+                ],
+                errorMessage: "Invalid config; customViewports viewport width/height must be >= 320 and <= 7680"
+              }
+            },
+            required: ["browser", "viewport"],
+            additionalProperties: false
+          },
+          errorMessage: {
+            minItems: "Invalid config; customViewports must have at least one entry",
+            _: "Invalid config; customViewports must be an array of {browser, viewport} objects"
+          }
         }
-      },
-      required: ["browsers", "viewports"],
-      additionalProperties: false
+      }
     },
     mobile: {
       type: "object",
@@ -1171,10 +1225,30 @@ var SnapshotSchema = {
               },
               uniqueItems: true,
               errorMessage: "Invalid snapshot options; viewports must be an array of unique arrays."
+            },
+            customViewports: {
+              type: "array",
+              items: {
+                type: "object",
+                properties: {
+                  browser: {
+                    type: "string",
+                    enum: [constants_default.CHROME, constants_default.FIREFOX, constants_default.SAFARI, constants_default.EDGE]
+                  },
+                  viewport: {
+                    type: "array",
+                    items: { type: "number", minimum: 1 },
+                    minItems: 1,
+                    maxItems: 2
+                  }
+                },
+                required: ["browser", "viewport"],
+                additionalProperties: false
+              },
+              errorMessage: "Invalid snapshot options; customViewports must be an array of {browser, viewport} objects"
             }
           },
-          required: ["viewports"],
-          errorMessage: "Invalid snapshot options; web must include viewports property."
+          errorMessage: "Invalid snapshot options; web must include viewports or customViewports property."
         },
         mobile: {
           type: "object",
@@ -1659,20 +1733,55 @@ function closeBrowsers(browsers) {
 function getWebRenderViewports(ctx) {
   let webRenderViewports = [];
   if (ctx.config.web) {
-    for (const viewport of ctx.config.web.viewports) {
-      webRenderViewports.push({
-        viewport,
-        viewportString: `${viewport.width}${viewport.height ? "x" + viewport.height : ""}`,
-        fullPage: viewport.height ? false : true,
-        device: false
-      });
+    if (ctx.config.web.browserViewports) {
+      const seen = /* @__PURE__ */ new Set();
+      for (const viewports of Object.values(ctx.config.web.browserViewports)) {
+        for (const viewport of viewports) {
+          const key = `${viewport.width}x${viewport.height}`;
+          if (!seen.has(key)) {
+            seen.add(key);
+            webRenderViewports.push({
+              viewport,
+              viewportString: `${viewport.width}${viewport.height ? "x" + viewport.height : ""}`,
+              fullPage: viewport.height ? false : true,
+              device: false
+            });
+          }
+        }
+      }
+    } else {
+      for (const viewport of ctx.config.web.viewports) {
+        webRenderViewports.push({
+          viewport,
+          viewportString: `${viewport.width}${viewport.height ? "x" + viewport.height : ""}`,
+          fullPage: viewport.height ? false : true,
+          device: false
+        });
+      }
     }
   }
   return webRenderViewports;
 }
 function getWebRenderViewportsForOptions(options) {
   let webRenderViewports = [];
-  if (options.web && Array.isArray(options.web.viewports)) {
+  if (options.web && Array.isArray(options.web.customViewports) && options.web.customViewports.length > 0) {
+    const browserViewports = transformCustomViewportsToBrowserViewports(options.web.customViewports);
+    const seen = /* @__PURE__ */ new Set();
+    for (const viewports of Object.values(browserViewports)) {
+      for (const vp of viewports) {
+        const key = `${vp.width}x${vp.height}`;
+        if (!seen.has(key)) {
+          seen.add(key);
+          webRenderViewports.push({
+            viewport: vp,
+            viewportString: `${vp.width}${vp.height ? "x" + vp.height : ""}`,
+            fullPage: vp.height ? false : true,
+            device: false
+          });
+        }
+      }
+    }
+  } else if (options.web && Array.isArray(options.web.viewports)) {
     for (const viewport of options.web.viewports) {
       if (Array.isArray(viewport) && viewport.length > 0) {
         let viewportObj = {
@@ -1692,6 +1801,22 @@ function getWebRenderViewportsForOptions(options) {
   }
   return webRenderViewports;
 }
+function transformCustomViewportsToBrowserViewports(customViewports) {
+  const browserViewports = {};
+  for (const entry of customViewports) {
+    if (!browserViewports[entry.browser]) {
+      browserViewports[entry.browser] = [];
+    }
+    const vp = { width: entry.viewport[0], height: entry.viewport[1] || 0 };
+    const exists = browserViewports[entry.browser].some(
+      (existing) => existing.width === vp.width && existing.height === vp.height
+    );
+    if (!exists) {
+      browserViewports[entry.browser].push(vp);
+    }
+  }
+  return browserViewports;
+}
 function getMobileRenderViewports(ctx) {
   var _a;
   let mobileRenderViewports = {};
@@ -1970,9 +2095,15 @@ function stopTunnelHelper(ctx) {
 function calculateVariantCount(config) {
   let variantCount = 0;
   if (config.web) {
-    const browsers = config.web.browsers || [];
-    const viewports = config.web.viewports || [];
-    variantCount += browsers.length * viewports.length;
+    if (config.web.browserViewports) {
+      for (const viewports of Object.values(config.web.browserViewports)) {
+        variantCount += viewports.length;
+      }
+    } else {
+      const browsers = config.web.browsers || [];
+      const viewports = config.web.viewports || [];
+      variantCount += browsers.length * viewports.length;
+    }
   }
   if (config.mobile) {
     const devices = config.mobile.devices || [];
@@ -1984,9 +2115,15 @@ function calculateVariantCountFromSnapshot(snapshot, globalConfig) {
   var _a, _b;
   let variantCount = 0;
   if ((_a = snapshot.options) == null ? void 0 : _a.web) {
-    const browsers = snapshot.options.web.browsers || [];
-    const viewports = snapshot.options.web.viewports || [];
-    variantCount += browsers.length * viewports.length;
+    if (snapshot.options.web.browserViewports) {
+      for (const viewports of Object.values(snapshot.options.web.browserViewports)) {
+        variantCount += viewports.length;
+      }
+    } else {
+      const browsers = snapshot.options.web.browsers || [];
+      const viewports = snapshot.options.web.viewports || [];
+      variantCount += browsers.length * viewports.length;
+    }
   }
   if ((_b = snapshot.options) == null ? void 0 : _b.mobile) {
     const devices = snapshot.options.mobile.devices || [];
@@ -2987,7 +3124,7 @@ var authExec_default = (ctx) => {
 };
 
 // package.json
-var version = "4.1.57";
+var version = "4.1.58";
 var package_default = {
   name: "@lambdatest/smartui-cli",
   version,
@@ -3844,7 +3981,7 @@ var httpClient = class {
   }
 };
 var ctx_default = (options) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   let env = env_default();
   let webConfig;
   let mobileConfig;
@@ -3922,18 +4059,49 @@ var ctx_default = (options) => {
       env.LT_USERNAME = options.userName;
       env.LT_ACCESS_KEY = options.accessKey;
     }
+    if (((_b = config.web) == null ? void 0 : _b.customViewports) && !constants_default.ALLOWED_CUSTOM_VIEWPORT_COMMANDS.includes(options.commandType)) {
+      throw new Error("customViewports is only supported for the exec command. Use browsers and viewports instead.");
+    }
   } catch (error) {
     console.log(`[smartui] Error: ${error.message}`);
     process.exit(1);
   }
   if (config.web) {
-    webConfig = { browsers: config.web.browsers, viewports: [] };
-    for (let viewport of (_b = config.web) == null ? void 0 : _b.viewports) webConfig.viewports.push({ width: viewport[0], height: viewport[1] || 0 });
+    const hasCustomViewports = config.web.customViewports && Array.isArray(config.web.customViewports) && config.web.customViewports.length > 0;
+    const hasBrowsersAndViewports = config.web.browsers && config.web.browsers.length > 0 && config.web.viewports && config.web.viewports.length > 0;
+    if (!hasCustomViewports && !hasBrowsersAndViewports) {
+      throw new Error("Invalid config; web config must have either customViewports or both browsers and viewports");
+    }
+    if (hasCustomViewports) {
+      const browserViewports = {};
+      for (const entry of config.web.customViewports) {
+        const vp = { width: entry.viewport[0], height: entry.viewport[1] || 0 };
+        if (!browserViewports[entry.browser]) browserViewports[entry.browser] = [];
+        if (!browserViewports[entry.browser].some((v) => v.width === vp.width && v.height === vp.height)) {
+          browserViewports[entry.browser].push(vp);
+        }
+      }
+      const browsers = Object.keys(browserViewports);
+      const allViewports = [];
+      for (const vps of Object.values(browserViewports)) {
+        for (const vp of vps) {
+          if (!allViewports.some((v) => v.width === vp.width && v.height === vp.height)) {
+            allViewports.push(vp);
+          }
+        }
+      }
+      webConfig = { browsers, viewports: allViewports, browserViewports };
+    } else {
+      webConfig = { browsers: config.web.browsers, viewports: [] };
+      if ((_c = config.web) == null ? void 0 : _c.viewports) {
+        for (let viewport of config.web.viewports) webConfig.viewports.push({ width: viewport[0], height: viewport[1] || 0 });
+      }
+    }
   }
   if (config.mobile) {
     mobileConfig = {
       devices: config.mobile.devices,
-      fullPage: (_c = config.mobile.fullPage) != null ? _c : true,
+      fullPage: (_d = config.mobile.fullPage) != null ? _d : true,
       orientation: config.mobile.orientation || constants_default.MOBILE_ORIENTATION_PORTRAIT
     };
   }
@@ -4000,18 +4168,18 @@ var ctx_default = (options) => {
       waitForPageRender: config.waitForPageRender || 0,
       waitForTimeout: config.waitForTimeout || 0,
       waitForDiscovery: config.waitForDiscovery || 3e4,
-      enableJavaScript: (_d = config.enableJavaScript) != null ? _d : false,
-      cliEnableJavaScript: (_e = config.cliEnableJavaScript) != null ? _e : true,
+      enableJavaScript: (_e = config.enableJavaScript) != null ? _e : false,
+      cliEnableJavaScript: (_f = config.cliEnableJavaScript) != null ? _f : true,
       scrollTime: config.scrollTime || constants_default.DEFAULT_SCROLL_TIME,
       allowedHostnames: config.allowedHostnames || [],
       allowedAssets: config.allowedAssets || [],
       basicAuthorization: basicAuthObj,
       lazyLoadConfiguration: lazyLoadConfigObj,
-      smartIgnore: (_f = config.smartIgnore) != null ? _f : false,
-      delayedUpload: (_g = config.delayedUpload) != null ? _g : false,
-      useGlobalCache: (_h = config.useGlobalCache) != null ? _h : false,
-      ignoreHTTPSErrors: (_i = config.ignoreHTTPSErrors) != null ? _i : false,
-      skipBuildCreation: (_j = config.skipBuildCreation) != null ? _j : false,
+      smartIgnore: (_g = config.smartIgnore) != null ? _g : false,
+      delayedUpload: (_h = config.delayedUpload) != null ? _h : false,
+      useGlobalCache: (_i = config.useGlobalCache) != null ? _i : false,
+      ignoreHTTPSErrors: (_j = config.ignoreHTTPSErrors) != null ? _j : false,
+      skipBuildCreation: (_k = config.skipBuildCreation) != null ? _k : false,
       tunnel: tunnelObj,
       dedicatedProxyURL: config.dedicatedProxyURL || "",
       geolocation: config.geolocation || "",
@@ -4024,7 +4192,7 @@ var ctx_default = (options) => {
       loadDomContent,
       approvalThreshold: config.approvalThreshold,
       rejectionThreshold: config.rejectionThreshold,
-      showRenderErrors: (_k = config.showRenderErrors) != null ? _k : false,
+      showRenderErrors: (_l = config.showRenderErrors) != null ? _l : false,
       customCSS: config.customCSS
     },
     uploadFilePath: "",
@@ -4558,6 +4726,7 @@ var normalizeSameSite = (value) => {
 };
 function prepareSnapshot(snapshot, ctx) {
   return __async(this, null, function* () {
+    var _a;
     let processedOptions = {};
     processedOptions.cliEnableJavascript = ctx.config.cliEnableJavaScript;
     processedOptions.ignoreHTTPSErrors = ctx.config.ignoreHTTPSErrors;
@@ -4579,8 +4748,8 @@ function prepareSnapshot(snapshot, ctx) {
     if (options && Object.keys(options).length) {
       ctx.log.debug(`Snapshot options: ${JSON.stringify(options)}`);
       const isNotAllEmpty = (obj) => {
-        var _a;
-        for (let key in obj) if ((_a = obj[key]) == null ? void 0 : _a.length) return true;
+        var _a2;
+        for (let key in obj) if ((_a2 = obj[key]) == null ? void 0 : _a2.length) return true;
         return false;
       };
       if (options.loadDomContent) {
@@ -4601,13 +4770,20 @@ function prepareSnapshot(snapshot, ctx) {
       }
       if (options.web && Object.keys(options.web).length) {
         processedOptions.web = {};
-        if (options.web.viewports && options.web.viewports.length > 0) {
-          processedOptions.web.viewports = options.web.viewports.filter(
-            (viewport) => Array.isArray(viewport) && viewport.length > 0
-          );
+        if (options.web.customViewports && Array.isArray(options.web.customViewports) && options.web.customViewports.length > 0) {
+          processedOptions.web.browserViewports = transformCustomViewportsToBrowserViewports(options.web.customViewports);
+        } else {
+          if (options.web.viewports && options.web.viewports.length > 0) {
+            processedOptions.web.viewports = options.web.viewports.filter(
+              (viewport) => Array.isArray(viewport) && viewport.length > 0
+            );
+          }
+          if (options.web.browsers && options.web.browsers.length > 0) {
+            processedOptions.web.browsers = options.web.browsers;
+          }
         }
-        if (options.web.browsers && options.web.browsers.length > 0) {
-          processedOptions.web.browsers = options.web.browsers;
+        if (Object.keys(processedOptions.web).length === 0) {
+          delete processedOptions.web;
         }
       }
       if (options.mobile && Object.keys(options.mobile).length) {
@@ -4663,6 +4839,9 @@ function prepareSnapshot(snapshot, ctx) {
         processedOptions.ignoreType = options.ignoreType;
       }
     }
+    if (!processedOptions.web && ((_a = ctx.config.web) == null ? void 0 : _a.browserViewports)) {
+      processedOptions.web = { browserViewports: ctx.config.web.browserViewports };
+    }
     if (ctx.config.tunnel) {
       if (ctx.tunnelDetails && ctx.tunnelDetails.tunnelPort != -1 && ctx.tunnelDetails.tunnelHost != "") {
         const tunnelAddress = `http://${ctx.tunnelDetails.tunnelHost}:${ctx.tunnelDetails.tunnelPort}`;
@@ -4734,7 +4913,7 @@ function prepareSnapshot(snapshot, ctx) {
 }
 function processSnapshot(snapshot, ctx) {
   return __async(this, null, function* () {
-    var _a, _b;
+    var _a, _b, _c;
     updateLogContext({ task: "discovery" });
     ctx.log.debug(`Processing snapshot ${snapshot.name} ${snapshot.url}`);
     const isHeadless = ((_a = process.env.HEADLESS) == null ? void 0 : _a.toLowerCase()) === "false" ? false : true;
@@ -5023,13 +5202,20 @@ function processSnapshot(snapshot, ctx) {
       }
       if (options.web && Object.keys(options.web).length) {
         processedOptions.web = {};
-        if (options.web.viewports && options.web.viewports.length > 0) {
-          processedOptions.web.viewports = options.web.viewports.filter(
-            (viewport) => Array.isArray(viewport) && viewport.length > 0
-          );
+        if (options.web.customViewports && Array.isArray(options.web.customViewports) && options.web.customViewports.length > 0) {
+          processedOptions.web.browserViewports = transformCustomViewportsToBrowserViewports(options.web.customViewports);
+        } else {
+          if (options.web.viewports && options.web.viewports.length > 0) {
+            processedOptions.web.viewports = options.web.viewports.filter(
+              (viewport) => Array.isArray(viewport) && viewport.length > 0
+            );
+          }
+          if (options.web.browsers && options.web.browsers.length > 0) {
+            processedOptions.web.browsers = options.web.browsers;
+          }
         }
-        if (options.web.browsers && options.web.browsers.length > 0) {
-          processedOptions.web.browsers = options.web.browsers;
+        if (Object.keys(processedOptions.web).length === 0) {
+          delete processedOptions.web;
         }
       }
       if (options.mobile && Object.keys(options.mobile).length) {
@@ -5087,6 +5273,9 @@ function processSnapshot(snapshot, ctx) {
         processedOptions.ignoreType = options.ignoreType;
       }
     }
+    if (!processedOptions.web && ((_c = ctx.config.web) == null ? void 0 : _c.browserViewports)) {
+      processedOptions.web = { browserViewports: ctx.config.web.browserViewports };
+    }
     if (ctx.config.tunnel) {
       if (ctx.tunnelDetails && ctx.tunnelDetails.tunnelPort != -1 && ctx.tunnelDetails.tunnelHost != "") {
         const tunnelAddress = `http://${ctx.tunnelDetails.tunnelHost}:${ctx.tunnelDetails.tunnelPort}`;
@@ -5458,28 +5647,42 @@ var Queue = class {
     }
   }
   processGenerateVariants(snapshot) {
+    var _a, _b;
+    let hasWebOptions = ((_a = snapshot.options) == null ? void 0 : _a.web) && Object.keys(snapshot.options.web).length > 0;
+    let hasMobileOptions = ((_b = snapshot.options) == null ? void 0 : _b.mobile) && Object.keys(snapshot.options.mobile).length > 0;
     if (snapshot.options) {
-      if (snapshot.options.web) {
+      if (hasWebOptions) {
         this.generateWebVariants(snapshot, snapshot.options.web);
       }
-      if (snapshot.options.mobile) {
+      if (hasMobileOptions) {
         this.generateMobileVariants(snapshot, snapshot.options.mobile);
       }
     }
-    if (!snapshot.options || snapshot.options && !snapshot.options.web && !snapshot.options.mobile) {
+    if (!snapshot.options || !hasWebOptions && !hasMobileOptions) {
       this.generateVariants(snapshot, this.ctx.config);
     }
   }
   generateVariants(snapshot, config) {
     if (config.web) {
-      const browsers = config.web.browsers || [];
-      const viewports = config.web.viewports || [];
-      for (const browser of browsers) {
-        for (const viewport of viewports) {
-          const width = viewport.width;
-          const height = viewport.height || 0;
-          const variant = `${snapshot.name}_${browser}_viewport[${width}]_viewport[${height}]`;
-          this.variants.push(variant);
+      if (config.web.browserViewports) {
+        for (const [browser, viewports] of Object.entries(config.web.browserViewports)) {
+          for (const viewport of viewports) {
+            const width = viewport.width;
+            const height = viewport.height || 0;
+            const variant = `${snapshot.name}_${browser}_viewport[${width}]_viewport[${height}]`;
+            this.variants.push(variant);
+          }
+        }
+      } else {
+        const browsers = config.web.browsers || [];
+        const viewports = config.web.viewports || [];
+        for (const browser of browsers) {
+          for (const viewport of viewports) {
+            const width = viewport.width;
+            const height = viewport.height || 0;
+            const variant = `${snapshot.name}_${browser}_viewport[${width}]_viewport[${height}]`;
+            this.variants.push(variant);
+          }
         }
       }
     }
@@ -5494,15 +5697,24 @@ var Queue = class {
   }
   generateWebVariants(snapshot, webConfig) {
     var _a, _b, _c;
-    const browsers = (_c = (_b = webConfig.browsers) != null ? _b : (_a = this.ctx.config.web) == null ? void 0 : _a.browsers) != null ? _c : [constants_default.CHROME, constants_default.EDGE, constants_default.FIREFOX, constants_default.SAFARI];
-    const viewports = webConfig.viewports || [];
-    for (const browser of browsers) {
-      for (const viewport of viewports) {
-        const width = viewport[0];
-        const height = viewport[1] || 0;
-        const variant = `${snapshot.name}_${browser}_viewport[${width}]_viewport[${height}]`;
+    if (webConfig.customViewports && Array.isArray(webConfig.customViewports) && webConfig.customViewports.length > 0) {
+      for (const entry of webConfig.customViewports) {
+        const width = entry.viewport[0];
+        const height = entry.viewport[1] || 0;
+        const variant = `${snapshot.name}_${entry.browser}_viewport[${width}]_viewport[${height}]`;
         this.variants.push(variant);
       }
+    } else {
+      const browsers = (_c = (_b = webConfig.browsers) != null ? _b : (_a = this.ctx.config.web) == null ? void 0 : _a.browsers) != null ? _c : [constants_default.CHROME, constants_default.EDGE, constants_default.FIREFOX, constants_default.SAFARI];
+      const viewports = webConfig.viewports || [];
+      for (const browser of browsers) {
+        for (const viewport of viewports) {
+          const width = viewport[0];
+          const height = viewport[1] || 0;
+          const variant = `${snapshot.name}_${browser}_viewport[${width}]_viewport[${height}]`;
+          this.variants.push(variant);
+        }
+      }
     }
   }
   generateMobileVariants(snapshot, mobileConfig) {
@@ -5515,16 +5727,19 @@ var Queue = class {
     }
   }
   filterExistingVariants(snapshot, config) {
+    var _a, _b;
     let drop = true;
-    if (snapshot.options && snapshot.options.web) {
+    let hasWebOptions = ((_a = snapshot.options) == null ? void 0 : _a.web) && Object.keys(snapshot.options.web).length > 0;
+    let hasMobileOptions = ((_b = snapshot.options) == null ? void 0 : _b.mobile) && Object.keys(snapshot.options.mobile).length > 0;
+    if (snapshot.options && hasWebOptions) {
       const webDrop = this.filterWebVariants(snapshot, snapshot.options.web);
       if (!webDrop) drop = false;
     }
-    if (snapshot.options && snapshot.options.mobile) {
+    if (snapshot.options && hasMobileOptions) {
       const mobileDrop = this.filterMobileVariants(snapshot, snapshot.options.mobile);
       if (!mobileDrop) drop = false;
     }
-    if (!snapshot.options || snapshot.options && !snapshot.options.web && !snapshot.options.mobile) {
+    if (!snapshot.options || !hasWebOptions && !hasMobileOptions) {
       const configDrop = this.filterVariants(snapshot, config);
       if (!configDrop) drop = false;
     }
@@ -5534,28 +5749,63 @@ var Queue = class {
     var _a;
     let allVariantsDropped = true;
     if (config.web) {
-      const browsers = config.web.browsers || [];
-      const viewports = config.web.viewports || [];
-      for (const browser of browsers) {
-        for (const viewport of viewports) {
-          const width = viewport.width;
-          const height = viewport.height || 0;
-          const variant = `${snapshot.name}_${browser}_viewport[${width}]_viewport[${height}]`;
-          if (!this.variants.includes(variant)) {
-            allVariantsDropped = false;
-            if (!snapshot.options) snapshot.options = {};
-            if (!snapshot.options.web) snapshot.options.web = { browsers: [], viewports: [] };
-            if (!snapshot.options.web.browsers.includes(browser)) {
-              snapshot.options.web.browsers.push(browser);
+      if (config.web.browserViewports) {
+        const customViewports = [];
+        for (const [browser, viewports] of Object.entries(config.web.browserViewports)) {
+          for (const viewport of viewports) {
+            const width = viewport.width;
+            const height = viewport.height || 0;
+            const variant = `${snapshot.name}_${browser}_viewport[${width}]_viewport[${height}]`;
+            if (!this.variants.includes(variant)) {
+              allVariantsDropped = false;
+              if (height > 0) {
+                customViewports.push({ browser, viewport: [width, height] });
+              } else {
+                customViewports.push({ browser, viewport: [width] });
+              }
             }
+          }
+        }
+        if (customViewports.length > 0) {
+          if (!snapshot.options) snapshot.options = {};
+          snapshot.options.web = { browsers: [], viewports: [], customViewports };
+          for (const entry of customViewports) {
+            if (!snapshot.options.web.browsers.includes(entry.browser)) {
+              snapshot.options.web.browsers.push(entry.browser);
+            }
+            const vp = entry.viewport;
             const viewportExists = snapshot.options.web.viewports.some(
-              (existingViewport) => existingViewport[0] === width && (existingViewport.length < 2 || existingViewport[1] === height)
+              (ev) => ev[0] === vp[0] && (ev.length < 2 || ev[1] === (vp[1] || 0))
             );
             if (!viewportExists) {
-              if (height > 0) {
-                snapshot.options.web.viewports.push([width, height]);
-              } else {
-                snapshot.options.web.viewports.push([width]);
+              snapshot.options.web.viewports.push(vp);
+            }
+          }
+        }
+      } else {
+        const browsers = config.web.browsers || [];
+        const viewports = config.web.viewports || [];
+        for (const browser of browsers) {
+          for (const viewport of viewports) {
+            const width = viewport.width;
+            const height = viewport.height || 0;
+            const variant = `${snapshot.name}_${browser}_viewport[${width}]_viewport[${height}]`;
+            if (!this.variants.includes(variant)) {
+              allVariantsDropped = false;
+              if (!snapshot.options) snapshot.options = {};
+              if (!snapshot.options.web) snapshot.options.web = { browsers: [], viewports: [] };
+              if (!snapshot.options.web.browsers.includes(browser)) {
+                snapshot.options.web.browsers.push(browser);
+              }
+              const viewportExists = snapshot.options.web.viewports.some(
+                (existingViewport) => existingViewport[0] === width && (existingViewport.length < 2 || existingViewport[1] === height)
+              );
+              if (!viewportExists) {
+                if (height > 0) {
+                  snapshot.options.web.viewports.push([width, height]);
+                } else {
+                  snapshot.options.web.viewports.push([width]);
+                }
               }
             }
           }
@@ -5583,31 +5833,60 @@ var Queue = class {
   }
   filterWebVariants(snapshot, webConfig) {
     var _a, _b, _c;
-    const browsers = (_c = (_b = webConfig.browsers) != null ? _b : (_a = this.ctx.config.web) == null ? void 0 : _a.browsers) != null ? _c : [constants_default.CHROME, constants_default.EDGE, constants_default.FIREFOX, constants_default.SAFARI];
-    const viewports = webConfig.viewports || [];
     let allVariantsDropped = true;
     if (!snapshot.options) {
       snapshot.options = {};
     }
-    snapshot.options.web = { browsers: [], viewports: [] };
-    for (const browser of browsers) {
-      for (const viewport of viewports) {
-        const width = viewport[0];
-        const height = viewport[1] || 0;
-        const variant = `${snapshot.name}_${browser}_viewport[${width}]_viewport[${height}]`;
+    if (webConfig.customViewports && Array.isArray(webConfig.customViewports) && webConfig.customViewports.length > 0) {
+      const filteredCustomViewports = [];
+      const browsers = [];
+      const viewports = [];
+      for (const entry of webConfig.customViewports) {
+        const width = entry.viewport[0];
+        const height = entry.viewport[1] || 0;
+        const variant = `${snapshot.name}_${entry.browser}_viewport[${width}]_viewport[${height}]`;
         if (!this.variants.includes(variant)) {
           allVariantsDropped = false;
-          if (!snapshot.options.web.browsers.includes(browser)) {
-            snapshot.options.web.browsers.push(browser);
+          filteredCustomViewports.push(entry);
+          if (!browsers.includes(entry.browser)) {
+            browsers.push(entry.browser);
           }
-          const viewportExists = snapshot.options.web.viewports.some(
-            (existingViewport) => existingViewport[0] === width && (existingViewport.length < 2 || existingViewport[1] === height)
+          const viewportExists = viewports.some(
+            (ev) => ev[0] === width && (ev.length < 2 || ev[1] === height)
           );
           if (!viewportExists) {
             if (height > 0) {
-              snapshot.options.web.viewports.push([width, height]);
+              viewports.push([width, height]);
             } else {
-              snapshot.options.web.viewports.push([width]);
+              viewports.push([width]);
+            }
+          }
+        }
+      }
+      snapshot.options.web = { browsers, viewports, customViewports: filteredCustomViewports };
+    } else {
+      snapshot.options.web = { browsers: [], viewports: [] };
+      const browsers = (_c = (_b = webConfig.browsers) != null ? _b : (_a = this.ctx.config.web) == null ? void 0 : _a.browsers) != null ? _c : [constants_default.CHROME, constants_default.EDGE, constants_default.FIREFOX, constants_default.SAFARI];
+      const viewports = webConfig.viewports || [];
+      for (const browser of browsers) {
+        for (const viewport of viewports) {
+          const width = viewport[0];
+          const height = viewport[1] || 0;
+          const variant = `${snapshot.name}_${browser}_viewport[${width}]_viewport[${height}]`;
+          if (!this.variants.includes(variant)) {
+            allVariantsDropped = false;
+            if (!snapshot.options.web.browsers.includes(browser)) {
+              snapshot.options.web.browsers.push(browser);
+            }
+            const viewportExists = snapshot.options.web.viewports.some(
+              (existingViewport) => existingViewport[0] === width && (existingViewport.length < 2 || existingViewport[1] === height)
+            );
+            if (!viewportExists) {
+              if (height > 0) {
+                snapshot.options.web.viewports.push([width, height]);
+              } else {
+                snapshot.options.web.viewports.push([width]);
+              }
             }
           }
         }
@@ -5918,7 +6197,9 @@ command.name("exec").description("Run test commands around SmartUI").argument("<
       console.log(`Error: The '--buildName' option cannot be an empty string.`);
       process.exit(1);
     }
-    let ctx = ctx_default(command11.optsWithGlobals());
+    let opts = command11.optsWithGlobals();
+    opts.commandType = constants_default.COMMAND_TYPE_EXEC;
+    let ctx = ctx_default(opts);
     if (!which__default.default.sync(execCommand[0], { nothrow: true })) {
       ctx.log.error(`Error: Command not found "${execCommand[0]}"`);
       return;
@@ -6759,7 +7040,9 @@ command2.name("capture").description("Capture screenshots of static sites").argu
       console.log(`Error: The '--buildName' option cannot be an empty string.`);
       process.exit(1);
     }
-    let ctx = ctx_default(command11.optsWithGlobals());
+    let opts = command11.optsWithGlobals();
+    opts.commandType = constants_default.COMMAND_TYPE_CAPTURE;
+    let ctx = ctx_default(opts);
     ctx.isSnapshotCaptured = true;
     if (!fs6__default.default.existsSync(file)) {
       ctx.log.error(`Web Static Config file ${file} not found.`);
@@ -6854,7 +7137,9 @@ command3.name("upload").description("Upload screenshots from given directory").a
       console.log(`Error: The '--buildName' option cannot be an empty string.`);
       process.exit(1);
     }
-    let ctx = ctx_default(command11.optsWithGlobals());
+    let opts = command11.optsWithGlobals();
+    opts.commandType = constants_default.COMMAND_TYPE_UPLOAD;
+    let ctx = ctx_default(opts);
     ctx.isSnapshotCaptured = true;
     if (!fs6__default.default.existsSync(directory)) {
       console.log(`Error: The provided directory ${directory} not found.`);
@@ -7137,7 +7422,9 @@ var uploadAppFigmaCommand = new commander.Command();
 uploadFigma.name("upload-figma").description("Capture screenshots of static sites").argument("<file>", "figma design config file").option("--markBaseline", "Mark the uploaded images as baseline").option("--buildName <buildName>", "Name of the build").action(function(file, _, command11) {
   return __async(this, null, function* () {
     var _a, _b;
-    let ctx = ctx_default(command11.optsWithGlobals());
+    let opts = command11.optsWithGlobals();
+    opts.commandType = constants_default.COMMAND_TYPE_UPLOAD_FIGMA;
+    let ctx = ctx_default(opts);
     ctx.isSnapshotCaptured = true;
     if (!fs6__default.default.existsSync(file)) {
       console.log(`Error: Figma Config file ${file} not found.`);
@@ -7179,7 +7466,9 @@ uploadFigma.name("upload-figma").description("Capture screenshots of static site
 uploadWebFigmaCommand.name("upload-figma-web").description("Capture figma screenshots into CLI build").argument("<file>", "figma config config file").option("--markBaseline", "Mark the uploaded images as baseline").option("--buildName <buildName>", "Name of the build").option("--fetch-results [filename]", "Fetch results and optionally specify an output file, e.g., <filename>.json").action(function(file, _, command11) {
   return __async(this, null, function* () {
     var _a;
-    let ctx = ctx_default(command11.optsWithGlobals());
+    let opts = command11.optsWithGlobals();
+    opts.commandType = constants_default.COMMAND_TYPE_UPLOAD_FIGMA;
+    let ctx = ctx_default(opts);
     if (!fs6__default.default.existsSync(file)) {
       console.log(`Error: figma-web config file ${file} not found.`);
       return;
@@ -7232,7 +7521,9 @@ uploadWebFigmaCommand.name("upload-figma-web").description("Capture figma screen
 uploadAppFigmaCommand.name("upload-figma-app").description("Capture figma screenshots into App Build").argument("<file>", "figma config config file").option("--markBaseline", "Mark the uploaded images as baseline").option("--buildName <buildName>", "Name of the build").option("--fetch-results [filename]", "Fetch results and optionally specify an output file, e.g., <filename>.json").action(function(file, _, command11) {
   return __async(this, null, function* () {
     var _a;
-    let ctx = ctx_default(command11.optsWithGlobals());
+    let opts = command11.optsWithGlobals();
+    opts.commandType = constants_default.COMMAND_TYPE_UPLOAD_FIGMA;
+    let ctx = ctx_default(opts);
     if (!fs6__default.default.existsSync(file)) {
       console.log(`Error: figma-app config file ${file} not found.`);
       return;
@@ -7291,7 +7582,9 @@ command4.name("exec:start").description("Start SmartUI server").option("-P, --po
       console.log(`Error: The '--buildName' option cannot be an empty string.`);
       process.exit(1);
     }
-    let ctx = ctx_default(command4.optsWithGlobals());
+    let opts = command4.optsWithGlobals();
+    opts.commandType = constants_default.COMMAND_TYPE_EXEC_START;
+    let ctx = ctx_default(opts);
     ctx.snapshotQueue = new Queue(ctx);
     ctx.totalSnapshots = 0;
     ctx.isStartExec = true;
@@ -7491,7 +7784,9 @@ var command7 = new commander.Command();
 command7.name("branch").description("Merge a source branch into the target branch").requiredOption("--source <string>", "Source branch to merge").requiredOption("--target <string>", "Target branch to merge into").action(function(options) {
   return __async(this, null, function* () {
     const { source, target } = options;
-    let ctx = ctx_default(command7.optsWithGlobals());
+    let opts = command7.optsWithGlobals();
+    opts.commandType = constants_default.COMMAND_TYPE_MERGE;
+    let ctx = ctx_default(opts);
     if (!source || source.trim() === "") {
       ctx.log.error("Error: The --source option cannot be empty.");
       process.exit(1);
@@ -7574,7 +7869,9 @@ var command8 = new commander.Command();
 command8.name("build").description("Merge a source build into the target build").requiredOption("--source <string>", "Source build to merge").requiredOption("--target <string>", "Target build to merge into").action(function(options) {
   return __async(this, null, function* () {
     const { source, target } = options;
-    let ctx = ctx_default(command8.optsWithGlobals());
+    let opts = command8.optsWithGlobals();
+    opts.commandType = constants_default.COMMAND_TYPE_MERGE;
+    let ctx = ctx_default(opts);
     if (!source || source.trim() === "") {
       ctx.log.error("Error: The --source option cannot be empty.");
       process.exit(1);
@@ -7746,7 +8043,9 @@ command10.name("upload-pdf").description("Upload PDFs for visual comparison").ar
       console.log(`Error: The '--buildName' option cannot be an empty string.`);
       process.exit(1);
     }
-    let ctx = ctx_default(command11.optsWithGlobals());
+    let opts = command11.optsWithGlobals();
+    opts.commandType = constants_default.COMMAND_TYPE_UPLOAD_PDF;
+    let ctx = ctx_default(opts);
     if (!fs6__default.default.existsSync(directory)) {
       console.log(`Error: The provided directory ${directory} not found.`);
       process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambdatest/smartui-cli",
-  "version": "4.1.57",
+  "version": "4.1.58",
   "description": "A command line interface (CLI) to run SmartUI tests on LambdaTest",
   "files": [
     "dist/**/*"