@acemir/cssom 0.9.3 → 0.9.5

package/build/CSSOM.js

@@ -1574,7 +1574,7 @@ Object.defineProperties(CSSOM.CSSLayerStatementRule.prototype, {
  * @param {string} token
  */
 CSSOM.parse = function parse(token, errorHandler) {
-	errorHandler = errorHandler === undefined && (console && console.error);
+	errorHandler = errorHandler === undefined ? (console && console.error) : errorHandler;
 
 	var i = 0;
 
@@ -1807,16 +1807,19 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 * - Class selectors (e.g., `.container`)
 	 * - Attribute selectors (e.g., `[type="text"]`)
 	 * - Pseudo-classes and pseudo-elements (e.g., `:hover`, `::before`, `:nth-child(2)`)
+	 * - Pseudo-classes with nested parentheses, including cases where parentheses are nested inside arguments,
+	 *   such as `:has(.sel:nth-child(3n))`
 	 * - The parent selector (`&`)
 	 * - Combinators (`>`, `+`, `~`) with optional whitespace
 	 * - Whitespace (descendant combinator)
 	 *
 	 * The pattern ensures that a string consists only of valid basic selector components,
-	 * possibly repeated and combined, but does not match full CSS selector groups separated by commas.
+	 * possibly repeated and combined, including pseudo-classes with nested parentheses,
+	 * but does not match full CSS selector groups separated by commas.
 	 *
 	 * @type {RegExp}
 	 */
-	var basicSelectorRegExp = /^([a-zA-Z][a-zA-Z0-9_-]*|\*|#[a-zA-Z0-9_-]+|\.[a-zA-Z0-9_-]+|\[[^\[\]]*(?:\s+[iI])?\]|::?[a-zA-Z0-9_-]+(?:\([^\(\)]*\))?|&|\s*[>+~]\s*|\s+)+$/;
+	var basicSelectorRegExp = /^([a-zA-Z][a-zA-Z0-9_-]*|\*|#[a-zA-Z0-9_-]+|\.[a-zA-Z0-9_-]+|\[[^\[\]]*(?:\s+[iI])?\]|::?[a-zA-Z0-9_-]+(?:\(((?:[^()"]+|"[^"]*"|'[^']*'|\((?:[^()"]+|"[^"]*"|'[^']*')*\))*?)\))?|&|\s*[>+~]\s*|\s+)+$/;
 
 	/**
 	 * Regular expression to match CSS pseudo-classes with arguments.
@@ -1825,16 +1828,17 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 *
 	 * Capture groups:
 	 *   1. The pseudo-class name (letters and hyphens).
-	 *   2. The argument inside the parentheses (any characters except a closing parenthesis).
+	 *   2. The argument inside the parentheses (can contain nested parentheses, quoted strings, and other characters.).
 	 *
 	 * Global flag (`g`) is used to find all matches in the input string.
 	 *
-	 * Example match: `:nth-child(2n+1)`
-	 *   - Group 1: "nth-child"
-	 *   - Group 2: "2n+1"
+	 * Example matches:
+	 *   - :nth-child(2n+1)
+	 *   - :has(.sel:nth-child(3n))
+	 *   - :not(".foo, .bar")
 	 * @type {RegExp}
 	 */
-	var globalPseudoClassRegExp = /:([a-zA-Z-]+)\(([^)]*?(?:\s+[iI])?)\)/g;
+	var globalPseudoClassRegExp = /:([a-zA-Z-]+)\(((?:[^()"]+|"[^"]*"|'[^']*'|\((?:[^()"]+|"[^"]*"|'[^']*')*\))*?)\)/g;
 
 	/**
 	 * Parses a CSS selector string and splits it into parts, handling nested parentheses.

package/lib/parse.js

@@ -7,7 +7,7 @@ var CSSOM = {};
  * @param {string} token
  */
 CSSOM.parse = function parse(token, errorHandler) {
-	errorHandler = errorHandler === undefined && (console && console.error);
+	errorHandler = errorHandler === undefined ? (console && console.error) : errorHandler;
 
 	var i = 0;
 
@@ -240,16 +240,19 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 * - Class selectors (e.g., `.container`)
 	 * - Attribute selectors (e.g., `[type="text"]`)
 	 * - Pseudo-classes and pseudo-elements (e.g., `:hover`, `::before`, `:nth-child(2)`)
+	 * - Pseudo-classes with nested parentheses, including cases where parentheses are nested inside arguments,
+	 *   such as `:has(.sel:nth-child(3n))`
 	 * - The parent selector (`&`)
 	 * - Combinators (`>`, `+`, `~`) with optional whitespace
 	 * - Whitespace (descendant combinator)
 	 *
 	 * The pattern ensures that a string consists only of valid basic selector components,
-	 * possibly repeated and combined, but does not match full CSS selector groups separated by commas.
+	 * possibly repeated and combined, including pseudo-classes with nested parentheses,
+	 * but does not match full CSS selector groups separated by commas.
 	 *
 	 * @type {RegExp}
 	 */
-	var basicSelectorRegExp = /^([a-zA-Z][a-zA-Z0-9_-]*|\*|#[a-zA-Z0-9_-]+|\.[a-zA-Z0-9_-]+|\[[^\[\]]*(?:\s+[iI])?\]|::?[a-zA-Z0-9_-]+(?:\([^\(\)]*\))?|&|\s*[>+~]\s*|\s+)+$/;
+	var basicSelectorRegExp = /^([a-zA-Z][a-zA-Z0-9_-]*|\*|#[a-zA-Z0-9_-]+|\.[a-zA-Z0-9_-]+|\[[^\[\]]*(?:\s+[iI])?\]|::?[a-zA-Z0-9_-]+(?:\(((?:[^()"]+|"[^"]*"|'[^']*'|\((?:[^()"]+|"[^"]*"|'[^']*')*\))*?)\))?|&|\s*[>+~]\s*|\s+)+$/;
 
 	/**
 	 * Regular expression to match CSS pseudo-classes with arguments.
@@ -258,16 +261,17 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 *
 	 * Capture groups:
 	 *   1. The pseudo-class name (letters and hyphens).
-	 *   2. The argument inside the parentheses (any characters except a closing parenthesis).
+	 *   2. The argument inside the parentheses (can contain nested parentheses, quoted strings, and other characters.).
 	 *
 	 * Global flag (`g`) is used to find all matches in the input string.
 	 *
-	 * Example match: `:nth-child(2n+1)`
-	 *   - Group 1: "nth-child"
-	 *   - Group 2: "2n+1"
+	 * Example matches:
+	 *   - :nth-child(2n+1)
+	 *   - :has(.sel:nth-child(3n))
+	 *   - :not(".foo, .bar")
 	 * @type {RegExp}
 	 */
-	var globalPseudoClassRegExp = /:([a-zA-Z-]+)\(([^)]*?(?:\s+[iI])?)\)/g;
+	var globalPseudoClassRegExp = /:([a-zA-Z-]+)\(((?:[^()"]+|"[^"]*"|'[^']*'|\((?:[^()"]+|"[^"]*"|'[^']*')*\))*?)\)/g;
 
 	/**
 	 * Parses a CSS selector string and splits it into parts, handling nested parentheses.

package/package.json

@@ -7,7 +7,7 @@
     "parser",
     "styleSheet"
   ],
-  "version": "0.9.3",
+  "version": "0.9.5",
   "author": "Nikita Vasilyev <me@elv1s.ru>",
   "contributors": [
     "Acemir Sousa Mendes <acemirsm@gmail.com>"