From a722f48f143f8a8e3299847e62ecdda40e16c0e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 08:10:30 +0200 Subject: [PATCH] chore(deps): update definitelytyped (#20070) --- package-lock.json | 62 +++++++++---------- package.json | 6 +- packages/appium/lib/grid-register.js | 4 +- .../lib/jsonwp-proxy/protocol-converter.js | 16 +++-- packages/base-driver/package.json | 2 +- packages/driver-test-support/package.json | 2 +- packages/fake-driver/lib/commands/element.ts | 2 +- .../test/e2e/element-interaction-tests.js | 4 +- packages/support/lib/util.js | 7 ++- 9 files changed, 56 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index b7b6421d140..1ac7d2409f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,11 +14,11 @@ "devDependencies": { "@colors/colors": "1.6.0", "@tsconfig/node14": "14.1.2", - "@types/chai": "4.3.15", + "@types/chai": "4.3.16", "@types/chai-as-promised": "7.1.8", - "@types/diff": "5.2.0", + "@types/diff": "5.2.1", "@types/mocha": "10.0.6", - "@types/node": "20.12.8", + "@types/node": "20.12.11", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "@types/sinon-chai": "3.2.12", @@ -3474,9 +3474,9 @@ } }, "node_modules/@types/chai": { - "version": "4.3.15", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.15.tgz", - "integrity": "sha512-PYVSvyeZqy9++MoSegq88PxoPndWDDLGbJmE/OZnzUk3D4cCRTmA4N6EX3g0GgLVA+vtys7bj4luhkVCglGTkQ==", + "version": "4.3.16", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.16.tgz", + "integrity": "sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==", "dev": true }, "node_modules/@types/chai-as-promised": { @@ -3496,9 +3496,9 @@ } }, "node_modules/@types/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-pjJH+02ukgJRW0mViDUA1cdC+wzSgRu0e4cPuogPLAw0i66y62iMP0ZlXoJAmoXrKRZnF3pMDwyKZsgNVlMX4A==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.1.tgz", + "integrity": "sha512-uxpcuwWJGhe2AR1g8hD9F5OYGCqjqWnBUQFD8gMZsDbv8oPHzxJF6iMO6n8Tk0AdzlxoaaoQhOYlIg/PukVU8g==", "dev": true }, "node_modules/@types/eslint": { @@ -3610,9 +3610,9 @@ "integrity": "sha512-Q8oFIHJHr+htLrTXN2FuZfg+WXVHQRwU/hC2GpUu+Q8e3FUM9EDkS2pE3R2AO1ZGu56f479ybdMCNF1DAu8cAQ==" }, "node_modules/@types/lodash": { - "version": "4.17.0", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz", - "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==" + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz", + "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==" }, "node_modules/@types/method-override": { "version": "0.0.35", @@ -3656,9 +3656,9 @@ } }, "node_modules/@types/node": { - "version": "20.12.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.8.tgz", - "integrity": "sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==", + "version": "20.12.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.11.tgz", + "integrity": "sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==", "dependencies": { "undici-types": "~5.26.4" } @@ -21578,7 +21578,7 @@ "@types/async-lock": "1.4.2", "@types/bluebird": "3.5.42", "@types/express": "4.17.21", - "@types/lodash": "4.17.0", + "@types/lodash": "4.17.1", "@types/method-override": "0.0.35", "@types/serve-favicon": "2.5.7", "async-lock": "1.4.1", @@ -22009,7 +22009,7 @@ "license": "Apache-2.0", "dependencies": { "@appium/types": "^0.17.0", - "@types/lodash": "4.17.0", + "@types/lodash": "4.17.1", "@types/stoppable": "1.1.3", "axios": "1.6.8", "bluebird": "3.7.2", @@ -22842,7 +22842,7 @@ "@types/async-lock": "1.4.2", "@types/bluebird": "3.5.42", "@types/express": "4.17.21", - "@types/lodash": "4.17.0", + "@types/lodash": "4.17.1", "@types/method-override": "0.0.35", "@types/serve-favicon": "2.5.7", "async-lock": "1.4.1", @@ -23129,7 +23129,7 @@ "version": "file:packages/driver-test-support", "requires": { "@appium/types": "^0.17.0", - "@types/lodash": "4.17.0", + "@types/lodash": "4.17.1", "@types/stoppable": "1.1.3", "axios": "1.6.8", "bluebird": "3.7.2", @@ -25812,9 +25812,9 @@ } }, "@types/chai": { - "version": "4.3.15", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.15.tgz", - "integrity": "sha512-PYVSvyeZqy9++MoSegq88PxoPndWDDLGbJmE/OZnzUk3D4cCRTmA4N6EX3g0GgLVA+vtys7bj4luhkVCglGTkQ==", + "version": "4.3.16", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.16.tgz", + "integrity": "sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==", "dev": true }, "@types/chai-as-promised": { @@ -25833,9 +25833,9 @@ } }, "@types/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-pjJH+02ukgJRW0mViDUA1cdC+wzSgRu0e4cPuogPLAw0i66y62iMP0ZlXoJAmoXrKRZnF3pMDwyKZsgNVlMX4A==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@types/diff/-/diff-5.2.1.tgz", + "integrity": "sha512-uxpcuwWJGhe2AR1g8hD9F5OYGCqjqWnBUQFD8gMZsDbv8oPHzxJF6iMO6n8Tk0AdzlxoaaoQhOYlIg/PukVU8g==", "dev": true }, "@types/eslint": { @@ -25939,9 +25939,9 @@ "integrity": "sha512-Q8oFIHJHr+htLrTXN2FuZfg+WXVHQRwU/hC2GpUu+Q8e3FUM9EDkS2pE3R2AO1ZGu56f479ybdMCNF1DAu8cAQ==" }, "@types/lodash": { - "version": "4.17.0", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz", - "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==" + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.1.tgz", + "integrity": "sha512-X+2qazGS3jxLAIz5JDXDzglAF3KpijdhFxlf/V1+hEsOUc+HnWi81L/uv/EvGuV90WY+7mPGFCUDGfQC3Gj95Q==" }, "@types/method-override": { "version": "0.0.35", @@ -25982,9 +25982,9 @@ } }, "@types/node": { - "version": "20.12.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.8.tgz", - "integrity": "sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==", + "version": "20.12.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.11.tgz", + "integrity": "sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==", "requires": { "undici-types": "~5.26.4" } diff --git a/package.json b/package.json index c1c3d652183..090dde987e8 100644 --- a/package.json +++ b/package.json @@ -82,11 +82,11 @@ "devDependencies": { "@colors/colors": "1.6.0", "@tsconfig/node14": "14.1.2", - "@types/chai": "4.3.15", + "@types/chai": "4.3.16", "@types/chai-as-promised": "7.1.8", - "@types/diff": "5.2.0", + "@types/diff": "5.2.1", "@types/mocha": "10.0.6", - "@types/node": "20.12.8", + "@types/node": "20.12.11", "@types/semver": "7.5.8", "@types/sinon": "17.0.3", "@types/sinon-chai": "3.2.12", diff --git a/packages/appium/lib/grid-register.js b/packages/appium/lib/grid-register.js index ef6f55f716c..80e22ef6ff9 100644 --- a/packages/appium/lib/grid-register.js +++ b/packages/appium/lib/grid-register.js @@ -57,13 +57,13 @@ function postRequest(configHolder, addr, port, basePath) { // Move Selenium 3 configuration properties to configuration object if (!_.has(configHolder, 'configuration')) { let configuration = {}; - for (const property in configHolder) { + for (const property in /** @type {import('@appium/types').StringRecord} */ (configHolder)) { if (_.has(configHolder, property) && property !== 'capabilities') { configuration[property] = configHolder[property]; delete configHolder[property]; } } - configHolder.configuration = configuration; + /** @type {import('@appium/types').StringRecord} */ (configHolder).configuration = configuration; } // if the node config does not have the appium/webdriver url, host, and port, diff --git a/packages/base-driver/lib/jsonwp-proxy/protocol-converter.js b/packages/base-driver/lib/jsonwp-proxy/protocol-converter.js index 47d295c663f..9a9e1899ae7 100644 --- a/packages/base-driver/lib/jsonwp-proxy/protocol-converter.js +++ b/packages/base-driver/lib/jsonwp-proxy/protocol-converter.js @@ -134,10 +134,12 @@ class ProtocolConverter { const bodyObj = util.safeJsonParse(body); if (_.isPlainObject(bodyObj)) { if (this.downstreamProtocol === W3C && _.has(bodyObj, 'name') && !_.has(bodyObj, 'handle')) { - this.log.debug(`Copied 'name' value '${bodyObj.name}' to 'handle' as per W3C spec`); + this.log.debug( + `Copied 'name' value '${/** @type {import('@appium/types').StringRecord} */ (bodyObj).name}' to 'handle' as per W3C spec` + ); return await this.proxyFunc(url, method, { - ...bodyObj, - handle: bodyObj.name, + .../** @type {import('@appium/types').StringRecord} */ (bodyObj), + handle: /** @type {import('@appium/types').StringRecord} */ (bodyObj).name, }); } if ( @@ -145,10 +147,12 @@ class ProtocolConverter { _.has(bodyObj, 'handle') && !_.has(bodyObj, 'name') ) { - this.log.debug(`Copied 'handle' value '${bodyObj.handle}' to 'name' as per JSONWP spec`); + this.log.debug( + `Copied 'handle' value '${/** @type {import('@appium/types').StringRecord} */ (bodyObj).handle}' to 'name' as per JSONWP spec` + ); return await this.proxyFunc(url, method, { - ...bodyObj, - name: bodyObj.handle, + .../** @type {import('@appium/types').StringRecord} */ (bodyObj), + name: /** @type {import('@appium/types').StringRecord} */ (bodyObj).handle, }); } } diff --git a/packages/base-driver/package.json b/packages/base-driver/package.json index 24d1e59b9c1..7e6763e6d69 100644 --- a/packages/base-driver/package.json +++ b/packages/base-driver/package.json @@ -50,7 +50,7 @@ "@types/async-lock": "1.4.2", "@types/bluebird": "3.5.42", "@types/express": "4.17.21", - "@types/lodash": "4.17.0", + "@types/lodash": "4.17.1", "@types/method-override": "0.0.35", "@types/serve-favicon": "2.5.7", "async-lock": "1.4.1", diff --git a/packages/driver-test-support/package.json b/packages/driver-test-support/package.json index 7ab26cfc7ec..787b0f4d1e2 100644 --- a/packages/driver-test-support/package.json +++ b/packages/driver-test-support/package.json @@ -42,7 +42,7 @@ "types": "./build/lib/index.d.ts", "dependencies": { "@appium/types": "^0.17.0", - "@types/lodash": "4.17.0", + "@types/lodash": "4.17.1", "@types/stoppable": "1.1.3", "axios": "1.6.8", "bluebird": "3.7.2", diff --git a/packages/fake-driver/lib/commands/element.ts b/packages/fake-driver/lib/commands/element.ts index e2cfb3d30f2..8b670f97400 100644 --- a/packages/fake-driver/lib/commands/element.ts +++ b/packages/fake-driver/lib/commands/element.ts @@ -122,7 +122,7 @@ const ElementsMixin: FakeDriverElementsMixin = { async getCssProperty(this: FakeDriver, prop: string, elementId: string) { this.assertWebviewContext(); const el = this.getElement(elementId); - return el.getCss(prop); + return el.getCss(prop) ?? ''; }, async getLocation(this: FakeDriver, elementId: string) { diff --git a/packages/fake-driver/test/e2e/element-interaction-tests.js b/packages/fake-driver/test/e2e/element-interaction-tests.js index cb9155f295f..492fe184d90 100644 --- a/packages/fake-driver/test/e2e/element-interaction-tests.js +++ b/packages/fake-driver/test/e2e/element-interaction-tests.js @@ -102,9 +102,9 @@ function elementTests() { let {elementId} = await driver.$('body'); (await driver.getElementCSSValue(elementId, 'background-color')).should.equal('#000'); }); - it('should return null for an unspecified css property', async function () { + it('should return empty string for an unspecified css property', async function () { let {elementId} = await driver.$('body'); - should.equal(await driver.getElementCSSValue(elementId, 'font-size'), null); + should.equal(await driver.getElementCSSValue(elementId, 'font-size'), ''); }); }); } diff --git a/packages/support/lib/util.js b/packages/support/lib/util.js index 74748f1eaa4..1c155e2791f 100644 --- a/packages/support/lib/util.js +++ b/packages/support/lib/util.js @@ -122,8 +122,11 @@ function multiResolve(roots, ...args) { return roots.map((root) => path.resolve(root, ...args)); } -/* +/** * Parses an object if possible. Otherwise returns the object without parsing. + * + * @param {any} obj + * @returns {any} */ function safeJsonParse(obj) { try { @@ -178,7 +181,7 @@ function jsonStringify(obj, replacer = null, space = 2) { function unwrapElement(el) { for (const propName of [W3C_WEB_ELEMENT_IDENTIFIER, 'ELEMENT']) { if (_.has(el, propName)) { - return el[propName]; + return /** @type {string} */ (el[propName]); } } return /** @type {string} */(el);