appium-xcuitest-driver 3.56.3 → 3.57.0

package/build/lib/commands/source.js

@@ -9,8 +9,6 @@ exports.helpers = exports.default = exports.commands = void 0;
 
 require("source-map-support/register");
 
-var _lodash = _interopRequireDefault(require("lodash"));
-
 var _xmldom = _interopRequireDefault(require("@xmldom/xmldom"));
 
 var _js2xmlparser = _interopRequireDefault(require("js2xmlparser2"));
@@ -20,7 +18,9 @@ let commands = {},
     extensions = {};
 exports.helpers = helpers;
 exports.commands = commands;
-const APPIUM_SRC_XML = '<?xml version="1.0" encoding="UTF-8"?><AppiumAUT/>';
+const APPIUM_AUT_TAG = 'AppiumAUT';
+const APPIUM_SRC_XML = `<?xml version="1.0" encoding="UTF-8"?><${APPIUM_AUT_TAG}/>`;
+const APPIUM_TAG_PATTERN = new RegExp(`</?${APPIUM_AUT_TAG}/?>`);
 
 commands.getPageSource = async function getPageSource() {
   if (this.isWebContext()) {
@@ -39,7 +39,12 @@ commands.getPageSource = async function getPageSource() {
 };
 
 helpers.getNativePageSource = async function getNativePageSource() {
-  const srcTree = await this.proxyCommand('/source', 'GET');
+  const srcTree = await this.proxyCommand(`/source?scope=${APPIUM_AUT_TAG}`, 'GET');
+
+  if (APPIUM_TAG_PATTERN.test(srcTree)) {
+    return srcTree;
+  }
+
   const parser = new _xmldom.default.DOMParser();
   const tree = parser.parseFromString(srcTree);
   const doc = parser.parseFromString(APPIUM_SRC_XML);
@@ -48,12 +53,9 @@ helpers.getNativePageSource = async function getNativePageSource() {
 };
 
 helpers.mobileGetSource = async function mobileGetSource(opts = {}) {
-  if (!_lodash.default.isString(opts.format)) {
-    return await this.getNativePageSource();
-  }
-
   const paramsMap = {
-    format: opts.format
+    format: opts.format || 'xml',
+    scope: APPIUM_AUT_TAG
   };
 
   if (opts.excludedAttributes) {
@@ -126,4 +128,4 @@ var _default = extensions;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/commands/source.js"],"names":["commands","helpers","extensions","APPIUM_SRC_XML","getPageSource","isWebContext","script","executeAtom","settings","getSettings","useJSONSource","srcTree","mobileGetSource","format","getSourceXml","getTreeForXML","getNativePageSource","proxyCommand","parser","xmldom","DOMParser","tree","parseFromString","doc","documentElement","appendChild","XMLSerializer","serializeToString","opts","_","isString","paramsMap","excludedAttributes","excluded_attributes","query","Object","entries","map","k","v","encodeURIComponent","join","getTree","element","elementIndex","parentPath","curPath","rect","subtree","type","enabled","parseInt","isEnabled","visible","isVisible","x","y","width","height","name","label","value","i","children","length","push","jsonSource","wrapArray","elementName","declaration","include","prettyPrinting","indentString","assign"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AACA;;AAGA,IAAIA,QAAQ,GAAG,EAAf;AAAA,IAAmBC,OAAO,GAAG,EAA7B;AAAA,IAAiCC,UAAU,GAAG,EAA9C;;;AAEA,MAAMC,cAAc,GAAG,oDAAvB;;AAGAH,QAAQ,CAACI,aAAT,GAAyB,eAAeA,aAAf,GAAgC;AACvD,MAAI,KAAKC,YAAL,EAAJ,EAAyB;AACvB,UAAMC,MAAM,GAAG,2CAAf;AACA,WAAO,MAAM,KAAKC,WAAL,CAAiB,gBAAjB,EAAmC,CAACD,MAAD,EAAS,EAAT,CAAnC,CAAb;AACD;;AAED,MAAI,CAAC,MAAM,KAAKE,QAAL,CAAcC,WAAd,EAAP,EAAoCC,aAAxC,EAAuD;AACrD,UAAMC,OAAO,GAAG,MAAM,KAAKC,eAAL,CAAqB;AAACC,MAAAA,MAAM,EAAE;AAAT,KAArB,CAAtB;AACA,WAAOC,YAAY,CAACC,aAAa,CAACJ,OAAD,CAAd,CAAnB;AACD;;AACD,SAAO,MAAM,KAAKK,mBAAL,EAAb;AACD,CAXD;;AAaAf,OAAO,CAACe,mBAAR,GAA8B,eAAeA,mBAAf,GAAsC;AAClE,QAAML,OAAO,GAAG,MAAM,KAAKM,YAAL,CAAkB,SAAlB,EAA6B,KAA7B,CAAtB;AACA,QAAMC,MAAM,GAAG,IAAIC,gBAAOC,SAAX,EAAf;AACA,QAAMC,IAAI,GAAGH,MAAM,CAACI,eAAP,CAAuBX,OAAvB,CAAb;AACA,QAAMY,GAAG,GAAGL,MAAM,CAACI,eAAP,CAAuBnB,cAAvB,CAAZ;AACAoB,EAAAA,GAAG,CAACC,eAAJ,CAAoBC,WAApB,CAAgCJ,IAAI,CAACG,eAArC;AACA,SAAO,IAAIL,gBAAOO,aAAX,GAA2BC,iBAA3B,CAA6CJ,GAA7C,CAAP;AACD,CAPD;;AASAtB,OAAO,CAACW,eAAR,GAA0B,eAAeA,eAAf,CAAgCgB,IAAI,GAAG,EAAvC,EAA2C;AACnE,MAAI,CAACC,gBAAEC,QAAF,CAAWF,IAAI,CAACf,MAAhB,CAAL,EAA8B;AAC5B,WAAO,MAAM,KAAKG,mBAAL,EAAb;AACD;;AACD,QAAMe,SAAS,GAAG;AAChBlB,IAAAA,MAAM,EAAEe,IAAI,CAACf;AADG,GAAlB;;AAGA,MAAIe,IAAI,CAACI,kBAAT,EAA6B;AAC3BD,IAAAA,SAAS,CAACE,mBAAV,GAAgCL,IAAI,CAACI,kBAArC;AACD;;AACD,QAAME,KAAK,GAAGC,MAAM,CAACC,OAAP,CAAeL,SAAf,EACXM,GADW,CACP,CAAC,CAACC,CAAD,EAAIC,CAAJ,CAAD,KAAa,GAAEC,kBAAkB,CAACF,CAAD,CAAI,IAAGE,kBAAkB,CAACD,CAAD,CAAI,EADvD,EAEXE,IAFW,CAEN,GAFM,CAAd;AAGA,SAAO,MAAM,KAAKxB,YAAL,CAAmB,WAAUiB,KAAM,EAAnC,EAAsC,KAAtC,CAAb;AACD,CAdD;;AAsCA,SAASnB,aAAT,CAAwBJ,OAAxB,EAAiC;AAC/B,WAAS+B,OAAT,CAAkBC,OAAlB,EAA2BC,YAA3B,EAAyCC,UAAzC,EAAqD;AACnD,QAAIC,OAAO,GAAI,GAAED,UAAW,IAAGD,YAAa,EAA5C;AACA,QAAIG,IAAI,GAAGJ,OAAO,CAACI,IAAR,IAAgB,EAA3B;AACA,QAAIC,OAAO,GAAG;AACZ,WAAK;AACHC,QAAAA,IAAI,EAAG,kBAAiBN,OAAO,CAACM,IAAK,EADlC;AAEHC,QAAAA,OAAO,EAAEC,QAAQ,CAACR,OAAO,CAACS,SAAT,EAAoB,EAApB,CAAR,KAAoC,CAF1C;AAGHC,QAAAA,OAAO,EAAEF,QAAQ,CAACR,OAAO,CAACW,SAAT,EAAoB,EAApB,CAAR,KAAoC,CAH1C;AAIHC,QAAAA,CAAC,EAAER,IAAI,CAACQ,CAJL;AAKHC,QAAAA,CAAC,EAAET,IAAI,CAACS,CALL;AAMHC,QAAAA,KAAK,EAAEV,IAAI,CAACU,KANT;AAOHC,QAAAA,MAAM,EAAEX,IAAI,CAACW;AAPV,OADO;AAUZ,WAAK;AAVO,KAAd;;AAYA,QAAIf,OAAO,CAACgB,IAAR,KAAiB,IAArB,EAA2B;AACzBX,MAAAA,OAAO,CAAC,GAAD,CAAP,CAAaW,IAAb,GAAoBhB,OAAO,CAACgB,IAA5B;AACD;;AACD,QAAIhB,OAAO,CAACiB,KAAR,KAAkB,IAAtB,EAA4B;AAC1BZ,MAAAA,OAAO,CAAC,GAAD,CAAP,CAAaY,KAAb,GAAqBjB,OAAO,CAACiB,KAA7B;AACD;;AACD,QAAIjB,OAAO,CAACkB,KAAR,KAAkB,IAAtB,EAA4B;AAC1Bb,MAAAA,OAAO,CAAC,GAAD,CAAP,CAAaa,KAAb,GAAqBlB,OAAO,CAACkB,KAA7B;AACD;;AACD,SAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAG,CAACnB,OAAO,CAACoB,QAAR,IAAoB,EAArB,EAAyBC,MAA7C,EAAqDF,CAAC,EAAtD,EAA0D;AACxDd,MAAAA,OAAO,CAAC,GAAD,CAAP,CAAaiB,IAAb,CAAkBvB,OAAO,CAACC,OAAO,CAACoB,QAAR,CAAiBD,CAAjB,CAAD,EAAsBA,CAAtB,EAAyBhB,OAAzB,CAAzB;AACD;;AACD,WAAO;AACL,OAAE,kBAAiBH,OAAO,CAACM,IAAK,EAAhC,GAAoCD;AAD/B,KAAP;AAGD;;AACD,MAAI3B,IAAI,GAAGqB,OAAO,CAAC/B,OAAD,EAAU,CAAV,EAAa,EAAb,CAAlB;AACA,SAAOU,IAAP;AACD;;AAED,SAASP,YAAT,CAAuBoD,UAAvB,EAAmC;AACjC,SAAO,2BAAO,WAAP,EAAoBA,UAApB,EAAgC;AACrCC,IAAAA,SAAS,EAAE;AAACjB,MAAAA,OAAO,EAAE,KAAV;AAAiBkB,MAAAA,WAAW,EAAE;AAA9B,KAD0B;AAErCC,IAAAA,WAAW,EAAE;AAACC,MAAAA,OAAO,EAAE;AAAV,KAFwB;AAGrCC,IAAAA,cAAc,EAAE;AAACC,MAAAA,YAAY,EAAE;AAAf;AAHqB,GAAhC,CAAP;AAKD;;AAGDrC,MAAM,CAACsC,MAAP,CAAcvE,UAAd,EAA0BF,QAA1B,EAAoCC,OAApC;eAEeC,U","sourcesContent":["import _ from 'lodash';\nimport xmldom from '@xmldom/xmldom';\nimport js2xml from 'js2xmlparser2';\n\n\nlet commands = {}, helpers = {}, extensions = {};\n\nconst APPIUM_SRC_XML = '<?xml version=\"1.0\" encoding=\"UTF-8\"?><AppiumAUT/>';\n\n\ncommands.getPageSource = async function getPageSource () {\n  if (this.isWebContext()) {\n    const script = 'return document.documentElement.outerHTML';\n    return await this.executeAtom('execute_script', [script, []]);\n  }\n\n  if ((await this.settings.getSettings()).useJSONSource) {\n    const srcTree = await this.mobileGetSource({format: 'json'});\n    return getSourceXml(getTreeForXML(srcTree));\n  }\n  return await this.getNativePageSource();\n};\n\nhelpers.getNativePageSource = async function getNativePageSource () {\n  const srcTree = await this.proxyCommand('/source', 'GET');\n  const parser = new xmldom.DOMParser();\n  const tree = parser.parseFromString(srcTree);\n  const doc = parser.parseFromString(APPIUM_SRC_XML);\n  doc.documentElement.appendChild(tree.documentElement);\n  return new xmldom.XMLSerializer().serializeToString(doc);\n};\n\nhelpers.mobileGetSource = async function mobileGetSource (opts = {}) {\n  if (!_.isString(opts.format)) {\n    return await this.getNativePageSource();\n  }\n  const paramsMap = {\n    format: opts.format,\n  };\n  if (opts.excludedAttributes) {\n    paramsMap.excluded_attributes = opts.excludedAttributes;\n  }\n  const query = Object.entries(paramsMap)\n    .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)\n    .join('&');\n  return await this.proxyCommand(`/source?${query}`, 'GET');\n};\n\n/* Will get JSON of the form:\n *   { isEnabled: '1',\n *     isVisible: '1',\n *     frame: '{{0, 0}, {375, 667}}',\n *     children:\n *      [ { isEnabled: '1',\n *          isVisible: '1',\n *          frame: '{{0, 0}, {375, 667}}',\n *          children: [],\n *          rect: { x: 0, y: 0, width: 375, height: 667 },\n *          value: null,\n *          label: null,\n *          type: 'Other',\n *          name: null,\n *          rawIdentifier: null },\n *     rect: { origin: { x: 0, y: 0 }, size: { width: 375, height: 667 } },\n *     value: null,\n *     label: 'UICatalog',\n *     type: 'Application',\n *     name: 'UICatalog',\n *     rawIdentifier: null }\n */\nfunction getTreeForXML (srcTree) {\n  function getTree (element, elementIndex, parentPath) {\n    let curPath = `${parentPath}/${elementIndex}`;\n    let rect = element.rect || {};\n    let subtree = {\n      '@': {\n        type: `XCUIElementType${element.type}`,\n        enabled: parseInt(element.isEnabled, 10) === 1,\n        visible: parseInt(element.isVisible, 10) === 1,\n        x: rect.x,\n        y: rect.y,\n        width: rect.width,\n        height: rect.height,\n      },\n      '>': []\n    };\n    if (element.name !== null) {\n      subtree['@'].name = element.name;\n    }\n    if (element.label !== null) {\n      subtree['@'].label = element.label;\n    }\n    if (element.value !== null) {\n      subtree['@'].value = element.value;\n    }\n    for (let i = 0; i < (element.children || []).length; i++) {\n      subtree['>'].push(getTree(element.children[i], i, curPath));\n    }\n    return {\n      [`XCUIElementType${element.type}`]: subtree\n    };\n  }\n  let tree = getTree(srcTree, 0, '');\n  return tree;\n}\n\nfunction getSourceXml (jsonSource) {\n  return js2xml('AppiumAUT', jsonSource, {\n    wrapArray: {enabled: false, elementName: 'element'},\n    declaration: {include: true},\n    prettyPrinting: {indentString: '  '}\n  });\n}\n\n\nObject.assign(extensions, commands, helpers);\nexport { commands, helpers };\nexport default extensions;\n"],"file":"lib/commands/source.js","sourceRoot":"../../.."}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/commands/source.js"],"names":["commands","helpers","extensions","APPIUM_AUT_TAG","APPIUM_SRC_XML","APPIUM_TAG_PATTERN","RegExp","getPageSource","isWebContext","script","executeAtom","settings","getSettings","useJSONSource","srcTree","mobileGetSource","format","getSourceXml","getTreeForXML","getNativePageSource","proxyCommand","test","parser","xmldom","DOMParser","tree","parseFromString","doc","documentElement","appendChild","XMLSerializer","serializeToString","opts","paramsMap","scope","excludedAttributes","excluded_attributes","query","Object","entries","map","k","v","encodeURIComponent","join","getTree","element","elementIndex","parentPath","curPath","rect","subtree","type","enabled","parseInt","isEnabled","visible","isVisible","x","y","width","height","name","label","value","i","children","length","push","jsonSource","wrapArray","elementName","declaration","include","prettyPrinting","indentString","assign"],"mappings":"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","sourcesContent":["import xmldom from '@xmldom/xmldom';\nimport js2xml from 'js2xmlparser2';\n\n\nlet commands = {}, helpers = {}, extensions = {};\n\nconst APPIUM_AUT_TAG = 'AppiumAUT';\nconst APPIUM_SRC_XML = `<?xml version=\"1.0\" encoding=\"UTF-8\"?><${APPIUM_AUT_TAG}/>`;\nconst APPIUM_TAG_PATTERN = new RegExp(`</?${APPIUM_AUT_TAG}/?>`);\n\n\ncommands.getPageSource = async function getPageSource () {\n  if (this.isWebContext()) {\n    const script = 'return document.documentElement.outerHTML';\n    return await this.executeAtom('execute_script', [script, []]);\n  }\n\n  if ((await this.settings.getSettings()).useJSONSource) {\n    const srcTree = await this.mobileGetSource({format: 'json'});\n    return getSourceXml(getTreeForXML(srcTree));\n  }\n  return await this.getNativePageSource();\n};\n\nhelpers.getNativePageSource = async function getNativePageSource () {\n  const srcTree = await this.proxyCommand(`/source?scope=${APPIUM_AUT_TAG}`, 'GET');\n  if (APPIUM_TAG_PATTERN.test(srcTree)) {\n    return srcTree;\n  }\n  // This might only happen if the driver is using an older/cached WDA\n  // build (e.g. below 3.16.0)\n  // TODO: remove this block after a while\n  const parser = new xmldom.DOMParser();\n  const tree = parser.parseFromString(srcTree);\n  const doc = parser.parseFromString(APPIUM_SRC_XML);\n  doc.documentElement.appendChild(tree.documentElement);\n  return new xmldom.XMLSerializer().serializeToString(doc);\n};\n\nhelpers.mobileGetSource = async function mobileGetSource (opts = {}) {\n  const paramsMap = {\n    format: opts.format || 'xml',\n    scope: APPIUM_AUT_TAG,\n  };\n  if (opts.excludedAttributes) {\n    paramsMap.excluded_attributes = opts.excludedAttributes;\n  }\n  const query = Object.entries(paramsMap)\n    .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)\n    .join('&');\n  return await this.proxyCommand(`/source?${query}`, 'GET');\n};\n\n/* Will get JSON of the form:\n *   { isEnabled: '1',\n *     isVisible: '1',\n *     frame: '{{0, 0}, {375, 667}}',\n *     children:\n *      [ { isEnabled: '1',\n *          isVisible: '1',\n *          frame: '{{0, 0}, {375, 667}}',\n *          children: [],\n *          rect: { x: 0, y: 0, width: 375, height: 667 },\n *          value: null,\n *          label: null,\n *          type: 'Other',\n *          name: null,\n *          rawIdentifier: null },\n *     rect: { origin: { x: 0, y: 0 }, size: { width: 375, height: 667 } },\n *     value: null,\n *     label: 'UICatalog',\n *     type: 'Application',\n *     name: 'UICatalog',\n *     rawIdentifier: null }\n */\nfunction getTreeForXML (srcTree) {\n  function getTree (element, elementIndex, parentPath) {\n    let curPath = `${parentPath}/${elementIndex}`;\n    let rect = element.rect || {};\n    let subtree = {\n      '@': {\n        type: `XCUIElementType${element.type}`,\n        enabled: parseInt(element.isEnabled, 10) === 1,\n        visible: parseInt(element.isVisible, 10) === 1,\n        x: rect.x,\n        y: rect.y,\n        width: rect.width,\n        height: rect.height,\n      },\n      '>': []\n    };\n    if (element.name !== null) {\n      subtree['@'].name = element.name;\n    }\n    if (element.label !== null) {\n      subtree['@'].label = element.label;\n    }\n    if (element.value !== null) {\n      subtree['@'].value = element.value;\n    }\n    for (let i = 0; i < (element.children || []).length; i++) {\n      subtree['>'].push(getTree(element.children[i], i, curPath));\n    }\n    return {\n      [`XCUIElementType${element.type}`]: subtree\n    };\n  }\n  let tree = getTree(srcTree, 0, '');\n  return tree;\n}\n\nfunction getSourceXml (jsonSource) {\n  return js2xml('AppiumAUT', jsonSource, {\n    wrapArray: {enabled: false, elementName: 'element'},\n    declaration: {include: true},\n    prettyPrinting: {indentString: '  '}\n  });\n}\n\n\nObject.assign(extensions, commands, helpers);\nexport { commands, helpers };\nexport default extensions;\n"],"file":"lib/commands/source.js","sourceRoot":"../../.."}

package/lib/commands/source.js

@@ -1,11 +1,12 @@
-import _ from 'lodash';
 import xmldom from '@xmldom/xmldom';
 import js2xml from 'js2xmlparser2';
 
 
 let commands = {}, helpers = {}, extensions = {};
 
-const APPIUM_SRC_XML = '<?xml version="1.0" encoding="UTF-8"?><AppiumAUT/>';
+const APPIUM_AUT_TAG = 'AppiumAUT';
+const APPIUM_SRC_XML = `<?xml version="1.0" encoding="UTF-8"?><${APPIUM_AUT_TAG}/>`;
+const APPIUM_TAG_PATTERN = new RegExp(`</?${APPIUM_AUT_TAG}/?>`);
 
 
 commands.getPageSource = async function getPageSource () {
@@ -22,7 +23,13 @@ commands.getPageSource = async function getPageSource () {
 };
 
 helpers.getNativePageSource = async function getNativePageSource () {
-  const srcTree = await this.proxyCommand('/source', 'GET');
+  const srcTree = await this.proxyCommand(`/source?scope=${APPIUM_AUT_TAG}`, 'GET');
+  if (APPIUM_TAG_PATTERN.test(srcTree)) {
+    return srcTree;
+  }
+  // This might only happen if the driver is using an older/cached WDA
+  // build (e.g. below 3.16.0)
+  // TODO: remove this block after a while
   const parser = new xmldom.DOMParser();
   const tree = parser.parseFromString(srcTree);
   const doc = parser.parseFromString(APPIUM_SRC_XML);
@@ -31,11 +38,9 @@ helpers.getNativePageSource = async function getNativePageSource () {
 };
 
 helpers.mobileGetSource = async function mobileGetSource (opts = {}) {
-  if (!_.isString(opts.format)) {
-    return await this.getNativePageSource();
-  }
   const paramsMap = {
-    format: opts.format,
+    format: opts.format || 'xml',
+    scope: APPIUM_AUT_TAG,
   };
   if (opts.excludedAttributes) {
     paramsMap.excluded_attributes = opts.excludedAttributes;

package/package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "3.56.3",
+  "version": "3.57.0",
   "author": "appium",
   "license": "Apache-2.0",
   "repository": {
@@ -30,6 +30,31 @@
     "mainClass": "XCUITestDriver",
     "scripts": {
       "build-wda": "./build/lib/build-wda.js"
+    },
+    "schema": {
+      "$schema": "http://json-schema.org/draft-07/schema",
+      "type": "object",
+      "properties": {
+        "webdriveragent-port": {
+          "appiumCliDest": "wdaLocalPort",
+          "default": 8100,
+          "description": "Local port used for communication with WebDriverAgent",
+          "maximum": 65535,
+          "minimum": 1,
+          "type": "integer"
+        },
+        "webkit-debug-proxy-port": {
+          "appiumCliDest": "webkitDebugProxyPort",
+          "default": 27753,
+          "description": "(Real device only) Port to which `ios-webkit-debug-proxy` is connected",
+          "maximum": 65535,
+          "minimum": 1,
+          "type": "integer"
+        }
+      },
+      "additionalProperties": false,
+      "title": "XCUITest Driver Configuration",
+      "description": "Appium configuration schema for the XCUITest driver."
     }
   },
   "main": "./build/index.js",
@@ -54,7 +79,7 @@
     "appium-ios-simulator": "^3.28.0",
     "appium-remote-debugger": "^8.13.2",
     "appium-support": "^2.47.1",
-    "appium-webdriveragent": "^3.13.0",
+    "appium-webdriveragent": "^3.16.0",
     "appium-xcode": "^3.8.0",
     "async-lock": "^1.0.0",
     "asyncbox": "^2.3.1",