@appium/images-plugin 1.2.0 → 1.2.4

package/build/lib/image-element.js

@@ -1,22 +1,13 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IMAGE_ELEMENT_PREFIX = exports.DEFAULT_TEMPLATE_IMAGE_SCALE = exports.IMAGE_EL_TAP_STRATEGY_W3C = exports.IMAGE_EL_TAP_STRATEGY_MJSONWP = exports.ImageElement = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const appium_base_driver_1 = require("appium-base-driver");
+const base_driver_1 = require("@appium/base-driver");
 const logger_1 = __importDefault(require("./logger"));
-const appium_support_1 = require("appium-support");
+const support_1 = require("@appium/support");
 const finder_1 = require("./finder");
 const IMAGE_ELEMENT_PREFIX = 'appium-image-element-';
 exports.IMAGE_ELEMENT_PREFIX = IMAGE_ELEMENT_PREFIX;
@@ -68,7 +59,7 @@ class ImageElement {
     constructor(b64Template, rect, score, b64Result = null, finder = null) {
         this.template = b64Template;
         this.rect = rect;
-        this.id = `${IMAGE_ELEMENT_PREFIX}${appium_support_1.util.uuidV4()}`;
+        this.id = `${IMAGE_ELEMENT_PREFIX}${support_1.util.uuidV4()}`;
         this.b64MatchedImage = b64Result;
         this.score = score;
         this.finder = finder;
@@ -127,87 +118,85 @@ class ImageElement {
      *
      * @param {BaseDriver} driver - driver for calling actions with
      */
-    click(driver) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // 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({}, finder_1.DEFAULT_SETTINGS, driver.settings.getSettings());
-            const { autoUpdateImageElementPosition: updatePos, checkForImageElementStaleness, imageElementTapStrategy, } = settings;
-            // validate tap strategy
-            if (!IMAGE_TAP_STRATEGIES.includes(imageElementTapStrategy)) {
-                throw new Error(`Incorrect imageElementTapStrategy setting ` +
-                    `'${imageElementTapStrategy}'. Must be one of ` +
-                    JSON.stringify(IMAGE_TAP_STRATEGIES));
+    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({}, finder_1.DEFAULT_SETTINGS, driver.settings.getSettings());
+        const { autoUpdateImageElementPosition: updatePos, checkForImageElementStaleness, imageElementTapStrategy, } = settings;
+        // validate tap strategy
+        if (!IMAGE_TAP_STRATEGIES.includes(imageElementTapStrategy)) {
+            throw new Error(`Incorrect imageElementTapStrategy setting ` +
+                `'${imageElementTapStrategy}'. Must be one of ` +
+                JSON.stringify(IMAGE_TAP_STRATEGIES));
+        }
+        if (checkForImageElementStaleness || updatePos) {
+            logger_1.default.info('Checking image element for staleness before clicking');
+            try {
+                newImgEl = await this.finder.findByImage(this.template, {
+                    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
+                });
             }
-            if (checkForImageElementStaleness || updatePos) {
-                logger_1.default.info('Checking image element for staleness before clicking');
-                try {
-                    newImgEl = yield this.finder.findByImage(this.template, {
-                        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
-                    });
-                }
-                catch (err) {
-                    throw new appium_base_driver_1.errors.StaleElementReferenceError();
-                }
-                if (!this.equals(newImgEl)) {
-                    logger_1.default.warn(`When trying to click on an image element, the image changed ` +
-                        `position from where it was originally found. It is now at ` +
-                        `${JSON.stringify(newImgEl.rect)} and was originally at ` +
-                        `${JSON.stringify(this.rect)}.`);
-                    if (updatePos) {
-                        logger_1.default.warn('Click will proceed at new coordinates');
-                        this.rect = lodash_1.default.clone(newImgEl.rect);
-                    }
-                    else {
-                        logger_1.default.warn('Click will take place at original coordinates. If you ' +
-                            'would like Appium to automatically click the new ' +
-                            "coordinates, set the 'autoUpdateImageElementPosition' " +
-                            'setting to true');
-                    }
-                }
+            catch (err) {
+                throw new base_driver_1.errors.StaleElementReferenceError();
             }
-            const { x, y } = this.center;
-            logger_1.default.info(`Will tap on image element at coordinate [${x}, ${y}]`);
-            if (imageElementTapStrategy === IMAGE_EL_TAP_STRATEGY_W3C) {
-                // set up a W3C action to click on the image by position
-                logger_1.default.info('Will tap using W3C actions');
-                const action = {
-                    type: 'pointer',
-                    id: 'mouse',
-                    parameters: { pointerType: 'touch' },
-                    actions: [
-                        { type: 'pointerMove', x, y, duration: 0 },
-                        { type: 'pointerDown', button: 0 },
-                        { type: 'pause', duration: TAP_DURATION_MS },
-                        { type: 'pointerUp', button: 0 },
-                    ]
-                };
-                // check if the driver has the appropriate performActions method
-                if (driver.performActions) {
-                    return yield driver.performActions([action]);
+            if (!this.equals(newImgEl)) {
+                logger_1.default.warn(`When trying to click on an image element, the image changed ` +
+                    `position from where it was originally found. It is now at ` +
+                    `${JSON.stringify(newImgEl.rect)} and was originally at ` +
+                    `${JSON.stringify(this.rect)}.`);
+                if (updatePos) {
+                    logger_1.default.warn('Click will proceed at new coordinates');
+                    this.rect = lodash_1.default.clone(newImgEl.rect);
+                }
+                else {
+                    logger_1.default.warn('Click will take place at original coordinates. If you ' +
+                        'would like Appium to automatically click the new ' +
+                        "coordinates, set the 'autoUpdateImageElementPosition' " +
+                        'setting to true');
                 }
-                // if not, warn and fall back to the other method
-                logger_1.default.warn('Driver does not seem to implement W3C actions, falling back ' +
-                    'to TouchActions');
             }
-            // if the w3c strategy was not requested, do the only other option (mjsonwp
-            // touch actions)
-            logger_1.default.info('Will tap using MJSONWP TouchActions');
+        }
+        const { x, y } = this.center;
+        logger_1.default.info(`Will tap on image element at coordinate [${x}, ${y}]`);
+        if (imageElementTapStrategy === IMAGE_EL_TAP_STRATEGY_W3C) {
+            // set up a W3C action to click on the image by position
+            logger_1.default.info('Will tap using W3C actions');
             const action = {
-                action: 'tap',
-                options: { x, y }
+                type: 'pointer',
+                id: 'mouse',
+                parameters: { pointerType: 'touch' },
+                actions: [
+                    { type: 'pointerMove', x, y, duration: 0 },
+                    { type: 'pointerDown', button: 0 },
+                    { type: 'pause', duration: TAP_DURATION_MS },
+                    { type: 'pointerUp', button: 0 },
+                ]
             };
-            if (driver.performTouch) {
-                return yield driver.performTouch([action]);
+            // check if the driver has the appropriate performActions method
+            if (driver.performActions) {
+                return await driver.performActions([action]);
             }
-            throw new Error("Driver did not implement the 'performTouch' command. " +
-                'For drivers to support finding image elements, they ' +
-                "should support 'performTouch' and 'performActions'");
-        });
+            // if not, warn and fall back to the other method
+            logger_1.default.warn('Driver does not seem to implement W3C actions, falling back ' +
+                'to TouchActions');
+        }
+        // if the w3c strategy was not requested, do the only other option (mjsonwp
+        // touch actions)
+        logger_1.default.info('Will tap using MJSONWP TouchActions');
+        const action = {
+            action: 'tap',
+            options: { x, y }
+        };
+        if (driver.performTouch) {
+            return await driver.performTouch([action]);
+        }
+        throw new Error("Driver did not implement the 'performTouch' command. " +
+            'For drivers to support finding image elements, they ' +
+            "should support 'performTouch' and 'performActions'");
     }
     /**
      * Handle various Appium commands that involve an image element
@@ -219,37 +208,35 @@ class ImageElement {
      *
      * @returns {Object} - the result of running a command
      */
-    static execute(driver, imgEl, cmd, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            switch (cmd) {
-                case 'click':
-                    return yield imgEl.click(driver);
-                case 'elementDisplayed':
-                    return true;
-                case 'getSize':
-                    return imgEl.size;
-                case 'getLocation':
-                case 'getLocationInView':
-                    return imgEl.location;
-                case 'getElementRect':
-                    return imgEl.rect;
-                case 'getAttribute':
-                    // /session/:sessionId/element/:elementId/attribute/:name
-                    // /session/:sessionId/element/:elementId/attribute/visual should retun the visual data
-                    // e.g. ["content-desc","appium-image-element-xxxxx","xxxxx"], ["visual","appium-image-element-xxxxx","xxxxx"]
-                    switch (args[0]) {
-                        case 'visual':
-                            return imgEl.matchedImage;
-                        case 'score':
-                            return imgEl.score;
-                        default:
-                            throw new appium_base_driver_1.errors.NotYetImplementedError();
-                    }
-                default: throw new appium_base_driver_1.errors.NotYetImplementedError();
-            }
-        });
+    static async execute(driver, imgEl, cmd, ...args) {
+        switch (cmd) {
+            case 'click':
+                return await imgEl.click(driver);
+            case 'elementDisplayed':
+                return true;
+            case 'getSize':
+                return imgEl.size;
+            case 'getLocation':
+            case 'getLocationInView':
+                return imgEl.location;
+            case 'getElementRect':
+                return imgEl.rect;
+            case 'getAttribute':
+                // /session/:sessionId/element/:elementId/attribute/:name
+                // /session/:sessionId/element/:elementId/attribute/visual should retun the visual data
+                // e.g. ["content-desc","appium-image-element-xxxxx","xxxxx"], ["visual","appium-image-element-xxxxx","xxxxx"]
+                switch (args[0]) {
+                    case 'visual':
+                        return imgEl.matchedImage;
+                    case 'score':
+                        return imgEl.score;
+                    default:
+                        throw new base_driver_1.errors.NotYetImplementedError();
+                }
+            default: throw new base_driver_1.errors.NotYetImplementedError();
+        }
     }
 }
 exports.default = ImageElement;
 exports.ImageElement = ImageElement;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2UtZWxlbWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9pbWFnZS1lbGVtZW50LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7OztBQUFBLG9EQUF1QjtBQUN2QiwyREFBNEM7QUFDNUMsc0RBQTJCO0FBQzNCLG1EQUFzQztBQUN0QyxxQ0FBNEM7QUFFNUMsTUFBTSxvQkFBb0IsR0FBRyx1QkFBdUIsQ0FBQztBQTRQckIsb0RBQW9CO0FBM1BwRCxNQUFNLGVBQWUsR0FBRyxHQUFHLENBQUM7QUFDNUIsTUFBTSx5QkFBeUIsR0FBRyxZQUFZLENBQUM7QUF5UEEsOERBQXlCO0FBeFB4RSxNQUFNLDZCQUE2QixHQUFHLGNBQWMsQ0FBQztBQXdQckMsc0VBQTZCO0FBdlA3QyxNQUFNLG9CQUFvQixHQUFHO0lBQzNCLDZCQUE2QjtJQUM3Qix5QkFBeUI7Q0FDMUIsQ0FBQztBQUNGLE1BQU0sNEJBQTRCLEdBQUcsR0FBRyxDQUFDO0FBb1B2QyxvRUFBNEI7QUFsUDlCOzs7Ozs7R0FNRztBQUVIOzs7O0dBSUc7QUFFSDs7OztHQUlHO0FBRUg7OztHQUdHO0FBQ0gsTUFBcUIsWUFBWTtJQUUvQjs7Ozs7Ozs7Ozs7T0FXRztJQUNILFlBQWEsV0FBVyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUyxHQUFHLElBQUksRUFBRSxNQUFNLEdBQUcsSUFBSTtRQUNwRSxJQUFJLENBQUMsUUFBUSxHQUFHLFdBQVcsQ0FBQztRQUM1QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsRUFBRSxHQUFHLEdBQUcsb0JBQW9CLEdBQUcscUJBQUksQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDO1FBQ3BELElBQUksQ0FBQyxlQUFlLEdBQUcsU0FBUyxDQUFDO1FBQ2pDLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2UtZWxlbWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9pbWFnZS1lbGVtZW50LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLG9EQUF1QjtBQUN2QixxREFBNkM7QUFDN0Msc0RBQTJCO0FBQzNCLDZDQUF1QztBQUN2QyxxQ0FBNEM7QUFFNUMsTUFBTSxvQkFBb0IsR0FBRyx1QkFBdUIsQ0FBQztBQTRQckIsb0RBQW9CO0FBM1BwRCxNQUFNLGVBQWUsR0FBRyxHQUFHLENBQUM7QUFDNUIsTUFBTSx5QkFBeUIsR0FBRyxZQUFZLENBQUM7QUF5UEEsOERBQXlCO0FBeFB4RSxNQUFNLDZCQUE2QixHQUFHLGNBQWMsQ0FBQztBQXdQckMsc0VBQTZCO0FBdlA3QyxNQUFNLG9CQUFvQixHQUFHO0lBQzNCLDZCQUE2QjtJQUM3Qix5QkFBeUI7Q0FDMUIsQ0FBQztBQUNGLE1BQU0sNEJBQTRCLEdBQUcsR0FBRyxDQUFDO0FBb1B2QyxvRUFBNEI7QUFsUDlCOzs7Ozs7R0FNRztBQUVIOzs7O0dBSUc7QUFFSDs7OztHQUlHO0FBRUg7OztHQUdHO0FBQ0gsTUFBcUIsWUFBWTtJQUUvQjs7Ozs7Ozs7Ozs7T0FXRztJQUNILFlBQWEsV0FBVyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUyxHQUFHLElBQUksRUFBRSxNQUFNLEdBQUcsSUFBSTtRQUNwRSxJQUFJLENBQUMsUUFBUSxHQUFHLFdBQVcsQ0FBQztRQUM1QixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNqQixJQUFJLENBQUMsRUFBRSxHQUFHLEdBQUcsb0JBQW9CLEdBQUcsY0FBSSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7UUFDcEQsSUFBSSxDQUFDLGVBQWUsR0FBRyxTQUFTLENBQUM7UUFDakMsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7UUFDbkIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FB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

package/build/lib/logger.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const appium_support_1 = require("appium-support");
-const log = appium_support_1.logger.getLogger('ImageElementPlugin');
+const support_1 = require("@appium/support");
+const log = support_1.logger.getLogger('ImageElementPlugin');
 exports.default = log;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL2xvZ2dlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLG1EQUF3QztBQUN4QyxNQUFNLEdBQUcsR0FBRyx1QkFBTSxDQUFDLFNBQVMsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0FBQ25ELGtCQUFlLEdBQUcsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL2xvZ2dlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZDQUF5QztBQUN6QyxNQUFNLEdBQUcsR0FBRyxnQkFBTSxDQUFDLFNBQVMsQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO0FBQ25ELGtCQUFlLEdBQUcsQ0FBQyJ9

package/build/lib/plugin.js

@@ -1,48 +1,16 @@
 "use strict";
 /* eslint-disable no-case-declarations */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IMAGE_STRATEGY = exports.getImgElFromArgs = exports.ImageElementPlugin = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const appium_base_driver_1 = require("appium-base-driver");
+const base_driver_1 = require("@appium/base-driver");
 const base_plugin_1 = __importDefault(require("@appium/base-plugin"));
 const compare_1 = require("./compare");
-const finder_1 = __importStar(require("./finder"));
+const finder_1 = __importDefault(require("./finder"));
 const image_element_1 = require("./image-element");
-const IMG_EL_BODY_RE = new RegExp(`"(${finder_1.W3C_ELEMENT_KEY}|${finder_1.MJSONWP_ELEMENT_KEY})":\s*` + // eslint-disable-line no-useless-escape
-    `"${image_element_1.IMAGE_ELEMENT_PREFIX}[^"]+"`);
-const IMG_EL_URL_RE = new RegExp(`/(element|screenshot)` +
-    `/${image_element_1.IMAGE_ELEMENT_PREFIX}[^/]+`);
 const IMAGE_STRATEGY = '-image';
 exports.IMAGE_STRATEGY = IMAGE_STRATEGY;
 function getImgElFromArgs(args) {
@@ -58,67 +26,37 @@ class ImageElementPlugin extends base_plugin_1.default {
         super(pluginName);
         this.finder = new finder_1.default();
     }
-    shouldAvoidProxy(method, route, body) {
-        // if it looks like we have an image element in the url (as a route
-        // parameter), never proxy. Just look for our image element prefix in allowed
-        // positions (either after an 'element' or 'screenshot' path segment), and
-        // ensure the prefix is followed by something
-        if (IMG_EL_URL_RE.test(route)) {
-            return true;
-        }
-        // also if it looks like we have an image element in the request body (as
-        // a JSON parameter), never proxy. Basically check against a regexp of the
-        // json string of the body, where we know what the form of an image element
-        // must be
-        if (body) {
-            const stringBody = JSON.stringify(body);
-            if (stringBody && IMG_EL_BODY_RE.test(stringBody)) {
-                return true;
-            }
-        }
-        return false;
+    async compareImages(next, driver, ...args) {
+        return await (0, compare_1.compareImages)(...args);
     }
-    compareImages(next, driver, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield compare_1.compareImages(...args);
-        });
+    async findElement(next, driver, ...args) {
+        return await this._find(false, next, driver, ...args);
     }
-    findElement(next, driver, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this._find(false, next, driver, ...args);
-        });
+    async findElements(next, driver, ...args) {
+        return await this._find(true, next, driver, ...args);
     }
-    findElements(next, driver, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this._find(true, next, driver, ...args);
-        });
-    }
-    _find(multiple, next, driver, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [strategy, selector] = args;
-            // if we're not actually finding by image, just do the normal thing
-            if (strategy !== IMAGE_STRATEGY) {
-                return yield next();
-            }
-            this.finder.setDriver(driver);
-            return yield this.finder.findByImage(selector, { multiple });
-        });
+    async _find(multiple, next, driver, ...args) {
+        const [strategy, selector] = args;
+        // if we're not actually finding by image, just do the normal thing
+        if (strategy !== IMAGE_STRATEGY) {
+            return await next();
+        }
+        this.finder.setDriver(driver);
+        return await this.finder.findByImage(selector, { multiple });
     }
-    handle(next, driver, cmdName, ...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // if we have a command that involves an image element id, attempt to find the image element
-            // and execute the command on it
-            const imgElId = getImgElFromArgs(args);
-            if (imgElId) {
-                if (!this.finder.imgElCache.has(imgElId)) {
-                    throw new appium_base_driver_1.errors.NoSuchElementError();
-                }
-                const imgEl = this.finder.imgElCache.get(imgElId);
-                return yield image_element_1.ImageElement.execute(driver, imgEl, cmdName, ...args);
+    async handle(next, driver, cmdName, ...args) {
+        // if we have a command that involves an image element id, attempt to find the image element
+        // and execute the command on it
+        const imgElId = getImgElFromArgs(args);
+        if (imgElId) {
+            if (!this.finder.imgElCache.has(imgElId)) {
+                throw new base_driver_1.errors.NoSuchElementError();
             }
-            // otherwise just do the normal thing
-            return yield next();
-        });
+            const imgEl = this.finder.imgElCache.get(imgElId);
+            return await image_element_1.ImageElement.execute(driver, imgEl, cmdName, ...args);
+        }
+        // otherwise just do the normal thing
+        return await next();
     }
 }
 exports.default = ImageElementPlugin;
@@ -132,7 +70,8 @@ ImageElementPlugin.newMethodMap = {
                 required: ['mode', 'firstImage', 'secondImage'],
                 optional: ['options']
             },
+            neverProxy: true,
         }
     },
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3BsdWdpbi5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEseUNBQXlDOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRXpDLG9EQUF1QjtBQUN2QiwyREFBNEM7QUFDNUMsc0VBQTZDO0FBQzdDLHVDQUEwQztBQUMxQyxtREFBb0Y7QUFDcEYsbURBQXFFO0FBRXJFLE1BQU0sY0FBYyxHQUFHLElBQUksTUFBTSxDQUMvQixLQUFLLHdCQUFlLElBQUksNEJBQW1CLFFBQVEsR0FBRyx3Q0FBd0M7SUFDOUYsSUFBSSxvQ0FBb0IsUUFBUSxDQUNqQyxDQUFDO0FBRUYsTUFBTSxhQUFhLEdBQUcsSUFBSSxNQUFNLENBQzlCLHVCQUF1QjtJQUN2QixJQUFJLG9DQUFvQixPQUFPLENBQ2hDLENBQUM7QUFFRixNQUFNLGNBQWMsR0FBRyxRQUFRLENBQUM7QUErRmUsd0NBQWM7QUE3RjdELFNBQVMsZ0JBQWdCLENBQUUsSUFBSTtJQUM3QixLQUFLLElBQUksR0FBRyxJQUFJLElBQUksRUFBRTtRQUNwQixJQUFJLGdCQUFDLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxVQUFVLENBQUMsb0NBQW9CLENBQUMsRUFBRTtZQUMzRCxPQUFPLEdBQUcsQ0FBQztTQUNaO0tBQ0Y7QUFDSCxDQUFDO0FBdUY0Qiw0Q0FBZ0I7QUFyRjdDLE1BQXFCLGtCQUFtQixTQUFRLHFCQUFVO0lBRXhELFlBQWEsVUFBVTtRQUNyQixLQUFLLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDbEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLGdCQUFrQixFQUFFLENBQUM7SUFDekMsQ0FBQztJQWVELGdCQUFnQixDQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSTtRQUNuQyxtRUFBbUU7UUFDbkUsNkVBQTZFO1FBQzdFLDBFQUEwRTtRQUMxRSw2Q0FBNkM7UUFDN0MsSUFBSSxhQUFhLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQzdCLE9BQU8sSUFBSSxDQUFDO1NBQ2I7UUFHRCx5RUFBeUU7UUFDekUsMEVBQTBFO1FBQzFFLDJFQUEyRTtRQUMzRSxVQUFVO1FBQ1YsSUFBSSxJQUFJLEVBQUU7WUFDUixNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3hDLElBQUksVUFBVSxJQUFJLGNBQWMsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUU7Z0JBQ2pELE9BQU8sSUFBSSxDQUFDO2FBQ2I7U0FDRjtRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2YsQ0FBQztJQUVLLGFBQWEsQ0FBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLEdBQUcsSUFBSTs7WUFDeEMsT0FBTyxNQUFNLHVCQUFhLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUN0QyxDQUFDO0tBQUE7SUFFSyxXQUFXLENBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUk7O1lBQ3RDLE9BQU8sTUFBTSxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUM7UUFDeEQsQ0FBQztLQUFBO0lBRUssWUFBWSxDQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsR0FBRyxJQUFJOztZQUN2QyxPQUFPLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDO1FBQ3ZELENBQUM7S0FBQTtJQUVLLEtBQUssQ0FBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUk7O1lBQzFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLEdBQUcsSUFBSSxDQUFDO1lBRWxDLG1FQUFtRTtZQUNuRSxJQUFJLFFBQVEsS0FBSyxjQUFjLEVBQUU7Z0JBQy9CLE9BQU8sTUFBTSxJQUFJLEVBQUUsQ0FBQzthQUNyQjtZQUVELElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQzlCLE9BQU8sTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBQyxRQUFRLEVBQUMsQ0FBQyxDQUFDO1FBQzdELENBQUM7S0FBQTtJQUVLLE1BQU0sQ0FBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUk7O1lBQzFDLDRGQUE0RjtZQUM1RixnQ0FBZ0M7WUFDaEMsTUFBTSxPQUFPLEdBQUcsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDdkMsSUFBSSxPQUFPLEVBQUU7Z0JBQ1gsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRTtvQkFDeEMsTUFBTSxJQUFJLDJCQUFNLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztpQkFDdkM7Z0JBQ0QsTUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNsRCxPQUFPLE1BQU0sNEJBQVksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQzthQUNwRTtZQUVELHFDQUFxQztZQUNyQyxPQUFPLE1BQU0sSUFBSSxFQUFFLENBQUM7UUFDdEIsQ0FBQztLQUFBOztBQWxGSCxxQ0FtRkM7QUFFUSxnREFBa0I7QUE5RXpCLCtEQUErRDtBQUN4RCwrQkFBWSxHQUFHO0lBQ3BCLDJDQUEyQyxFQUFFO1FBQzNDLElBQUksRUFBRTtZQUNKLE9BQU8sRUFBRSxlQUFlO1lBQ3hCLGFBQWEsRUFBRTtnQkFDYixRQUFRLEVBQUUsQ0FBQyxNQUFNLEVBQUUsWUFBWSxFQUFFLGFBQWEsQ0FBQztnQkFDL0MsUUFBUSxFQUFFLENBQUMsU0FBUyxDQUFDO2FBQ3RCO1NBQ0Y7S0FDRjtDQUNGLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vbGliL3BsdWdpbi5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEseUNBQXlDOzs7Ozs7QUFFekMsb0RBQXVCO0FBQ3ZCLHFEQUE2QztBQUM3QyxzRUFBNkM7QUFDN0MsdUNBQTBDO0FBQzFDLHNEQUEwQztBQUMxQyxtREFBcUU7QUFFckUsTUFBTSxjQUFjLEdBQUcsUUFBUSxDQUFDO0FBd0VlLHdDQUFjO0FBdEU3RCxTQUFTLGdCQUFnQixDQUFFLElBQUk7SUFDN0IsS0FBSyxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUU7UUFDcEIsSUFBSSxnQkFBQyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsSUFBSSxHQUFHLENBQUMsVUFBVSxDQUFDLG9DQUFvQixDQUFDLEVBQUU7WUFDM0QsT0FBTyxHQUFHLENBQUM7U0FDWjtLQUNGO0FBQ0gsQ0FBQztBQWdFNEIsNENBQWdCO0FBOUQ3QyxNQUFxQixrQkFBbUIsU0FBUSxxQkFBVTtJQUV4RCxZQUFhLFVBQVU7UUFDckIsS0FBSyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxnQkFBa0IsRUFBRSxDQUFDO0lBQ3pDLENBQUM7SUFnQkQsS0FBSyxDQUFDLGFBQWEsQ0FBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLEdBQUcsSUFBSTtRQUN4QyxPQUFPLE1BQU0sSUFBQSx1QkFBYSxFQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7SUFDdEMsQ0FBQztJQUVELEtBQUssQ0FBQyxXQUFXLENBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUk7UUFDdEMsT0FBTyxNQUFNLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsS0FBSyxDQUFDLFlBQVksQ0FBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLEdBQUcsSUFBSTtRQUN2QyxPQUFPLE1BQU0sSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLEdBQUcsSUFBSTtRQUMxQyxNQUFNLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxHQUFHLElBQUksQ0FBQztRQUVsQyxtRUFBbUU7UUFDbkUsSUFBSSxRQUFRLEtBQUssY0FBYyxFQUFFO1lBQy9CLE9BQU8sTUFBTSxJQUFJLEVBQUUsQ0FBQztTQUNyQjtRQUVELElBQUksQ0FBQyxNQUFNLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQzlCLE9BQU8sTUFBTSxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsRUFBQyxRQUFRLEVBQUMsQ0FBQyxDQUFDO0lBQzdELENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsSUFBSTtRQUMxQyw0RkFBNEY7UUFDNUYsZ0NBQWdDO1FBQ2hDLE1BQU0sT0FBTyxHQUFHLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3ZDLElBQUksT0FBTyxFQUFFO1lBQ1gsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRTtnQkFDeEMsTUFBTSxJQUFJLG9CQUFNLENBQUMsa0JBQWtCLEVBQUUsQ0FBQzthQUN2QztZQUNELE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztZQUNsRCxPQUFPLE1BQU0sNEJBQVksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztTQUNwRTtRQUVELHFDQUFxQztRQUNyQyxPQUFPLE1BQU0sSUFBSSxFQUFFLENBQUM7SUFDdEIsQ0FBQzs7QUEzREgscUNBNERDO0FBRVEsZ0RBQWtCO0FBdkR6QiwrREFBK0Q7QUFDeEQsK0JBQVksR0FBRztJQUNwQiwyQ0FBMkMsRUFBRTtRQUMzQyxJQUFJLEVBQUU7WUFDSixPQUFPLEVBQUUsZUFBZTtZQUN4QixhQUFhLEVBQUU7Z0JBQ2IsUUFBUSxFQUFFLENBQUMsTUFBTSxFQUFFLFlBQVksRUFBRSxhQUFhLENBQUM7Z0JBQy9DLFFBQVEsRUFBRSxDQUFDLFNBQVMsQ0FBQzthQUN0QjtZQUNELFVBQVUsRUFBRSxJQUFJO1NBQ2pCO0tBQ0Y7Q0FDRixDQUFDIn0=

package/build/test/e2e/plugin-e2e-specs.js

@@ -1,20 +1,14 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+const APPIUM_HOME = path_1.default.resolve(__dirname, '..', '..', '..', 'local_appium_home');
+// need to assign this before appium is imported via e2eSetup
+process.env.APPIUM_HOME = APPIUM_HOME;
 const chai_1 = __importDefault(require("chai"));
 const chai_as_promised_1 = __importDefault(require("chai-as-promised"));
-const path_1 = __importDefault(require("path"));
 const webdriverio_1 = require("webdriverio");
 const compare_1 = require("../../lib/compare");
 const fixtures_1 = require("../fixtures");
@@ -22,10 +16,8 @@ const helpers_1 = require("@appium/base-plugin/build/test/helpers");
 chai_1.default.use(chai_as_promised_1.default);
 chai_1.default.should();
 const THIS_PLUGIN_DIR = path_1.default.resolve(__dirname, '..', '..', '..');
-const APPIUM_HOME = path_1.default.resolve(__dirname, '..', '..', '..', 'local_appium_home');
 const TEST_HOST = 'localhost';
-const TEST_PORT = 4723;
-const TEST_FAKE_APP = path_1.default.resolve(APPIUM_HOME, 'appium-fake-driver', 'node_modules', 'appium-fake-driver', 'test', 'fixtures', 'app.xml');
+const TEST_FAKE_APP = path_1.default.resolve(APPIUM_HOME, '@appium', 'fake-driver', 'node_modules', '@appium', 'fake-driver', 'test', 'fixtures', 'app.xml');
 const TEST_CAPS = {
     platformName: 'Fake',
     'appium:automationName': 'Fake',
@@ -34,44 +26,37 @@ const TEST_CAPS = {
 };
 const WDIO_OPTS = {
     hostname: TEST_HOST,
-    port: TEST_PORT,
     connectionRetryCount: 0,
     capabilities: TEST_CAPS
 };
 describe('ImageElementPlugin', function () {
     let server, driver = null;
-    after(function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (driver) {
-                yield driver.deleteSession();
-            }
-        });
+    after(async function () {
+        if (driver) {
+            await driver.deleteSession();
+        }
     });
-    helpers_1.e2eSetup({
-        before, after, server, port: TEST_PORT, host: TEST_HOST, appiumHome: APPIUM_HOME,
-        driverName: 'fake', driverSource: 'npm', driverSpec: 'appium-fake-driver',
-        pluginName: 'images', pluginSource: 'local', pluginSpec: THIS_PLUGIN_DIR,
+    (0, helpers_1.e2eSetup)({
+        before, after, server, host: TEST_HOST, driverName: 'fake', driverSource: 'npm',
+        driverSpec: '@appium/fake-driver', pluginName: 'images', pluginSource: 'local',
+        pluginSpec: THIS_PLUGIN_DIR,
     });
-    it('should add the compareImages route', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            driver = yield webdriverio_1.remote(WDIO_OPTS);
-            let comparison = yield driver.compareImages(compare_1.MATCH_FEATURES_MODE, fixtures_1.TEST_IMG_1_B64, fixtures_1.TEST_IMG_2_B64, {});
-            comparison.count.should.eql(0);
-            comparison = yield driver.compareImages(compare_1.GET_SIMILARITY_MODE, fixtures_1.TEST_IMG_1_B64, fixtures_1.TEST_IMG_2_B64, {});
-            comparison.score.should.be.above(0.2);
-        });
+    it('should add the compareImages route', async function () {
+        driver = await (0, webdriverio_1.remote)({ ...WDIO_OPTS, port: this.port });
+        let comparison = await driver.compareImages(compare_1.MATCH_FEATURES_MODE, fixtures_1.TEST_IMG_1_B64, fixtures_1.TEST_IMG_2_B64, {});
+        comparison.count.should.eql(0);
+        comparison = await driver.compareImages(compare_1.GET_SIMILARITY_MODE, fixtures_1.TEST_IMG_1_B64, fixtures_1.TEST_IMG_2_B64, {});
+        comparison.score.should.be.above(0.2);
     });
-    it('should find and interact with image elements', function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            const imageEl = yield driver.$(fixtures_1.APPSTORE_IMG_PATH);
-            const { x, y } = yield imageEl.getLocation();
-            const { width, height } = yield imageEl.getSize();
-            x.should.eql(28);
-            y.should.eql(72);
-            width.should.eql(80);
-            height.should.eql(91);
-            yield imageEl.click();
-        });
+    it('should find and interact with image elements', async function () {
+        const imageEl = await driver.$(fixtures_1.APPSTORE_IMG_PATH);
+        const { x, y } = await imageEl.getLocation();
+        const { width, height } = await imageEl.getSize();
+        x.should.eql(28);
+        y.should.eql(72);
+        width.should.eql(80);
+        height.should.eql(91);
+        await imageEl.click();
     });
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLWUyZS1zcGVjcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Rlc3QvZTJlL3BsdWdpbi1lMmUtc3BlY3MuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7QUFBQSxnREFBd0I7QUFDeEIsd0VBQThDO0FBQzlDLGdEQUF3QjtBQUN4Qiw2Q0FBNkM7QUFDN0MsK0NBQTZFO0FBQzdFLDBDQUFnRjtBQUNoRixvRUFBa0U7QUFFbEUsY0FBSSxDQUFDLEdBQUcsQ0FBQywwQkFBYyxDQUFDLENBQUM7QUFDekIsY0FBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO0FBRWQsTUFBTSxlQUFlLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztBQUNsRSxNQUFNLFdBQVcsR0FBRyxjQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO0FBQ25GLE1BQU0sU0FBUyxHQUFHLFdBQVcsQ0FBQztBQUM5QixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUM7QUFDdkIsTUFBTSxhQUFhLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUUsb0JBQW9CLEVBQUUsY0FBYyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQzNGLFNBQVMsQ0FBQyxDQUFDO0FBQzlDLE1BQU0sU0FBUyxHQUFHO0lBQ2hCLFlBQVksRUFBRSxNQUFNO0lBQ3BCLHVCQUF1QixFQUFFLE1BQU07SUFDL0IsbUJBQW1CLEVBQUUsTUFBTTtJQUMzQixZQUFZLEVBQUUsYUFBYTtDQUM1QixDQUFDO0FBQ0YsTUFBTSxTQUFTLEdBQUc7SUFDaEIsUUFBUSxFQUFFLFNBQVM7SUFDbkIsSUFBSSxFQUFFLFNBQVM7SUFDZixvQkFBb0IsRUFBRSxDQUFDO0lBQ3ZCLFlBQVksRUFBRSxTQUFTO0NBQ3hCLENBQUM7QUFFRixRQUFRLENBQUMsb0JBQW9CLEVBQUU7SUFDN0IsSUFBSSxNQUFNLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FBQztJQUUxQixLQUFLLENBQUM7O1lBQ0osSUFBSSxNQUFNLEVBQUU7Z0JBQ1YsTUFBTSxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7YUFDOUI7UUFDSCxDQUFDO0tBQUEsQ0FBQyxDQUFDO0lBRUgsa0JBQVEsQ0FBQztRQUNQLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxVQUFVLEVBQUUsV0FBVztRQUNoRixVQUFVLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsVUFBVSxFQUFFLG9CQUFvQjtRQUN6RSxVQUFVLEVBQUUsUUFBUSxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsVUFBVSxFQUFFLGVBQWU7S0FDekUsQ0FBQyxDQUFDO0lBRUgsRUFBRSxDQUFDLG9DQUFvQyxFQUFFOztZQUN2QyxNQUFNLEdBQUcsTUFBTSxvQkFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQy9CLElBQUksVUFBVSxHQUFHLE1BQU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyw2QkFBbUIsRUFBRSx5QkFBYyxFQUFFLHlCQUFjLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDckcsVUFBVSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQy9CLFVBQVUsR0FBRyxNQUFNLE1BQU0sQ0FBQyxhQUFhLENBQUMsNkJBQW1CLEVBQUUseUJBQWMsRUFBRSx5QkFBYyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQ2pHLFVBQVUsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDeEMsQ0FBQztLQUFBLENBQUMsQ0FBQztJQUVILEVBQUUsQ0FBQyw4Q0FBOEMsRUFBRTs7WUFDakQsTUFBTSxPQUFPLEdBQUcsTUFBTSxNQUFNLENBQUMsQ0FBQyxDQUFDLDRCQUFpQixDQUFDLENBQUM7WUFDbEQsTUFBTSxFQUFDLENBQUMsRUFBRSxDQUFDLEVBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQztZQUMzQyxNQUFNLEVBQUMsS0FBSyxFQUFFLE1BQU0sRUFBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2hELENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ2pCLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ2pCLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ3JCLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ3RCLE1BQU0sT0FBTyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ3hCLENBQUM7S0FBQSxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLWUyZS1zcGVjcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Rlc3QvZTJlL3BsdWdpbi1lMmUtc3BlY3MuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxnREFBd0I7QUFDeEIsTUFBTSxXQUFXLEdBQUcsY0FBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsbUJBQW1CLENBQUMsQ0FBQztBQUNuRiw2REFBNkQ7QUFDN0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO0FBRXRDLGdEQUF3QjtBQUN4Qix3RUFBOEM7QUFDOUMsNkNBQTZDO0FBQzdDLCtDQUE2RTtBQUM3RSwwQ0FBZ0Y7QUFDaEYsb0VBQWtFO0FBRWxFLGNBQUksQ0FBQyxHQUFHLENBQUMsMEJBQWMsQ0FBQyxDQUFDO0FBQ3pCLGNBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztBQUVkLE1BQU0sZUFBZSxHQUFHLGNBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7QUFDbEUsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDO0FBQzlCLE1BQU0sYUFBYSxHQUFHLGNBQUksQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLFNBQVMsRUFBRSxhQUFhLEVBQUUsY0FBYyxFQUN0RixTQUFTLEVBQUUsYUFBYSxFQUFFLE1BQU0sRUFBRSxVQUFVLEVBQUUsU0FBUyxDQUFDLENBQUM7QUFDM0QsTUFBTSxTQUFTLEdBQUc7SUFDaEIsWUFBWSxFQUFFLE1BQU07SUFDcEIsdUJBQXVCLEVBQUUsTUFBTTtJQUMvQixtQkFBbUIsRUFBRSxNQUFNO0lBQzNCLFlBQVksRUFBRSxhQUFhO0NBQzVCLENBQUM7QUFDRixNQUFNLFNBQVMsR0FBRztJQUNoQixRQUFRLEVBQUUsU0FBUztJQUNuQixvQkFBb0IsRUFBRSxDQUFDO0lBQ3ZCLFlBQVksRUFBRSxTQUFTO0NBQ3hCLENBQUM7QUFFRixRQUFRLENBQUMsb0JBQW9CLEVBQUU7SUFDN0IsSUFBSSxNQUFNLEVBQUUsTUFBTSxHQUFHLElBQUksQ0FBQztJQUUxQixLQUFLLENBQUMsS0FBSztRQUNULElBQUksTUFBTSxFQUFFO1lBQ1YsTUFBTSxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUM7U0FDOUI7SUFDSCxDQUFDLENBQUMsQ0FBQztJQUVILElBQUEsa0JBQVEsRUFBQztRQUNQLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsS0FBSztRQUMvRSxVQUFVLEVBQUUscUJBQXFCLEVBQUUsVUFBVSxFQUFFLFFBQVEsRUFBRSxZQUFZLEVBQUUsT0FBTztRQUM5RSxVQUFVLEVBQUUsZUFBZTtLQUM1QixDQUFDLENBQUM7SUFFSCxFQUFFLENBQUMsb0NBQW9DLEVBQUUsS0FBSztRQUM1QyxNQUFNLEdBQUcsTUFBTSxJQUFBLG9CQUFJLEVBQUMsRUFBQyxHQUFHLFNBQVMsRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBQyxDQUFDLENBQUM7UUFDckQsSUFBSSxVQUFVLEdBQUcsTUFBTSxNQUFNLENBQUMsYUFBYSxDQUFDLDZCQUFtQixFQUFFLHlCQUFjLEVBQUUseUJBQWMsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNyRyxVQUFVLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDL0IsVUFBVSxHQUFHLE1BQU0sTUFBTSxDQUFDLGFBQWEsQ0FBQyw2QkFBbUIsRUFBRSx5QkFBYyxFQUFFLHlCQUFjLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDakcsVUFBVSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN4QyxDQUFDLENBQUMsQ0FBQztJQUVILEVBQUUsQ0FBQyw4Q0FBOEMsRUFBRSxLQUFLO1FBQ3RELE1BQU0sT0FBTyxHQUFHLE1BQU0sTUFBTSxDQUFDLENBQUMsQ0FBQyw0QkFBaUIsQ0FBQyxDQUFDO1FBQ2xELE1BQU0sRUFBQyxDQUFDLEVBQUUsQ0FBQyxFQUFDLEdBQUcsTUFBTSxPQUFPLENBQUMsV0FBVyxFQUFFLENBQUM7UUFDM0MsTUFBTSxFQUFDLEtBQUssRUFBRSxNQUFNLEVBQUMsR0FBRyxNQUFNLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNoRCxDQUFDLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNqQixDQUFDLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNqQixLQUFLLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUNyQixNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN0QixNQUFNLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQztJQUN4QixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUMsQ0FBQyxDQUFDIn0=