appium-xcuitest-driver 4.32.3 → 4.32.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [4.32.4](https://github.com/appium/appium-xcuitest-driver/compare/v4.32.3...v4.32.4) (2023-06-16)
+
+
+### Bug Fixes
+
+* **deps:** update dependency css-selector-parser to v2 ([#1759](https://github.com/appium/appium-xcuitest-driver/issues/1759)) ([0426349](https://github.com/appium/appium-xcuitest-driver/commit/0426349da313127111c19d4de44151ab45ecb64f))
+
 ## [4.32.3](https://github.com/appium/appium-xcuitest-driver/compare/v4.32.2...v4.32.3) (2023-06-16)
 
 

package/build/lib/css-converter.d.ts

@@ -1,79 +1,4 @@
 export default CssConverter;
-export type CssNameValueObject = {
-    /**
-     * The name of the CSS object
-     */
-    name?: string | undefined;
-    /**
-     * The value of the CSS object
-     */
-    value?: string | undefined;
-};
-export type CssAttr = {
-    name?: string | undefined;
-    /**
-     * Type of attribute (must be string or empty)
-     */
-    valueType?: string | undefined;
-    /**
-     * Value of the attribute
-     */
-    value?: string | undefined;
-    /**
-     * The operator between value and value type (=, *=, , ^=, $=)
-     */
-    operator?: string | undefined;
-};
-export type CssPseudo = {
-    /**
-     * The type of CSS pseudo selector (https://www.npmjs.com/package/css-selector-parser for reference)
-     */
-    valueType?: string | undefined;
-    /**
-     * The name of the pseudo selector
-     */
-    name?: string | undefined;
-    /**
-     * The value of the pseudo selector
-     */
-    value?: string | undefined;
-};
-export type CssRule = {
-    /**
-     * The nesting operator (aka: combinator https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors)
-     */
-    nestingOperator?: string | undefined;
-    /**
-     * The tag name (aka: type selector https://developer.mozilla.org/en-US/docs/Web/CSS/Type_selectors)
-     */
-    tagName?: string | undefined;
-    /**
-     * An array of CSS class names
-     */
-    classNames?: string[] | undefined;
-    /**
-     * An array of CSS attributes
-     */
-    attrs?: CssAttr[] | undefined;
-    /**
-     * An array of CSS pseudos
-     */
-    pseudos?: CssPseudo[] | undefined;
-    /**
-     * CSS identifier
-     */
-    id?: string | undefined;
-    /**
-     * A descendant of this CSS rule
-     */
-    rule?: CssRule | undefined;
-};
-export type CssObject = {
-    /**
-     * Type of CSS object. 'rule', 'ruleset' or 'selectors'
-     */
-    type?: string | undefined;
-};
 declare namespace CssConverter {
     /**
      * Convert a CSS selector to a iOS Class Chain selector

package/build/lib/css-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"css-converter.d.ts","sourceRoot":"","sources":["../../lib/css-converter.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAmSA;;;;OAIG;IACH,8DAYC"}
+{"version":3,"file":"css-converter.d.ts","sourceRoot":"","sources":["../../lib/css-converter.js"],"names":[],"mappings":";;IAoQA;;;;OAIG;IACH,8DAcC"}

package/build/lib/css-converter.js

@@ -6,12 +6,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const css_selector_parser_1 = require("css-selector-parser");
 const lodash_1 = __importDefault(require("lodash"));
 const driver_1 = require("appium/driver");
+const logger_js_1 = __importDefault(require("./logger.js"));
 const CssConverter = {};
-const parser = new css_selector_parser_1.CssSelectorParser();
-parser.registerSelectorPseudos('has');
-parser.registerNestingOperators('>', '+', '~');
-parser.registerAttrEqualityMods('^', '$', '*', '~');
-parser.enableSubstitutes();
+const parseCssSelector = (0, css_selector_parser_1.createParser)({
+    syntax: {
+        pseudoClasses: {
+            unknown: 'accept',
+            definitions: {
+                Selector: ['has'],
+            }
+        },
+        combinators: ['>', '+', '~'],
+        attributes: {
+            operators: ['^=', '$=', '*=', '~=', '=']
+        },
+        ids: true,
+        classNames: true,
+        tag: {
+            wildcard: true
+        },
+    },
+    substitutes: true
+});
 const BOOLEAN_ATTRS = [
     'visible', 'accessible', 'accessibility-container', 'enabled',
 ];
@@ -36,7 +52,7 @@ const ATTRIBUTE_ALIASES = [
 /**
  * Convert hyphen separated word to camel case
  *
- * @param {string} str
+ * @param {string?} str
  * @returns {string} The hyphen separated word translated to camel case
  */
 function toCamelCase(str) {
@@ -47,19 +63,16 @@ function toCamelCase(str) {
     const out = tokens.join('');
     return out.charAt(0).toLowerCase() + out.slice(1);
 }
-/**
- * @typedef {Object} CssNameValueObject
- * @property {string} [name] The name of the CSS object
- * @property {string} [value] The value of the CSS object
- */
 /**
  * Get the boolean from a CSS object. If empty, return true. If not true/false/empty, throw exception
  *
- * @param {CssNameValueObject} css A CSS object that has 'name' and 'value'
+ * @param {import('css-selector-parser').AstAttribute|import('css-selector-parser').AstPseudoClass} cssAttr
  * @returns {string} Either 'true' or 'false'. If value is empty, return 'true'
  */
-function requireBoolean(css) {
-    const val = css.value?.toLowerCase() || 'true'; // an omitted boolean attribute means 'true' (e.g.: input[checked] means checked is true)
+function requireBoolean(cssAttr) {
+    // @ts-ignore We only support strings
+    const attrValue = cssAttr.value?.value;
+    const val = lodash_1.default.toLower(attrValue) || 'true'; // an omitted boolean attribute means 'true' (e.g.: input[checked] means checked is true)
     switch (val) {
         case '0':
         case 'false':
@@ -68,7 +81,7 @@ function requireBoolean(css) {
         case 'true':
             return '1';
         default:
-            throw new TypeError(`'${css.name}' must be true, false or empty. Found '${css.value}'`);
+            throw new TypeError(`'${cssAttr.name}' must be true/1 or false/0 or empty. Found '${attrValue}'`);
     }
 }
 /**
@@ -77,43 +90,38 @@ function requireBoolean(css) {
  * Converts to lowercase and if an attribute name is an alias for something else, return
  * what it is an alias for
  *
- * @param {Object} css CSS object
+ * @param {import('css-selector-parser').AstAttribute|import('css-selector-parser').AstPseudoClass} cssEntity
  * @returns {string} The canonical attribute name
  */
-function requireAttributeName(css) {
-    const attrName = css.name.toLowerCase();
+function requireEntityName(cssEntity) {
+    const entityName = cssEntity.name.toLowerCase();
     // Check if it's supported and if it is, return it
-    if (ALL_ATTRS.includes(attrName)) {
-        return attrName.toLowerCase();
+    if (ALL_ATTRS.includes(entityName)) {
+        return entityName.toLowerCase();
     }
     // If attrName is an alias for something else, return that
     for (const [officialAttr, aliasAttrs] of ATTRIBUTE_ALIASES) {
-        if (aliasAttrs.includes(attrName)) {
+        if (aliasAttrs.includes(entityName)) {
             return officialAttr;
         }
     }
-    throw new Error(`'${attrName}' is not a valid attribute. ` +
-        `Supported attributes are '${ALL_ATTRS.join(', ')}'`);
+    throw new Error(`'${entityName}' is not a valid attribute. ` +
+        `Supported attributes are: '${ALL_ATTRS.join(', ')}'`);
 }
-/**
- * @typedef {Object} CssAttr
- * @property {string} [name]
- * @property {string} [valueType] Type of attribute (must be string or empty)
- * @property {string} [value] Value of the attribute
- * @property {string} [operator] The operator between value and value type (=, *=, , ^=, $=)
- */
 /**
  * Convert a CSS attribute into a UiSelector method call
  *
- * @param {CssAttr} cssAttr CSS attribute object
+ * @param {import('css-selector-parser').AstAttribute} cssAttr CSS attribute object
  * @returns {string|{index: string|undefined}} CSS attribute parsed as UiSelector
  */
 function parseAttr(cssAttr) {
-    if (cssAttr.valueType && cssAttr.valueType !== 'string') {
-        throw new TypeError(`'${cssAttr.name}=${cssAttr.value}' is an invalid attribute. ` +
-            `Only 'string' and empty attribute types are supported. Found '${cssAttr.valueType}'`);
+    // @ts-ignore We only care for strings
+    const attrValue = cssAttr.value?.value;
+    if (!lodash_1.default.isString(attrValue) && !lodash_1.default.isEmpty(attrValue)) {
+        throw new TypeError(`'${cssAttr.name}=${attrValue}' is an invalid attribute. ` +
+            `Only 'string' and empty attribute types are supported. Found '${attrValue}'`);
     }
-    const attrName = toCamelCase(requireAttributeName(cssAttr));
+    const attrName = toCamelCase(requireEntityName(cssAttr));
     // Validate that it's a supported attribute
     if (!STR_ATTRS.includes(attrName) && !BOOLEAN_ATTRS.includes(attrName)) {
         throw new Error(`'${attrName}' is not supported. Supported attributes are ` +
@@ -121,12 +129,12 @@ function parseAttr(cssAttr) {
     }
     // Parse index if it's an index attribute
     if (attrName === 'index') {
-        return { index: cssAttr.value };
+        return { index: attrValue };
     }
     if (BOOLEAN_ATTRS.includes(attrName)) {
         return `${attrName} == ${requireBoolean(cssAttr)}`;
     }
-    let value = cssAttr.value || '';
+    let value = attrValue || '';
     if (value === '') {
         return `[${attrName} LIKE ${value}]`;
     }
@@ -147,49 +155,34 @@ function parseAttr(cssAttr) {
                 ` '=', '*=', '^=', '$=' and '~=' are supported.`);
     }
 }
-/**
- * @typedef {Object} CssPseudo
- * @property {string} [valueType] The type of CSS pseudo selector (https://www.npmjs.com/package/css-selector-parser for reference)
- * @property {string} [name] The name of the pseudo selector
- * @property {string} [value] The value of the pseudo selector
- */
 /**
  * Convert a CSS pseudo class to a UiSelector
  *
- * @param {CssPseudo} cssPseudo CSS Pseudo class
+ * @param {import('css-selector-parser').AstPseudoClass} cssPseudo
  * @returns {string|{index: string|undefined}|undefined} Pseudo selector parsed as UiSelector
  */
 function parsePseudo(cssPseudo) {
-    if (cssPseudo.valueType && cssPseudo.valueType !== 'string') {
-        throw new Error(`'${cssPseudo.name}=${cssPseudo.value}'. ` +
-            `Unsupported css pseudo class value type: '${cssPseudo.valueType}'. Only 'string' type or empty is supported.`);
+    // @ts-ignore We only care for strings
+    const argValue = cssPseudo.argument?.value;
+    if (!lodash_1.default.isString(argValue) && !lodash_1.default.isEmpty(argValue)) {
+        throw new TypeError(`'${cssPseudo.name}=${argValue}'. ` +
+            `Unsupported css pseudo class value: '${argValue}'. Only 'string' type or empty is supported.`);
     }
-    const pseudoName = requireAttributeName(cssPseudo);
+    const pseudoName = requireEntityName(cssPseudo);
     if (BOOLEAN_ATTRS.includes(pseudoName)) {
         return `${toCamelCase(pseudoName)} == ${requireBoolean(cssPseudo)}`;
     }
     if (pseudoName === 'index') {
-        return { index: cssPseudo.value };
+        return { index: argValue };
     }
 }
-/**
- * @typedef {Object} CssRule
- * @property {string} [nestingOperator] The nesting operator (aka: combinator https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors)
- * @property {string} [tagName] The tag name (aka: type selector https://developer.mozilla.org/en-US/docs/Web/CSS/Type_selectors)
- * @property {string[]} [classNames] An array of CSS class names
- * @property {CssAttr[]} [attrs] An array of CSS attributes
- * @property {CssPseudo[]} [pseudos] An array of CSS pseudos
- * @property {string} [id] CSS identifier
- * @property {CssRule} [rule] A descendant of this CSS rule
- */
 /**
  * Convert a CSS rule to a UiSelector
- * @param {CssRule} cssRule CSS rule definition
+ * @param {import('css-selector-parser').AstRule} cssRule CSS rule definition
  */
 function parseCssRule(cssRule) {
-    const { nestingOperator } = cssRule;
-    if (nestingOperator && nestingOperator !== ' ' && nestingOperator !== '>') {
-        throw new Error(`'${nestingOperator}' is not a supported combinator. ` +
+    if (cssRule.combinator && ![' ', '>'].includes(cssRule.combinator)) {
+        throw new Error(`'${cssRule.combinator}' is not a supported combinator. ` +
             `Only child combinator (>) and descendant combinator are supported.`);
     }
     let iosClassChainSelector = '';
@@ -198,67 +191,47 @@ function parseCssRule(cssRule) {
       is not a valid ios class. Must be a single string (e.g.: XCUIElementTypeWindow) without
       dots separating them`);
     }
-    if (cssRule.tagName && cssRule.tagName !== '*' && !cssRule.tagName.toLowerCase().startsWith('xcuielementtype')) {
-        const capitalizedTagName = cssRule.tagName.charAt(0).toUpperCase() + cssRule.tagName.slice(1);
-        cssRule.tagName = `XCUIElementType${capitalizedTagName}`;
+    // @ts-ignore name presense
+    let tagName = cssRule.tag?.name ?? '';
+    if (tagName && tagName !== '*' && !lodash_1.default.startsWith(lodash_1.default.toLower(tagName), 'xcuielementtype')) {
+        const capitalizedTagName = tagName.charAt(0).toUpperCase() + tagName.slice(1);
+        tagName = `XCUIElementType${capitalizedTagName}`;
     }
-    iosClassChainSelector += (cssRule.tagName || '*');
-    let attrs = [];
-    if (cssRule.id) {
-        attrs.push(`name == "${cssRule.id}"`);
+    iosClassChainSelector += (tagName || '*');
+    const attrs = [];
+    if (cssRule.ids && !lodash_1.default.isEmpty(cssRule.ids)) {
+        attrs.push(`name == "${cssRule.ids[0]}"`);
     }
-    if (cssRule.attrs) {
-        for (const attr of cssRule.attrs) {
-            attrs.push(parseAttr(attr));
-        }
+    for (const attr of cssRule.attributes ?? []) {
+        attrs.push(parseAttr(attr));
     }
-    if (cssRule.pseudos) {
-        for (const pseudo of cssRule.pseudos) {
-            attrs.push(parsePseudo(pseudo));
-        }
+    for (const pseudo of cssRule.pseudoClasses ?? []) {
+        attrs.push(parsePseudo(pseudo));
     }
     const nonIndexAttrs = attrs.filter((attr) => lodash_1.default.isString(attr));
-    if (nonIndexAttrs && nonIndexAttrs.length > 0) {
+    if (!lodash_1.default.isEmpty(nonIndexAttrs)) {
         iosClassChainSelector += `[\`${nonIndexAttrs.join(' AND ')}\`]`;
     }
     const indexAttr = attrs.find((attr) => lodash_1.default.isObject(attr) && attr.index);
     if (indexAttr) {
         iosClassChainSelector += `[${ /** @type { {index: string} } */(indexAttr).index}]`;
     }
-    if (cssRule.rule) {
-        iosClassChainSelector += `/${parseCssRule(cssRule.rule)}`;
-    }
-    if (cssRule.nestingOperator === '>') {
-        return iosClassChainSelector;
-    }
-    else {
-        return `**/` + iosClassChainSelector;
+    if (cssRule.nestedRule) {
+        iosClassChainSelector += `/${parseCssRule(cssRule.nestedRule)}`;
     }
+    return cssRule.combinator === '>' ? iosClassChainSelector : `**/${iosClassChainSelector}`;
 }
-/**
- * @typedef {Object} CssObject
- * @property {string} [type] Type of CSS object. 'rule', 'ruleset' or 'selectors'
- */
 /**
  * Convert CSS object to iOS Class Chain selector
- * @param {CssObject} css CSS object
+ *
+ * @param {import('css-selector-parser').AstSelector} css CSS object
  * @returns {string} The CSS object parsed as a UiSelector
  */
 function parseCssObject(css) {
-    switch (css.type) {
-        case 'rule':
-            // @ts-expect-error this is extremely broken
-            return parseCssRule(css);
-        case 'ruleSet':
-            // @ts-expect-error this is extremely broken
-            return parseCssObject(css.rule);
-        case 'selectors':
-            // @ts-expect-error this is extremely broken
-            return css.selectors.map((selector) => parseCssObject(selector)).join('; ');
-        default:
-            // This is never reachable, but if it ever is do this.
-            throw new Error(`iOS Class Chain does not support '${css.type}' css. Only supports 'rule', 'ruleSet', 'selectors'`);
+    if (!lodash_1.default.isEmpty(css.rules)) {
+        return parseCssRule(css.rules[0]);
     }
+    throw new Error('No rules could be parsed out of the current selector');
 }
 /**
  * Convert a CSS selector to a iOS Class Chain selector
@@ -268,15 +241,17 @@ function parseCssObject(css) {
 CssConverter.toIosClassChainSelector = function toIosClassChainSelector(cssSelector) {
     let cssObj;
     try {
-        cssObj = parser.parse(cssSelector);
+        cssObj = parseCssSelector(cssSelector);
     }
     catch (e) {
+        logger_js_1.default.debug(e.stack);
         throw new driver_1.errors.InvalidSelectorError(`Invalid CSS selector '${cssSelector}'. Reason: '${e.message}'`);
     }
     try {
         return parseCssObject(cssObj);
     }
     catch (e) {
+        logger_js_1.default.debug(e.stack);
         throw new driver_1.errors.InvalidSelectorError(`Unsupported CSS selector '${cssSelector}'. Reason: '${e.message}'`);
     }
 };

package/build/lib/css-converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"css-converter.js","sourceRoot":"","sources":["../../lib/css-converter.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"css-converter.js","sourceRoot":"","sources":["../../lib/css-converter.js"],"names":[],"mappings":";;;;;AAAA,6DAAmD;AACnD,oDAAuB;AACvB,0CAAuC;AACvC,4DAA8B;AAE9B,MAAM,YAAY,GAAG,EAAE,CAAC;AAExB,MAAM,gBAAgB,GAAG,IAAA,kCAAY,EAAC;IACpC,MAAM,EAAE;QACN,aAAa,EAAE;YACb,OAAO,EAAE,QAAQ;YACjB,WAAW,EAAE;gBACX,QAAQ,EAAE,CAAC,KAAK,CAAC;aAClB;SACF;QACD,WAAW,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QAC5B,UAAU,EAAE;YACV,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC;SACzC;QACD,GAAG,EAAE,IAAI;QACT,UAAU,EAAE,IAAI;QAChB,GAAG,EAAE;YACH,QAAQ,EAAE,IAAI;SACf;KACF;IACD,WAAW,EAAE,IAAI;CAClB,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG;IACpB,SAAS,EAAE,YAAY,EAAE,yBAAyB,EAAE,SAAS;CAC9D,CAAC;AAEF,MAAM,aAAa,GAAG;IACpB,OAAO;CACR,CAAC;AAEF,MAAM,SAAS,GAAG;IAChB,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CACjC,CAAC;AAEF,MAAM,SAAS,GAAG;IAChB,GAAG,aAAa;IAChB,GAAG,aAAa;IAChB,GAAG,SAAS;CACb,CAAC;AAEF;;GAEG;AACH,MAAM,iBAAiB,GAAG;IACxB,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,CAAC;CACzB,CAAC;AAEF;;;;;GAKG;AACH,SAAS,WAAW,CAAE,GAAG;IACvB,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,EAAE,CAAC;KACX;IACD,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IACrG,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5B,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAE,OAAO;IAC9B,qCAAqC;IACrC,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;IACvC,MAAM,GAAG,GAAG,gBAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,CAAC,yFAAyF;IACrI,QAAQ,GAAG,EAAE;QACX,KAAK,GAAG,CAAC;QACT,KAAK,OAAO;YACV,OAAO,GAAG,CAAC;QACb,KAAK,GAAG,CAAC;QACT,KAAK,MAAM;YACT,OAAO,GAAG,CAAC;QACb;YACE,MAAM,IAAI,SAAS,CAAC,IAAI,OAAO,CAAC,IAAI,gDAAgD,SAAS,GAAG,CAAC,CAAC;KACrG;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,iBAAiB,CAAE,SAAS;IACnC,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAEhD,kDAAkD;IAClD,IAAI,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAClC,OAAO,UAAU,CAAC,WAAW,EAAE,CAAC;KACjC;IAED,0DAA0D;IAC1D,KAAK,MAAM,CAAC,YAAY,EAAE,UAAU,CAAC,IAAI,iBAAiB,EAAE;QAC1D,IAAI,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YACnC,OAAO,YAAY,CAAC;SACrB;KACF;IACD,MAAM,IAAI,KAAK,CAAC,IAAI,UAAU,8BAA8B;QAC1D,8BAA8B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;GAKG;AACH,SAAS,SAAS,CAAE,OAAO;IACzB,sCAAsC;IACtC,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;IACvC,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACnD,MAAM,IAAI,SAAS,CAAC,IAAI,OAAO,CAAC,IAAI,IAAI,SAAS,6BAA6B;YAC5E,iEAAiE,SAAS,GAAG,CAAC,CAAC;KAClF;IACD,MAAM,QAAQ,GAAG,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC;IAEzD,2CAA2C;IAC3C,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACtE,MAAM,IAAI,KAAK,CAAC,IAAI,QAAQ,+CAA+C;YACzE,IAAI,CAAC,GAAG,SAAS,EAAE,GAAG,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACvD;IAED,yCAAyC;IACzC,IAAI,QAAQ,KAAK,OAAO,EAAE;QACxB,OAAO,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC;KAC3B;IACD,IAAI,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;QACpC,OAAO,GAAG,QAAQ,OAAO,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;KACpD;IAED,IAAI,KAAK,GAAG,SAAS,IAAI,EAAE,CAAC;IAC5B,IAAI,KAAK,KAAK,EAAE,EAAE;QAChB,OAAO,IAAI,QAAQ,SAAS,KAAK,GAAG,CAAC;KACtC;IAED,QAAQ,OAAO,CAAC,QAAQ,EAAE;QACxB,KAAK,GAAG;YACN,OAAO,GAAG,QAAQ,QAAQ,KAAK,GAAG,CAAC;QACrC,KAAK,IAAI;YACP,OAAO,GAAG,QAAQ,aAAa,gBAAC,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC;QAC1D,KAAK,IAAI;YACP,OAAO,GAAG,QAAQ,gBAAgB,KAAK,GAAG,CAAC;QAC7C,KAAK,IAAI;YACP,OAAO,GAAG,QAAQ,cAAc,KAAK,GAAG,CAAC;QAC3C,KAAK,IAAI;YACP,OAAO,GAAG,QAAQ,cAAc,KAAK,GAAG,CAAC;QAC3C;YACE,sEAAsE;YACtE,MAAM,IAAI,KAAK,CAAC,uCAAuC,OAAO,CAAC,QAAQ,KAAK;gBAC1E,gDAAgD,CAAC,CAAC;KACvD;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,WAAW,CAAE,SAAS;IAC7B,sCAAsC;IACtC,MAAM,QAAQ,GAAG,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC;IAC3C,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;QACjD,MAAM,IAAI,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,IAAI,QAAQ,KAAK;YACrD,wCAAwC,QAAQ,8CAA8C,CAAC,CAAC;KACnG;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAEhD,IAAI,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QACtC,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;KACrE;IAED,IAAI,UAAU,KAAK,OAAO,EAAE;QAC1B,OAAO,EAAC,KAAK,EAAE,QAAQ,EAAC,CAAC;KAC1B;AACH,CAAC;AAED;;;GAGG;AACH,SAAS,YAAY,CAAE,OAAO;IAC5B,IAAI,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAClE,MAAM,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,UAAU,mCAAmC;YACvE,oEAAoE,CAAC,CAAC;KACzE;IAED,IAAI,qBAAqB,GAAG,EAAE,CAAC;IAC/B,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;2BAEnE,CAAC,CAAC;KAC1B;IACD,2BAA2B;IAC3B,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC;IACtC,IAAI,OAAO,IAAI,OAAO,KAAK,GAAG,IAAI,CAAC,gBAAC,CAAC,UAAU,CAAC,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,iBAAiB,CAAC,EAAE;QACtF,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9E,OAAO,GAAG,kBAAkB,kBAAkB,EAAE,CAAC;KAClD;IACD,qBAAqB,IAAI,CAAC,OAAO,IAAI,GAAG,CAAC,CAAC;IAE1C,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC1C,KAAK,CAAC,IAAI,CAAC,YAAY,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;KAC3C;IACD,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,UAAU,IAAI,EAAE,EAAE;QAC3C,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;KAC7B;IACD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,aAAa,IAAI,EAAE,EAAE;QAChD,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;KACjC;IACD,MAAM,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/D,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAC7B,qBAAqB,IAAI,MAAM,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;KACjE;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IACvE,IAAI,SAAS,EAAE;QACb,qBAAqB,IAAI,IAAI,CAAA,gCAAgC,CAAC,SAAS,CAAC,CAAC,KAAK,GAAG,CAAC;KACnF;IAED,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,qBAAqB,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;KACjE;IAED,OAAO,OAAO,CAAC,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,MAAM,qBAAqB,EAAE,CAAC;AAC5F,CAAC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAE,GAAG;IAC1B,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QACzB,OAAO,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACnC;IAED,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;AAC1E,CAAC;AAED;;;;GAIG;AACH,YAAY,CAAC,uBAAuB,GAAG,SAAS,uBAAuB,CAAE,WAAW;IAClF,IAAI,MAAM,CAAC;IACX,IAAI;QACF,MAAM,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;KACxC;IAAC,OAAO,CAAC,EAAE;QACV,mBAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACnB,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,yBAAyB,WAAW,eAAe,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;KACxG;IACD,IAAI;QACF,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;KAC/B;IAAC,OAAO,CAAC,EAAE;QACV,mBAAG,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QACnB,MAAM,IAAI,eAAM,CAAC,oBAAoB,CAAC,6BAA6B,WAAW,eAAe,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;KAC5G;AACH,CAAC,CAAC;AAEF,kBAAe,YAAY,CAAC"}

package/lib/css-converter.js

@@ -1,14 +1,30 @@
-import { CssSelectorParser } from 'css-selector-parser';
+import { createParser } from 'css-selector-parser';
 import _ from 'lodash';
 import { errors } from 'appium/driver';
+import log from './logger.js';
 
 const CssConverter = {};
 
-const parser = new CssSelectorParser();
-parser.registerSelectorPseudos('has');
-parser.registerNestingOperators('>', '+', '~');
-parser.registerAttrEqualityMods('^', '$', '*', '~');
-parser.enableSubstitutes();
+const parseCssSelector = createParser({
+  syntax: {
+    pseudoClasses: {
+      unknown: 'accept',
+      definitions: {
+        Selector: ['has'],
+      }
+    },
+    combinators: ['>', '+', '~'],
+    attributes: {
+      operators: ['^=', '$=', '*=', '~=', '=']
+    },
+    ids: true,
+    classNames: true,
+    tag: {
+      wildcard: true
+    },
+  },
+  substitutes: true
+});
 
 const BOOLEAN_ATTRS = [
   'visible', 'accessible', 'accessibility-container', 'enabled',
@@ -39,7 +55,7 @@ const ATTRIBUTE_ALIASES = [
 /**
  * Convert hyphen separated word to camel case
  *
- * @param {string} str
+ * @param {string?} str
  * @returns {string} The hyphen separated word translated to camel case
  */
 function toCamelCase (str) {
@@ -51,20 +67,16 @@ function toCamelCase (str) {
   return out.charAt(0).toLowerCase() + out.slice(1);
 }
 
-/**
- * @typedef {Object} CssNameValueObject
- * @property {string} [name] The name of the CSS object
- * @property {string} [value] The value of the CSS object
- */
-
 /**
  * Get the boolean from a CSS object. If empty, return true. If not true/false/empty, throw exception
  *
- * @param {CssNameValueObject} css A CSS object that has 'name' and 'value'
+ * @param {import('css-selector-parser').AstAttribute|import('css-selector-parser').AstPseudoClass} cssAttr
  * @returns {string} Either 'true' or 'false'. If value is empty, return 'true'
  */
-function requireBoolean (css) {
-  const val = css.value?.toLowerCase() || 'true'; // an omitted boolean attribute means 'true' (e.g.: input[checked] means checked is true)
+function requireBoolean (cssAttr) {
+  // @ts-ignore We only support strings
+  const attrValue = cssAttr.value?.value;
+  const val = _.toLower(attrValue) || 'true'; // an omitted boolean attribute means 'true' (e.g.: input[checked] means checked is true)
   switch (val) {
     case '0':
     case 'false':
@@ -73,7 +85,7 @@ function requireBoolean (css) {
     case 'true':
       return '1';
     default:
-      throw new TypeError(`'${css.name}' must be true, false or empty. Found '${css.value}'`);
+      throw new TypeError(`'${cssAttr.name}' must be true/1 or false/0 or empty. Found '${attrValue}'`);
   }
 }
 
@@ -83,47 +95,41 @@ function requireBoolean (css) {
  * Converts to lowercase and if an attribute name is an alias for something else, return
  * what it is an alias for
  *
- * @param {Object} css CSS object
+ * @param {import('css-selector-parser').AstAttribute|import('css-selector-parser').AstPseudoClass} cssEntity
  * @returns {string} The canonical attribute name
  */
-function requireAttributeName (css) {
-  const attrName = css.name.toLowerCase();
+function requireEntityName (cssEntity) {
+  const entityName = cssEntity.name.toLowerCase();
 
   // Check if it's supported and if it is, return it
-  if (ALL_ATTRS.includes(attrName)) {
-    return attrName.toLowerCase();
+  if (ALL_ATTRS.includes(entityName)) {
+    return entityName.toLowerCase();
   }
 
   // If attrName is an alias for something else, return that
   for (const [officialAttr, aliasAttrs] of ATTRIBUTE_ALIASES) {
-    if (aliasAttrs.includes(attrName)) {
+    if (aliasAttrs.includes(entityName)) {
       return officialAttr;
     }
   }
-  throw new Error(`'${attrName}' is not a valid attribute. ` +
-    `Supported attributes are '${ALL_ATTRS.join(', ')}'`);
+  throw new Error(`'${entityName}' is not a valid attribute. ` +
+    `Supported attributes are: '${ALL_ATTRS.join(', ')}'`);
 }
 
-/**
- * @typedef {Object} CssAttr
- * @property {string} [name]
- * @property {string} [valueType] Type of attribute (must be string or empty)
- * @property {string} [value] Value of the attribute
- * @property {string} [operator] The operator between value and value type (=, *=, , ^=, $=)
- */
-
 /**
  * Convert a CSS attribute into a UiSelector method call
  *
- * @param {CssAttr} cssAttr CSS attribute object
+ * @param {import('css-selector-parser').AstAttribute} cssAttr CSS attribute object
  * @returns {string|{index: string|undefined}} CSS attribute parsed as UiSelector
  */
 function parseAttr (cssAttr) {
-  if (cssAttr.valueType && cssAttr.valueType !== 'string') {
-    throw new TypeError(`'${cssAttr.name}=${cssAttr.value}' is an invalid attribute. ` +
-      `Only 'string' and empty attribute types are supported. Found '${cssAttr.valueType}'`);
+  // @ts-ignore We only care for strings
+  const attrValue = cssAttr.value?.value;
+  if (!_.isString(attrValue) && !_.isEmpty(attrValue)) {
+    throw new TypeError(`'${cssAttr.name}=${attrValue}' is an invalid attribute. ` +
+      `Only 'string' and empty attribute types are supported. Found '${attrValue}'`);
   }
-  const attrName = toCamelCase(requireAttributeName(cssAttr));
+  const attrName = toCamelCase(requireEntityName(cssAttr));
 
   // Validate that it's a supported attribute
   if (!STR_ATTRS.includes(attrName) && !BOOLEAN_ATTRS.includes(attrName)) {
@@ -133,13 +139,13 @@ function parseAttr (cssAttr) {
 
   // Parse index if it's an index attribute
   if (attrName === 'index') {
-    return {index: cssAttr.value};
+    return {index: attrValue};
   }
   if (BOOLEAN_ATTRS.includes(attrName)) {
     return `${attrName} == ${requireBoolean(cssAttr)}`;
   }
 
-  let value = cssAttr.value || '';
+  let value = attrValue || '';
   if (value === '') {
     return `[${attrName} LIKE ${value}]`;
   }
@@ -162,55 +168,38 @@ function parseAttr (cssAttr) {
   }
 }
 
-/**
- * @typedef {Object} CssPseudo
- * @property {string} [valueType] The type of CSS pseudo selector (https://www.npmjs.com/package/css-selector-parser for reference)
- * @property {string} [name] The name of the pseudo selector
- * @property {string} [value] The value of the pseudo selector
- */
-
 /**
  * Convert a CSS pseudo class to a UiSelector
  *
- * @param {CssPseudo} cssPseudo CSS Pseudo class
+ * @param {import('css-selector-parser').AstPseudoClass} cssPseudo
  * @returns {string|{index: string|undefined}|undefined} Pseudo selector parsed as UiSelector
  */
 function parsePseudo (cssPseudo) {
-  if (cssPseudo.valueType && cssPseudo.valueType !== 'string') {
-    throw new Error(`'${cssPseudo.name}=${cssPseudo.value}'. ` +
-      `Unsupported css pseudo class value type: '${cssPseudo.valueType}'. Only 'string' type or empty is supported.`);
+  // @ts-ignore We only care for strings
+  const argValue = cssPseudo.argument?.value;
+  if (!_.isString(argValue) && !_.isEmpty(argValue)) {
+    throw new TypeError(`'${cssPseudo.name}=${argValue}'. ` +
+      `Unsupported css pseudo class value: '${argValue}'. Only 'string' type or empty is supported.`);
   }
 
-  const pseudoName = requireAttributeName(cssPseudo);
+  const pseudoName = requireEntityName(cssPseudo);
 
   if (BOOLEAN_ATTRS.includes(pseudoName)) {
     return `${toCamelCase(pseudoName)} == ${requireBoolean(cssPseudo)}`;
   }
 
   if (pseudoName === 'index') {
-    return {index: cssPseudo.value};
+    return {index: argValue};
   }
 }
 
-/**
- * @typedef {Object} CssRule
- * @property {string} [nestingOperator] The nesting operator (aka: combinator https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Selectors)
- * @property {string} [tagName] The tag name (aka: type selector https://developer.mozilla.org/en-US/docs/Web/CSS/Type_selectors)
- * @property {string[]} [classNames] An array of CSS class names
- * @property {CssAttr[]} [attrs] An array of CSS attributes
- * @property {CssPseudo[]} [pseudos] An array of CSS pseudos
- * @property {string} [id] CSS identifier
- * @property {CssRule} [rule] A descendant of this CSS rule
- */
-
 /**
  * Convert a CSS rule to a UiSelector
- * @param {CssRule} cssRule CSS rule definition
+ * @param {import('css-selector-parser').AstRule} cssRule CSS rule definition
  */
 function parseCssRule (cssRule) {
-  const { nestingOperator } = cssRule;
-  if (nestingOperator && nestingOperator !== ' ' && nestingOperator !== '>') {
-    throw new Error(`'${nestingOperator}' is not a supported combinator. ` +
+  if (cssRule.combinator && ![' ', '>'].includes(cssRule.combinator)) {
+    throw new Error(`'${cssRule.combinator}' is not a supported combinator. ` +
       `Only child combinator (>) and descendant combinator are supported.`);
   }
 
@@ -220,28 +209,26 @@ function parseCssRule (cssRule) {
       is not a valid ios class. Must be a single string (e.g.: XCUIElementTypeWindow) without
       dots separating them`);
   }
-  if (cssRule.tagName && cssRule.tagName !== '*' && !cssRule.tagName.toLowerCase().startsWith('xcuielementtype')) {
-    const capitalizedTagName = cssRule.tagName.charAt(0).toUpperCase() + cssRule.tagName.slice(1);
-    cssRule.tagName = `XCUIElementType${capitalizedTagName}`;
+  // @ts-ignore name presense
+  let tagName = cssRule.tag?.name ?? '';
+  if (tagName && tagName !== '*' && !_.startsWith(_.toLower(tagName), 'xcuielementtype')) {
+    const capitalizedTagName = tagName.charAt(0).toUpperCase() + tagName.slice(1);
+    tagName = `XCUIElementType${capitalizedTagName}`;
   }
-  iosClassChainSelector += (cssRule.tagName || '*');
+  iosClassChainSelector += (tagName || '*');
 
-  let attrs = [];
-  if (cssRule.id) {
-    attrs.push(`name == "${cssRule.id}"`);
+  const attrs = [];
+  if (cssRule.ids && !_.isEmpty(cssRule.ids)) {
+    attrs.push(`name == "${cssRule.ids[0]}"`);
   }
-  if (cssRule.attrs) {
-    for (const attr of cssRule.attrs) {
-      attrs.push(parseAttr(attr));
-    }
+  for (const attr of cssRule.attributes ?? []) {
+    attrs.push(parseAttr(attr));
   }
-  if (cssRule.pseudos) {
-    for (const pseudo of cssRule.pseudos) {
-      attrs.push(parsePseudo(pseudo));
-    }
+  for (const pseudo of cssRule.pseudoClasses ?? []) {
+    attrs.push(parsePseudo(pseudo));
   }
   const nonIndexAttrs = attrs.filter((attr) => _.isString(attr));
-  if (nonIndexAttrs && nonIndexAttrs.length > 0) {
+  if (!_.isEmpty(nonIndexAttrs)) {
     iosClassChainSelector += `[\`${nonIndexAttrs.join(' AND ')}\`]`;
   }
 
@@ -250,43 +237,25 @@ function parseCssRule (cssRule) {
     iosClassChainSelector += `[${/** @type { {index: string} } */(indexAttr).index}]`;
   }
 
-  if (cssRule.rule) {
-    iosClassChainSelector += `/${parseCssRule(cssRule.rule)}`;
+  if (cssRule.nestedRule) {
+    iosClassChainSelector += `/${parseCssRule(cssRule.nestedRule)}`;
   }
 
-  if (cssRule.nestingOperator === '>') {
-    return iosClassChainSelector;
-  } else {
-    return `**/` + iosClassChainSelector;
-  }
+  return cssRule.combinator === '>' ? iosClassChainSelector : `**/${iosClassChainSelector}`;
 }
 
-/**
- * @typedef {Object} CssObject
- * @property {string} [type] Type of CSS object. 'rule', 'ruleset' or 'selectors'
- */
-
 /**
  * Convert CSS object to iOS Class Chain selector
- * @param {CssObject} css CSS object
+ *
+ * @param {import('css-selector-parser').AstSelector} css CSS object
  * @returns {string} The CSS object parsed as a UiSelector
  */
 function parseCssObject (css) {
-  switch (css.type) {
-    case 'rule':
-      // @ts-expect-error this is extremely broken
-      return parseCssRule(css);
-    case 'ruleSet':
-      // @ts-expect-error this is extremely broken
-      return parseCssObject(css.rule);
-    case 'selectors':
-      // @ts-expect-error this is extremely broken
-      return css.selectors.map((selector) => parseCssObject(selector)).join('; ');
-
-    default:
-      // This is never reachable, but if it ever is do this.
-      throw new Error(`iOS Class Chain does not support '${css.type}' css. Only supports 'rule', 'ruleSet', 'selectors'`);
+  if (!_.isEmpty(css.rules)) {
+    return parseCssRule(css.rules[0]);
   }
+
+  throw new Error('No rules could be parsed out of the current selector');
 }
 
 /**
@@ -297,13 +266,15 @@ function parseCssObject (css) {
 CssConverter.toIosClassChainSelector = function toIosClassChainSelector (cssSelector) {
   let cssObj;
   try {
-    cssObj = parser.parse(cssSelector);
+    cssObj = parseCssSelector(cssSelector);
   } catch (e) {
+    log.debug(e.stack);
     throw new errors.InvalidSelectorError(`Invalid CSS selector '${cssSelector}'. Reason: '${e.message}'`);
   }
   try {
     return parseCssObject(cssObj);
   } catch (e) {
+    log.debug(e.stack);
     throw new errors.InvalidSelectorError(`Unsupported CSS selector '${cssSelector}'. Reason: '${e.message}'`);
   }
 };

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "appium-xcuitest-driver",
-  "version": "4.32.3",
+  "version": "4.32.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-xcuitest-driver",
-      "version": "4.32.3",
+      "version": "4.32.4",
       "license": "Apache-2.0",
       "dependencies": {
         "@xmldom/xmldom": "0.8.8",
@@ -19,7 +19,7 @@
         "async-lock": "1.4.0",
         "asyncbox": "2.9.4",
         "bluebird": "3.7.2",
-        "css-selector-parser": "1.4.1",
+        "css-selector-parser": "2.2.3",
         "fancy-log": "2.0.0",
         "js2xmlparser2": "0.2.0",
         "lodash": "4.17.21",
@@ -49,7 +49,7 @@
         "@types/chai-as-promised": "7.1.5",
         "@types/lodash": "4.14.195",
         "@types/mocha": "10.0.1",
-        "@types/node": "18.16.16",
+        "@types/node": "18.16.18",
         "@types/portscanner": "2.1.1",
         "@types/sinon": "10.0.15",
         "@types/sinon-chai": "3.2.9",
@@ -2530,9 +2530,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.16.16",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.16.tgz",
-      "integrity": "sha512-NpaM49IGQQAUlBhHMF82QH80J08os4ZmyF9MkpCzWAGuOHqE4gTEbhzd7L3l5LmWuZ6E0OiC1FweQ4tsiW35+g=="
+      "version": "18.16.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.18.tgz",
+      "integrity": "sha512-/aNaQZD0+iSBAGnvvN2Cx92HqE5sZCPZtx2TsK+4nvV23fFe09jVDvpArXr2j9DnYlzuU9WuoykDDc6wqvpNcw=="
     },
     "node_modules/@types/normalize-package-data": {
       "version": "2.4.1",
@@ -5244,9 +5244,19 @@
       }
     },
     "node_modules/css-selector-parser": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.4.1.tgz",
-      "integrity": "sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g=="
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-2.2.3.tgz",
+      "integrity": "sha512-m5+MAFyt1pdzS754fwxCdya7E+fouV5oXLCG1KkMtR+5JDBEegM7ilSUNtnOTrVA46pVEEgC9+YO/VEOVFRYIw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ]
     },
     "node_modules/css-shorthand-properties": {
       "version": "1.1.1",

package/package.json

@@ -8,7 +8,7 @@
     "xcuitest",
     "xctest"
   ],
-  "version": "4.32.3",
+  "version": "4.32.4",
   "author": "Appium Contributors",
   "license": "Apache-2.0",
   "repository": {
@@ -78,7 +78,7 @@
     "async-lock": "1.4.0",
     "asyncbox": "2.9.4",
     "bluebird": "3.7.2",
-    "css-selector-parser": "1.4.1",
+    "css-selector-parser": "2.2.3",
     "fancy-log": "2.0.0",
     "js2xmlparser2": "0.2.0",
     "lodash": "4.17.21",
@@ -146,7 +146,7 @@
     "@types/chai-as-promised": "7.1.5",
     "@types/lodash": "4.14.195",
     "@types/mocha": "10.0.1",
-    "@types/node": "18.16.16",
+    "@types/node": "18.16.18",
     "@types/portscanner": "2.1.1",
     "@types/sinon": "10.0.15",
     "@types/sinon-chai": "3.2.9",