@appium/images-plugin 2.1.6 → 2.1.8

package/build/lib/compare.d.ts

@@ -1,3 +1,39 @@
-export type OccurrenceResult = import('@appium/opencv').OccurrenceResult;
-export function compareImages(next: import("@appium/types").NextPluginCallback<unknown>, driver: [string, string, string, any], ...args: Promise<import("@appium/opencv").OccurrenceResult>): Promise<unknown>;
+export type Visualized = {
+    visualization: string | null | undefined;
+};
+export type MatchingResult = import('@appium/opencv').MatchingResult & Visualized;
+export type OccurrenceResult = import('@appium/opencv').OccurrenceResult & Visualized;
+export type SimilarityResult = import('@appium/opencv').SimilarityResult & Visualized;
+export type ComparisonResult = MatchingResult | OccurrenceResult | SimilarityResult | SimilarityResult[];
+/**
+ * @typedef {{visualization: string|null|undefined}} Visualized
+ * @typedef {import('@appium/opencv').MatchingResult & Visualized} MatchingResult
+ * @typedef {import('@appium/opencv').OccurrenceResult & Visualized} OccurrenceResult
+ * @typedef {import('@appium/opencv').SimilarityResult & Visualized} SimilarityResult
+ * @typedef {MatchingResult|OccurrenceResult|SimilarityResult|SimilarityResult[]} ComparisonResult
+ */
+/**
+ * Performs images comparison using OpenCV framework features.
+ * It is expected that both OpenCV framework and opencv4nodejs
+ * module are installed on the machine where Appium server is running.
+ *
+ * @param {string} mode - One of possible comparison modes:
+ * matchFeatures, getSimilarity, matchTemplate
+ * @param {string|Buffer} firstImage - Base64-encoded image file.
+ * All image formats, that OpenCV library itself accepts, are supported.
+ * @param {string|Buffer} secondImage - Base64-encoded image file.
+ * All image formats, that OpenCV library itself accepts, are supported.
+ * @param {import('@appium/opencv').MatchingOptions
+ * |import('@appium/opencv').SimilarityOptions
+ * |import('@appium/opencv').OccurrenceOptions} [options={}] - The content of this dictionary depends
+ * on the actual `mode` value. See the documentation on `@appium/support`
+ * module for more details.
+ * @returns {Promise<ComparisonResult>} The content of the resulting dictionary depends
+ * on the actual `mode` and `options` values. See the documentation on
+ * `@appium/support` module for more details.
+ * @throws {Error} If required OpenCV modules are not installed or
+ * if `mode` value is incorrect or if there was an unexpected issue while
+ * matching the images.
+ */
+export function compareImages(mode: string, firstImage: string | Buffer, secondImage: string | Buffer, options?: import("@appium/opencv").MatchingOptions | import("@appium/opencv").SimilarityOptions | import("@appium/opencv").OccurrenceOptions | undefined): Promise<ComparisonResult>;
 //# sourceMappingURL=compare.d.ts.map

package/build/lib/compare.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compare.d.ts","sourceRoot":"","sources":["../../lib/compare.js"],"names":[],"mappings":"+BAoFa,OAAO,gBAAgB,EAAE,gBAAgB;AAEkmC,+MAAsF"}
+{"version":3,"file":"compare.d.ts","sourceRoot":"","sources":["../../lib/compare.js"],"names":[],"mappings":"yBAMa;IAAC,aAAa,EAAE,MAAM,GAAC,IAAI,GAAC,SAAS,CAAA;CAAC;6BACtC,OAAO,gBAAgB,EAAE,cAAc,GAAG,UAAU;+BACpD,OAAO,gBAAgB,EAAE,gBAAgB,GAAG,UAAU;+BACtD,OAAO,gBAAgB,EAAE,gBAAgB,GAAG,UAAU;+BACtD,cAAc,GAAC,gBAAgB,GAAC,gBAAgB,GAAC,gBAAgB,EAAE;AALhF;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,oCAlBW,MAAM,cAEN,MAAM,GAAC,MAAM,eAEb,MAAM,GAAC,MAAM,6JAOX,QAAQ,gBAAgB,CAAC,CAgDrC"}

package/build/lib/compare.js

@@ -8,6 +8,13 @@ const lodash_1 = __importDefault(require("lodash"));
 const driver_1 = require("appium/driver");
 const opencv_1 = require("@appium/opencv");
 const constants_1 = require("./constants");
+/**
+ * @typedef {{visualization: string|null|undefined}} Visualized
+ * @typedef {import('@appium/opencv').MatchingResult & Visualized} MatchingResult
+ * @typedef {import('@appium/opencv').OccurrenceResult & Visualized} OccurrenceResult
+ * @typedef {import('@appium/opencv').SimilarityResult & Visualized} SimilarityResult
+ * @typedef {MatchingResult|OccurrenceResult|SimilarityResult|SimilarityResult[]} ComparisonResult
+ */
 /**
  * Performs images comparison using OpenCV framework features.
  * It is expected that both OpenCV framework and opencv4nodejs
@@ -19,43 +26,44 @@ const constants_1 = require("./constants");
  * All image formats, that OpenCV library itself accepts, are supported.
  * @param {string|Buffer} secondImage - Base64-encoded image file.
  * All image formats, that OpenCV library itself accepts, are supported.
- * @param {object} [options] - The content of this dictionary depends
+ * @param {import('@appium/opencv').MatchingOptions
+ * |import('@appium/opencv').SimilarityOptions
+ * |import('@appium/opencv').OccurrenceOptions} [options={}] - The content of this dictionary depends
  * on the actual `mode` value. See the documentation on `@appium/support`
  * module for more details.
- * @returns {Promise<object|object[]>} The content of the resulting dictionary depends
+ * @returns {Promise<ComparisonResult>} The content of the resulting dictionary depends
  * on the actual `mode` and `options` values. See the documentation on
  * `@appium/support` module for more details.
  * @throws {Error} If required OpenCV modules are not installed or
  * if `mode` value is incorrect or if there was an unexpected issue while
  * matching the images.
  */
-/**
- * @type {import('@appium/types').PluginCommand<[string, string, string, object|undefined], Promise<OccurrenceResult>>}
- */
 async function compareImages(mode, firstImage, secondImage, options = {}) {
     const img1 = Buffer.isBuffer(firstImage) ? firstImage : Buffer.from(firstImage, 'base64');
     const img2 = Buffer.isBuffer(secondImage) ? secondImage : Buffer.from(secondImage, 'base64');
-    let result = null;
+    let result;
     switch (lodash_1.default.toLower(mode)) {
         case constants_1.MATCH_FEATURES_MODE.toLowerCase():
             try {
-                result = await (0, opencv_1.getImagesMatches)(img1, img2, options);
+                result = await (0, opencv_1.getImagesMatches)(img1, img2, /** @type {import('@appium/opencv').MatchingOptions} */ (options));
             }
             catch (err) {
                 // might throw if no matches
-                result = { count: 0 };
+                result = /** @type {import('@appium/opencv').MatchingResult} */ ({ count: 0 });
             }
             break;
         case constants_1.GET_SIMILARITY_MODE.toLowerCase():
-            result = await (0, opencv_1.getImagesSimilarity)(img1, img2, options);
+            result = await (0, opencv_1.getImagesSimilarity)(img1, img2, /** @type {import('@appium/opencv').SimilarityOptions} */ (options));
             break;
-        case constants_1.MATCH_TEMPLATE_MODE.toLowerCase():
+        case constants_1.MATCH_TEMPLATE_MODE.toLowerCase(): {
+            const opts = /** @type {import('@appium/opencv').OccurrenceOptions} */ (options);
             // firstImage/img1 is the full image and secondImage/img2 is the partial one
-            result = await (0, opencv_1.getImageOccurrence)(img1, img2, options);
-            if (options.multiple) {
+            result = await (0, opencv_1.getImageOccurrence)(img1, img2, opts);
+            if (opts.multiple) {
                 return result.multiple.map(convertVisualizationToBase64);
             }
             break;
+        }
         default:
             throw new driver_1.errors.InvalidArgumentError(`'${mode}' images comparison mode is unknown. ` +
                 `Only ${JSON.stringify([
@@ -71,16 +79,15 @@ exports.compareImages = compareImages;
  * base64 encodes the visualization part of the result
  * (if necessary)
  *
- * @param {OccurrenceResult} element - occurrence result
- *
+ * @param {Partial<{visualization: Buffer|null}>} element - occurrence result
+ * @returns {any} I know this looks ugly from the typing perspective
  **/
 function convertVisualizationToBase64(element) {
-    if (!lodash_1.default.isEmpty(element.visualization)) {
-        element.visualization = element.visualization.toString('base64');
-    }
-    return element;
+    return Buffer.isBuffer(element.visualization)
+        ? {
+            ...(element),
+            visualization: element.visualization.toString('base64')
+        }
+        : element;
 }
-/**
- * @typedef {import('@appium/opencv').OccurrenceResult} OccurrenceResult
- */
 //# sourceMappingURL=compare.js.map

package/build/lib/compare.js.map

@@ -1 +1 @@
-{"version":3,"file":"compare.js","sourceRoot":"","sources":["../../lib/compare.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,0CAAqC;AACrC,2CAAyF;AACzF,2CAA0F;AAE1F;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH;;GAEG;AACH,KAAK,UAAU,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,GAAG,EAAE;IACtE,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC1F,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC7F,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,QAAQ,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACvB,KAAK,+BAAmB,CAAC,WAAW,EAAE;YACpC,IAAI;gBACF,MAAM,GAAG,MAAM,IAAA,yBAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;aACtD;YAAC,OAAO,GAAG,EAAE;gBACZ,4BAA4B;gBAC5B,MAAM,GAAG,EAAC,KAAK,EAAE,CAAC,EAAC,CAAC;aACrB;YACD,MAAM;QACR,KAAK,+BAAmB,CAAC,WAAW,EAAE;YACpC,MAAM,GAAG,MAAM,IAAA,4BAAmB,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YACxD,MAAM;QACR,KAAK,+BAAmB,CAAC,WAAW,EAAE;YACpC,4EAA4E;YAC5E,MAAM,GAAG,MAAM,IAAA,2BAAkB,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YACvD,IAAI,OAAO,CAAC,QAAQ,EAAE;gBACpB,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;aAC1D;YACD,MAAM;QACR;YACE,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,IAAI,IAAI,uCAAuC;gBAC7C,QAAQ,IAAI,CAAC,SAAS,CAAC;oBACrB,+BAAmB;oBACnB,+BAAmB;oBACnB,+BAAmB;iBACpB,CAAC,uBAAuB,CAC5B,CAAC;KACL;IACD,OAAO,4BAA4B,CAAC,MAAM,CAAC,CAAC;AAC9C,CAAC;AAiBO,sCAAa;AAfrB;;;;;;IAMI;AACJ,SAAS,4BAA4B,CAAC,OAAO;IAC3C,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QACrC,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;KAClE;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAID;;GAEG"}
+{"version":3,"file":"compare.js","sourceRoot":"","sources":["../../lib/compare.js"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,0CAAqC;AACrC,2CAAyF;AACzF,2CAA0F;AAE1F;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,KAAK,UAAU,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,GAAG,EAAE;IACtE,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC1F,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC7F,IAAI,MAAM,CAAC;IACX,QAAQ,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACvB,KAAK,+BAAmB,CAAC,WAAW,EAAE;YACpC,IAAI;gBACF,MAAM,GAAG,MAAM,IAAA,yBAAgB,EAC7B,IAAI,EAAE,IAAI,EAAE,uDAAuD,CAAA,CAAC,OAAO,CAAC,CAC7E,CAAC;aACH;YAAC,OAAO,GAAG,EAAE;gBACZ,4BAA4B;gBAC5B,MAAM,GAAG,sDAAsD,CAAA,CAAC,EAAC,KAAK,EAAE,CAAC,EAAC,CAAC,CAAC;aAC7E;YACD,MAAM;QACR,KAAK,+BAAmB,CAAC,WAAW,EAAE;YACpC,MAAM,GAAG,MAAM,IAAA,4BAAmB,EAChC,IAAI,EAAE,IAAI,EAAE,yDAAyD,CAAA,CAAC,OAAO,CAAC,CAAC,CAAC;YAClF,MAAM;QACR,KAAK,+BAAmB,CAAC,WAAW,EAAE,CAAC,CAAC;YACtC,MAAM,IAAI,GAAG,yDAAyD,CAAA,CAAC,OAAO,CAAC,CAAC;YAChF,4EAA4E;YAC5E,MAAM,GAAG,MAAM,IAAA,2BAAkB,EAC/B,IAAI,EAAE,IAAI,EAAE,IAAI,CACjB,CAAC;YACF,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjB,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;aAC1D;YACD,MAAM;SACP;QACD;YACE,MAAM,IAAI,eAAM,CAAC,oBAAoB,CACnC,IAAI,IAAI,uCAAuC;gBAC7C,QAAQ,IAAI,CAAC,SAAS,CAAC;oBACrB,+BAAmB;oBACnB,+BAAmB;oBACnB,+BAAmB;iBACpB,CAAC,uBAAuB,CAC5B,CAAC;KACL;IACD,OAAO,4BAA4B,CAAC,MAAM,CAAC,CAAC;AAC9C,CAAC;AAkBO,sCAAa;AAhBrB;;;;;;IAMI;AACJ,SAAS,4BAA4B,CAAC,OAAO;IAC3C,OAAO,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,aAAa,CAAC;QAC3C,CAAC,CAAC;YACA,GAAG,CAAC,OAAO,CAAC;YACZ,aAAa,EAAE,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACxD;QACD,CAAC,CAAC,OAAO,CAAC;AACd,CAAC"}

package/build/lib/finder.d.ts

@@ -3,8 +3,8 @@ export default class ImageElementFinder {
      * @param {number} max
      */
     constructor(max?: number);
-    /** @type {LRU<string,ImageElement>} */
-    _imgElCache: LRU<string, ImageElement>;
+    /** @type {LRUCache<string,ImageElement>} */
+    _imgElCache: LRUCache<string, ImageElement>;
     /**
      * @param {ImageElement} imgEl
      * @returns {Element}
@@ -25,7 +25,7 @@ export default class ImageElementFinder {
      * @property {boolean} [ignoreDefaultImageTemplateScale=false] - Whether we
      * ignore defaultImageTemplateScale. It can be used when you would like to
      * scale template with defaultImageTemplateScale setting.
-     * @property {import('@appium/types').Rect?} containerRect - The bounding
+     * @property {import('@appium/types').Rect?} [containerRect=null] - The bounding
      * rectangle to limit the search in
      */
     /**
@@ -60,7 +60,7 @@ export default class ImageElementFinder {
          * - The bounding
          * rectangle to limit the search in
          */
-        containerRect: import('@appium/types').Rect | null;
+        containerRect?: import("@appium/types").Rect | null | undefined;
     }): Promise<Element | Element[] | ImageElement>;
     /**
      * Ensure that the image template sent in for a find is of a suitable size
@@ -85,13 +85,13 @@ export default class ImageElementFinder {
     }>;
     /**
      * @typedef ImageTemplateSettings
-     * @property {boolean} fixImageTemplateScale - fixImageTemplateScale in device-settings
-     * @property {number} defaultImageTemplateScale - defaultImageTemplateScale in device-settings
-     * @property {boolean} ignoreDefaultImageTemplateScale - Ignore defaultImageTemplateScale if it has true.
+     * @property {boolean} [fixImageTemplateScale=false] - fixImageTemplateScale in device-settings
+     * @property {number} [defaultImageTemplateScale=DEFAULT_TEMPLATE_IMAGE_SCALE] - defaultImageTemplateScale in device-settings
+     * @property {boolean} [ignoreDefaultImageTemplateScale=false] - Ignore defaultImageTemplateScale if it has true.
      * If the template has been scaled to defaultImageTemplateScale or should ignore the scale,
      * this parameter should be true. e.g. click in image-element module
-     * @property {number} xScale - Scale ratio for width
-     * @property {number} yScale - Scale ratio for height
+     * @property {number} [xScale=DEFAULT_FIX_IMAGE_TEMPLATE_SCALE] - Scale ratio for width
+     * @property {number} [yScale=DEFAULT_FIX_IMAGE_TEMPLATE_SCALE] - Scale ratio for height
   
      */
     /**
@@ -108,25 +108,25 @@ export default class ImageElementFinder {
         /**
          * - fixImageTemplateScale in device-settings
          */
-        fixImageTemplateScale: boolean;
+        fixImageTemplateScale?: boolean | undefined;
         /**
          * - defaultImageTemplateScale in device-settings
          */
-        defaultImageTemplateScale: number;
+        defaultImageTemplateScale?: number | undefined;
         /**
          * - Ignore defaultImageTemplateScale if it has true.
          * If the template has been scaled to defaultImageTemplateScale or should ignore the scale,
          * this parameter should be true. e.g. click in image-element module
          */
-        ignoreDefaultImageTemplateScale: boolean;
+        ignoreDefaultImageTemplateScale?: boolean | undefined;
         /**
          * - Scale ratio for width
          */
-        xScale: number;
+        xScale?: number | undefined;
         /**
          * - Scale ratio for height
          */
-        yScale: number;
+        yScale?: number | undefined;
     }): Promise<Buffer>;
 }
 export type ExternalDriver = import('@appium/types').ExternalDriver;
@@ -147,5 +147,6 @@ export type ScreenshotScale = {
      */
     yScale: number;
 };
+import { LRUCache } from 'lru-cache';
 import { ImageElement } from './image-element';
 //# sourceMappingURL=finder.d.ts.map

package/build/lib/finder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"finder.d.ts","sourceRoot":"","sources":["../../lib/finder.js"],"names":[],"mappings":"AAmCA;IAIE;;OAEG;IACH,kBAFW,MAAM,EAQhB;IAZD,uCAAuC;IACvC,uCAAY;IAaZ;;;OAGG;IACH,4BAHW,YAAY,GACV,OAAO,CAKnB;IAED;;;OAGG;IACH,yBAHW,MAAM,GACJ,YAAY,GAAC,SAAS,CAIlC;IAED,2BAEC;IAED;;;;;;;;;;;OAWG;IAEH;;;;;;;;;;OAUG;IACH,sBAPW,MAAM,UAEN,cAAc;;;;;;;;;;;;;;;;;;;;;uBAVX,OAAO,eAAe,EAAE,IAAI;QAa7B,QAAQ,OAAO,GAAC,OAAO,EAAE,GAAC,YAAY,CAAC,CAsInD;IAED;;;;;;;OAOG;IACH,6BALW,MAAM,WACN,OAAO,eAAe,EAAE,IAAI,GAE1B,QAAQ,MAAM,CAAC,CA0B3B;IAED;;;;;;;;OAQG;IACH,kCALW,cAAc,cACd,OAAO,eAAe,EAAE,IAAI;;OAiItC;IAED;;;;;;;;;;OAUG;IACH;;;;;;;;;OASG;IACH,gCANW,MAAM;;;;+BAbH,OAAO;;;;mCACP,MAAM;;;;;;yCACN,OAAO;;;;gBAGP,MAAM;;;;gBACN,MAAM;QAWP,QAAQ,MAAM,CAAC,CAkE3B;CACF;6BAGY,OAAO,eAAe,EAAE,cAAc;sBACtC,OAAO,eAAe,EAAE,OAAO;;;;;gBAK9B,MAAM;;;;;;YAKN,MAAM;;;;YACN,MAAM;;6BAjfO,iBAAiB"}
+{"version":3,"file":"finder.d.ts","sourceRoot":"","sources":["../../lib/finder.js"],"names":[],"mappings":"AAmCA;IAIE;;OAEG;IACH,kBAFW,MAAM,EAQhB;IAZD,4CAA4C;IAC5C,aADW,SAAS,MAAM,EAAC,YAAY,CAAC,CAC5B;IAaZ;;;OAGG;IACH,4BAHW,YAAY,GACV,OAAO,CAKnB;IAED;;;OAGG;IACH,yBAHW,MAAM,GACJ,YAAY,GAAC,SAAS,CAIlC;IAED,2BAEC;IAED;;;;;;;;;;;OAWG;IAEH;;;;;;;;;;OAUG;IACH,sBAPW,MAAM,UAEN,cAAc;;;;;;;;;;;;;;;;;;;;;;QAGZ,QAAQ,OAAO,GAAC,OAAO,EAAE,GAAC,YAAY,CAAC,CA+InD;IAED;;;;;;;OAOG;IACH,6BALW,MAAM,WACN,OAAO,eAAe,EAAE,IAAI,GAE1B,QAAQ,MAAM,CAAC,CA6B3B;IAED;;;;;;;;OAQG;IACH,kCALW,cAAc,cACd,OAAO,eAAe,EAAE,IAAI;;OAiItC;IAED;;;;;;;;;;OAUG;IACH;;;;;;;;;OASG;IACH,gCANW,MAAM;;;;;;;;;;;;;;;;;;;;;;;QAIJ,QAAQ,MAAM,CAAC,CAqE3B;CACF;6BAGY,OAAO,eAAe,EAAE,cAAc;sBACtC,OAAO,eAAe,EAAE,OAAO;;;;;gBAK9B,MAAM;;;;;;YAKN,MAAM;;;;YACN,MAAM;;yBAlgBG,WAAW;6BAEP,iBAAiB"}

package/build/lib/finder.js

@@ -68,7 +68,7 @@ class ImageElementFinder {
      * @property {boolean} [ignoreDefaultImageTemplateScale=false] - Whether we
      * ignore defaultImageTemplateScale. It can be used when you would like to
      * scale template with defaultImageTemplateScale setting.
-     * @property {import('@appium/types').Rect?} containerRect - The bounding
+     * @property {import('@appium/types').Rect?} [containerRect=null] - The bounding
      * rectangle to limit the search in
      */
     /**
@@ -86,7 +86,7 @@ class ImageElementFinder {
         const settings = { ...constants_1.DEFAULT_SETTINGS, ...driver.settings.getSettings() };
         const { imageMatchThreshold: threshold, imageMatchMethod, fixImageTemplateSize, fixImageTemplateScale, defaultImageTemplateScale, getMatchedImageResult: visualize, } = settings;
         logger_1.default.info(`Finding image element with match threshold ${threshold}`);
-        if (!driver.getWindowRect && !driver.getWindowSize) {
+        if (!driver.getWindowRect && !lodash_1.default.has(driver, 'getWindowSize')) {
             throw new Error("This driver does not support the required 'getWindowRect' command");
         }
         let screenSize;
@@ -98,7 +98,7 @@ class ImageElementFinder {
             };
         }
         else {
-            // TODO: Drop the deprecated endpoint
+            // @ts-ignore TODO: Drop the deprecated endpoint
             screenSize = await driver.getWindowSize();
         }
         // someone might have sent in a template that's larger than the screen
@@ -112,15 +112,21 @@ class ImageElementFinder {
             });
         }
         const results = [];
-        const condition = async () => {
+        let didFixTemplateImageScale = false;
+        const performLookup = async () => {
             try {
                 const { screenshot, scale } = await this.getScreenshotForImageFind(driver, screenSize);
-                template = await this.fixImageTemplateScale(template, {
-                    defaultImageTemplateScale,
-                    ignoreDefaultImageTemplateScale,
-                    fixImageTemplateScale,
-                    ...scale,
-                });
+                if (!didFixTemplateImageScale) {
+                    template = await this.fixImageTemplateScale(template, {
+                        defaultImageTemplateScale,
+                        ignoreDefaultImageTemplateScale,
+                        fixImageTemplateScale,
+                        ...(scale || {}),
+                    });
+                    // We do not want `template` to be mutated multiple times when the
+                    // wrapping lambda is retried
+                    didFixTemplateImageScale = true;
+                }
                 const comparisonOpts = {
                     threshold,
                     visualize,
@@ -153,7 +159,7 @@ class ImageElementFinder {
             }
         };
         try {
-            await driver.implicitWaitForCondition(condition);
+            await driver.implicitWaitForCondition(performLookup);
         }
         catch (err) {
             // this `implicitWaitForCondition` method will throw a 'Condition unmet'
@@ -203,6 +209,9 @@ class ImageElementFinder {
     async ensureTemplateSize(template, maxSize) {
         const imgObj = (0, sharp_1.default)(template);
         const { width: tplWidth, height: tplHeight } = await imgObj.metadata();
+        if (lodash_1.default.isNil(tplWidth) || lodash_1.default.isNil(tplHeight)) {
+            throw new Error(`Template width/height cannot be determined. Is it a valid image?`);
+        }
         logger_1.default.info(`Template image is ${tplWidth}x${tplHeight}. Bounding rectangle size is ${maxSize.width}x${maxSize.height}`);
         // if the template fits inside the screen dimensions, we're good
         if (tplWidth <= maxSize.width && tplHeight <= maxSize.height) {
@@ -213,8 +222,8 @@ class ImageElementFinder {
         // otherwise, scale it to fit inside the bounding rectangle dimensions:
         // https://sharp.pixelplumbing.com/api-resize
         return await imgObj.resize({
-            width: parseInt(maxSize.width, 10),
-            height: parseInt(maxSize.height, 10),
+            width: Math.trunc(maxSize.width),
+            height: Math.trunc(maxSize.height),
             fit: 'inside',
         })
             .toBuffer();
@@ -251,7 +260,7 @@ class ImageElementFinder {
         logger_1.default.info('Verifying screenshot size and aspect ratio');
         let imgObj = (0, sharp_1.default)(screenshot);
         let { width: shotWidth, height: shotHeight } = await imgObj.metadata();
-        if (shotWidth < 1 || shotHeight < 1) {
+        if (!shotWidth || shotWidth < 1 || !shotHeight || shotHeight < 1) {
             logger_1.default.warn(`The retrieved screenshot size ${shotWidth}x${shotHeight} does ` +
                 `not seem to be valid. No changes will be applied to the screenshot`);
             return { screenshot };
@@ -294,7 +303,7 @@ class ImageElementFinder {
             const yScale = (1.0 * shotHeight) / screenSize.height;
             const scaleFactor = Math.min(xScale, yScale);
             const [newWidth, newHeight] = [shotWidth * scaleFactor, shotHeight * scaleFactor]
-                .map((x) => parseInt(x, 10));
+                .map(Math.trunc);
             logger_1.default.warn(`Resizing screenshot to ${newWidth}x${newHeight} to match ` +
                 `screen aspect ratio so that image element coordinates have a ` +
                 `greater chance of being correct.`);
@@ -315,8 +324,8 @@ class ImageElementFinder {
             logger_1.default.info(`Scaling screenshot from ${shotWidth}x${shotHeight} to match ` +
                 `screen at ${screenSize.width}x${screenSize.height}`);
             imgObj = imgObj.resize({
-                width: parseInt(screenSize.width, 10),
-                height: parseInt(screenSize.height, 10),
+                width: Math.trunc(screenSize.width),
+                height: Math.trunc(screenSize.height),
                 fit: 'fill',
             });
             scale.xScale *= (1.0 * screenSize.width) / shotWidth;
@@ -329,13 +338,13 @@ class ImageElementFinder {
     }
     /**
      * @typedef ImageTemplateSettings
-     * @property {boolean} fixImageTemplateScale - fixImageTemplateScale in device-settings
-     * @property {number} defaultImageTemplateScale - defaultImageTemplateScale in device-settings
-     * @property {boolean} ignoreDefaultImageTemplateScale - Ignore defaultImageTemplateScale if it has true.
+     * @property {boolean} [fixImageTemplateScale=false] - fixImageTemplateScale in device-settings
+     * @property {number} [defaultImageTemplateScale=DEFAULT_TEMPLATE_IMAGE_SCALE] - defaultImageTemplateScale in device-settings
+     * @property {boolean} [ignoreDefaultImageTemplateScale=false] - Ignore defaultImageTemplateScale if it has true.
      * If the template has been scaled to defaultImageTemplateScale or should ignore the scale,
      * this parameter should be true. e.g. click in image-element module
-     * @property {number} xScale - Scale ratio for width
-     * @property {number} yScale - Scale ratio for height
+     * @property {number} [xScale=DEFAULT_FIX_IMAGE_TEMPLATE_SCALE] - Scale ratio for width
+     * @property {number} [yScale=DEFAULT_FIX_IMAGE_TEMPLATE_SCALE] - Scale ratio for height
   
      */
     /**
@@ -381,13 +390,16 @@ class ImageElementFinder {
         }
         let imgObj = (0, sharp_1.default)(template);
         const { width: baseTempWidth, height: baseTempHeigh } = await imgObj.metadata();
+        if (lodash_1.default.isNil(baseTempWidth) || lodash_1.default.isNil(baseTempHeigh)) {
+            throw new Error(`Template width/height cannot be determined. Is it a valid image?`);
+        }
         const scaledWidth = baseTempWidth * xScale;
         const scaledHeight = baseTempHeigh * yScale;
         logger_1.default.info(`Scaling template image from ${baseTempWidth}x${baseTempHeigh} to ${scaledWidth}x${scaledHeight}`);
         logger_1.default.info(`The ratio is ${xScale} and ${yScale}`);
         imgObj = imgObj.resize({
-            width: parseInt(scaledWidth, 10),
-            height: parseInt(scaledHeight, 10),
+            width: Math.trunc(scaledWidth),
+            height: Math.trunc(scaledHeight),
             fit: 'fill',
         });
         return await imgObj.toBuffer();

package/build/lib/finder.js.map

@@ -1 +1 @@
-{"version":3,"file":"finder.js","sourceRoot":"","sources":["../../lib/finder.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"finder.js","sourceRoot":"","sources":["../../lib/finder.js"],"names":[],"mappings":"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"}

package/build/lib/image-element.d.ts

@@ -29,14 +29,14 @@ export default class ImageElement {
      *
      * @param {import('appium/driver').BaseDriver} driver - the driver to use for commands
      * @param {string} cmd - the name of the driver command
-     * @param {string} imgElId - the id of the ImageElement to work with
+     * @param {any} imgEl - image element object
      * @param {string[]} args - Rest of arguments for executeScripts
      *
-     * @returns {object} - the result of running a command
+     * @returns {Promise<any>} - the result of running a command
      */
-    static execute(driver: import("appium/driver").BaseDriver<any, import("@appium/types").StringRecord, import("@appium/types").StringRecord, import("@appium/types").DefaultCreateSessionResult<any>, void, import("@appium/types").StringRecord>, imgEl: any, cmd: string, ...args: string[]): object;
+    static execute(driver: import("appium/driver").BaseDriver<any, import("@appium/types").StringRecord, import("@appium/types").StringRecord, import("@appium/types").DefaultCreateSessionResult<any>, void, import("@appium/types").StringRecord>, imgEl: any, cmd: string, ...args: string[]): Promise<any>;
     /**
-     * @param {ImageElementOpts}
+     * @param {ImageElementOpts} options
      */
     constructor({ template, rect, score, match, finder, containerRect, }: ImageElementOpts);
     template: Buffer;
@@ -82,9 +82,9 @@ export default class ImageElement {
      * Use a driver to tap the screen at the center of this ImageElement's
      * position
      *
-     * @param {BaseDriver} driver - driver for calling actions with
+     * @param {import('appium/driver').BaseDriver} driver - driver for calling actions with
      */
-    click(driver: BaseDriver): Promise<any>;
+    click(driver: import("appium/driver").BaseDriver<any, import("@appium/types").StringRecord, import("@appium/types").StringRecord, import("@appium/types").DefaultCreateSessionResult<any>, void, import("@appium/types").StringRecord>): Promise<any>;
     /**
      * Perform lookup of image element(s) inside of the current element
      *

package/build/lib/image-element.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"image-element.d.ts","sourceRoot":"","sources":["../../lib/image-element.js"],"names":[],"mappings":"AAWA;;;;GAIG;AAEH;;;;GAIG;AAEH;;;;;;;;;;GAUG;AAEH;;;GAGG;AACH;IAiNE;;;;;;;;;OASG;IACH,kQANW,MAAM,WAEN,MAAM,EAAE,GAEN,MAAM,CAoClB;IA5PD;;OAEG;IACH,sEAFW,gBAAgB,EAiB1B;IAPC,iBAAwB;IACxB,mCAAgB;IAChB,WAAmD;IACnD,qBAAkB;IAClB,cAAkB;IAClB,0CAAoB;IACpB,mDAAkC;IAGpC;;OAEG;IACH,sBAEC;IAED;;OAEG;IACH,yBAEC;IAED;;OAEG;IACH,uBAKC;IAED;;OAEG;IACH,4BAEC;IAED;;OAEG;IACH,kCAEC;IAED;;;OAGG;IACH,aAFa,OAAO,CAInB;IAED;;;;;OAKG;IACH,cALW,YAAY,GAEV,OAAO,CAUnB;IAED;;;;;OAKG;IACH,wCAmGC;IAED;;;;;;;OAOG;IACH,eALW,OAAO,6OAEN,MAAM,EAAE,GACP,QAAQ,OAAO,GAAC,OAAO,EAAE,GAAC,YAAY,CAAC,CAYnD;CA+CF;;;;;WAxRa,MAAM;;;;YACN,MAAM;;;;;;OAKN,MAAM;;;;OACN,MAAM;;;;;;cAKN,MAAM;;;;UACN,IAAI;;;;;WACJ,MAAM;;;;WAEN,MAAM;;;;YACN,OAAO,UAAU,EAAE,OAAO;;;;;mBAC1B,OAAO,eAAe,EAAE,IAAI;;mBA2Q7B,OAAO,eAAe,EAAE,IAAI;sBAC5B,OAAO,eAAe,EAAE,OAAO"}
+{"version":3,"file":"image-element.d.ts","sourceRoot":"","sources":["../../lib/image-element.js"],"names":[],"mappings":"AAWA;;;;GAIG;AAEH;;;;GAIG;AAEH;;;;;;;;;;GAUG;AAEH;;;GAGG;AACH;IAmNE;;;;;;;;;OASG;IACH,wPALW,GAAG,OADH,MAAM,WAEN,MAAM,EAAE,GAEN,QAAQ,GAAG,CAAC,CAoCxB;IA9PD;;OAEG;IACH,sEAFW,gBAAgB,EAiB1B;IAPC,iBAAwB;IACxB,mCAAgB;IAChB,WAAmD;IACnD,qBAAkB;IAClB,cAAkB;IAClB,0CAAoB;IACpB,mDAAkC;IAGpC;;OAEG;IACH,sBAEC;IAED;;OAEG;IACH,yBAEC;IAED;;OAEG;IACH,uBAKC;IAED;;OAEG;IACH,4BAEC;IAED;;OAEG;IACH,kCAEC;IAED;;;OAGG;IACH,aAFa,OAAO,CAInB;IAED;;;;;OAKG;IACH,cALW,YAAY,GAEV,OAAO,CAUnB;IAED;;;;;OAKG;IACH,sPAqGC;IAED;;;;;;;OAOG;IACH,eALW,OAAO,6OAEN,MAAM,EAAE,GACP,QAAQ,OAAO,GAAC,OAAO,EAAE,GAAC,YAAY,CAAC,CAYnD;CA+CF;;;;;WA1Ra,MAAM;;;;YACN,MAAM;;;;;;OAKN,MAAM;;;;OACN,MAAM;;;;;;cAKN,MAAM;;;;UACN,IAAI;;;;;WACJ,MAAM;;;;WAEN,MAAM;;;;YACN,OAAO,UAAU,EAAE,OAAO;;;;;mBAC1B,OAAO,eAAe,EAAE,IAAI;;mBA6Q7B,OAAO,eAAe,EAAE,IAAI;sBAC5B,OAAO,eAAe,EAAE,OAAO"}

package/build/lib/image-element.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImageElement = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const driver_1 = require("appium/driver");
-const support_1 = require("appium/support");
+const support_1 = require("@appium/support");
 const logger_1 = __importDefault(require("./logger"));
 const constants_1 = require("./constants");
 const TAP_DURATION_MS = 125;
@@ -37,7 +37,7 @@ const TAP_DURATION_MS = 125;
  */
 class ImageElement {
     /**
-     * @param {ImageElementOpts}
+     * @param {ImageElementOpts} options
      */
     constructor({ template, rect, score, match = null, finder = null, containerRect = null, }) {
         this.template = template;
@@ -104,12 +104,11 @@ class ImageElement {
      * Use a driver to tap the screen at the center of this ImageElement's
      * position
      *
-     * @param {BaseDriver} driver - driver for calling actions with
+     * @param {import('appium/driver').BaseDriver} driver - driver for calling actions with
      */
     async click(driver) {
         // before we click we need to make sure the element is actually still there
         // where we expect it to be
-        let newImgEl;
         const settings = Object.assign({}, constants_1.DEFAULT_SETTINGS, driver.settings.getSettings());
         const { autoUpdateImageElementPosition: updatePos, checkForImageElementStaleness, imageElementTapStrategy, } = settings;
         // validate tap strategy
@@ -118,16 +117,18 @@ class ImageElement {
                 `'${imageElementTapStrategy}'. Must be one of ` +
                 JSON.stringify(constants_1.IMAGE_TAP_STRATEGIES));
         }
+        let newImgEl;
         if (checkForImageElementStaleness || updatePos) {
             logger_1.default.info('Checking image element for staleness before clicking');
             try {
-                newImgEl = await this.finder.findByImage(this.template, driver, {
+                newImgEl = /** @type {ImageElement} */ (await ( /** @type {import('./finder').default} */(this.finder))
+                    .findByImage(this.template, driver, {
                     shouldCheckStaleness: true,
                     // Set ignoreDefaultImageTemplateScale because this.template is device screenshot based image
                     // managed inside Appium after finidng image by template which managed by a user
                     ignoreDefaultImageTemplateScale: true,
                     containerRect: this.containerRect,
-                });
+                }));
             }
             catch (err) {
                 throw new driver_1.errors.StaleElementReferenceError();
@@ -166,7 +167,7 @@ class ImageElement {
                 ],
             };
             // check if the driver has the appropriate performActions method
-            if (driver.performActions) {
+            if ('performActions' in driver && lodash_1.default.isFunction(driver.performActions)) {
                 return await driver.performActions([action]);
             }
             // if not, warn and fall back to the other method
@@ -179,7 +180,7 @@ class ImageElement {
             action: 'tap',
             options: { x, y },
         };
-        if (driver.performTouch) {
+        if ('performTouch' in driver && lodash_1.default.isFunction(driver.performTouch)) {
             return await driver.performTouch([action]);
         }
         throw new Error("Driver did not implement the 'performTouch' command. " +
@@ -199,17 +200,17 @@ class ImageElement {
         if (strategy !== constants_1.IMAGE_STRATEGY) {
             throw new driver_1.errors.InvalidSelectorError(`Lookup strategies other than '${constants_1.IMAGE_STRATEGY}' are not supported`);
         }
-        return await this.finder.findByImage(Buffer.from(selector, 'base64'), driver, { multiple, containerRect: this.rect });
+        return await ( /** @type {import('./finder').default} */(this.finder)).findByImage(Buffer.from(selector, 'base64'), driver, { multiple, containerRect: this.rect });
     }
     /**
      * Handle various Appium commands that involve an image element
      *
      * @param {import('appium/driver').BaseDriver} driver - the driver to use for commands
      * @param {string} cmd - the name of the driver command
-     * @param {string} imgElId - the id of the ImageElement to work with
+     * @param {any} imgEl - image element object
      * @param {string[]} args - Rest of arguments for executeScripts
      *
-     * @returns {object} - the result of running a command
+     * @returns {Promise<any>} - the result of running a command
      */
     static async execute(driver, imgEl, cmd, ...args) {
         switch (cmd) {

package/build/lib/image-element.js.map

@@ -1 +1 @@
-{"version":3,"file":"image-element.js","sourceRoot":"","sources":["../../lib/image-element.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"image-element.js","sourceRoot":"","sources":["../../lib/image-element.js"],"names":[],"mappings":"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"}

package/build/lib/plugin.d.ts

@@ -1,4 +1,4 @@
-export default class ImageElementPlugin {
+export default class ImageElementPlugin extends BasePlugin {
     static newMethodMap: {
         readonly '/session/:sessionId/appium/compare_images': {
             readonly POST: {
@@ -13,12 +13,21 @@ export default class ImageElementPlugin {
     };
     constructor(pluginName: any);
     finder: ImageElementFinder;
-    compareImages(next: any, driver: any, ...args: any[]): Promise<unknown>;
+    compareImages(next: any, driver: any, ...args: any[]): Promise<import("./compare").ComparisonResult>;
     findElement(next: any, driver: any, ...args: any[]): Promise<any>;
     findElements(next: any, driver: any, ...args: any[]): Promise<any>;
-    _find(multiple: any, next: any, driver: any, ...args: any[]): Promise<any>;
+    /**
+     *
+     * @param {boolean} multiple
+     * @param {*} next
+     * @param {*} driver
+     * @param  {...any} args
+     * @returns {Promise<any>}
+     */
+    _find(multiple: boolean, next: any, driver: any, ...args: any[]): Promise<any>;
     handle(next: any, driver: any, cmdName: any, ...args: any[]): Promise<any>;
 }
+import { BasePlugin } from 'appium/plugin';
 import ImageElementFinder from './finder';
 export function getImgElFromArgs(args: any): any;
 import { IMAGE_STRATEGY } from './constants';

package/build/lib/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":"AAcA;IAOE;;;;;;;;;;;MAWG;IAjBH,6BAGC;IADC,2BAAsC;IAiBxC,wEAEC;IAED,kEAEC;IAED,mEAEC;IAED,2EASC;IAED,2EAkBC;CACF;+BAtE8B,UAAU;AAIzC,iDAEC;+BAJkD,aAAa"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":"AAcA;IAOE;;;;;;;;;;;MAWG;IAjBH,6BAGC;IADC,2BAAsC;IAiBxC,qGAGC;IAED,kEAEC;IAED,mEAEC;IAED;;;;;;;OAOG;IACH,gBANW,OAAO,mCAGH,GAAG,KACL,QAAQ,GAAG,CAAC,CAWxB;IAED,2EAkBC;CACF;2BAjFwB,eAAe;+BAET,UAAU;AAIzC,iDAEC;+BAJkD,aAAa"}

package/build/lib/plugin.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IMAGE_STRATEGY = exports.getImgElFromArgs = exports.ImageElementPlugin = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const driver_1 = require("appium/driver");
-const plugin_1 = __importDefault(require("appium/plugin"));
+const plugin_1 = require("appium/plugin");
 const compare_1 = require("./compare");
 const finder_1 = __importDefault(require("./finder"));
 const image_element_1 = require("./image-element");
@@ -17,12 +17,13 @@ function getImgElFromArgs(args) {
     return args.find((arg) => lodash_1.default.isString(arg) && arg.startsWith(constants_1.IMAGE_ELEMENT_PREFIX));
 }
 exports.getImgElFromArgs = getImgElFromArgs;
-class ImageElementPlugin extends plugin_1.default {
+class ImageElementPlugin extends plugin_1.BasePlugin {
     constructor(pluginName) {
         super(pluginName);
         this.finder = new finder_1.default();
     }
     async compareImages(next, driver, ...args) {
+        // @ts-ignore Arguments should be ok there
         return await (0, compare_1.compareImages)(...args);
     }
     async findElement(next, driver, ...args) {
@@ -31,6 +32,14 @@ class ImageElementPlugin extends plugin_1.default {
     async findElements(next, driver, ...args) {
         return await this._find(true, next, driver, ...args);
     }
+    /**
+     *
+     * @param {boolean} multiple
+     * @param {*} next
+     * @param {*} driver
+     * @param  {...any} args
+     * @returns {Promise<any>}
+     */
     async _find(multiple, next, driver, ...args) {
         const [strategy, selector] = args;
         // if we're not actually finding by image, just do the normal thing

package/build/lib/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../lib/plugin.js"],"names":[],"mappings":"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"}

package/lib/compare.js

@@ -3,6 +3,14 @@ import {errors} from 'appium/driver';
 import {getImagesMatches, getImagesSimilarity, getImageOccurrence} from '@appium/opencv';
 import {MATCH_FEATURES_MODE, GET_SIMILARITY_MODE, MATCH_TEMPLATE_MODE} from './constants';
 
+/**
+ * @typedef {{visualization: string|null|undefined}} Visualized
+ * @typedef {import('@appium/opencv').MatchingResult & Visualized} MatchingResult
+ * @typedef {import('@appium/opencv').OccurrenceResult & Visualized} OccurrenceResult
+ * @typedef {import('@appium/opencv').SimilarityResult & Visualized} SimilarityResult
+ * @typedef {MatchingResult|OccurrenceResult|SimilarityResult|SimilarityResult[]} ComparisonResult
+ */
+
 /**
  * Performs images comparison using OpenCV framework features.
  * It is expected that both OpenCV framework and opencv4nodejs
@@ -14,43 +22,48 @@ import {MATCH_FEATURES_MODE, GET_SIMILARITY_MODE, MATCH_TEMPLATE_MODE} from './c
  * All image formats, that OpenCV library itself accepts, are supported.
  * @param {string|Buffer} secondImage - Base64-encoded image file.
  * All image formats, that OpenCV library itself accepts, are supported.
- * @param {object} [options] - The content of this dictionary depends
+ * @param {import('@appium/opencv').MatchingOptions
+ * |import('@appium/opencv').SimilarityOptions
+ * |import('@appium/opencv').OccurrenceOptions} [options={}] - The content of this dictionary depends
  * on the actual `mode` value. See the documentation on `@appium/support`
  * module for more details.
- * @returns {Promise<object|object[]>} The content of the resulting dictionary depends
+ * @returns {Promise<ComparisonResult>} The content of the resulting dictionary depends
  * on the actual `mode` and `options` values. See the documentation on
  * `@appium/support` module for more details.
  * @throws {Error} If required OpenCV modules are not installed or
  * if `mode` value is incorrect or if there was an unexpected issue while
  * matching the images.
  */
-
-/**
- * @type {import('@appium/types').PluginCommand<[string, string, string, object|undefined], Promise<OccurrenceResult>>}
- */
 async function compareImages(mode, firstImage, secondImage, options = {}) {
   const img1 = Buffer.isBuffer(firstImage) ? firstImage : Buffer.from(firstImage, 'base64');
   const img2 = Buffer.isBuffer(secondImage) ? secondImage : Buffer.from(secondImage, 'base64');
-  let result = null;
+  let result;
   switch (_.toLower(mode)) {
     case MATCH_FEATURES_MODE.toLowerCase():
       try {
-        result = await getImagesMatches(img1, img2, options);
+        result = await getImagesMatches(
+          img1, img2, /** @type {import('@appium/opencv').MatchingOptions} */(options)
+        );
       } catch (err) {
         // might throw if no matches
-        result = {count: 0};
+        result = /** @type {import('@appium/opencv').MatchingResult} */({count: 0});
       }
       break;
     case GET_SIMILARITY_MODE.toLowerCase():
-      result = await getImagesSimilarity(img1, img2, options);
+      result = await getImagesSimilarity(
+        img1, img2, /** @type {import('@appium/opencv').SimilarityOptions} */(options));
       break;
-    case MATCH_TEMPLATE_MODE.toLowerCase():
+    case MATCH_TEMPLATE_MODE.toLowerCase(): {
+      const opts = /** @type {import('@appium/opencv').OccurrenceOptions} */(options);
       // firstImage/img1 is the full image and secondImage/img2 is the partial one
-      result = await getImageOccurrence(img1, img2, options);
-      if (options.multiple) {
+      result = await getImageOccurrence(
+        img1, img2, opts
+      );
+      if (opts.multiple) {
         return result.multiple.map(convertVisualizationToBase64);
       }
       break;
+    }
     default:
       throw new errors.InvalidArgumentError(
         `'${mode}' images comparison mode is unknown. ` +
@@ -68,19 +81,16 @@ async function compareImages(mode, firstImage, secondImage, options = {}) {
  * base64 encodes the visualization part of the result
  * (if necessary)
  *
- * @param {OccurrenceResult} element - occurrence result
- *
+ * @param {Partial<{visualization: Buffer|null}>} element - occurrence result
+ * @returns {any} I know this looks ugly from the typing perspective
  **/
 function convertVisualizationToBase64(element) {
-  if (!_.isEmpty(element.visualization)) {
-    element.visualization = element.visualization.toString('base64');
-  }
-
-  return element;
+  return Buffer.isBuffer(element.visualization)
+    ? {
+      ...(element),
+      visualization: element.visualization.toString('base64')
+    }
+    : element;
 }
 
 export {compareImages};
-
-/**
- * @typedef {import('@appium/opencv').OccurrenceResult} OccurrenceResult
- */

package/lib/finder.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { LRUCache } from 'lru-cache';
+import {LRUCache} from 'lru-cache';
 import {errors} from 'appium/driver';
 import {ImageElement} from './image-element';
 import {compareImages} from './compare';
@@ -34,7 +34,7 @@ const CONDITION_UNMET_PATTERN = /Condition unmet/;
 
 
 export default class ImageElementFinder {
-  /** @type {LRU<string,ImageElement>} */
+  /** @type {LRUCache<string,ImageElement>} */
   _imgElCache;
 
   /**
@@ -78,7 +78,7 @@ export default class ImageElementFinder {
    * @property {boolean} [ignoreDefaultImageTemplateScale=false] - Whether we
    * ignore defaultImageTemplateScale. It can be used when you would like to
    * scale template with defaultImageTemplateScale setting.
-   * @property {import('@appium/types').Rect?} containerRect - The bounding
+   * @property {import('@appium/types').Rect?} [containerRect=null] - The bounding
    * rectangle to limit the search in
    */
 
@@ -109,7 +109,7 @@ export default class ImageElementFinder {
     } = settings;
 
     log.info(`Finding image element with match threshold ${threshold}`);
-    if (!driver.getWindowRect && !driver.getWindowSize) {
+    if (!driver.getWindowRect && !_.has(driver, 'getWindowSize')) {
       throw new Error("This driver does not support the required 'getWindowRect' command");
     }
     let screenSize;
@@ -120,7 +120,7 @@ export default class ImageElementFinder {
         height: screenRect.height,
       };
     } else {
-      // TODO: Drop the deprecated endpoint
+      // @ts-ignore TODO: Drop the deprecated endpoint
       screenSize = await driver.getWindowSize();
     }
 
@@ -136,16 +136,23 @@ export default class ImageElementFinder {
     }
 
     const results = [];
-    const condition = async () => {
+    let didFixTemplateImageScale = false;
+    const performLookup = async () => {
       try {
+
         const {screenshot, scale} = await this.getScreenshotForImageFind(driver, screenSize);
 
-        template = await this.fixImageTemplateScale(template, {
-          defaultImageTemplateScale,
-          ignoreDefaultImageTemplateScale,
-          fixImageTemplateScale,
-          ...scale,
-        });
+        if (!didFixTemplateImageScale) {
+          template = await this.fixImageTemplateScale(template, {
+            defaultImageTemplateScale,
+            ignoreDefaultImageTemplateScale,
+            fixImageTemplateScale,
+            ...(scale || {}),
+          });
+          // We do not want `template` to be mutated multiple times when the
+          // wrapping lambda is retried
+          didFixTemplateImageScale = true;
+        }
 
         const comparisonOpts = {
           threshold,
@@ -168,7 +175,9 @@ export default class ImageElementFinder {
           return true;
         };
 
-        const elOrEls = await compareImages(MATCH_TEMPLATE_MODE, screenshot, template, comparisonOpts);
+        const elOrEls = await compareImages(
+          MATCH_TEMPLATE_MODE, screenshot, template, comparisonOpts
+        );
         return _.some((_.isArray(elOrEls) ? elOrEls : [elOrEls]).map(pushIfOk));
       } catch (err) {
         // if compareImages fails, we'll get a specific error, but we should
@@ -183,7 +192,7 @@ export default class ImageElementFinder {
     };
 
     try {
-      await driver.implicitWaitForCondition(condition);
+      await driver.implicitWaitForCondition(performLookup);
     } catch (err) {
       // this `implicitWaitForCondition` method will throw a 'Condition unmet'
       // error if an element is not found eventually. In that case, we will
@@ -238,6 +247,9 @@ export default class ImageElementFinder {
   async ensureTemplateSize(template, maxSize) {
     const imgObj = sharp(template);
     const {width: tplWidth, height: tplHeight} = await imgObj.metadata();
+    if (_.isNil(tplWidth) || _.isNil(tplHeight)) {
+      throw new Error(`Template width/height cannot be determined. Is it a valid image?`);
+    }
 
     log.info(
       `Template image is ${tplWidth}x${tplHeight}. Bounding rectangle size is ${maxSize.width}x${maxSize.height}`
@@ -254,8 +266,8 @@ export default class ImageElementFinder {
     // otherwise, scale it to fit inside the bounding rectangle dimensions:
     // https://sharp.pixelplumbing.com/api-resize
     return await imgObj.resize({
-      width: parseInt(maxSize.width, 10),
-      height: parseInt(maxSize.height, 10),
+      width: Math.trunc(maxSize.width),
+      height: Math.trunc(maxSize.height),
       fit: 'inside',
     })
     .toBuffer();
@@ -301,7 +313,7 @@ export default class ImageElementFinder {
     let imgObj = sharp(screenshot);
     let {width: shotWidth, height: shotHeight} = await imgObj.metadata();
 
-    if (shotWidth < 1 || shotHeight < 1) {
+    if (!shotWidth || shotWidth < 1 || !shotHeight || shotHeight < 1) {
       log.warn(
         `The retrieved screenshot size ${shotWidth}x${shotHeight} does ` +
         `not seem to be valid. No changes will be applied to the screenshot`
@@ -354,7 +366,7 @@ export default class ImageElementFinder {
       const yScale = (1.0 * shotHeight) / screenSize.height;
       const scaleFactor = Math.min(xScale, yScale);
       const [newWidth, newHeight] = [shotWidth * scaleFactor, shotHeight * scaleFactor]
-        .map((x) => parseInt(x, 10));
+        .map(Math.trunc);
 
       log.warn(
         `Resizing screenshot to ${newWidth}x${newHeight} to match ` +
@@ -382,8 +394,8 @@ export default class ImageElementFinder {
         `screen at ${screenSize.width}x${screenSize.height}`
       );
       imgObj = imgObj.resize({
-        width: parseInt(screenSize.width, 10),
-        height: parseInt(screenSize.height, 10),
+        width: Math.trunc(screenSize.width),
+        height: Math.trunc(screenSize.height),
         fit: 'fill',
       });
 
@@ -399,13 +411,13 @@ export default class ImageElementFinder {
 
   /**
    * @typedef ImageTemplateSettings
-   * @property {boolean} fixImageTemplateScale - fixImageTemplateScale in device-settings
-   * @property {number} defaultImageTemplateScale - defaultImageTemplateScale in device-settings
-   * @property {boolean} ignoreDefaultImageTemplateScale - Ignore defaultImageTemplateScale if it has true.
+   * @property {boolean} [fixImageTemplateScale=false] - fixImageTemplateScale in device-settings
+   * @property {number} [defaultImageTemplateScale=DEFAULT_TEMPLATE_IMAGE_SCALE] - defaultImageTemplateScale in device-settings
+   * @property {boolean} [ignoreDefaultImageTemplateScale=false] - Ignore defaultImageTemplateScale if it has true.
    * If the template has been scaled to defaultImageTemplateScale or should ignore the scale,
    * this parameter should be true. e.g. click in image-element module
-   * @property {number} xScale - Scale ratio for width
-   * @property {number} yScale - Scale ratio for height
+   * @property {number} [xScale=DEFAULT_FIX_IMAGE_TEMPLATE_SCALE] - Scale ratio for width
+   * @property {number} [yScale=DEFAULT_FIX_IMAGE_TEMPLATE_SCALE] - Scale ratio for height
 
    */
   /**
@@ -469,6 +481,9 @@ export default class ImageElementFinder {
 
     let imgObj = sharp(template);
     const {width: baseTempWidth, height: baseTempHeigh} = await imgObj.metadata();
+    if (_.isNil(baseTempWidth) || _.isNil(baseTempHeigh)) {
+      throw new Error(`Template width/height cannot be determined. Is it a valid image?`);
+    }
 
     const scaledWidth = baseTempWidth * xScale;
     const scaledHeight = baseTempHeigh * yScale;
@@ -477,8 +492,8 @@ export default class ImageElementFinder {
     );
     log.info(`The ratio is ${xScale} and ${yScale}`);
     imgObj = imgObj.resize({
-      width: parseInt(scaledWidth, 10),
-      height: parseInt(scaledHeight, 10),
+      width: Math.trunc(scaledWidth),
+      height: Math.trunc(scaledHeight),
       fit: 'fill',
     });
     return await imgObj.toBuffer();

package/lib/image-element.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import {errors} from 'appium/driver';
-import {util} from 'appium/support';
+import {util} from '@appium/support';
 import log from './logger';
 import {
   IMAGE_STRATEGY, DEFAULT_SETTINGS, IMAGE_TAP_STRATEGIES,
@@ -39,7 +39,7 @@ const TAP_DURATION_MS = 125;
  */
 export default class ImageElement {
   /**
-   * @param {ImageElementOpts}
+   * @param {ImageElementOpts} options
    */
   constructor({
     template,
@@ -123,12 +123,11 @@ export default class ImageElement {
    * Use a driver to tap the screen at the center of this ImageElement's
    * position
    *
-   * @param {BaseDriver} driver - driver for calling actions with
+   * @param {import('appium/driver').BaseDriver} driver - driver for calling actions with
    */
   async click(driver) {
     // before we click we need to make sure the element is actually still there
     // where we expect it to be
-    let newImgEl;
     const settings = Object.assign({}, DEFAULT_SETTINGS, driver.settings.getSettings());
     const {
       autoUpdateImageElementPosition: updatePos,
@@ -145,16 +144,19 @@ export default class ImageElement {
       );
     }
 
+    let newImgEl;
     if (checkForImageElementStaleness || updatePos) {
       log.info('Checking image element for staleness before clicking');
       try {
-        newImgEl = await this.finder.findByImage(this.template, driver, {
-          shouldCheckStaleness: true,
-          // Set ignoreDefaultImageTemplateScale because this.template is device screenshot based image
-          // managed inside Appium after finidng image by template which managed by a user
-          ignoreDefaultImageTemplateScale: true,
-          containerRect: this.containerRect,
-        });
+        newImgEl = /** @type {ImageElement} */ (await (/** @type {import('./finder').default} */ (this.finder))
+          .findByImage(
+            this.template, driver, {
+            shouldCheckStaleness: true,
+            // Set ignoreDefaultImageTemplateScale because this.template is device screenshot based image
+            // managed inside Appium after finidng image by template which managed by a user
+            ignoreDefaultImageTemplateScale: true,
+            containerRect: this.containerRect,
+          }));
       } catch (err) {
         throw new errors.StaleElementReferenceError();
       }
@@ -199,7 +201,7 @@ export default class ImageElement {
       };
 
       // check if the driver has the appropriate performActions method
-      if (driver.performActions) {
+      if ('performActions' in driver && _.isFunction(driver.performActions)) {
         return await driver.performActions([action]);
       }
 
@@ -215,7 +217,7 @@ export default class ImageElement {
       options: {x, y},
     };
 
-    if (driver.performTouch) {
+    if ('performTouch' in driver && _.isFunction(driver.performTouch)) {
       return await driver.performTouch([action]);
     }
 
@@ -239,7 +241,7 @@ export default class ImageElement {
     if (strategy !== IMAGE_STRATEGY) {
       throw new errors.InvalidSelectorError(`Lookup strategies other than '${IMAGE_STRATEGY}' are not supported`);
     }
-    return await this.finder.findByImage(
+    return await (/** @type {import('./finder').default} */ (this.finder)).findByImage(
       Buffer.from(selector, 'base64'),
       driver,
       {multiple, containerRect: this.rect}
@@ -251,10 +253,10 @@ export default class ImageElement {
    *
    * @param {import('appium/driver').BaseDriver} driver - the driver to use for commands
    * @param {string} cmd - the name of the driver command
-   * @param {string} imgElId - the id of the ImageElement to work with
+   * @param {any} imgEl - image element object
    * @param {string[]} args - Rest of arguments for executeScripts
    *
-   * @returns {object} - the result of running a command
+   * @returns {Promise<any>} - the result of running a command
    */
   static async execute(driver, imgEl, cmd, ...args) {
     switch (cmd) {

package/lib/plugin.js

@@ -2,7 +2,7 @@
 
 import _ from 'lodash';
 import {errors} from 'appium/driver';
-import BasePlugin from 'appium/plugin';
+import {BasePlugin} from 'appium/plugin';
 import {compareImages} from './compare';
 import ImageElementFinder from './finder';
 import {ImageElement} from './image-element';
@@ -33,6 +33,7 @@ export default class ImageElementPlugin extends BasePlugin {
   });
 
   async compareImages(next, driver, ...args) {
+    // @ts-ignore Arguments should be ok there
     return await compareImages(...args);
   }
 
@@ -44,6 +45,14 @@ export default class ImageElementPlugin extends BasePlugin {
     return await this._find(true, next, driver, ...args);
   }
 
+  /**
+   *
+   * @param {boolean} multiple
+   * @param {*} next
+   * @param {*} driver
+   * @param  {...any} args
+   * @returns {Promise<any>}
+   */
   async _find(multiple, next, driver, ...args) {
     const [strategy, selector] = args;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appium/images-plugin",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "Plugin for working with images and image elements in Appium",
   "keywords": [
     "automation",
@@ -39,14 +39,15 @@
     "test:unit": "mocha \"./test/unit/**/*.spec.js\""
   },
   "dependencies": {
-    "@appium/opencv": "^2.1.5",
+    "@appium/opencv": "^2.1.6",
+    "@appium/support": "^4.1.10",
     "lodash": "4.17.21",
     "lru-cache": "10.0.1",
     "sharp": "0.32.6",
     "source-map-support": "0.5.21"
   },
   "peerDependencies": {
-    "appium": "^2.0.0-beta.35"
+    "appium": "^2.0.0"
   },
   "engines": {
     "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
@@ -59,7 +60,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bd6e3ac0b03e2e53c393423ac8954b814aaf09be",
+  "gitHead": "67504604b7d4602561db2cb3529860b241bec427",
   "typedoc": {
     "entryPoint": "./lib/plugin.js"
   }

package/tsconfig.json

@@ -1,6 +1,9 @@
 {
   "compilerOptions": {
     "outDir": "build",
+    "checkJs": true,
+    "esModuleInterop": true,
+    "strict": false,
     "paths": {
       "@appium/opencv": ["../opencv"]
     }