@appium/support 4.1.5 → 4.1.7

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.
@@ -59,7 +59,7 @@ export type HttpUploadOptions = {
59
59
  /**
60
60
  * - The HTTP method used for file upload
61
61
  */
62
- method?: import("axios").Method | undefined;
62
+ method?: axios.Method | undefined;
63
63
  /**
64
64
  * - The actual request timeout in milliseconds; defaults to {@linkcode DEFAULT_TIMEOUT_MS }
65
65
  */
@@ -95,4 +95,5 @@ export function uploadFile(localPath: string, remoteUri: string, uploadOptions?:
95
95
  * @throws {Error} If download operation fails
96
96
  */
97
97
  export function downloadFile(remoteUrl: string, dstPath: string, downloadOptions?: (DownloadOptions & NetOptions) | undefined): Promise<void>;
98
+ import axios from 'axios';
98
99
  //# sourceMappingURL=net.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"net.d.ts","sourceRoot":"","sources":["../../lib/net.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAsTc,MAAM;;;;UACN,MAAM;;;;;;aAMN,KAAK;YACL,KAAK;aACL,KAAK;mBACL,KAAK;gBACL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAzJnB;;;;;;;;GAQG;AACH,sCALW,MAAM,aACN,MAAM,0FAEJ,QAAQ,IAAI,CAAC,CAyCzB;AAED;;;;;;;GAOG;AACH,wCALW,MAAM,WACN,MAAM,+EAkEhB"}
1
+ {"version":3,"file":"net.d.ts","sourceRoot":"","sources":["../../lib/net.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAsTc,MAAM;;;;UACN,MAAM;;;;;;aAMN,KAAK;YACL,KAAK;aACL,KAAK;mBACL,KAAK;gBACL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAzJnB;;;;;;;;GAQG;AACH,sCALW,MAAM,aACN,MAAM,0FAEJ,QAAQ,IAAI,CAAC,CAyCzB;AAED;;;;;;;GAOG;AACH,wCALW,MAAM,WACN,MAAM,+EAkEhB;kBAzRiB,OAAO"}
@@ -140,7 +140,19 @@ export function quote(args: string | string[]): string;
140
140
  * @return {string} Either the unleaked string or the original object converted to string
141
141
  */
142
142
  export function unleakString(s: any): string;
143
- export function jsonStringify(obj: any, replacer: any, space?: number): string;
143
+ /**
144
+ * Stringifies the object passed in, converting Buffers into Strings for better
145
+ * display. This mimics JSON.stringify (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify)
146
+ * except the `replacer` argument can only be a function.
147
+ *
148
+ * @param {any} obj - the object to be serialized
149
+ * @param {((key:any, value:any) => any)?} replacer - function to transform the properties added to the
150
+ * serialized object
151
+ * @param {number|string|undefined} space - used to insert white space into the output JSON
152
+ * string for readability purposes. Defaults to 2
153
+ * @returns {string} - the JSON object serialized as a string
154
+ */
155
+ export function jsonStringify(obj: any, replacer?: ((key: any, value: any) => any) | null, space?: number | string | undefined): string;
144
156
  /**
145
157
  * @typedef PluralizeOptions
146
158
  * @property {boolean} [inclusive=false] - Whether to prefix with the number (e.g., 3 ducks)
@@ -1 +1 @@
1
- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../lib/util.js"],"names":[],"mappings":"AA4BA;;;;GAIG;AACH,+EAEC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CA8hBY,CAAC,SAAS,EAAE,GAAG,KAAK,GAAG,CAAC;AA5hBrC;;;;;;;GAOG;AACH,2DAMC;AAGD,2CAEC;AAED,oEAsBC;AAED,+BAYC;AAMD,kDAoBC;AAED,8DAEC;AAKD,6CAOC;AAsDD;;;;GAIG;AACH,uCAHW,MAAM,GACJ,OAAO,eAAe,EAAE,OAAO,CAO3C;AA1BD;;;;;;GAMG;AACH,kCAHW,OAAO,eAAe,EAAE,OAAO,GAAC,MAAM,GACpC,MAAM,CASlB;AAsBD,4DAgBC;AAED;;;;;;;;GAQG;AACH,4CANW,MAAM,GAAC,MAAM,GACX,MAAM,CAkBlB;AAED;;;;;;;;;GASG;AACH,wCANW,MAAM,QACN,MAAM,eACL,OAAO,UACN,OAAO,CAanB;AAzPD,+EAAyE;AA2PzE;;;;;;;;GAQG;AACH,yCALW,MAAM,SACN,MAAM,YACH,MAAM,KACP,QAAQ,OAAO,CAAC,CAoB5B;AAuBD;;;;;;;;;;;;GAYG;AACH,sCAVW,MAAM,YAIN,MAAM,QAFN,MAAM,GAIJ,OAAO,CAenB;AA7CD;;;;;;;;;;GAUG;AACH,kEAPW,MAAM,6EAahB;AA8BD;;;;;;GAMG;AACH,4BAHW,MAAM,GAAC,MAAM,EAAE,GACb,MAAM,CAIlB;AAED;;;;;;;GAOG;AACH,sCAFY,MAAM,CAIjB;AA7ND,+EAsBC;AAyMD;;;GAGG;AAEH;;;;;;;;GAQG;AACH,gCANW,MAAM,SACN,MAAM,YACN,gBAAgB,GAAC,OAAO,GAEtB,MAAM,CAYlB;AAnXD,yBAAuB;AADvB,yBAAuB;AADvB,uBAAiB;AAuXjB;;;;;;;GAOG;AAEH;;;;;;;;;;GAUG;AACH,0CANW,MAAM,SACN,eAAe,GACb,QAAQ,MAAM,CAAC,CAmD3B;6BA9bM,MAAM;6BAAN,MAAM;6BAAN,MAAM;6BAAN,MAAM;oCAVN,aAAa;AA0cpB;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,8CALW,MAAM,SACN,eAAe;yBAcH,GAAG,EAAE;;EA0C3B;cA1hBa,UAAU"}
1
+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../lib/util.js"],"names":[],"mappings":"AA4BA;;;;GAIG;AACH,+EAEC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+CA0hBY,CAAC,SAAS,EAAE,GAAG,KAAK,GAAG,CAAC;AAxhBrC;;;;;;;GAOG;AACH,2DAMC;AAGD,2CAEC;AAED,oEAsBC;AAED,+BAUC;AAMD,kDAoBC;AAED,8DAEC;AAKD,6CAOC;AAoDD;;;;GAIG;AACH,uCAHW,MAAM,GACJ,OAAO,eAAe,EAAE,OAAO,CAO3C;AA1BD;;;;;;GAMG;AACH,kCAHW,OAAO,eAAe,EAAE,OAAO,GAAC,MAAM,GACpC,MAAM,CASlB;AAsBD,4DAgBC;AAED;;;;;;;;GAQG;AACH,4CANW,MAAM,GAAC,MAAM,GACX,MAAM,CAkBlB;AAED;;;;;;;;;GASG;AACH,wCANW,MAAM,QACN,MAAM,eACL,OAAO,UACN,OAAO,CAanB;AArPD,+EAAyE;AAuPzE;;;;;;;;GAQG;AACH,yCALW,MAAM,SACN,MAAM,YACH,MAAM,KACP,QAAQ,OAAO,CAAC,CAoB5B;AAuBD;;;;;;;;;;;;GAYG;AACH,sCAVW,MAAM,YAIN,MAAM,QAFN,MAAM,GAIJ,OAAO,CAenB;AA7CD;;;;;;;;;;GAUG;AACH,kEAPW,MAAM,6EAahB;AA8BD;;;;;;GAMG;AACH,4BAHW,MAAM,GAAC,MAAM,EAAE,GACb,MAAM,CAIlB;AAED;;;;;;;GAOG;AACH,sCAFY,MAAM,CAIjB;AAvOD;;;;;;;;;;;GAWG;AACH,mCAPW,GAAG,oBACG,GAAG,SAAQ,GAAG,KAAK,GAAG,kBAE5B,MAAM,GAAC,MAAM,GAAC,SAAS,GAErB,MAAM,CAsBlB;AAyMD;;;GAGG;AAEH;;;;;;;;GAQG;AACH,gCANW,MAAM,SACN,MAAM,YACN,gBAAgB,GAAC,OAAO,GAEtB,MAAM,CAYlB;AA/WD,yBAAuB;AADvB,yBAAuB;AADvB,uBAAiB;AAmXjB;;;;;;;GAOG;AAEH;;;;;;;;;;GAUG;AACH,0CANW,MAAM,SACN,eAAe,GACb,QAAQ,MAAM,CAAC,CAmD3B;6BA1bM,MAAM;6BAAN,MAAM;6BAAN,MAAM;6BAAN,MAAM;oCAVN,aAAa;AAscpB;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AACH,8CALW,MAAM,SACN,eAAe;yBAcH,GAAG,EAAE;;EA0C3B;cAthBa,UAAU"}
package/build/lib/util.js CHANGED
@@ -87,10 +87,8 @@ function localIp() {
87
87
  let ip = lodash_1.default.chain(os_1.default.networkInterfaces())
88
88
  .values()
89
89
  .flatten()
90
- // @ts-ignore
91
- .filter(function (val) {
92
- return val.family === 'IPv4' && val.internal === false;
93
- })
90
+ // @ts-ignore this filter works fine
91
+ .filter(({ family, internal }) => family === 'IPv4' && internal === false)
94
92
  .map('address')
95
93
  .first()
96
94
  .value();
@@ -138,30 +136,28 @@ function safeJsonParse(obj) {
138
136
  }
139
137
  }
140
138
  exports.safeJsonParse = safeJsonParse;
141
- /*
139
+ /**
142
140
  * Stringifies the object passed in, converting Buffers into Strings for better
143
141
  * display. This mimics JSON.stringify (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify)
144
142
  * except the `replacer` argument can only be a function.
145
143
  *
146
- * @param {object} obj - the object to be serialized
147
- * @param {?function} replacer - function to transform the properties added to the
144
+ * @param {any} obj - the object to be serialized
145
+ * @param {((key:any, value:any) => any)?} replacer - function to transform the properties added to the
148
146
  * serialized object
149
- * @param {?number|string} space - used to insert white space into the output JSON
147
+ * @param {number|string|undefined} space - used to insert white space into the output JSON
150
148
  * string for readability purposes. Defaults to 2
151
- * returns {string} - the JSON object serialized as a string
149
+ * @returns {string} - the JSON object serialized as a string
152
150
  */
153
- function jsonStringify(obj, replacer, space = 2) {
151
+ function jsonStringify(obj, replacer = null, space = 2) {
154
152
  // if no replacer is passed, or it is not a function, just use a pass-through
155
- if (!lodash_1.default.isFunction(replacer)) {
156
- replacer = (k, v) => v;
157
- }
153
+ const replacerFunc = lodash_1.default.isFunction(replacer) ? replacer : (k, v) => v;
158
154
  // Buffers cannot be serialized in a readable way
159
155
  const bufferToJSON = Buffer.prototype.toJSON;
160
156
  delete Buffer.prototype.toJSON;
161
157
  try {
162
158
  return JSON.stringify(obj, (key, value) => {
163
159
  const updatedValue = Buffer.isBuffer(value) ? value.toString('utf8') : value;
164
- return replacer(key, updatedValue);
160
+ return replacerFunc(key, updatedValue);
165
161
  }, space);
166
162
  }
167
163
  finally {
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/util.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/util.js"],"names":[],"mappings":"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"}
package/lib/util.js CHANGED
@@ -84,10 +84,8 @@ function localIp() {
84
84
  let ip = _.chain(os.networkInterfaces())
85
85
  .values()
86
86
  .flatten()
87
- // @ts-ignore
88
- .filter(function (val) {
89
- return val.family === 'IPv4' && val.internal === false;
90
- })
87
+ // @ts-ignore this filter works fine
88
+ .filter(({family, internal}) => family === 'IPv4' && internal === false)
91
89
  .map('address')
92
90
  .first()
93
91
  .value();
@@ -136,23 +134,21 @@ function safeJsonParse(obj) {
136
134
  }
137
135
  }
138
136
 
139
- /*
137
+ /**
140
138
  * Stringifies the object passed in, converting Buffers into Strings for better
141
139
  * display. This mimics JSON.stringify (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify)
142
140
  * except the `replacer` argument can only be a function.
143
141
  *
144
- * @param {object} obj - the object to be serialized
145
- * @param {?function} replacer - function to transform the properties added to the
142
+ * @param {any} obj - the object to be serialized
143
+ * @param {((key:any, value:any) => any)?} replacer - function to transform the properties added to the
146
144
  * serialized object
147
- * @param {?number|string} space - used to insert white space into the output JSON
145
+ * @param {number|string|undefined} space - used to insert white space into the output JSON
148
146
  * string for readability purposes. Defaults to 2
149
- * returns {string} - the JSON object serialized as a string
147
+ * @returns {string} - the JSON object serialized as a string
150
148
  */
151
- function jsonStringify(obj, replacer, space = 2) {
149
+ function jsonStringify(obj, replacer = null, space = 2) {
152
150
  // if no replacer is passed, or it is not a function, just use a pass-through
153
- if (!_.isFunction(replacer)) {
154
- replacer = (k, v) => v;
155
- }
151
+ const replacerFunc = _.isFunction(replacer) ? replacer : (k, v) => v;
156
152
 
157
153
  // Buffers cannot be serialized in a readable way
158
154
  const bufferToJSON = Buffer.prototype.toJSON;
@@ -162,7 +158,7 @@ function jsonStringify(obj, replacer, space = 2) {
162
158
  obj,
163
159
  (key, value) => {
164
160
  const updatedValue = Buffer.isBuffer(value) ? value.toString('utf8') : value;
165
- return replacer(key, updatedValue);
161
+ return replacerFunc(key, updatedValue);
166
162
  },
167
163
  space
168
164
  );
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@appium/support",
3
- "version": "4.1.5",
3
+ "version": "4.1.7",
4
4
  "description": "Support libs used across appium packages",
5
5
  "keywords": [
6
6
  "automation",
@@ -41,34 +41,34 @@
41
41
  "test:unit": "mocha \"./test/unit/**/*.spec.js\""
42
42
  },
43
43
  "dependencies": {
44
- "@appium/tsconfig": "^0.3.0",
45
- "@appium/types": "^0.13.3",
44
+ "@appium/tsconfig": "^0.3.2",
45
+ "@appium/types": "^0.14.0",
46
46
  "@colors/colors": "1.6.0",
47
- "@types/archiver": "5.3.2",
48
- "@types/base64-stream": "1.0.2",
47
+ "@types/archiver": "5.3.3",
48
+ "@types/base64-stream": "1.0.3",
49
49
  "@types/find-root": "1.1.2",
50
- "@types/jsftp": "2.1.2",
51
- "@types/klaw": "3.0.3",
50
+ "@types/jsftp": "2.1.3",
51
+ "@types/klaw": "3.0.4",
52
52
  "@types/lockfile": "1.0.2",
53
53
  "@types/mv": "2.1.2",
54
- "@types/ncp": "2.0.5",
54
+ "@types/ncp": "2.0.6",
55
55
  "@types/npmlog": "4.1.4",
56
- "@types/pluralize": "0.0.30",
57
- "@types/semver": "7.5.0",
58
- "@types/shell-quote": "1.7.1",
56
+ "@types/pluralize": "0.0.31",
57
+ "@types/semver": "7.5.3",
58
+ "@types/shell-quote": "1.7.2",
59
59
  "@types/supports-color": "8.1.1",
60
- "@types/teen_process": "2.0.0",
61
- "@types/uuid": "9.0.2",
60
+ "@types/teen_process": "2.0.1",
61
+ "@types/uuid": "9.0.5",
62
62
  "@types/which": "3.0.0",
63
- "archiver": "5.3.2",
64
- "axios": "1.4.0",
63
+ "archiver": "6.0.1",
64
+ "axios": "1.5.1",
65
65
  "base64-stream": "1.0.0",
66
66
  "bluebird": "3.7.2",
67
67
  "bplist-creator": "0.1.1",
68
68
  "bplist-parser": "0.3.2",
69
69
  "form-data": "4.0.0",
70
70
  "get-stream": "6.0.1",
71
- "glob": "10.3.3",
71
+ "glob": "10.3.10",
72
72
  "jsftp": "2.1.3",
73
73
  "klaw": "4.1.0",
74
74
  "lockfile": "1.0.4",
@@ -89,14 +89,14 @@
89
89
  "shell-quote": "1.8.1",
90
90
  "source-map-support": "0.5.21",
91
91
  "supports-color": "8.1.1",
92
- "teen_process": "2.0.4",
92
+ "teen_process": "2.0.50",
93
93
  "type-fest": "3.13.1",
94
- "uuid": "9.0.0",
95
- "which": "3.0.1",
94
+ "uuid": "9.0.1",
95
+ "which": "4.0.0",
96
96
  "yauzl": "2.10.0"
97
97
  },
98
98
  "optionalDependencies": {
99
- "sharp": "0.32.5"
99
+ "sharp": "0.32.6"
100
100
  },
101
101
  "engines": {
102
102
  "node": "^14.17.0 || ^16.13.0 || >=18.0.0",
@@ -105,7 +105,7 @@
105
105
  "publishConfig": {
106
106
  "access": "public"
107
107
  },
108
- "gitHead": "820428b76931e401c65455e72f6465da0d2c38c1",
108
+ "gitHead": "475198e36b49c820786142ff6e9f5e799926c99b",
109
109
  "typedoc": {
110
110
  "entryPoint": "./lib/index.js"
111
111
  }