@acemir/cssom 0.9.4 → 0.9.6

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;
 
@@ -1798,13 +1798,14 @@ CSSOM.parse = function parse(token, errorHandler) {
 	}
 
 	/**
-	 * Regular expression to match a basic CSS selector.
-	 *
-	 * This regex matches the following selector components:
+	 * Validates a basic CSS selector, allowing for deeply nested balanced parentheses in pseudo-classes.
+	 * This function replaces the previous basicSelectorRegExp.
+	 * 
+	 * This function matches:
 	 * - Type selectors (e.g., `div`, `span`)
 	 * - Universal selector (`*`)
-	 * - ID selectors (e.g., `#header`)
-	 * - Class selectors (e.g., `.container`)
+	 * - ID selectors (e.g., `#header`, `#a\ b`, `#åèiöú`)
+	 * - Class selectors (e.g., `.container`, `.a\ b`, `.åèiöú`)
 	 * - 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,
@@ -1813,13 +1814,66 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 * - Combinators (`>`, `+`, `~`) with optional whitespace
 	 * - Whitespace (descendant combinator)
 	 *
-	 * The pattern ensures that a string consists only of valid basic selector components,
-	 * possibly repeated and combined, including pseudo-classes with nested parentheses,
-	 * but does not match full CSS selector groups separated by commas.
+	 * Unicode and escape sequences are allowed in identifiers.
 	 *
-	 * @type {RegExp}
+	 * @param {string} selector
+	 * @returns {boolean}
 	 */
-	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+)+$/;
+	function basicSelectorValidator(selector) {
+		var length = selector.length;
+		var i = 0;
+		var stack = [];
+		var inAttr = false;
+		var inSingleQuote = false;
+		var inDoubleQuote = false;
+
+		while (i < length) {
+			var char = selector[i];
+
+			if (inSingleQuote) {
+				if (char === "'" && selector[i - 1] !== "\\") {
+					inSingleQuote = false;
+				}
+			} else if (inDoubleQuote) {
+				if (char === '"' && selector[i - 1] !== "\\") {
+					inDoubleQuote = false;
+				}
+			} else if (inAttr) {
+				if (char === "]") {
+					inAttr = false;
+				} else if (char === "'") {
+					inSingleQuote = true;
+				} else if (char === '"') {
+					inDoubleQuote = true;
+				}
+			} else {
+				if (char === "[") {
+					inAttr = true;
+				} else if (char === "'") {
+					inSingleQuote = true;
+				} else if (char === '"') {
+					inDoubleQuote = true;
+				} else if (char === "(") {
+					stack.push("(");
+				} else if (char === ")") {
+					if (!stack.length || stack.pop() !== "(") {
+						return false;
+					}
+				}
+			}
+			i++;
+		}
+
+		// If any stack or quote/attr context remains, it's invalid
+		if (stack.length || inAttr || inSingleQuote || inDoubleQuote) {
+			return false;
+		}
+
+		// Fallback to a loose regexp for the overall selector structure (without deep paren matching)
+		// This is similar to the original, but without nested paren limitations
+		var looseSelectorRegExp = /^([a-zA-Z_\u00A0-\uFFFF\\][a-zA-Z0-9_\u00A0-\uFFFF\-\\]*|\*|#[a-zA-Z0-9_\u00A0-\uFFFF\-\\]+|\.[a-zA-Z0-9_\u00A0-\uFFFF\-\\]+|\[[^\[\]]*(?:\s+[iI])?\]|::?[a-zA-Z0-9_\u00A0-\uFFFF\-\\]+(?:\((.*)\))?|&|\s*[>+~]\s*|\s+)+$/;
+		return looseSelectorRegExp.test(selector);
+	}
 
 	/**
 	 * Regular expression to match CSS pseudo-classes with arguments.
@@ -1902,40 +1956,62 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 * Validates a CSS selector string, including handling of nested selectors within certain pseudo-classes.
 	 *
 	 * This function checks if the provided selector is valid according to the rules defined by
-	 * `basicSelectorRegExp`. For pseudo-classes that accept selector lists (such as :not, :is, :has, :where),
+	 * `basicSelectorValidator`. For pseudo-classes that accept selector lists (such as :not, :is, :has, :where),
 	 * it recursively validates each nested selector using the same validation logic.
 	 *
 	 * @param {string} selector - The CSS selector string to validate.
 	 * @returns {boolean} Returns `true` if the selector is valid, otherwise `false`.
 	 */
+
+	// Cache to store validated selectors
+	var validatedSelectorsCache = new Map();
+
+	// Only pseudo-classes that accept selector lists should recurse
+	var selectorListPseudoClasses = {
+		'not': true,
+		'is': true,
+		'has': true,
+		'where': true
+	};
+
 	function validateSelector(selector) {
-		var match, nestedSelectors, i;
-
-		// Only pseudo-classes that accept selector lists should recurse
-		var selectorListPseudoClasses = {
-			'not': true,
-			'is': true,
-			'has': true,
-			'where': true
-		};
+		if (validatedSelectorsCache.has(selector)) {
+			return validatedSelectorsCache.get(selector);
+		}
 
-		// Reset regex lastIndex for global regex in ES5 loop
+		// Use a non-global regex to find all pseudo-classes with arguments
+		var pseudoClassMatches = [];
 		var pseudoClassRegExp = new RegExp(globalPseudoClassRegExp.source, globalPseudoClassRegExp.flags);
+		var match;
 		while ((match = pseudoClassRegExp.exec(selector)) !== null) {
-			var pseudoClass = match[1];
+			pseudoClassMatches.push(match);
+		}
+
+		for (var j = 0; j < pseudoClassMatches.length; j++) {
+			var pseudoClass = pseudoClassMatches[j][1];
 			if (selectorListPseudoClasses.hasOwnProperty(pseudoClass)) {
-				nestedSelectors = parseAndSplitNestedSelectors(match[2]);
-				// Validate each nested selector
-				for (i = 0; i < nestedSelectors.length; i++) {
-					if (!validateSelector(nestedSelectors[i])) {
+				var nestedSelectors = parseAndSplitNestedSelectors(pseudoClassMatches[j][2]);
+				for (var i = 0; i < nestedSelectors.length; i++) {
+					var nestedSelector = nestedSelectors[i];
+					if (!validatedSelectorsCache.has(nestedSelector)) {
+						var nestedSelectorValidation = validateSelector(nestedSelector);
+						validatedSelectorsCache.set(nestedSelector, nestedSelectorValidation);
+						if (!nestedSelectorValidation) {
+							validatedSelectorsCache.set(selector, false);
+							return false;
+						}
+					} else if (!validatedSelectorsCache.get(nestedSelector)) {
+						validatedSelectorsCache.set(selector, false);
 						return false;
 					}
 				}
 			}
 		}
 
-		// Allow "&" anywhere in the selector for nested selectors
-		return basicSelectorRegExp.test(selector);
+		var basicSelectorValidation = basicSelectorValidator(selector);
+		validatedSelectorsCache.set(selector, basicSelectorValidation);
+
+		return basicSelectorValidation;
 	}
 
 	/**

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;
 
@@ -231,13 +231,14 @@ CSSOM.parse = function parse(token, errorHandler) {
 	}
 
 	/**
-	 * Regular expression to match a basic CSS selector.
-	 *
-	 * This regex matches the following selector components:
+	 * Validates a basic CSS selector, allowing for deeply nested balanced parentheses in pseudo-classes.
+	 * This function replaces the previous basicSelectorRegExp.
+	 * 
+	 * This function matches:
 	 * - Type selectors (e.g., `div`, `span`)
 	 * - Universal selector (`*`)
-	 * - ID selectors (e.g., `#header`)
-	 * - Class selectors (e.g., `.container`)
+	 * - ID selectors (e.g., `#header`, `#a\ b`, `#åèiöú`)
+	 * - Class selectors (e.g., `.container`, `.a\ b`, `.åèiöú`)
 	 * - 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,
@@ -246,13 +247,66 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 * - Combinators (`>`, `+`, `~`) with optional whitespace
 	 * - Whitespace (descendant combinator)
 	 *
-	 * The pattern ensures that a string consists only of valid basic selector components,
-	 * possibly repeated and combined, including pseudo-classes with nested parentheses,
-	 * but does not match full CSS selector groups separated by commas.
+	 * Unicode and escape sequences are allowed in identifiers.
 	 *
-	 * @type {RegExp}
+	 * @param {string} selector
+	 * @returns {boolean}
 	 */
-	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+)+$/;
+	function basicSelectorValidator(selector) {
+		var length = selector.length;
+		var i = 0;
+		var stack = [];
+		var inAttr = false;
+		var inSingleQuote = false;
+		var inDoubleQuote = false;
+
+		while (i < length) {
+			var char = selector[i];
+
+			if (inSingleQuote) {
+				if (char === "'" && selector[i - 1] !== "\\") {
+					inSingleQuote = false;
+				}
+			} else if (inDoubleQuote) {
+				if (char === '"' && selector[i - 1] !== "\\") {
+					inDoubleQuote = false;
+				}
+			} else if (inAttr) {
+				if (char === "]") {
+					inAttr = false;
+				} else if (char === "'") {
+					inSingleQuote = true;
+				} else if (char === '"') {
+					inDoubleQuote = true;
+				}
+			} else {
+				if (char === "[") {
+					inAttr = true;
+				} else if (char === "'") {
+					inSingleQuote = true;
+				} else if (char === '"') {
+					inDoubleQuote = true;
+				} else if (char === "(") {
+					stack.push("(");
+				} else if (char === ")") {
+					if (!stack.length || stack.pop() !== "(") {
+						return false;
+					}
+				}
+			}
+			i++;
+		}
+
+		// If any stack or quote/attr context remains, it's invalid
+		if (stack.length || inAttr || inSingleQuote || inDoubleQuote) {
+			return false;
+		}
+
+		// Fallback to a loose regexp for the overall selector structure (without deep paren matching)
+		// This is similar to the original, but without nested paren limitations
+		var looseSelectorRegExp = /^([a-zA-Z_\u00A0-\uFFFF\\][a-zA-Z0-9_\u00A0-\uFFFF\-\\]*|\*|#[a-zA-Z0-9_\u00A0-\uFFFF\-\\]+|\.[a-zA-Z0-9_\u00A0-\uFFFF\-\\]+|\[[^\[\]]*(?:\s+[iI])?\]|::?[a-zA-Z0-9_\u00A0-\uFFFF\-\\]+(?:\((.*)\))?|&|\s*[>+~]\s*|\s+)+$/;
+		return looseSelectorRegExp.test(selector);
+	}
 
 	/**
 	 * Regular expression to match CSS pseudo-classes with arguments.
@@ -335,40 +389,62 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 * Validates a CSS selector string, including handling of nested selectors within certain pseudo-classes.
 	 *
 	 * This function checks if the provided selector is valid according to the rules defined by
-	 * `basicSelectorRegExp`. For pseudo-classes that accept selector lists (such as :not, :is, :has, :where),
+	 * `basicSelectorValidator`. For pseudo-classes that accept selector lists (such as :not, :is, :has, :where),
 	 * it recursively validates each nested selector using the same validation logic.
 	 *
 	 * @param {string} selector - The CSS selector string to validate.
 	 * @returns {boolean} Returns `true` if the selector is valid, otherwise `false`.
 	 */
-	function validateSelector(selector) {
-		var match, nestedSelectors, i;
 
-		// Only pseudo-classes that accept selector lists should recurse
-		var selectorListPseudoClasses = {
-			'not': true,
-			'is': true,
-			'has': true,
-			'where': true
-		};
+	// Cache to store validated selectors
+	var validatedSelectorsCache = new Map();
+
+	// Only pseudo-classes that accept selector lists should recurse
+	var selectorListPseudoClasses = {
+		'not': true,
+		'is': true,
+		'has': true,
+		'where': true
+	};
+
+	function validateSelector(selector) {
+		if (validatedSelectorsCache.has(selector)) {
+			return validatedSelectorsCache.get(selector);
+		}
 
-		// Reset regex lastIndex for global regex in ES5 loop
+		// Use a non-global regex to find all pseudo-classes with arguments
+		var pseudoClassMatches = [];
 		var pseudoClassRegExp = new RegExp(globalPseudoClassRegExp.source, globalPseudoClassRegExp.flags);
+		var match;
 		while ((match = pseudoClassRegExp.exec(selector)) !== null) {
-			var pseudoClass = match[1];
+			pseudoClassMatches.push(match);
+		}
+
+		for (var j = 0; j < pseudoClassMatches.length; j++) {
+			var pseudoClass = pseudoClassMatches[j][1];
 			if (selectorListPseudoClasses.hasOwnProperty(pseudoClass)) {
-				nestedSelectors = parseAndSplitNestedSelectors(match[2]);
-				// Validate each nested selector
-				for (i = 0; i < nestedSelectors.length; i++) {
-					if (!validateSelector(nestedSelectors[i])) {
+				var nestedSelectors = parseAndSplitNestedSelectors(pseudoClassMatches[j][2]);
+				for (var i = 0; i < nestedSelectors.length; i++) {
+					var nestedSelector = nestedSelectors[i];
+					if (!validatedSelectorsCache.has(nestedSelector)) {
+						var nestedSelectorValidation = validateSelector(nestedSelector);
+						validatedSelectorsCache.set(nestedSelector, nestedSelectorValidation);
+						if (!nestedSelectorValidation) {
+							validatedSelectorsCache.set(selector, false);
+							return false;
+						}
+					} else if (!validatedSelectorsCache.get(nestedSelector)) {
+						validatedSelectorsCache.set(selector, false);
 						return false;
 					}
 				}
 			}
 		}
 
-		// Allow "&" anywhere in the selector for nested selectors
-		return basicSelectorRegExp.test(selector);
+		var basicSelectorValidation = basicSelectorValidator(selector);
+		validatedSelectorsCache.set(selector, basicSelectorValidation);
+
+		return basicSelectorValidation;
 	}
 
 	/**

package/package.json

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