@acemir/cssom 0.9.1 → 0.9.2

package/build/CSSOM.js

@@ -1,6 +1,29 @@
 var CSSOM = {};
 
 
+// NOTE: Check viability to add a validation for css values or use a dependency like csstree-validator
+/**
+ * Regular expression to detect invalid characters in the value portion of a CSS style declaration.
+ *
+ * This regex matches a colon (:) that is not inside parentheses and not inside single or double quotes.
+ * It is used to ensure that the value part of a CSS property does not contain unexpected colons,
+ * which would indicate a malformed declaration (e.g., "color: foo:bar;" is invalid).
+ *
+ * The negative lookahead `(?![^(]*\))` ensures that the colon is not followed by a closing
+ * parenthesis without encountering an opening parenthesis, effectively ignoring colons inside
+ * function-like values (e.g., `url(data:image/png;base64,...)`).
+ *
+ * The lookahead `(?=(?:[^'"]|'[^']*'|"[^"]*")*$)` ensures that the colon is not inside single or double quotes,
+ * allowing colons within quoted strings (e.g., `content: ":";` or `background: url("foo:bar.png");`).
+ *
+ * Example:
+ *   "color: red;"         // valid, does not match
+ *   "background: url(data:image/png;base64,...);" // valid, does not match
+ *   "content: ':';"       // valid, does not match
+ *   "color: foo:bar;"     // invalid, matches
+ */
+var basicStylePropertyValueValidationRegExp = /:(?![^(]*\))(?=(?:[^'"]|'[^']*'|"[^"]*")*$)/;
+
 /**
  * @constructor
  * @see http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSStyleDeclaration
@@ -36,8 +59,12 @@ CSSOM.CSSStyleDeclaration.prototype = {
 	 * @param {string} [priority=null] "important" or null
 	 * @see http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSStyleDeclaration-setProperty
 	 */
-	setProperty: function(name, value, priority) {
-		if (this[name]) {
+	setProperty: function(name, value, priority, parseErrorHandler) 
+	{
+		// NOTE: Check viability to add a validation for css values or use a dependency like csstree-validator
+		if (basicStylePropertyValueValidationRegExp.test(value)) {
+			parseErrorHandler && parseErrorHandler('Invalid CSSStyleDeclaration property value');
+		} else if (this[name]) {
 			// Property already exist. Overwrite it.
 			var index = Array.prototype.indexOf.call(this, name);
 			if (index < 0) {
@@ -1546,7 +1573,8 @@ Object.defineProperties(CSSOM.CSSLayerStatementRule.prototype, {
 /**
  * @param {string} token
  */
-CSSOM.parse = function parse(token) {
+CSSOM.parse = function parse(token, errorHandler) {
+	errorHandler = errorHandler === undefined && (console && console.error);
 
 	var i = 0;
 
@@ -1568,6 +1596,8 @@ CSSOM.parse = function parse(token) {
 	var valueParenthesisDepth = 0;
 
 	var SIGNIFICANT_WHITESPACE = {
+		"name": true,
+		"before-name": true,
 		"selector": true,
 		"value": true,
 		"value-parenthesis": true,
@@ -1672,6 +1702,29 @@ CSSOM.parse = function parse(token) {
 		return null;
 	}
 
+	/**
+	 * Advances the index `i` to skip over a balanced block of curly braces in the given string.
+	 * This is typically used to ignore the contents of a CSS rule block.
+	 *
+	 * @param {number} i - The current index in the string to start searching from.
+	 * @param {string} str - The string containing the CSS code.
+	 * @param {number} fromIndex - The index in the string where the balanced block search should begin.
+	 * @returns {number} The updated index after skipping the balanced block.
+	 */
+	function ignoreBalancedBlock(i, str, fromIndex) {
+		var ruleClosingMatch = matchBalancedBlock(str, fromIndex);
+		if (ruleClosingMatch) {
+			var ignoreRange = ruleClosingMatch.index + ruleClosingMatch[0].length;
+			i+= ignoreRange;
+			if (token.charAt(i) === '}') {
+				i -= 1;
+			}
+		} else {
+			i += str.length;
+		}
+		return i;	
+	}
+
 	var parseError = function(message) {
 		var lines = token.substring(0, i).split('\n');
 		var lineCount = lines.length;
@@ -1681,7 +1734,12 @@ CSSOM.parse = function parse(token) {
 		/* jshint sub : true */
 		error['char'] = charCount;
 		error.styleSheet = styleSheet;
-		throw error;
+		// Print the error but continue parsing the sheet
+		try {
+			throw error;
+		} catch(e) {
+			errorHandler && errorHandler(e);
+		}
 	};
 
 	var validateAtRule = function(atRuleKey, validCallback, cannotBeNested) {
@@ -1732,22 +1790,156 @@ CSSOM.parse = function parse(token) {
 			}
 
 			// Ignore the entire rule block (if it's a statement it should ignore the statement plus the next block)
-			var ruleClosingMatch = matchBalancedBlock(ruleSlice);
-			if (ruleClosingMatch) {
-				var ignoreRange = ruleClosingMatch.index + ruleClosingMatch[0].length;
-				i+= ignoreRange;
-				if (token.charAt(i) === '}') {
-					i -= 1;
-				}
-			} else {
-				i += ruleSlice.length;
-			}
+			i = ignoreBalancedBlock(i, ruleSlice);
 			state = "before-selector";
 		} else {
 			validCallback.call(this);
 		}
 	}
 
+	/**
+	 * Regular expression to match a basic CSS selector.
+	 *
+	 * This regex matches the following selector components:
+	 * - Type selectors (e.g., `div`, `span`)
+	 * - Universal selector (`*`)
+	 * - ID selectors (e.g., `#header`)
+	 * - Class selectors (e.g., `.container`)
+	 * - Attribute selectors (e.g., `[type="text"]`)
+	 * - Pseudo-classes and pseudo-elements (e.g., `:hover`, `::before`, `:nth-child(2)`)
+	 * - 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.
+	 *
+	 * @type {RegExp}
+	 */
+	var basicSelectorRegExp = /^([a-zA-Z][a-zA-Z0-9_-]*|\*|#[a-zA-Z0-9_-]+|\.[a-zA-Z0-9_-]+|\[[^\[\]]*\]|::?[a-zA-Z0-9_-]+(?:\([^\(\)]*\))?|&|\s*[>+~]\s*|\s+)+$/;
+
+	/**
+	 * Regular expression to match CSS pseudo-classes with arguments.
+	 *
+	 * Matches patterns like `:pseudo-class(argument)`, capturing the pseudo-class name and its argument.
+	 *
+	 * Capture groups:
+	 *   1. The pseudo-class name (letters and hyphens).
+	 *   2. The argument inside the parentheses (any characters except a closing parenthesis).
+	 *
+	 * 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"
+	 * @type {RegExp}
+	 */
+	var globalPseudoClassRegExp = /:([a-zA-Z-]+)\(([^)]*)\)/g;
+
+	/**
+	 * Parses a CSS selector string and splits it into parts, handling nested parentheses.
+	 *
+	 * This function is useful for splitting selectors that may contain nested function-like
+	 * syntax (e.g., :not(.foo, .bar)), ensuring that commas inside parentheses do not split
+	 * the selector.
+	 *
+	 * @param {string} selector - The CSS selector string to parse.
+	 * @returns {string[]} An array of selector parts, split by top-level commas, with whitespace trimmed.
+	 */
+	function parseNestedSelectors(selector) {
+		var depth = 0;
+		var buffer = "";
+		var parts = [];
+		var i, char;
+
+		for (i = 0; i < selector.length; i++) {
+			char = selector.charAt(i);
+
+			if (char === '(') {
+				depth++;
+				buffer += char;
+			} else if (char === ')') {
+				depth--;
+				buffer += char;
+				if (depth === 0) {
+					parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+					buffer = "";
+				}
+			} else if (char === ',' && depth === 0) {
+				if (buffer.replace(/^\s+|\s+$/g, "")) {
+					parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+				}
+				buffer = "";
+			} else {
+				buffer += char;
+			}
+		}
+
+		if (buffer.replace(/^\s+|\s+$/g, "")) {
+			parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+		}
+
+		return parts;
+	}
+
+	/**
+	 * 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),
+	 * 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
+		};
+
+		// Reset regex lastIndex for global regex in ES5 loop
+		var pseudoClassRegExp = new RegExp(globalPseudoClassRegExp.source, globalPseudoClassRegExp.flags);
+		while ((match = pseudoClassRegExp.exec(selector)) !== null) {
+			var pseudoClass = match[1];
+			if (selectorListPseudoClasses.hasOwnProperty(pseudoClass)) {
+				nestedSelectors = parseNestedSelectors(match[2]);
+				// Validate each nested selector
+				for (i = 0; i < nestedSelectors.length; i++) {
+					if (!validateSelector(nestedSelectors[i])) {
+						return false;
+					}
+				}
+			}
+		}
+
+		// Allow "&" anywhere in the selector for nested selectors
+		return basicSelectorRegExp.test(selector);
+	}
+
+	/**
+	 * Checks if a given CSS selector text is valid by splitting it by commas
+	 * and validating each individual selector using the `validateSelector` function.
+	 *
+	 * @param {string} selectorText - The CSS selector text to validate. Can contain multiple selectors separated by commas.
+	 * @returns {boolean} Returns true if all selectors are valid, otherwise false.
+	 */
+	function isValidSelectorText(selectorText) {
+		// Split selectorText by commas and validate each part
+		var selectors = selectorText.split(',');
+		for (var i = 0; i < selectors.length; i++) {
+			if (!validateSelector(selectors[i].replace(/^\s+|\s+$/g, ""))) {
+				return false;
+			}
+		}
+		return true;
+	}
+
 	var endingIndex = token.length - 1;
 
 	for (var character; (character = token.charAt(i)); i++) {
@@ -1780,6 +1972,9 @@ CSSOM.parse = function parse(token) {
 					parseError('Unmatched "');
 				}
 			} while (token[index - 2] === '\\');
+			if (index === 0) {
+				break;
+			}
 			buffer += token.slice(i, index);
 			i = index - 1;
 			switch (state) {
@@ -1803,6 +1998,9 @@ CSSOM.parse = function parse(token) {
 					parseError("Unmatched '");
 				}
 			} while (token[index - 2] === '\\');
+			if (index === 0) {
+				break;
+			}
 			buffer += token.slice(i, index);
 			i = index - 1;
 			switch (state) {
@@ -1938,6 +2136,11 @@ CSSOM.parse = function parse(token) {
 			if (currentScope === styleSheet) {
 				nestedSelectorRule = null;
 			}
+			if (state === 'before-selector') {
+				parseError("Unexpected {");
+				i = ignoreBalancedBlock(i, token.slice(i));
+				break;
+			}
 			if (state === "selector" || state === "atRule") {
 				if (!nestedSelectorRule && buffer.indexOf(";") !== -1) {
 					var ruleClosingMatch = token.slice(i).match(forwardRuleClosingBraceRegExp);
@@ -1956,6 +2159,7 @@ CSSOM.parse = function parse(token) {
 				}
 
 				currentScope = parentRule = styleRule;
+				console.log('sel out', buffer);
 				styleRule.selectorText = buffer.trim();
 				styleRule.style.__starts = i;
 				styleRule.parentStyleSheet = styleSheet;
@@ -2067,7 +2271,7 @@ CSSOM.parse = function parse(token) {
 				documentRule.parentStyleSheet = styleSheet;
 				buffer = "";
 				state = "before-selector";
-			} else if (state === "name") {
+			} else if (state === "before-name" || state === "name") {
 				if (styleRule.constructor.name === "CSSNestedDeclarations") {
 					if (styleRule.style.length) {
 						parentRule.cssRules.push(styleRule);
@@ -2084,9 +2288,12 @@ CSSOM.parse = function parse(token) {
 					styleRule.parentStyleSheet = styleSheet;
 				}
 				
-				
 				styleRule = new CSSOM.CSSStyleRule();
-				styleRule.selectorText = buffer.trim();
+				console.log('sel in', buffer);
+				// In a nested selector, ensure each selector contains '&' at the beginning, except for selectors that already have '&' somewhere
+				styleRule.selectorText = parseNestedSelectors(buffer.trim()).map(function(sel) {
+						return sel.indexOf('&') === -1 ? '& ' + sel : sel;
+					}).join(', ');
 				styleRule.style.__starts = i - buffer.length;
 				styleRule.parentRule = parentRule;
 				nestedSelectorRule = styleRule;
@@ -2161,8 +2368,14 @@ CSSOM.parse = function parse(token) {
 
 		case ";":
 			switch (state) {
+				case "before-value":
+				case "before-name":
+					parseError("Unexpected ;");
+					buffer = "";
+					state = "before-name";
+					break;
 				case "value":
-					styleRule.style.setProperty(name, buffer.trim(), priority);
+					styleRule.style.setProperty(name, buffer.trim(), priority, parseError);
 					priority = "";
 					buffer = "";
 					state = "before-name";
@@ -2212,9 +2425,10 @@ CSSOM.parse = function parse(token) {
 		case "}":
 			switch (state) {
 				case "value":
-					styleRule.style.setProperty(name, buffer.trim(), priority);
+					styleRule.style.setProperty(name, buffer.trim(), priority, parseError);
 					priority = "";
 					/* falls through */
+				case "before-value":
 				case "before-name":
 				case "name":
 					styleRule.__ends = i + 1;
@@ -2232,7 +2446,14 @@ CSSOM.parse = function parse(token) {
 						currentScope = parentRule || styleSheet;
 					}
 
-					currentScope.cssRules.push(styleRule);
+					if (styleRule.constructor.name === "CSSStyleRule" && !isValidSelectorText(styleRule.selectorText)) {
+						if (styleRule === nestedSelectorRule) {
+							nestedSelectorRule = null;
+						}
+						parseError('Invalid CSSStyleRule.selectorText');
+					} else {
+						currentScope.cssRules.push(styleRule);
+					}
 					buffer = "";
 					if (currentScope.constructor === CSSOM.CSSKeyframesRule) {
 						state = "keyframeRule-begin";
@@ -2254,8 +2475,14 @@ CSSOM.parse = function parse(token) {
 				case "selector":
 					// End of media/supports/document rule.
 					if (!parentRule) {
+						parseError("Unexpected }");
+						
+						var hasPreviousStyleRule = currentScope.cssRules.length && currentScope.cssRules[currentScope.cssRules.length - 1].constructor.name === "CSSStyleRule";
+						if (hasPreviousStyleRule) {
+							i = ignoreBalancedBlock(i, token.slice(i), 1);
+						}
+						
 						break;
-						//parseError("Unexpected }");
 					}
 
 
@@ -2284,7 +2511,7 @@ CSSOM.parse = function parse(token) {
 							} else {
 								prevScope = currentScope;
 								currentScope = parentRule;
-								currentScope.cssRules.push(prevScope);
+								currentScope !== prevScope && currentScope.cssRules.push(prevScope);
 								break;
 							}
 						}

package/lib/CSSStyleDeclaration.js

@@ -2,6 +2,28 @@
 var CSSOM = {};
 ///CommonJS
 
+// NOTE: Check viability to add a validation for css values or use a dependency like csstree-validator
+/**
+ * Regular expression to detect invalid characters in the value portion of a CSS style declaration.
+ *
+ * This regex matches a colon (:) that is not inside parentheses and not inside single or double quotes.
+ * It is used to ensure that the value part of a CSS property does not contain unexpected colons,
+ * which would indicate a malformed declaration (e.g., "color: foo:bar;" is invalid).
+ *
+ * The negative lookahead `(?![^(]*\))` ensures that the colon is not followed by a closing
+ * parenthesis without encountering an opening parenthesis, effectively ignoring colons inside
+ * function-like values (e.g., `url(data:image/png;base64,...)`).
+ *
+ * The lookahead `(?=(?:[^'"]|'[^']*'|"[^"]*")*$)` ensures that the colon is not inside single or double quotes,
+ * allowing colons within quoted strings (e.g., `content: ":";` or `background: url("foo:bar.png");`).
+ *
+ * Example:
+ *   "color: red;"         // valid, does not match
+ *   "background: url(data:image/png;base64,...);" // valid, does not match
+ *   "content: ':';"       // valid, does not match
+ *   "color: foo:bar;"     // invalid, matches
+ */
+var basicStylePropertyValueValidationRegExp = /:(?![^(]*\))(?=(?:[^'"]|'[^']*'|"[^"]*")*$)/;
 
 /**
  * @constructor
@@ -38,8 +60,12 @@ CSSOM.CSSStyleDeclaration.prototype = {
 	 * @param {string} [priority=null] "important" or null
 	 * @see http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSStyleDeclaration-setProperty
 	 */
-	setProperty: function(name, value, priority) {
-		if (this[name]) {
+	setProperty: function(name, value, priority, parseErrorHandler) 
+	{
+		// NOTE: Check viability to add a validation for css values or use a dependency like csstree-validator
+		if (basicStylePropertyValueValidationRegExp.test(value)) {
+			parseErrorHandler && parseErrorHandler('Invalid CSSStyleDeclaration property value');
+		} else if (this[name]) {
 			// Property already exist. Overwrite it.
 			var index = Array.prototype.indexOf.call(this, name);
 			if (index < 0) {

package/lib/parse.js

@@ -6,7 +6,8 @@ var CSSOM = {};
 /**
  * @param {string} token
  */
-CSSOM.parse = function parse(token) {
+CSSOM.parse = function parse(token, errorHandler) {
+	errorHandler = errorHandler === undefined && (console && console.error);
 
 	var i = 0;
 
@@ -28,6 +29,8 @@ CSSOM.parse = function parse(token) {
 	var valueParenthesisDepth = 0;
 
 	var SIGNIFICANT_WHITESPACE = {
+		"name": true,
+		"before-name": true,
 		"selector": true,
 		"value": true,
 		"value-parenthesis": true,
@@ -132,6 +135,29 @@ CSSOM.parse = function parse(token) {
 		return null;
 	}
 
+	/**
+	 * Advances the index `i` to skip over a balanced block of curly braces in the given string.
+	 * This is typically used to ignore the contents of a CSS rule block.
+	 *
+	 * @param {number} i - The current index in the string to start searching from.
+	 * @param {string} str - The string containing the CSS code.
+	 * @param {number} fromIndex - The index in the string where the balanced block search should begin.
+	 * @returns {number} The updated index after skipping the balanced block.
+	 */
+	function ignoreBalancedBlock(i, str, fromIndex) {
+		var ruleClosingMatch = matchBalancedBlock(str, fromIndex);
+		if (ruleClosingMatch) {
+			var ignoreRange = ruleClosingMatch.index + ruleClosingMatch[0].length;
+			i+= ignoreRange;
+			if (token.charAt(i) === '}') {
+				i -= 1;
+			}
+		} else {
+			i += str.length;
+		}
+		return i;	
+	}
+
 	var parseError = function(message) {
 		var lines = token.substring(0, i).split('\n');
 		var lineCount = lines.length;
@@ -141,7 +167,12 @@ CSSOM.parse = function parse(token) {
 		/* jshint sub : true */
 		error['char'] = charCount;
 		error.styleSheet = styleSheet;
-		throw error;
+		// Print the error but continue parsing the sheet
+		try {
+			throw error;
+		} catch(e) {
+			errorHandler && errorHandler(e);
+		}
 	};
 
 	var validateAtRule = function(atRuleKey, validCallback, cannotBeNested) {
@@ -192,22 +223,156 @@ CSSOM.parse = function parse(token) {
 			}
 
 			// Ignore the entire rule block (if it's a statement it should ignore the statement plus the next block)
-			var ruleClosingMatch = matchBalancedBlock(ruleSlice);
-			if (ruleClosingMatch) {
-				var ignoreRange = ruleClosingMatch.index + ruleClosingMatch[0].length;
-				i+= ignoreRange;
-				if (token.charAt(i) === '}') {
-					i -= 1;
-				}
-			} else {
-				i += ruleSlice.length;
-			}
+			i = ignoreBalancedBlock(i, ruleSlice);
 			state = "before-selector";
 		} else {
 			validCallback.call(this);
 		}
 	}
 
+	/**
+	 * Regular expression to match a basic CSS selector.
+	 *
+	 * This regex matches the following selector components:
+	 * - Type selectors (e.g., `div`, `span`)
+	 * - Universal selector (`*`)
+	 * - ID selectors (e.g., `#header`)
+	 * - Class selectors (e.g., `.container`)
+	 * - Attribute selectors (e.g., `[type="text"]`)
+	 * - Pseudo-classes and pseudo-elements (e.g., `:hover`, `::before`, `:nth-child(2)`)
+	 * - 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.
+	 *
+	 * @type {RegExp}
+	 */
+	var basicSelectorRegExp = /^([a-zA-Z][a-zA-Z0-9_-]*|\*|#[a-zA-Z0-9_-]+|\.[a-zA-Z0-9_-]+|\[[^\[\]]*\]|::?[a-zA-Z0-9_-]+(?:\([^\(\)]*\))?|&|\s*[>+~]\s*|\s+)+$/;
+
+	/**
+	 * Regular expression to match CSS pseudo-classes with arguments.
+	 *
+	 * Matches patterns like `:pseudo-class(argument)`, capturing the pseudo-class name and its argument.
+	 *
+	 * Capture groups:
+	 *   1. The pseudo-class name (letters and hyphens).
+	 *   2. The argument inside the parentheses (any characters except a closing parenthesis).
+	 *
+	 * 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"
+	 * @type {RegExp}
+	 */
+	var globalPseudoClassRegExp = /:([a-zA-Z-]+)\(([^)]*)\)/g;
+
+	/**
+	 * Parses a CSS selector string and splits it into parts, handling nested parentheses.
+	 *
+	 * This function is useful for splitting selectors that may contain nested function-like
+	 * syntax (e.g., :not(.foo, .bar)), ensuring that commas inside parentheses do not split
+	 * the selector.
+	 *
+	 * @param {string} selector - The CSS selector string to parse.
+	 * @returns {string[]} An array of selector parts, split by top-level commas, with whitespace trimmed.
+	 */
+	function parseNestedSelectors(selector) {
+		var depth = 0;
+		var buffer = "";
+		var parts = [];
+		var i, char;
+
+		for (i = 0; i < selector.length; i++) {
+			char = selector.charAt(i);
+
+			if (char === '(') {
+				depth++;
+				buffer += char;
+			} else if (char === ')') {
+				depth--;
+				buffer += char;
+				if (depth === 0) {
+					parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+					buffer = "";
+				}
+			} else if (char === ',' && depth === 0) {
+				if (buffer.replace(/^\s+|\s+$/g, "")) {
+					parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+				}
+				buffer = "";
+			} else {
+				buffer += char;
+			}
+		}
+
+		if (buffer.replace(/^\s+|\s+$/g, "")) {
+			parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+		}
+
+		return parts;
+	}
+
+	/**
+	 * 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),
+	 * 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
+		};
+
+		// Reset regex lastIndex for global regex in ES5 loop
+		var pseudoClassRegExp = new RegExp(globalPseudoClassRegExp.source, globalPseudoClassRegExp.flags);
+		while ((match = pseudoClassRegExp.exec(selector)) !== null) {
+			var pseudoClass = match[1];
+			if (selectorListPseudoClasses.hasOwnProperty(pseudoClass)) {
+				nestedSelectors = parseNestedSelectors(match[2]);
+				// Validate each nested selector
+				for (i = 0; i < nestedSelectors.length; i++) {
+					if (!validateSelector(nestedSelectors[i])) {
+						return false;
+					}
+				}
+			}
+		}
+
+		// Allow "&" anywhere in the selector for nested selectors
+		return basicSelectorRegExp.test(selector);
+	}
+
+	/**
+	 * Checks if a given CSS selector text is valid by splitting it by commas
+	 * and validating each individual selector using the `validateSelector` function.
+	 *
+	 * @param {string} selectorText - The CSS selector text to validate. Can contain multiple selectors separated by commas.
+	 * @returns {boolean} Returns true if all selectors are valid, otherwise false.
+	 */
+	function isValidSelectorText(selectorText) {
+		// Split selectorText by commas and validate each part
+		var selectors = selectorText.split(',');
+		for (var i = 0; i < selectors.length; i++) {
+			if (!validateSelector(selectors[i].replace(/^\s+|\s+$/g, ""))) {
+				return false;
+			}
+		}
+		return true;
+	}
+
 	var endingIndex = token.length - 1;
 
 	for (var character; (character = token.charAt(i)); i++) {
@@ -240,6 +405,9 @@ CSSOM.parse = function parse(token) {
 					parseError('Unmatched "');
 				}
 			} while (token[index - 2] === '\\');
+			if (index === 0) {
+				break;
+			}
 			buffer += token.slice(i, index);
 			i = index - 1;
 			switch (state) {
@@ -263,6 +431,9 @@ CSSOM.parse = function parse(token) {
 					parseError("Unmatched '");
 				}
 			} while (token[index - 2] === '\\');
+			if (index === 0) {
+				break;
+			}
 			buffer += token.slice(i, index);
 			i = index - 1;
 			switch (state) {
@@ -398,6 +569,11 @@ CSSOM.parse = function parse(token) {
 			if (currentScope === styleSheet) {
 				nestedSelectorRule = null;
 			}
+			if (state === 'before-selector') {
+				parseError("Unexpected {");
+				i = ignoreBalancedBlock(i, token.slice(i));
+				break;
+			}
 			if (state === "selector" || state === "atRule") {
 				if (!nestedSelectorRule && buffer.indexOf(";") !== -1) {
 					var ruleClosingMatch = token.slice(i).match(forwardRuleClosingBraceRegExp);
@@ -416,6 +592,7 @@ CSSOM.parse = function parse(token) {
 				}
 
 				currentScope = parentRule = styleRule;
+				console.log('sel out', buffer);
 				styleRule.selectorText = buffer.trim();
 				styleRule.style.__starts = i;
 				styleRule.parentStyleSheet = styleSheet;
@@ -527,7 +704,7 @@ CSSOM.parse = function parse(token) {
 				documentRule.parentStyleSheet = styleSheet;
 				buffer = "";
 				state = "before-selector";
-			} else if (state === "name") {
+			} else if (state === "before-name" || state === "name") {
 				if (styleRule.constructor.name === "CSSNestedDeclarations") {
 					if (styleRule.style.length) {
 						parentRule.cssRules.push(styleRule);
@@ -544,9 +721,12 @@ CSSOM.parse = function parse(token) {
 					styleRule.parentStyleSheet = styleSheet;
 				}
 				
-				
 				styleRule = new CSSOM.CSSStyleRule();
-				styleRule.selectorText = buffer.trim();
+				console.log('sel in', buffer);
+				// In a nested selector, ensure each selector contains '&' at the beginning, except for selectors that already have '&' somewhere
+				styleRule.selectorText = parseNestedSelectors(buffer.trim()).map(function(sel) {
+						return sel.indexOf('&') === -1 ? '& ' + sel : sel;
+					}).join(', ');
 				styleRule.style.__starts = i - buffer.length;
 				styleRule.parentRule = parentRule;
 				nestedSelectorRule = styleRule;
@@ -621,8 +801,14 @@ CSSOM.parse = function parse(token) {
 
 		case ";":
 			switch (state) {
+				case "before-value":
+				case "before-name":
+					parseError("Unexpected ;");
+					buffer = "";
+					state = "before-name";
+					break;
 				case "value":
-					styleRule.style.setProperty(name, buffer.trim(), priority);
+					styleRule.style.setProperty(name, buffer.trim(), priority, parseError);
 					priority = "";
 					buffer = "";
 					state = "before-name";
@@ -672,9 +858,10 @@ CSSOM.parse = function parse(token) {
 		case "}":
 			switch (state) {
 				case "value":
-					styleRule.style.setProperty(name, buffer.trim(), priority);
+					styleRule.style.setProperty(name, buffer.trim(), priority, parseError);
 					priority = "";
 					/* falls through */
+				case "before-value":
 				case "before-name":
 				case "name":
 					styleRule.__ends = i + 1;
@@ -692,7 +879,14 @@ CSSOM.parse = function parse(token) {
 						currentScope = parentRule || styleSheet;
 					}
 
-					currentScope.cssRules.push(styleRule);
+					if (styleRule.constructor.name === "CSSStyleRule" && !isValidSelectorText(styleRule.selectorText)) {
+						if (styleRule === nestedSelectorRule) {
+							nestedSelectorRule = null;
+						}
+						parseError('Invalid CSSStyleRule.selectorText');
+					} else {
+						currentScope.cssRules.push(styleRule);
+					}
 					buffer = "";
 					if (currentScope.constructor === CSSOM.CSSKeyframesRule) {
 						state = "keyframeRule-begin";
@@ -714,8 +908,14 @@ CSSOM.parse = function parse(token) {
 				case "selector":
 					// End of media/supports/document rule.
 					if (!parentRule) {
+						parseError("Unexpected }");
+						
+						var hasPreviousStyleRule = currentScope.cssRules.length && currentScope.cssRules[currentScope.cssRules.length - 1].constructor.name === "CSSStyleRule";
+						if (hasPreviousStyleRule) {
+							i = ignoreBalancedBlock(i, token.slice(i), 1);
+						}
+						
 						break;
-						//parseError("Unexpected }");
 					}
 
 
@@ -744,7 +944,7 @@ CSSOM.parse = function parse(token) {
 							} else {
 								prevScope = currentScope;
 								currentScope = parentRule;
-								currentScope.cssRules.push(prevScope);
+								currentScope !== prevScope && currentScope.cssRules.push(prevScope);
 								break;
 							}
 						}

package/package.json

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