@appium/universal-xml-plugin 1.0.10 → 1.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/build/lib/xpath.d.ts +9 -2
  2. package/build/lib/xpath.d.ts.map +1 -1
  3. package/build/lib/xpath.js +14 -0
  4. package/build/lib/xpath.js.map +1 -1
  5. package/lib/xpath.js +11 -0
  6. package/package.json +3 -3
package/build/lib/xpath.d.ts CHANGED
@@ -1,4 +1,11 @@
1
- export function runQuery(query: any, xmlStr: any): import("xpath").SelectedValue[];
2
- export function transformQuery(query: any, xmlStr: any, multiple: any): string | null;
1
+ export function runQuery(query: any, xmlStr: any): import("xpath").SelectReturnType;
2
+ /**
3
+ *
4
+ * @param {string} query
5
+ * @param {string} xmlStr
6
+ * @param {boolean} multiple
7
+ * @returns {string|null}
8
+ */
9
+ export function transformQuery(query: string, xmlStr: string, multiple: boolean): string | null;
3
10
  export function getNodeAttrVal(node: any, attr: any): any;
4
11
  //# sourceMappingURL=xpath.d.ts.map
package/build/lib/xpath.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"xpath.d.ts","sourceRoot":"","sources":["../../lib/xpath.js"],"names":[],"mappings":"AAGA,mFAIC;AAED,sFA6BC;AAED,0DAMC"}
1
+ {"version":3,"file":"xpath.d.ts","sourceRoot":"","sources":["../../lib/xpath.js"],"names":[],"mappings":"AAIA,oFAIC;AAED;;;;;;GAMG;AACH,sCALW,MAAM,UACN,MAAM,YACN,OAAO,GACL,MAAM,GAAC,IAAI,CAkCvB;AAED,0DAMC"}
package/build/lib/xpath.js CHANGED
@@ -1,16 +1,30 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.getNodeAttrVal = exports.transformQuery = exports.runQuery = void 0;
4
7
  const xpath_1 = require("xpath");
5
8
  const xmldom_1 = require("@xmldom/xmldom");
9
+ const lodash_1 = __importDefault(require("lodash"));
6
10
  function runQuery(query, xmlStr) {
7
11
  const dom = new xmldom_1.DOMParser().parseFromString(xmlStr);
8
12
  const nodes = (0, xpath_1.select)(query, dom);
9
13
  return nodes;
10
14
  }
11
15
  exports.runQuery = runQuery;
16
+ /**
17
+ *
18
+ * @param {string} query
19
+ * @param {string} xmlStr
20
+ * @param {boolean} multiple
21
+ * @returns {string|null}
22
+ */
12
23
  function transformQuery(query, xmlStr, multiple) {
13
24
  const nodes = runQuery(query, xmlStr);
25
+ if (!lodash_1.default.isArray(nodes)) {
26
+ return null;
27
+ }
14
28
  const newQueries = nodes.map((node) => {
15
29
  const indexPath = getNodeAttrVal(node, 'indexPath');
16
30
  // at this point indexPath will look like /0/0/1/1/0/1/0/2
package/build/lib/xpath.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"xpath.js","sourceRoot":"","sources":["../../lib/xpath.js"],"names":[],"mappings":";;;AAAA,iCAA2C;AAC3C,2CAAyC;AAEzC,SAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM;IACpC,MAAM,GAAG,GAAG,IAAI,kBAAS,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,IAAA,cAAU,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACrC,OAAO,KAAK,CAAC;AACf,CAAC;AAJD,4BAIC;AAED,SAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ;IACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAEtC,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACpC,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACpD,0DAA0D;QAC1D,IAAI,QAAQ,GAAG,SAAS;aACrB,SAAS,CAAC,CAAC,CAAC,CAAC,mCAAmC;aAChD,KAAK,CAAC,GAAG,CAAC,CAAC,qBAAqB;aAChC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChB,sCAAsC;YACtC,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;YAC9C,OAAO,KAAK,UAAU,GAAG,CAAC;QAC5B,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY;QAE1B,iFAAiF;QACjF,OAAO,IAAI,QAAQ,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,IAAI,WAAW,GAAG,IAAI,CAAC;IACvB,IAAI,UAAU,CAAC,MAAM,EAAE;QACrB,IAAI,QAAQ,EAAE;YACZ,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtC;aAAM;YACL,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;SAC7B;KACF;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AA7BD,wCA6BC;AAED,SAAgB,cAAc,CAAC,IAAI,EAAE,IAAI;IACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACnF,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,+BAA+B,CAAC,CAAC;KAC7F;IACD,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC3B,CAAC;AAND,wCAMC"}
1
+ {"version":3,"file":"xpath.js","sourceRoot":"","sources":["../../lib/xpath.js"],"names":[],"mappings":";;;;;;AAAA,iCAA2C;AAC3C,2CAAyC;AACzC,oDAAuB;AAEvB,SAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM;IACpC,MAAM,GAAG,GAAG,IAAI,kBAAS,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,KAAK,GAAG,IAAA,cAAU,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACrC,OAAO,KAAK,CAAC;AACf,CAAC;AAJD,4BAIC;AAED;;;;;;GAMG;AACH,SAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ;IACpD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACtC,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACrB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACpC,MAAM,SAAS,GAAG,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACpD,0DAA0D;QAC1D,IAAI,QAAQ,GAAG,SAAS;aACrB,SAAS,CAAC,CAAC,CAAC,CAAC,mCAAmC;aAChD,KAAK,CAAC,GAAG,CAAC,CAAC,qBAAqB;aAChC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChB,sCAAsC;YACtC,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;YAC9C,OAAO,KAAK,UAAU,GAAG,CAAC;QAC5B,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY;QAE1B,iFAAiF;QACjF,OAAO,IAAI,QAAQ,EAAE,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,IAAI,WAAW,GAAG,IAAI,CAAC;IACvB,IAAI,UAAU,CAAC,MAAM,EAAE;QACrB,IAAI,QAAQ,EAAE;YACZ,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtC;aAAM;YACL,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;SAC7B;KACF;IACD,OAAO,WAAW,CAAC;AACrB,CAAC;AAhCD,wCAgCC;AAED,SAAgB,cAAc,CAAC,IAAI,EAAE,IAAI;IACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACnF,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,+BAA+B,CAAC,CAAC;KAC7F;IACD,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC3B,CAAC;AAND,wCAMC"}
package/lib/xpath.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import {select as xpathQuery} from 'xpath';
2
2
  import {DOMParser} from '@xmldom/xmldom';
3
+ import _ from 'lodash';
3
4
 
4
5
  export function runQuery(query, xmlStr) {
5
6
  const dom = new DOMParser().parseFromString(xmlStr);
@@ -7,8 +8,18 @@ export function runQuery(query, xmlStr) {
7
8
  return nodes;
8
9
  }
9
10
 
11
+ /**
12
+ *
13
+ * @param {string} query
14
+ * @param {string} xmlStr
15
+ * @param {boolean} multiple
16
+ * @returns {string|null}
17
+ */
10
18
  export function transformQuery(query, xmlStr, multiple) {
11
19
  const nodes = runQuery(query, xmlStr);
20
+ if (!_.isArray(nodes)) {
21
+ return null;
22
+ }
12
23
 
13
24
  const newQueries = nodes.map((node) => {
14
25
  const indexPath = getNodeAttrVal(node, 'indexPath');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@appium/universal-xml-plugin",
3
- "version": "1.0.10",
3
+ "version": "1.0.11",
4
4
  "description": "Appium plugin for making XML source and XPath queries the same across iOS and Android",
5
5
  "keywords": [
6
6
  "automation",
@@ -41,7 +41,7 @@
41
41
  "fast-xml-parser": "4.2.7",
42
42
  "lodash": "4.17.21",
43
43
  "source-map-support": "0.5.21",
44
- "xpath": "0.0.32"
44
+ "xpath": "0.0.33"
45
45
  },
46
46
  "peerDependencies": {
47
47
  "appium": "^2.0.0-beta.35"
@@ -57,7 +57,7 @@
57
57
  "publishConfig": {
58
58
  "access": "public"
59
59
  },
60
- "gitHead": "d6204b6902074210943d7bbbf72d139b9b170a20",
60
+ "gitHead": "820428b76931e401c65455e72f6465da0d2c38c1",
61
61
  "typedoc": {
62
62
  "entryPoint": "./lib/index.js"
63
63
  }