@appium/universal-xml-plugin 1.0.3 → 1.0.5

package/package.json

@@ -1,38 +1,64 @@
 {
   "name": "@appium/universal-xml-plugin",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Appium plugin for making XML source and XPath queries the same across iOS and Android",
-  "main": "./build/index.js",
+  "keywords": [
+    "automation",
+    "javascript",
+    "selenium",
+    "webdriver",
+    "ios",
+    "android",
+    "firefoxos",
+    "testing"
+  ],
+  "homepage": "https://appium.io",
+  "bugs": {
+    "url": "https://github.com/appium/appium/issues"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/appium/appium-plugins.git"
   },
-  "appium": {
-    "pluginName": "universal-xml",
-    "mainClass": "UniversalXMLPlugin"
-  },
-  "keywords": [
-    "appium",
-    "automation",
-    "xml",
-    "webdriver"
-  ],
-  "author": "Appium <maintainers@appium.io>",
   "license": "Apache-2.0",
-  "bugs": {
-    "url": "https://github.com/appium/appium-plugins/issues"
+  "author": "https://github.com/appium",
+  "types": "./build/lib/plugin.d.ts",
+  "files": [
+    "index.js",
+    "build",
+    "lib",
+    "tsconfig.json",
+    "!build/tsconfig.tsbuildinfo"
+  ],
+  "scripts": {
+    "test": "npm run test:unit",
+    "test:smoke": "node ./build/lib/index.js",
+    "test:unit": "mocha \"./test/unit/**/*.spec.js\""
   },
-  "homepage": "https://github.com/appium/appium-plugins#readme",
   "dependencies": {
-    "@appium/base-driver": "8.2.1",
-    "@appium/base-plugin": "^1.8.1",
+    "@types/xmldom": "0.1.31",
+    "@xmldom/xmldom": "0.8.6",
     "fast-xml-parser": "3.21.1",
-    "xmldom": "0.6.0",
+    "lodash": "4.17.21",
+    "source-map-support": "0.5.21",
     "xpath": "0.0.32"
   },
-  "scripts": {
-    "test:unit": "mocha \"./build/test/unit/*-specs.js\"",
-    "copyfiles": "copyfiles \"./test/fixtures/*.xml\" ./build"
+  "peerDependencies": {
+    "appium": "^2.0.0-beta.35"
+  },
+  "engines": {
+    "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
+    "npm": ">=8"
+  },
+  "appium": {
+    "pluginName": "universal-xml",
+    "mainClass": "UniversalXMLPlugin"
+  },
+  "publishConfig": {
+    "access": "public"
   },
-  "gitHead": "5efbd2840a4e5dd078a4646c026472a006ab2211"
+  "gitHead": "322363b8876a7ea7b630d538e22965f7bab0ea06",
+  "typedoc": {
+    "entryPoint": "./lib/index.js"
+  }
 }

package/tsconfig.json

@@ -1,11 +1,7 @@
 {
-  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "build"
   },
-  "include": [
-    "./index.js",
-    "./lib/**/*",
-    "./test/**/*"
-  ]
+  "extends": "@appium/tsconfig/tsconfig.plugin.json",
+  "include": ["lib"]
 }

package/build/index.js

@@ -1,25 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UniversalXMLPlugin = void 0;
-const plugin_1 = __importDefault(require("./lib/plugin"));
-exports.UniversalXMLPlugin = plugin_1.default;
-exports.default = plugin_1.default;
-if (module === require.main) {
-    const { transformSourceXml } = require('./lib/source');
-    const fs = require('fs');
-    const [, , xmlDataPath, platform, optsJson] = process.argv;
-    const xmlData = fs.readFileSync(xmlDataPath, 'utf8');
-    let opts = {};
-    if (optsJson) {
-        opts = JSON.parse(optsJson);
-    }
-    const { xml, unknowns } = transformSourceXml(xmlData, platform, opts);
-    console.log(xml); // eslint-disable-line no-console
-    if (unknowns.nodes.length || unknowns.attrs.length) {
-        console.error(unknowns); // eslint-disable-line no-console
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSwwREFBOEM7QUFFckMsNkJBRkYsZ0JBQWtCLENBRUU7QUFEM0Isa0JBQWUsZ0JBQWtCLENBQUM7QUFHbEMsSUFBSSxNQUFNLEtBQUssT0FBTyxDQUFDLElBQUksRUFBRTtJQUMzQixNQUFNLEVBQUUsa0JBQWtCLEVBQUUsR0FBRyxPQUFPLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDdkQsTUFBTSxFQUFFLEdBQUcsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3pCLE1BQU0sQ0FBQyxFQUFDLEVBQUUsV0FBVyxFQUFFLFFBQVEsRUFBRSxRQUFRLENBQUMsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDO0lBQzFELE1BQU0sT0FBTyxHQUFHLEVBQUUsQ0FBQyxZQUFZLENBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3JELElBQUksSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUNkLElBQUksUUFBUSxFQUFFO1FBQ1osSUFBSSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7S0FDN0I7SUFDRCxNQUFNLEVBQUMsR0FBRyxFQUFFLFFBQVEsRUFBQyxHQUFHLGtCQUFrQixDQUFDLE9BQU8sRUFBRSxRQUFRLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDcEUsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLGlDQUFpQztJQUNuRCxJQUFJLFFBQVEsQ0FBQyxLQUFLLENBQUMsTUFBTSxJQUFJLFFBQVEsQ0FBQyxLQUFLLENBQUMsTUFBTSxFQUFFO1FBQ2xELE9BQU8sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxpQ0FBaUM7S0FDM0Q7Q0FDRiJ9

package/build/test/fixtures/android-transformed-path.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UI width="1080" height="1920" indexPath="/0">
-  <View text="" indexPath="/0/0" x="0" y="0" width="1080" height="1920" visible="true">
-    <View text="" indexPath="/0/0/0" x="0" y="0" width="1080" height="1920" visible="true">
-      <View text="" indexPath="/0/0/0/0" x="0" y="72" width="1080" height="1848" visible="true">
-        <View text="" indexPath="/0/0/0/0/0" x="0" y="72" width="1080" height="1848" id="action_bar_root" visible="true">
-          <View text="" indexPath="/0/0/0/0/0/0" x="0" y="72" width="1080" height="1848" id="android:id/content" visible="true">
-            <View text="" indexPath="/0/0/0/0/0/0/0" x="0" y="72" width="1080" height="1848" visible="true">
-              <View text="" indexPath="/0/0/0/0/0/0/0/0" x="0" y="72" width="1080" height="1848" visible="true"></View>
-              <View text="" indexPath="/0/0/0/0/0/0/0/1" x="0" y="72" width="1080" height="1848" visible="true">
-                <View text="" indexPath="/0/0/0/0/0/0/0/1/0" x="0" y="72" width="1080" height="168" visible="true">
-                  <View text="" indexPath="/0/0/0/0/0/0/0/1/0/0" x="0" y="72" width="1080" height="168" visible="true">
-                    <View text="" indexPath="/0/0/0/0/0/0/0/1/0/0/0" x="0" y="72" width="1080" height="168" visible="true">
-                      <Button text="" indexPath="/0/0/0/0/0/0/0/1/0/0/0/0" x="0" y="72" width="168" height="168" visible="true"></Button>
-                    </View>
-                  </View>
-                </View>
-                <View text="" indexPath="/0/0/0/0/0/0/0/1/1" x="0" y="240" width="1080" height="1680" visible="true">
-                  <Text text="Login" indexPath="/0/0/0/0/0/0/0/1/1/0" x="413" y="360" width="255" height="136" visible="true"></Text>
-                  <View text="" indexPath="/0/0/0/0/0/0/0/1/1/1" x="150" y="496" width="780" height="120" visible="true">
-                    <TextInput text="alice" indexPath="/0/0/0/0/0/0/0/1/1/1/0" x="150" y="504" width="780" height="112" axId="username" visible="true"></TextInput>
-                  </View>
-                  <View text="" indexPath="/0/0/0/0/0/0/0/1/1/2" x="150" y="616" width="780" height="120" visible="true">
-                    <TextInput text="•••••••••" indexPath="/0/0/0/0/0/0/0/1/1/2/0" x="150" y="624" width="780" height="112" axId="password" visible="true"></TextInput>
-                  </View>
-                  <View text="" indexPath="/0/0/0/0/0/0/0/1/1/3" x="456" y="736" width="168" height="113" visible="true">
-                    <View text="" indexPath="/0/0/0/0/0/0/0/1/1/3/0" x="456" y="736" width="168" height="113" axId="loginBtn" visible="true">
-                      <Text text="Login" indexPath="/0/0/0/0/0/0/0/1/1/3/0/0" x="456" y="736" width="168" height="113" visible="true"></Text>
-                    </View>
-                  </View>
-                </View>
-              </View>
-            </View>
-          </View>
-        </View>
-      </View>
-    </View>
-  </View>
-</UI>

package/build/test/fixtures/android-transformed.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UI width="1080" height="1920">
-  <View text="" x="0" y="0" width="1080" height="1920" visible="true">
-    <View text="" x="0" y="0" width="1080" height="1920" visible="true">
-      <View text="" x="0" y="72" width="1080" height="1848" visible="true">
-        <View text="" x="0" y="72" width="1080" height="1848" id="action_bar_root" visible="true">
-          <View text="" x="0" y="72" width="1080" height="1848" id="android:id/content" visible="true">
-            <View text="" x="0" y="72" width="1080" height="1848" visible="true">
-              <View text="" x="0" y="72" width="1080" height="1848" visible="true"></View>
-              <View text="" x="0" y="72" width="1080" height="1848" visible="true">
-                <View text="" x="0" y="72" width="1080" height="168" visible="true">
-                  <View text="" x="0" y="72" width="1080" height="168" visible="true">
-                    <View text="" x="0" y="72" width="1080" height="168" visible="true">
-                      <Button text="" x="0" y="72" width="168" height="168" visible="true"></Button>
-                    </View>
-                  </View>
-                </View>
-                <View text="" x="0" y="240" width="1080" height="1680" visible="true">
-                  <Text text="Login" x="413" y="360" width="255" height="136" visible="true"></Text>
-                  <View text="" x="150" y="496" width="780" height="120" visible="true">
-                    <TextInput text="alice" x="150" y="504" width="780" height="112" axId="username" visible="true"></TextInput>
-                  </View>
-                  <View text="" x="150" y="616" width="780" height="120" visible="true">
-                    <TextInput text="•••••••••" x="150" y="624" width="780" height="112" axId="password" visible="true"></TextInput>
-                  </View>
-                  <View text="" x="456" y="736" width="168" height="113" visible="true">
-                    <View text="" x="456" y="736" width="168" height="113" axId="loginBtn" visible="true">
-                      <Text text="Login" x="456" y="736" width="168" height="113" visible="true"></Text>
-                    </View>
-                  </View>
-                </View>
-              </View>
-            </View>
-          </View>
-        </View>
-      </View>
-    </View>
-  </View>
-</UI>

package/build/test/fixtures/android.xml

@@ -1,39 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
-<hierarchy index="0" class="hierarchy" rotation="0" width="1080" height="1920">
-  <android.widget.FrameLayout index="0" package="io.cloudgrey.the_app" class="android.widget.FrameLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,0][1080,1920]" displayed="true">
-    <android.widget.LinearLayout index="0" package="io.cloudgrey.the_app" class="android.widget.LinearLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,0][1080,1920]" displayed="true">
-      <android.widget.FrameLayout index="0" package="io.cloudgrey.the_app" class="android.widget.FrameLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,72][1080,1920]" displayed="true">
-        <android.widget.LinearLayout index="0" package="io.cloudgrey.the_app" class="android.widget.LinearLayout" text="" resource-id="io.cloudgrey.the_app:id/action_bar_root" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,72][1080,1920]" displayed="true">
-          <android.widget.FrameLayout index="0" package="io.cloudgrey.the_app" class="android.widget.FrameLayout" text="" resource-id="android:id/content" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,72][1080,1920]" displayed="true">
-            <android.widget.RelativeLayout index="0" package="io.cloudgrey.the_app" class="android.widget.RelativeLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,72][1080,1920]" displayed="true">
-              <android.view.ViewGroup index="0" package="io.cloudgrey.the_app" class="android.view.ViewGroup" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,72][1080,1920]" displayed="true" />
-              <android.widget.RelativeLayout index="1" package="io.cloudgrey.the_app" class="android.widget.RelativeLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,72][1080,1920]" displayed="true">
-                <android.widget.LinearLayout index="0" package="io.cloudgrey.the_app" class="android.widget.LinearLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,72][1080,240]" displayed="true">
-                  <android.widget.FrameLayout index="0" package="io.cloudgrey.the_app" class="android.widget.FrameLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,72][1080,240]" displayed="true">
-                    <android.view.ViewGroup index="0" package="io.cloudgrey.the_app" class="android.view.ViewGroup" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,72][1080,240]" displayed="true">
-                      <android.widget.ImageButton index="0" package="io.cloudgrey.the_app" class="android.widget.ImageButton" text="" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,72][168,240]" displayed="true" />
-                    </android.view.ViewGroup>
-                  </android.widget.FrameLayout>
-                </android.widget.LinearLayout>
-                <android.widget.FrameLayout index="1" package="io.cloudgrey.the_app" class="android.widget.FrameLayout" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[0,240][1080,1920]" displayed="true">
-                  <android.widget.TextView index="0" package="io.cloudgrey.the_app" class="android.widget.TextView" text="Login" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[413,360][668,496]" displayed="true" />
-                  <android.view.ViewGroup index="1" package="io.cloudgrey.the_app" class="android.view.ViewGroup" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[150,496][930,616]" displayed="true">
-                    <android.widget.EditText index="0" package="io.cloudgrey.the_app" class="android.widget.EditText" text="alice" content-desc="username" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="false" long-clickable="true" password="false" scrollable="false" selected="false" bounds="[150,504][930,616]" displayed="true" />
-                  </android.view.ViewGroup>
-                  <android.view.ViewGroup index="2" package="io.cloudgrey.the_app" class="android.view.ViewGroup" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[150,616][930,736]" displayed="true">
-                    <android.widget.EditText index="0" package="io.cloudgrey.the_app" class="android.widget.EditText" text="•••••••••" content-desc="password" checkable="false" checked="false" clickable="true" enabled="true" focusable="true" focused="false" long-clickable="true" password="true" scrollable="false" selected="false" bounds="[150,624][930,736]" displayed="true" />
-                  </android.view.ViewGroup>
-                  <android.view.ViewGroup index="3" package="io.cloudgrey.the_app" class="android.view.ViewGroup" text="" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[456,736][624,849]" displayed="true">
-                    <android.view.ViewGroup index="0" package="io.cloudgrey.the_app" class="android.view.ViewGroup" text="" content-desc="loginBtn" checkable="false" checked="false" clickable="false" enabled="true" focusable="true" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[456,736][624,849]" displayed="true">
-                      <android.widget.TextView index="0" package="io.cloudgrey.the_app" class="android.widget.TextView" text="Login" checkable="false" checked="false" clickable="false" enabled="true" focusable="false" focused="false" long-clickable="false" password="false" scrollable="false" selected="false" bounds="[456,736][624,849]" displayed="true" />
-                    </android.view.ViewGroup>
-                  </android.view.ViewGroup>
-                </android.widget.FrameLayout>
-              </android.widget.RelativeLayout>
-            </android.widget.RelativeLayout>
-          </android.widget.FrameLayout>
-        </android.widget.LinearLayout>
-      </android.widget.FrameLayout>
-    </android.widget.LinearLayout>
-  </android.widget.FrameLayout>
-</hierarchy>

package/build/test/fixtures/index.js

@@ -1,25 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.XML_IOS_EDGE_TRANSFORMED = exports.XML_IOS_EDGE = exports.XML_ANDROID_TRANSFORMED_INDEX_PATH = exports.XML_IOS_TRANSFORMED_INDEX_PATH = exports.XML_ANDROID_TRANSFORMED = exports.XML_IOS_TRANSFORMED = exports.XML_ANDROID = exports.XML_IOS = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const XML_IOS = fs_1.default.readFileSync(path_1.default.resolve(__dirname, 'ios.xml'), 'utf8').trim();
-exports.XML_IOS = XML_IOS;
-const XML_IOS_TRANSFORMED = fs_1.default.readFileSync(path_1.default.resolve(__dirname, 'ios-transformed.xml'), 'utf8').trim();
-exports.XML_IOS_TRANSFORMED = XML_IOS_TRANSFORMED;
-const XML_IOS_TRANSFORMED_INDEX_PATH = fs_1.default.readFileSync(path_1.default.resolve(__dirname, 'ios-transformed-path.xml'), 'utf8').trim();
-exports.XML_IOS_TRANSFORMED_INDEX_PATH = XML_IOS_TRANSFORMED_INDEX_PATH;
-const XML_IOS_EDGE = fs_1.default.readFileSync(path_1.default.resolve(__dirname, 'ios-edge.xml'), 'utf8').trim();
-exports.XML_IOS_EDGE = XML_IOS_EDGE;
-const XML_IOS_EDGE_TRANSFORMED = fs_1.default.readFileSync(path_1.default.resolve(__dirname, 'ios-transformed-edge.xml'), 'utf8').trim();
-exports.XML_IOS_EDGE_TRANSFORMED = XML_IOS_EDGE_TRANSFORMED;
-const XML_ANDROID = fs_1.default.readFileSync(path_1.default.resolve(__dirname, 'android.xml'), 'utf8').trim();
-exports.XML_ANDROID = XML_ANDROID;
-const XML_ANDROID_TRANSFORMED = fs_1.default.readFileSync(path_1.default.resolve(__dirname, 'android-transformed.xml'), 'utf8').trim();
-exports.XML_ANDROID_TRANSFORMED = XML_ANDROID_TRANSFORMED;
-const XML_ANDROID_TRANSFORMED_INDEX_PATH = fs_1.default.readFileSync(path_1.default.resolve(__dirname, 'android-transformed-path.xml'), 'utf8').trim();
-exports.XML_ANDROID_TRANSFORMED_INDEX_PATH = XML_ANDROID_TRANSFORMED_INDEX_PATH;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi90ZXN0L2ZpeHR1cmVzL2luZGV4LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDRDQUFvQjtBQUNwQixnREFBd0I7QUFFeEIsTUFBTSxPQUFPLEdBQUcsWUFBRSxDQUFDLFlBQVksQ0FBQyxjQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxTQUFTLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQVMxRSwwQkFBTztBQVJoQixNQUFNLG1CQUFtQixHQUFHLFlBQUUsQ0FBQyxZQUFZLENBQUMsY0FBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUscUJBQXFCLENBQUMsRUFBRSxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztBQVE1RSxrREFBbUI7QUFQbEQsTUFBTSw4QkFBOEIsR0FBRyxZQUFFLENBQUMsWUFBWSxDQUFDLGNBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLDBCQUEwQixDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7QUFPOUMsd0VBQThCO0FBTjNHLE1BQU0sWUFBWSxHQUFHLFlBQUUsQ0FBQyxZQUFZLENBQUMsY0FBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7QUFPdkQsb0NBQVk7QUFObEQsTUFBTSx3QkFBd0IsR0FBRyxZQUFFLENBQUMsWUFBWSxDQUFDLGNBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLDBCQUEwQixDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7QUFNakUsNERBQXdCO0FBTDVFLE1BQU0sV0FBVyxHQUFHLFlBQUUsQ0FBQyxZQUFZLENBQUMsY0FBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsYUFBYSxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7QUFJekUsa0NBQVc7QUFIN0IsTUFBTSx1QkFBdUIsR0FBRyxZQUFFLENBQUMsWUFBWSxDQUFDLGNBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLHlCQUF5QixDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7QUFHL0QsMERBQXVCO0FBRjNFLE1BQU0sa0NBQWtDLEdBQUcsWUFBRSxDQUFDLFlBQVksQ0FBQyxjQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSw4QkFBOEIsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO0FBR2pJLGdGQUFrQyJ9

package/build/test/fixtures/ios-edge.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AppiumAUT>
-  <XCUIElementTypeApplication type="XCUIElementTypeApplication" name="TheApp" label="TheApp" enabled="true" visible="true" x="0" y="0" width="414" height="896" index="0">
-    <SomeRandoElement type="blah" oddAttribute="odd" />
-    <SomeRandoElement type="blah" oddAttribute="odd" />
-    <XCUIElementTypeOther type="XCUIElementTypeOther" name="username" label="username" enabled="true" visible="true" x="50" y="185" width="314" height="51" index="0">
-      <XCUIElementTypeTextField type="XCUIElementTypeTextField" value="alice" name="username" label="username" enabled="true" visible="true" x="50" y="185" width="314" height="51" index="0"/>
-      <XCUIElementTypeTab type="XCUIElementTypeTab" name="fakeTab" label="" enabled="" visible="true" x="50" y="185" width="314" height="51" index="1"/>
-      <XCUIElementTypeTab type="XCUIElementTypeTab" name="fakeTab" label="" enabled="" visible="true" x="50" y="185" width="314" height="51" index="2"/>
-      <XCUIElementTypeKey type="XCUIElementTypeKey" name="fakeKey" label="" enabled="" visible="true" x="50" y="185" width="314" height="51" index="3">
-        <XCUIElementTypeOther type="XCUIElementTypeOther" name="fakeOther" label="" enabled="" visible="true" x="1" y="2" width="3" height="4" index="0"/>
-      </XCUIElementTypeKey>
-      <XCUIElementTypeKey type="XCUIElementTypeKey" name="fakeKey" label="" enabled="" visible="true" x="50" y="185" width="314" height="51" index="4"/>
-    </XCUIElementTypeOther>
-  </XCUIElementTypeApplication>
-</AppiumAUT>

package/build/test/fixtures/ios-transformed-edge.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UI>
-  <App visible="true" x="0" y="0" width="414" height="896" axId="TheApp" text="TheApp">
-    <SomeRandoElement oddAttribute="odd"></SomeRandoElement>
-    <SomeRandoElement oddAttribute="odd"></SomeRandoElement>
-    <Element visible="true" x="50" y="185" width="314" height="51" axId="username" text="username">
-      <TextInput value="alice" visible="true" x="50" y="185" width="314" height="51" axId="username" text="username"></TextInput>
-      <Button visible="true" x="50" y="185" width="314" height="51" axId="fakeTab" text=""></Button>
-      <Button visible="true" x="50" y="185" width="314" height="51" axId="fakeTab" text=""></Button>
-      <Button visible="true" x="50" y="185" width="314" height="51" axId="fakeKey" text="">
-        <Element visible="true" x="1" y="2" width="3" height="4" axId="fakeOther" text=""></Element>
-      </Button>
-      <Button visible="true" x="50" y="185" width="314" height="51" axId="fakeKey" text=""></Button>
-    </Element>
-  </App>
-</UI>

package/build/test/fixtures/ios-transformed-path.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UI indexPath="/0">
-  <App visible="true" x="0" y="0" width="414" height="896" indexPath="/0/0" axId="TheApp" text="TheApp">
-    <Window visible="true" x="0" y="0" width="414" height="896" indexPath="/0/0/0">
-      <Element visible="true" x="0" y="0" width="414" height="896" indexPath="/0/0/0/0">
-        <Nav visible="true" x="0" y="48" width="414" height="44" indexPath="/0/0/0/0/0" axId="RCCView">
-          <Button visible="true" x="0" y="48" width="96" height="44" indexPath="/0/0/0/0/0/0" axId="The App" text="The App"></Button>
-        </Nav>
-        <Element visible="true" x="0" y="0" width="414" height="896" indexPath="/0/0/0/0/1">
-          <Element visible="true" x="0" y="0" width="414" height="896" indexPath="/0/0/0/0/1/0">
-            <Element visible="true" x="0" y="92" width="414" height="804" indexPath="/0/0/0/0/1/0/0">
-              <Element visible="true" x="0" y="92" width="414" height="804" indexPath="/0/0/0/0/1/0/0/0" axId="Login username password loginBtn" text="Login username password loginBtn">
-                <Element visible="true" x="0" y="92" width="414" height="804" indexPath="/0/0/0/0/1/0/0/0/0" axId="Login username password loginBtn" text="Login username password loginBtn">
-                  <Element visible="true" x="0" y="92" width="414" height="804" indexPath="/0/0/0/0/1/0/0/0/0/0" axId="Login username password loginBtn" text="Login username password loginBtn">
-                    <Element visible="true" x="0" y="92" width="414" height="273" indexPath="/0/0/0/0/1/0/0/0/0/0/0" axId="Login username password loginBtn" text="Login username password loginBtn">
-                      <Text value="Login" visible="true" x="157" y="132" width="101" height="51" indexPath="/0/0/0/0/1/0/0/0/0/0/0/0" axId="Login" text="Login"></Text>
-                      <Element visible="true" x="50" y="183" width="314" height="40" indexPath="/0/0/0/0/1/0/0/0/0/0/0/1" axId="username" text="username">
-                        <Element visible="true" x="50" y="183" width="314" height="40" indexPath="/0/0/0/0/1/0/0/0/0/0/0/1/0" axId="username" text="username">
-                          <Element visible="true" x="50" y="185" width="314" height="51" indexPath="/0/0/0/0/1/0/0/0/0/0/0/1/0/0" axId="username" text="username">
-                            <TextInput value="alice" visible="true" x="50" y="185" width="314" height="51" indexPath="/0/0/0/0/1/0/0/0/0/0/0/1/0/0/0" axId="username" text="username"></TextInput>
-                            <Button visible="true" x="50" y="185" width="314" height="51" indexPath="/0/0/0/0/1/0/0/0/0/0/0/1/0/0/1" axId="fakeTab" text=""></Button>
-                            <Button visible="true" x="50" y="185" width="314" height="51" indexPath="/0/0/0/0/1/0/0/0/0/0/0/1/0/0/2" axId="fakeKey" text=""></Button>
-                          </Element>
-                        </Element>
-                      </Element>
-                      <Element visible="true" x="50" y="223" width="314" height="40" indexPath="/0/0/0/0/1/0/0/0/0/0/0/2" axId="password" text="password">
-                        <Element visible="true" x="50" y="223" width="314" height="40" indexPath="/0/0/0/0/1/0/0/0/0/0/0/2/0" axId="password" text="password">
-                          <Element visible="true" x="50" y="225" width="314" height="51" indexPath="/0/0/0/0/1/0/0/0/0/0/0/2/0/0" axId="password" text="password">
-                            <TextInput value="•••••••••" visible="true" x="50" y="225" width="314" height="51" indexPath="/0/0/0/0/1/0/0/0/0/0/0/2/0/0/0" axId="password" text="password"></TextInput>
-                          </Element>
-                        </Element>
-                      </Element>
-                      <Element visible="true" x="177" y="263" width="60" height="102" indexPath="/0/0/0/0/1/0/0/0/0/0/0/3" axId="loginBtn" text="loginBtn">
-                        <Element visible="true" x="177" y="327" width="60" height="38" indexPath="/0/0/0/0/1/0/0/0/0/0/0/3/0" axId="loginBtn" text="loginBtn"></Element>
-                      </Element>
-                    </Element>
-                  </Element>
-                </Element>
-              </Element>
-            </Element>
-          </Element>
-        </Element>
-      </Element>
-    </Window>
-    <Window visible="false" x="0" y="0" width="414" height="896" indexPath="/0/0/1">
-      <Element visible="false" x="0" y="0" width="414" height="896" indexPath="/0/0/1/0">
-        <Element visible="false" x="0" y="0" width="414" height="896" indexPath="/0/0/1/0/0"></Element>
-        <Element visible="false" x="0" y="896" width="414" height="71" indexPath="/0/0/1/0/1">
-          <Element visible="false" x="0" y="896" width="414" height="71" indexPath="/0/0/1/0/1/0"></Element>
-        </Element>
-      </Element>
-    </Window>
-  </App>
-</UI>

package/build/test/fixtures/ios-transformed.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<UI>
-  <App visible="true" x="0" y="0" width="414" height="896" axId="TheApp" text="TheApp">
-    <Window visible="true" x="0" y="0" width="414" height="896">
-      <Element visible="true" x="0" y="0" width="414" height="896">
-        <Nav visible="true" x="0" y="48" width="414" height="44" axId="RCCView">
-          <Button visible="true" x="0" y="48" width="96" height="44" axId="The App" text="The App"></Button>
-        </Nav>
-        <Element visible="true" x="0" y="0" width="414" height="896">
-          <Element visible="true" x="0" y="0" width="414" height="896">
-            <Element visible="true" x="0" y="92" width="414" height="804">
-              <Element visible="true" x="0" y="92" width="414" height="804" axId="Login username password loginBtn" text="Login username password loginBtn">
-                <Element visible="true" x="0" y="92" width="414" height="804" axId="Login username password loginBtn" text="Login username password loginBtn">
-                  <Element visible="true" x="0" y="92" width="414" height="804" axId="Login username password loginBtn" text="Login username password loginBtn">
-                    <Element visible="true" x="0" y="92" width="414" height="273" axId="Login username password loginBtn" text="Login username password loginBtn">
-                      <Text value="Login" visible="true" x="157" y="132" width="101" height="51" axId="Login" text="Login"></Text>
-                      <Element visible="true" x="50" y="183" width="314" height="40" axId="username" text="username">
-                        <Element visible="true" x="50" y="183" width="314" height="40" axId="username" text="username">
-                          <Element visible="true" x="50" y="185" width="314" height="51" axId="username" text="username">
-                            <TextInput value="alice" visible="true" x="50" y="185" width="314" height="51" axId="username" text="username"></TextInput>
-                            <Button visible="true" x="50" y="185" width="314" height="51" axId="fakeTab" text=""></Button>
-                            <Button visible="true" x="50" y="185" width="314" height="51" axId="fakeKey" text=""></Button>
-                          </Element>
-                        </Element>
-                      </Element>
-                      <Element visible="true" x="50" y="223" width="314" height="40" axId="password" text="password">
-                        <Element visible="true" x="50" y="223" width="314" height="40" axId="password" text="password">
-                          <Element visible="true" x="50" y="225" width="314" height="51" axId="password" text="password">
-                            <TextInput value="•••••••••" visible="true" x="50" y="225" width="314" height="51" axId="password" text="password"></TextInput>
-                          </Element>
-                        </Element>
-                      </Element>
-                      <Element visible="true" x="177" y="263" width="60" height="102" axId="loginBtn" text="loginBtn">
-                        <Element visible="true" x="177" y="327" width="60" height="38" axId="loginBtn" text="loginBtn"></Element>
-                      </Element>
-                    </Element>
-                  </Element>
-                </Element>
-              </Element>
-            </Element>
-          </Element>
-        </Element>
-      </Element>
-    </Window>
-    <Window visible="false" x="0" y="0" width="414" height="896">
-      <Element visible="false" x="0" y="0" width="414" height="896">
-        <Element visible="false" x="0" y="0" width="414" height="896"></Element>
-        <Element visible="false" x="0" y="896" width="414" height="71">
-          <Element visible="false" x="0" y="896" width="414" height="71"></Element>
-        </Element>
-      </Element>
-    </Window>
-  </App>
-</UI>

package/build/test/fixtures/ios.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><AppiumAUT><XCUIElementTypeApplication type="XCUIElementTypeApplication" name="TheApp" label="TheApp" enabled="true" visible="true" x="0" y="0" width="414" height="896" index="0">
-  <XCUIElementTypeWindow type="XCUIElementTypeWindow" enabled="true" visible="true" x="0" y="0" width="414" height="896" index="0">
-    <XCUIElementTypeOther type="XCUIElementTypeOther" enabled="true" visible="true" x="0" y="0" width="414" height="896" index="0">
-      <XCUIElementTypeNavigationBar type="XCUIElementTypeNavigationBar" name="RCCView" enabled="true" visible="true" x="0" y="48" width="414" height="44" index="0">
-        <XCUIElementTypeButton type="XCUIElementTypeButton" name="The App" label="The App" enabled="true" visible="true" x="0" y="48" width="96" height="44" index="0"/>
-      </XCUIElementTypeNavigationBar>
-      <XCUIElementTypeOther type="XCUIElementTypeOther" enabled="true" visible="true" x="0" y="0" width="414" height="896" index="1">
-        <XCUIElementTypeOther type="XCUIElementTypeOther" enabled="true" visible="true" x="0" y="0" width="414" height="896" index="0">
-          <XCUIElementTypeOther type="XCUIElementTypeOther" enabled="true" visible="true" x="0" y="92" width="414" height="804" index="0">
-            <XCUIElementTypeOther type="XCUIElementTypeOther" name="Login username password loginBtn" label="Login username password loginBtn" enabled="true" visible="true" x="0" y="92" width="414" height="804" index="0">
-              <XCUIElementTypeOther type="XCUIElementTypeOther" name="Login username password loginBtn" label="Login username password loginBtn" enabled="true" visible="true" x="0" y="92" width="414" height="804" index="0">
-                <XCUIElementTypeOther type="XCUIElementTypeOther" name="Login username password loginBtn" label="Login username password loginBtn" enabled="true" visible="true" x="0" y="92" width="414" height="804" index="0">
-                  <XCUIElementTypeOther type="XCUIElementTypeOther" name="Login username password loginBtn" label="Login username password loginBtn" enabled="true" visible="true" x="0" y="92" width="414" height="273" index="0">
-                    <XCUIElementTypeStaticText type="XCUIElementTypeStaticText" value="Login" name="Login" label="Login" enabled="true" visible="true" x="157" y="132" width="101" height="51" index="0"/>
-                    <XCUIElementTypeOther type="XCUIElementTypeOther" name="username" label="username" enabled="true" visible="true" x="50" y="183" width="314" height="40" index="1">
-                      <XCUIElementTypeOther type="XCUIElementTypeOther" name="username" label="username" enabled="true" visible="true" x="50" y="183" width="314" height="40" index="0">
-                        <XCUIElementTypeOther type="XCUIElementTypeOther" name="username" label="username" enabled="true" visible="true" x="50" y="185" width="314" height="51" index="0">
-                          <XCUIElementTypeTextField type="XCUIElementTypeTextField" value="alice" name="username" label="username" enabled="true" visible="true" x="50" y="185" width="314" height="51" index="0"/>
-                          <XCUIElementTypeTab type="XCUIElementTypeTab" name="fakeTab" label="" enabled="" visible="true" x="50" y="185" width="314" height="51" index="1"/>
-                          <XCUIElementTypeKey type="XCUIElementTypeKey" name="fakeKey" label="" enabled="" visible="true" x="50" y="185" width="314" height="51" index="2"/>
-                        </XCUIElementTypeOther>
-                      </XCUIElementTypeOther>
-                    </XCUIElementTypeOther>
-                    <XCUIElementTypeOther type="XCUIElementTypeOther" name="password" label="password" enabled="true" visible="true" x="50" y="223" width="314" height="40" index="2">
-                      <XCUIElementTypeOther type="XCUIElementTypeOther" name="password" label="password" enabled="true" visible="true" x="50" y="223" width="314" height="40" index="0">
-                        <XCUIElementTypeOther type="XCUIElementTypeOther" name="password" label="password" enabled="true" visible="true" x="50" y="225" width="314" height="51" index="0">
-                          <XCUIElementTypeSecureTextField type="XCUIElementTypeSecureTextField" value="•••••••••" name="password" label="password" enabled="true" visible="true" x="50" y="225" width="314" height="51" index="0"/>
-                        </XCUIElementTypeOther>
-                      </XCUIElementTypeOther>
-                    </XCUIElementTypeOther>
-                    <XCUIElementTypeOther type="XCUIElementTypeOther" name="loginBtn" label="loginBtn" enabled="true" visible="true" x="177" y="263" width="60" height="102" index="3">
-                      <XCUIElementTypeOther type="XCUIElementTypeOther" name="loginBtn" label="loginBtn" enabled="true" visible="true" x="177" y="327" width="60" height="38" index="0"/>
-                    </XCUIElementTypeOther>
-                  </XCUIElementTypeOther>
-                </XCUIElementTypeOther>
-              </XCUIElementTypeOther>
-            </XCUIElementTypeOther>
-          </XCUIElementTypeOther>
-        </XCUIElementTypeOther>
-      </XCUIElementTypeOther>
-    </XCUIElementTypeOther>
-  </XCUIElementTypeWindow>
-  <XCUIElementTypeWindow type="XCUIElementTypeWindow" enabled="true" visible="false" x="0" y="0" width="414" height="896" index="1">
-    <XCUIElementTypeOther type="XCUIElementTypeOther" enabled="true" visible="false" x="0" y="0" width="414" height="896" index="0">
-      <XCUIElementTypeOther type="XCUIElementTypeOther" enabled="true" visible="false" x="0" y="0" width="414" height="896" index="0"/>
-      <XCUIElementTypeOther type="XCUIElementTypeOther" enabled="true" visible="false" x="0" y="896" width="414" height="71" index="1">
-        <XCUIElementTypeOther type="XCUIElementTypeOther" enabled="true" visible="false" x="0" y="896" width="414" height="71" index="0"/>
-      </XCUIElementTypeOther>
-    </XCUIElementTypeOther>
-  </XCUIElementTypeWindow>
-</XCUIElementTypeApplication></AppiumAUT>

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

@@ -1,59 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = __importDefault(require("chai"));
-const chai_as_promised_1 = __importDefault(require("chai-as-promised"));
-const index_1 = __importDefault(require("../../index"));
-const base_driver_1 = __importDefault(require("@appium/base-driver"));
-const fixtures_1 = require("../fixtures");
-const xpath_1 = require("../../lib/xpath");
-chai_1.default.use(chai_as_promised_1.default);
-chai_1.default.should();
-describe('UniversalXMLPlugin', function () {
-    let next;
-    const p = new index_1.default();
-    describe('getPageSource', function () {
-        const driver = new base_driver_1.default();
-        it('should transform page source for ios', async function () {
-            next = driver.getPageSource = () => fixtures_1.XML_IOS;
-            driver.caps = { platformName: 'iOS' };
-            await p.getPageSource(next, driver).should.eventually.eql(fixtures_1.XML_IOS_TRANSFORMED);
-        });
-        it('should transform page source for android', async function () {
-            next = driver.getPageSourcce = () => fixtures_1.XML_ANDROID;
-            driver.caps = { platformName: 'Android' };
-            driver.opts = { appPackage: 'io.cloudgrey.the_app' };
-            await p.getPageSource(next, driver).should.eventually.eql(fixtures_1.XML_ANDROID_TRANSFORMED);
-        });
-    });
-    describe('findElement(s)', function () {
-        const driver = new base_driver_1.default();
-        it('should turn an xpath query into another query run on the original ios source', async function () {
-            next = driver.getPageSource = () => fixtures_1.XML_IOS;
-            driver.caps = { platformName: 'iOS' };
-            // mock out the findElement function to just return an xml node from the fixture
-            driver.findElement = (strategy, selector) => {
-                const nodes = (0, xpath_1.runQuery)(selector, fixtures_1.XML_IOS.replace(/<\/?AppiumAUT>/, ''));
-                return nodes[0];
-            };
-            const node = await p.findElement(next, driver, 'xpath', '//TextInput[@axId="username"]');
-            (0, xpath_1.getNodeAttrVal)(node, 'value').should.eql('alice');
-            node.nodeName.should.eql('XCUIElementTypeTextField');
-        });
-        it('should turn an xpath query into another query run on the original android source', async function () {
-            next = driver.getPageSource = () => fixtures_1.XML_ANDROID;
-            driver.caps = { platformName: 'Android' };
-            driver.opts = { appPackage: 'io.cloudgrey.the_app' };
-            driver.findElement = (strategy, selector) => {
-                const nodes = (0, xpath_1.runQuery)(selector, fixtures_1.XML_ANDROID);
-                return nodes[0];
-            };
-            const node = await p.findElement(next, driver, 'xpath', '//TextInput[@axId="username"]');
-            (0, xpath_1.getNodeAttrVal)(node, 'content-desc').should.eql('username');
-            node.nodeName.should.eql('android.widget.EditText');
-        });
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLXNwZWNzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vdGVzdC91bml0L3BsdWdpbi1zcGVjcy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLGdEQUF3QjtBQUN4Qix3RUFBOEM7QUFDOUMsd0RBQTZDO0FBQzdDLHNFQUE2QztBQUM3QywwQ0FBaUc7QUFDakcsMkNBQTJEO0FBRTNELGNBQUksQ0FBQyxHQUFHLENBQUMsMEJBQWMsQ0FBQyxDQUFDO0FBQ3pCLGNBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztBQUVkLFFBQVEsQ0FBQyxvQkFBb0IsRUFBRTtJQUM3QixJQUFJLElBQUksQ0FBQztJQUNULE1BQU0sQ0FBQyxHQUFHLElBQUksZUFBa0IsRUFBRSxDQUFDO0lBQ25DLFFBQVEsQ0FBQyxlQUFlLEVBQUU7UUFDeEIsTUFBTSxNQUFNLEdBQUcsSUFBSSxxQkFBVSxFQUFFLENBQUM7UUFDaEMsRUFBRSxDQUFDLHNDQUFzQyxFQUFFLEtBQUs7WUFDOUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxhQUFhLEdBQUcsR0FBRyxFQUFFLENBQUMsa0JBQU8sQ0FBQztZQUM1QyxNQUFNLENBQUMsSUFBSSxHQUFHLEVBQUMsWUFBWSxFQUFFLEtBQUssRUFBQyxDQUFDO1lBQ3BDLE1BQU0sQ0FBQyxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsTUFBTSxDQUFDLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsOEJBQW1CLENBQUMsQ0FBQztRQUNqRixDQUFDLENBQUMsQ0FBQztRQUNILEVBQUUsQ0FBQywwQ0FBMEMsRUFBRSxLQUFLO1lBQ2xELElBQUksR0FBRyxNQUFNLENBQUMsY0FBYyxHQUFHLEdBQUcsRUFBRSxDQUFDLHNCQUFXLENBQUM7WUFDakQsTUFBTSxDQUFDLElBQUksR0FBRyxFQUFDLFlBQVksRUFBRSxTQUFTLEVBQUMsQ0FBQztZQUN4QyxNQUFNLENBQUMsSUFBSSxHQUFHLEVBQUMsVUFBVSxF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