@acemir/cssom 0.9.24 → 0.9.26

package/lib/parse.js

@@ -1,14 +1,17 @@
 //.CommonJS
-var CSSOM = {};
+var CSSOM = {
+	setup: require('./CSSOM').setup
+};
 ///CommonJS
 
-
 /**
  * Parses a CSS string and returns a CSSOM.CSSStyleSheet object representing the parsed stylesheet.
  *
  * @param {string} token - The CSS string to parse.
  * @param {object} [opts] - Optional parsing options.
- * @param {object} [opts.globalObject] - An optional global object to attach to the stylesheet. Useful on jsdom webplatform tests.
+ * @param {object} [opts.globalObject] - @deprecated This property will be removed in the next release. Use CSSOM.setup({ globalObject }) instead. - An optional global object to override globals and window. Useful on jsdom webplatform tests.
+ * @param {Element | ProcessingInstruction} [opts.ownerNode] - The owner node of the stylesheet.
+ * @param {CSSRule} [opts.ownerRule] - The owner rule of the stylesheet.
  * @param {CSSOM.CSSStyleSheet} [opts.styleSheet] - Reuse a style sheet instead of creating a new one (e.g. as `parentStyleSheet`)
  * @param {CSSOM.CSSRuleList} [opts.cssRules] - Prepare all rules in this list instead of mutating the style sheet continually
  * @param {function|boolean} [errorHandler] - Optional error handler function or `true` to use `console.error`.
@@ -62,6 +65,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		styleSheet = opts.styleSheet;
 	} else {
 		styleSheet = new CSSOM.CSSStyleSheet()
+		styleSheet.__constructed = false;
 	}
 
 	var topScope;
@@ -72,7 +76,19 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	}
 
 	if (opts && opts.globalObject) {
-		styleSheet.__globalObject = opts.globalObject;
+		CSSOM.setup({ globalObject: opts.globalObject });
+	}
+
+	if (opts && opts.ownerNode) {
+		styleSheet.__ownerNode = opts.ownerNode;
+		var ownerNodeMedia = opts.ownerNode.media || (opts.ownerNode.getAttribute && opts.ownerNode.getAttribute("media"));
+		if (ownerNodeMedia) {
+			styleSheet.media.mediaText = ownerNodeMedia;
+		}
+	}
+
+	if (opts && opts.ownerRule) {
+		styleSheet.__ownerRule = opts.ownerRule;
 	}
 
 	// @type CSSStyleSheet|CSSMediaRule|CSSContainerRule|CSSSupportsRule|CSSFontFaceRule|CSSKeyframesRule|CSSDocumentRule
@@ -84,7 +100,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	var ancestorRules = [];
 	var prevScope;
 
-	var name, priority="", styleRule, mediaRule, containerRule, counterStyleRule, supportsRule, importRule, fontFaceRule, keyframesRule, documentRule, hostRule, startingStyleRule, scopeRule, pageRule, layerBlockRule, layerStatementRule, nestedSelectorRule, namespaceRule;
+	var name, priority = "", styleRule, mediaRule, containerRule, counterStyleRule, supportsRule, importRule, fontFaceRule, keyframesRule, documentRule, hostRule, startingStyleRule, scopeRule, pageRule, layerBlockRule, layerStatementRule, nestedSelectorRule, namespaceRule;
 
 	// Track defined namespace prefixes for validation
 	var definedNamespacePrefixes = {};
@@ -182,14 +198,14 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		var ruleClosingMatch = matchBalancedBlock(str, fromIndex);
 		if (ruleClosingMatch) {
 			var ignoreRange = ruleClosingMatch.index + ruleClosingMatch[0].length;
-			i+= ignoreRange;
+			i += ignoreRange;
 			if (token.charAt(i) === '}') {
 				i -= 1;
 			}
 		} else {
 			i += str.length;
 		}
-		return i;	
+		return i;
 	}
 
 	/**
@@ -199,29 +215,29 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	 */
 	function parseScopePrelude(preludeContent) {
 		var parts = preludeContent.split(/\s*\)\s*to\s+\(/);
-		
+
 		// Restore the parentheses that were consumed by the split
 		if (parts.length === 2) {
 			parts[0] = parts[0] + ')';
 			parts[1] = '(' + parts[1];
 		}
-		
+
 		var hasStart = parts[0] &&
 			parts[0].charAt(0) === '(' &&
 			parts[0].charAt(parts[0].length - 1) === ')';
 		var hasEnd = parts[1] &&
 			parts[1].charAt(0) === '(' &&
 			parts[1].charAt(parts[1].length - 1) === ')';
-		
+
 		// Handle case: @scope to (<end>)
 		var hasOnlyEnd = !hasStart &&
 			!hasEnd &&
 			parts[0].indexOf('to (') === 0 &&
 			parts[0].charAt(parts[0].length - 1) === ')';
-		
+
 		var startSelector = '';
 		var endSelector = '';
-		
+
 		if (hasStart) {
 			startSelector = parts[0].slice(1, -1).trim();
 		}
@@ -231,7 +247,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		if (hasOnlyEnd) {
 			endSelector = parts[0].slice(4, -1).trim();
 		}
-		
+
 		return {
 			startSelector: startSelector,
 			endSelector: endSelector,
@@ -269,11 +285,11 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		var inDoubleQuote = false;
 		var inAttr = false;
 		var stack = useStack ? [] : null;
-		
+
 		for (var i = 0; i < selector.length; i++) {
 			var char = selector[i];
 			var prevChar = i > 0 ? selector[i - 1] : '';
-			
+
 			if (inSingleQuote) {
 				if (char === "'" && prevChar !== "\\") {
 					inSingleQuote = false;
@@ -324,7 +340,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				}
 			}
 		}
-		
+
 		// Check if everything is balanced
 		if (useStack) {
 			return stack.length === 0 && bracketDepth === 0 && !inSingleQuote && !inDoubleQuote && !inAttr;
@@ -374,7 +390,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 			/(?:^|[\s>+~,\[])cue\s*\(/i,
 			/(?:^|[\s>+~,\[])cue-region\s*\(/i
 		];
-		
+
 		for (var i = 0; i < invalidPatterns.length; i++) {
 			if (invalidPatterns[i].test(selector)) {
 				return true;
@@ -420,7 +436,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				isValid = true;
 			}
 		}
-		
+
 		// Additional validation for @scope rule
 		if (isValid && atRuleKey === "@scope") {
 			var openBraceIndex = ruleSlice.indexOf('{');
@@ -439,7 +455,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 					var hasStart = parsedScopePrelude.hasStart;
 					var hasEnd = parsedScopePrelude.hasEnd;
 					var hasOnlyEnd = parsedScopePrelude.hasOnlyEnd;
-					
+
 					// Validation rules for @scope:
 					// 1. Empty selectors in parentheses are invalid: @scope () {} or @scope (.a) to () {}
 					if ((hasStart && startSelector === '') || (hasEnd && endSelector === '') || (hasOnlyEnd && endSelector === '')) {
@@ -475,13 +491,13 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 			if (openBraceIndex !== -1) {
 				// Extract the rule prelude (everything between the at-rule and {)
 				var rulePrelude = ruleSlice.slice(0, openBraceIndex).trim();
-				
+
 				// Skip past at-rule keyword and whitespace
 				var preludeContent = rulePrelude.slice("@page".length).trim();
 
 				if (preludeContent.length > 0) {
 					var trimmedValue = preludeContent.trim();
-            
+
 					// Empty selector is valid for @page
 					if (trimmedValue !== '') {
 						// Parse @page selectorText for page name and pseudo-pages
@@ -505,7 +521,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 
 							// Validate pseudo-pages if present
 							if (pseudoPages) {
-								var pseudos = pseudoPages.split(':').filter(function(p) { return p; });
+								var pseudos = pseudoPages.split(':').filter(function (p) { return p; });
 								var validPseudos = ['left', 'right', 'first', 'blank'];
 								var allValid = true;
 								for (var j = 0; j < pseudos.length; j++) {
@@ -514,7 +530,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 										break;
 									}
 								}
-								
+
 								if (!allValid) {
 									isValid = false;
 								}
@@ -523,15 +539,15 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 							isValid = false;
 						}
 					}
-					
+
 				}
 			}
 		}
-		
+
 		if (!isValid) {
 			// If it's invalid the browser will simply ignore the entire invalid block
 			// Use regex to find the closing brace of the invalid rule
-			
+
 			// Regex used above is not ES5 compliant. Using alternative.
 			// var ruleStatementMatch = ruleSlice.match(atRulesStatemenRegExp); //
 			var ruleStatementMatch = atRulesStatemenRegExpES5Alternative(ruleSlice);
@@ -546,7 +562,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 			// Check if there's a semicolon before the invalid at-rule and the first opening brace
 			if (atRuleKey === "@layer") {
 				var ruleSemicolonAndOpeningBraceMatch = ruleSlice.match(forwardRuleSemicolonAndOpeningBraceRegExp);
-				if (ruleSemicolonAndOpeningBraceMatch && ruleSemicolonAndOpeningBraceMatch[1] === ";" ) {
+				if (ruleSemicolonAndOpeningBraceMatch && ruleSemicolonAndOpeningBraceMatch[1] === ";") {
 					// Ignore the rule block until the semicolon
 					i += ruleSemicolonAndOpeningBraceMatch.index + ruleSemicolonAndOpeningBraceMatch[0].length;
 					state = "before-selector";
@@ -564,7 +580,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 
 	// Helper functions for looseSelectorValidator
 	// Defined outside to avoid recreation on every validation call
-	
+
 	/**
 	 * Check if character is a valid identifier start
 	 * @param {string} c - Character to check
@@ -636,19 +652,19 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		// Helper: Parse namespace prefix (optional)
 		function parseNamespace() {
 			var start = i;
-			
+
 			// Match: *| or identifier| or |
 			if (i < len && selector[i] === '*') {
 				i++;
 			} else if (i < len && (isIdentStart(selector[i]) || selector[i] === '\\')) {
 				parseIdentifier();
 			}
-			
+
 			if (i < len && selector[i] === '|') {
 				i++;
 				return true;
 			}
-			
+
 			// Rollback if no pipe found
 			i = start;
 			return false;
@@ -659,15 +675,15 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 			if (i >= len || selector[i] !== '(') {
 				return false;
 			}
-			
+
 			i++; // Skip opening paren
 			var depth = 1;
 			var inString = false;
 			var stringChar = '';
-			
+
 			while (i < len && depth > 0) {
 				var c = selector[i];
-				
+
 				if (c === '\\' && i + 1 < len) {
 					i += 2; // Skip escaped character
 				} else if (!inString && (c === '"' || c === '\'')) {
@@ -687,7 +703,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 					i++;
 				}
 			}
-			
+
 			return depth === 0;
 		}
 
@@ -789,7 +805,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 			// Match type selector with optional namespace: [namespace|]identifier
 			else if (i < len && (isIdentStart(selector[i]) || selector[i] === '\\' || selector[i] === '*' || selector[i] === '|')) {
 				parseNamespace(); // Optional namespace prefix
-				
+
 				if (i < len && selector[i] === '*') {
 					i++; // Universal selector
 					hasMatchedComponent = true;
@@ -865,36 +881,36 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		// Pseudo-classes like :lang(), :dir(), :nth-*() should not accept quoted strings
 		// Using iterative parsing instead of regex to avoid exponential backtracking
 		var noQuotesPseudos = ['lang', 'dir', 'nth-child', 'nth-last-child', 'nth-of-type', 'nth-last-of-type'];
-		
+
 		for (var idx = 0; idx < selector.length; idx++) {
 			// Look for pseudo-class/element start
 			if (selector[idx] === ':') {
 				var pseudoStart = idx;
 				idx++;
-				
+
 				// Skip second colon for pseudo-elements
 				if (idx < selector.length && selector[idx] === ':') {
 					idx++;
 				}
-				
+
 				// Extract pseudo name
 				var nameStart = idx;
 				while (idx < selector.length && /[a-zA-Z0-9\-]/.test(selector[idx])) {
 					idx++;
 				}
-				
+
 				if (idx === nameStart) {
 					continue; // No name found
 				}
-				
+
 				var pseudoName = selector.substring(nameStart, idx).toLowerCase();
-				
+
 				// Check if this pseudo has arguments
 				if (idx < selector.length && selector[idx] === '(') {
 					idx++;
 					var contentStart = idx;
 					var depth = 1;
-					
+
 					// Find matching closing paren (handle nesting)
 					while (idx < selector.length && depth > 0) {
 						if (selector[idx] === '\\') {
@@ -909,10 +925,10 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 							idx++;
 						}
 					}
-					
+
 					if (depth === 0) {
 						var pseudoContent = selector.substring(contentStart, idx - 1);
-						
+
 						// Check if this pseudo should not have quoted strings
 						for (var j = 0; j < noQuotesPseudos.length; j++) {
 							if (pseudoName === noQuotesPseudos[j] && /['"]/.test(pseudoContent)) {
@@ -927,7 +943,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		// Use the iterative validator to avoid regex backtracking issues
 		return looseSelectorValidator(selector);
 	}
-	
+
 	/**
 	 * Regular expression to match CSS pseudo-classes with arguments.
 	 *
@@ -946,7 +962,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	 *
 	 * REPLACED WITH FUNCTION to avoid exponential backtracking.
 	 */
-	
+
 	/**
 	 * Extract pseudo-classes with arguments from a selector using iterative parsing.
 	 * Replaces the previous globalPseudoClassRegExp to avoid exponential backtracking.
@@ -962,30 +978,30 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	 */
 	function extractPseudoClasses(selector) {
 		var matches = [];
-		
+
 		for (var i = 0; i < selector.length; i++) {
 			// Look for pseudo-class start (single or double colon)
 			if (selector[i] === ':') {
 				var pseudoStart = i;
 				i++;
-				
+
 				// Skip second colon for pseudo-elements (::)
 				if (i < selector.length && selector[i] === ':') {
 					i++;
 				}
-				
+
 				// Extract pseudo name
 				var nameStart = i;
 				while (i < selector.length && /[a-zA-Z\-]/.test(selector[i])) {
 					i++;
 				}
-				
+
 				if (i === nameStart) {
 					continue; // No name found
 				}
-				
+
 				var pseudoName = selector.substring(nameStart, i);
-				
+
 				// Check if this pseudo has arguments
 				if (i < selector.length && selector[i] === '(') {
 					i++;
@@ -993,11 +1009,11 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 					var depth = 1;
 					var inSingleQuote = false;
 					var inDoubleQuote = false;
-					
+
 					// Find matching closing paren (handle nesting and strings)
 					while (i < selector.length && depth > 0) {
 						var ch = selector[i];
-						
+
 						if (ch === '\\') {
 							i += 2; // Skip escaped character
 						} else if (ch === "'" && !inDoubleQuote) {
@@ -1016,21 +1032,21 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 							i++;
 						}
 					}
-					
+
 					if (depth === 0) {
 						var pseudoArgs = selector.substring(argsStart, i - 1);
 						var fullMatch = selector.substring(pseudoStart, i);
-						
+
 						// Store match in same format as regex: [fullMatch, pseudoName, pseudoArgs, startIndex]
 						matches.push([fullMatch, pseudoName, pseudoArgs, pseudoStart]);
 					}
-					
+
 					// Move back one since loop will increment
 					i--;
 				}
 			}
 		}
-		
+
 		return matches;
 	}
 
@@ -1134,6 +1150,23 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 			var pseudoClass = pseudoClassMatches[j][1];
 			if (selectorListPseudoClasses.hasOwnProperty(pseudoClass)) {
 				var nestedSelectors = parseAndSplitNestedSelectors(pseudoClassMatches[j][2]);
+
+				// Check if ANY selector in the list contains & (nesting selector)
+				// If so, skip validation for the entire selector list since & will be replaced at runtime
+				var hasAmpersand = false;
+				for (var k = 0; k < nestedSelectors.length; k++) {
+					if (/&/.test(nestedSelectors[k])) {
+						hasAmpersand = true;
+						break;
+					}
+				}
+
+				// If any selector has &, skip validation for this entire pseudo-class
+				if (hasAmpersand) {
+					continue;
+				}
+
+				// Otherwise, validate each selector normally
 				for (var i = 0; i < nestedSelectors.length; i++) {
 					var nestedSelector = nestedSelectors[i];
 					if (!validatedSelectorsCache.hasOwnProperty(nestedSelector)) {
@@ -1170,10 +1203,10 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		var inAttr = false;
 		var inSingleQuote = false;
 		var inDoubleQuote = false;
-		
+
 		for (var i = 0; i < selector.length; i++) {
 			var char = selector[i];
-			
+
 			if (inSingleQuote) {
 				if (char === "'" && selector[i - 1] !== "\\") {
 					inSingleQuote = false;
@@ -1200,18 +1233,18 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				}
 			}
 		}
-		
+
 		if (pipeIndex === -1) {
 			return true; // No namespace, always valid
 		}
-		
+
 		var namespacePrefix = selector.substring(0, pipeIndex);
-		
+
 		// Universal namespace (*|) and default namespace (|) are always valid
 		if (namespacePrefix === '*' || namespacePrefix === '') {
 			return true;
 		}
-		
+
 		// Check if the custom namespace prefix is defined
 		return definedNamespacePrefixes.hasOwnProperty(namespacePrefix);
 	}
@@ -1220,22 +1253,92 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	 * Processes a CSS selector text 
 	 * 
 	 * @param {string} selectorText - The CSS selector text to process
-	 * @returns {string} The processed selector text with normalized whitespace
+	 * @returns {string} The processed selector text with normalized whitespace and invalid selectors removed
 	 */
 	function processSelectorText(selectorText) {
-		// TODO: Remove invalid selectors that appears inside pseudo classes
-		// TODO: The same processing here needs to be reused in CSSStyleRule.selectorText setter
-		// TODO: Move these validation logic to a shared function to be reused in CSSStyleRule.selectorText setter
-
-		/**
-		 * Normalizes whitespace and preserving quoted strings.
-		 * Replaces all newline characters (CRLF, CR, or LF) with spaces while keeping quoted
-		 * strings (single or double quotes) intact, including any escaped characters within them.
-		 */
-		return selectorText.replace(/(['"])(?:\\.|[^\\])*?\1|(\r\n|\r|\n)/g, function(match, _, newline) {
+		// Normalize whitespace first
+		var normalized = selectorText.replace(/(['"])(?:\\.|[^\\])*?\1|(\r\n|\r|\n)/g, function (match, _, newline) {
 			if (newline) return " ";
 			return match;
 		});
+
+		// Recursively process pseudo-classes to handle nesting
+		return processNestedPseudoClasses(normalized);
+	}
+
+	/**
+	 * Recursively processes pseudo-classes to filter invalid selectors
+	 * 
+	 * @param {string} selectorText - The CSS selector text to process
+	 * @param {number} depth - Current recursion depth (to prevent infinite loops)
+	 * @returns {string} The processed selector text with invalid selectors removed
+	 */
+	function processNestedPseudoClasses(selectorText, depth) {
+		// Prevent infinite recursion
+		if (typeof depth === 'undefined') {
+			depth = 0;
+		}
+		if (depth > 10) {
+			return selectorText;
+		}
+
+		var pseudoClassMatches = extractPseudoClasses(selectorText);
+
+		// If no pseudo-classes found, return as-is
+		if (pseudoClassMatches.length === 0) {
+			return selectorText;
+		}
+
+		// Build result by processing matches from right to left (to preserve positions)
+		var result = selectorText;
+
+		for (var j = pseudoClassMatches.length - 1; j >= 0; j--) {
+			var pseudoClass = pseudoClassMatches[j][1];
+			if (selectorListPseudoClasses.hasOwnProperty(pseudoClass)) {
+				var fullMatch = pseudoClassMatches[j][0];
+				var pseudoArgs = pseudoClassMatches[j][2];
+				var matchStart = pseudoClassMatches[j][3];
+
+				// Check if ANY selector contains & BEFORE processing
+				var nestedSelectorsRaw = parseAndSplitNestedSelectors(pseudoArgs);
+				var hasAmpersand = false;
+				for (var k = 0; k < nestedSelectorsRaw.length; k++) {
+					if (/&/.test(nestedSelectorsRaw[k])) {
+						hasAmpersand = true;
+						break;
+					}
+				}
+
+				// If & is present, skip all processing (keep everything unchanged)
+				if (hasAmpersand) {
+					continue;
+				}
+
+				// Recursively process the arguments
+				var processedArgs = processNestedPseudoClasses(pseudoArgs, depth + 1);
+				var nestedSelectors = parseAndSplitNestedSelectors(processedArgs);
+
+				// Filter out invalid selectors
+				var validSelectors = [];
+				for (var i = 0; i < nestedSelectors.length; i++) {
+					var nestedSelector = nestedSelectors[i];
+					if (basicSelectorValidator(nestedSelector)) {
+						validSelectors.push(nestedSelector);
+					}
+				}
+
+				// Reconstruct the pseudo-class with only valid selectors
+				var newArgs = validSelectors.join(', ');
+				var newPseudoClass = ':' + pseudoClass + '(' + newArgs + ')';
+
+				// Replace in the result string using position (processing right to left preserves positions)
+				result = result.substring(0, matchStart) + newPseudoClass + result.substring(matchStart + fullMatch.length);
+			}
+		}
+
+		return result;
+
+		return normalized;
 	}
 
 	/**
@@ -1249,6 +1352,12 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		// TODO: The same validations here needs to be reused in CSSStyleRule.selectorText setter
 		// TODO: Move these validation logic to a shared function to be reused in CSSStyleRule.selectorText setter
 
+		// Check for empty selector lists in pseudo-classes (e.g., :is(), :not(), :where(), :has())
+		// These are invalid after filtering out invalid selectors
+		if (/:(?:is|not|where|has)\(\s*\)/.test(selectorText)) {
+			return false;
+		}
+
 		// Check for newlines inside single or double quotes using regex
 		// This matches any quoted string (single or double) containing a newline
 		var quotedNewlineRegExp = /(['"])(?:\\.|[^\\])*?\1/g;
@@ -1288,12 +1397,22 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		// Print the error but continue parsing the sheet
 		try {
 			throw error;
-		} catch(e) {
+		} catch (e) {
 			errorHandler && errorHandler(e);
 		}
 	};
 
+	// Helper functions to check character types
+	function isSelectorStartChar(char) {
+		return '.:#&*['.indexOf(char) !== -1;
+	}
+
+	function isWhitespaceChar(char) {
+		return ' \t\n\r'.indexOf(char) !== -1;
+	}
+
 	var endingIndex = token.length - 1;
+	var initialEndingIndex = endingIndex;
 
 	for (var character; (character = token.charAt(i)); i++) {
 		if (i === endingIndex) {
@@ -1303,8 +1422,9 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				case "layerBlock":
 					if (character !== ";") {
 						token += ";";
-						break;
+						endingIndex += 1;
 					}
+					break;
 				case "value":
 					if (character !== "}") {
 						if (character === ";") {
@@ -1332,7 +1452,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 					}
 			}
 		}
-		
+
 		// Handle escape sequences before processing special characters
 		// If we encounter a backslash, add both the backslash and the next character to buffer
 		// and skip the next iteration to prevent the escaped character from being interpreted
@@ -1341,813 +1461,991 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 			i++; // Skip the next character
 			continue;
 		}
-		
+
 		switch (character) {
 
-		case " ":
-		case "\t":
-		case "\r":
-		case "\n":
-		case "\f":
-			if (SIGNIFICANT_WHITESPACE[state]) {
-				buffer += character;
-			}
-			break;
-
-		// String
-		case '"':
-			index = i + 1;
-			do {
-				index = token.indexOf('"', index) + 1;
-				if (!index) {
-					parseError('Unmatched "');
+			case " ":
+			case "\t":
+			case "\r":
+			case "\n":
+			case "\f":
+				if (SIGNIFICANT_WHITESPACE[state]) {
+					buffer += character;
 				}
-			} while (token[index - 2] === '\\');
-			if (index === 0) {
 				break;
-			}
-			buffer += token.slice(i, index);
-			i = index - 1;
-			switch (state) {
-				case 'before-value':
-					state = 'value';
-					break;
-				case 'importRule-begin':
-					state = 'importRule';
-					if (i === endingIndex) {
-						token += ';'
+
+			// String
+			case '"':
+				index = i + 1;
+				do {
+					index = token.indexOf('"', index) + 1;
+					if (!index) {
+						parseError('Unmatched "');
 					}
+				} while (token[index - 2] === '\\');
+				if (index === 0) {
 					break;
-				case 'namespaceRule-begin':
-					state = 'namespaceRule';
-					if (i === endingIndex) {
-						token += ';'
+				}
+				buffer += token.slice(i, index);
+				i = index - 1;
+				switch (state) {
+					case 'before-value':
+						state = 'value';
+						break;
+					case 'importRule-begin':
+						state = 'importRule';
+						if (i === endingIndex) {
+							token += ';'
+						}
+						break;
+					case 'namespaceRule-begin':
+						state = 'namespaceRule';
+						if (i === endingIndex) {
+							token += ';'
+						}
+						break;
+				}
+				break;
+
+			case "'":
+				index = i + 1;
+				do {
+					index = token.indexOf("'", index) + 1;
+					if (!index) {
+						parseError("Unmatched '");
 					}
+				} while (token[index - 2] === '\\');
+				if (index === 0) {
 					break;
-			}
-			break;
-
-		case "'":
-			index = i + 1;
-			do {
-				index = token.indexOf("'", index) + 1;
-				if (!index) {
-					parseError("Unmatched '");
 				}
-			} while (token[index - 2] === '\\');
-			if (index === 0) {
+				buffer += token.slice(i, index);
+				i = index - 1;
+				switch (state) {
+					case 'before-value':
+						state = 'value';
+						break;
+					case 'importRule-begin':
+						state = 'importRule';
+						break;
+					case 'namespaceRule-begin':
+						state = 'namespaceRule';
+						break;
+				}
 				break;
-			}
-			buffer += token.slice(i, index);
-			i = index - 1;
-			switch (state) {
-				case 'before-value':
-					state = 'value';
-					break;
-				case 'importRule-begin':
-					state = 'importRule';
-					break;
-				case 'namespaceRule-begin':
-					state = 'namespaceRule';
-					break;
-			}
-			break;
-
-		// Comment
-		case "/":
-			if (token.charAt(i + 1) === "*") {
-				i += 2;
-				index = token.indexOf("*/", i);
-				if (index === -1) {
-					i = token.length - 1;
-					buffer = "";
+
+			// Comment
+			case "/":
+				if (token.charAt(i + 1) === "*") {
+					i += 2;
+					index = token.indexOf("*/", i);
+					if (index === -1) {
+						i = token.length - 1;
+						buffer = "";
+					} else {
+						i = index + 1;
+					}
 				} else {
-					i = index + 1;
+					buffer += character;
 				}
-			} else {
-				buffer += character;
-			}
-			if (state === "importRule-begin") {
-				buffer += " ";
-				state = "importRule";
-			}
-			if (state === "namespaceRule-begin") {
-				buffer += " ";
-				state = "namespaceRule";
-			}
-			break;
-
-		// At-rule
-		case "@":
-			if (nestedSelectorRule) {
-				if (styleRule && styleRule.constructor.name === "CSSNestedDeclarations") {
-					currentScope.cssRules.push(styleRule);
+				if (state === "importRule-begin") {
+					buffer += " ";
+					state = "importRule";
 				}
-				if (nestedSelectorRule.parentRule.constructor.name === "CSSStyleRule") {
-					styleRule = nestedSelectorRule.parentRule;
+				if (state === "namespaceRule-begin") {
+					buffer += " ";
+					state = "namespaceRule";
 				}
-				nestedSelectorRule = null;
-			}
-			if (token.indexOf("@-moz-document", i) === i) {
-				validateAtRule("@-moz-document", function(){
-					state = "documentRule-begin";
-					documentRule = new CSSOM.CSSDocumentRule();
-					documentRule.__starts = i;
-					i += "-moz-document".length;
-				});
-				buffer = "";
-				break;
-			} else if (token.indexOf("@media", i) === i) {
-				validateAtRule("@media", function(){
-					state = "atBlock";
-					mediaRule = new CSSOM.CSSMediaRule();
-					mediaRule.__starts = i;
-					i += "media".length;
-				});
-				buffer = "";
-				break;
-			} else if (token.indexOf("@container", i) === i) {
-				validateAtRule("@container", function(){
-					state = "containerBlock";
-					containerRule = new CSSOM.CSSContainerRule();
-					containerRule.__starts = i;
-					i += "container".length;
-				});
-				buffer = "";
-				break;
-			} else if (token.indexOf("@counter-style", i) === i) {
-				validateAtRule("@counter-style", function(){
-					state = "counterStyleBlock"
-					counterStyleRule = new CSSOM.CSSCounterStyleRule();
-					counterStyleRule.__starts = i;
-					i += "counter-style".length;
-				}, true);
-				buffer = "";
-				break;
-			} else if (token.indexOf("@scope", i) === i) {
-				validateAtRule("@scope", function(){
-					state = "scopeBlock";
-					scopeRule = new CSSOM.CSSScopeRule();
-					scopeRule.__starts = i;
-					i += "scope".length;
-				});
-				buffer = "";
-				break;
-			} else if (token.indexOf("@layer", i) === i) {
-				validateAtRule("@layer", function(){
-					state = "layerBlock"
-					layerBlockRule = new CSSOM.CSSLayerBlockRule();
-					layerBlockRule.__starts = i;
-					i += "layer".length;
-				});
-				buffer = "";
-				break;
-			} else if (token.indexOf("@page", i) === i) {
-				validateAtRule("@page", function(){
-					state = "pageBlock"
-					pageRule = new CSSOM.CSSPageRule();
-					pageRule.__starts = i;
-					i += "page".length;
-				});
-				buffer = "";
-				break;
-			} else if (token.indexOf("@supports", i) === i) {
-				validateAtRule("@supports", function(){
-					state = "conditionBlock";
-					supportsRule = new CSSOM.CSSSupportsRule();
-					supportsRule.__starts = i;
-					i += "supports".length;
-				});
-				buffer = "";
 				break;
-			} else if (token.indexOf("@host", i) === i) {
-				validateAtRule("@host", function(){
-					state = "hostRule-begin";
-					i += "host".length;
-					hostRule = new CSSOM.CSSHostRule();
-					hostRule.__starts = i;
-				});
-				buffer = "";
-				break;
-			} else if (token.indexOf("@starting-style", i) === i) {
-				validateAtRule("@starting-style", function(){
-					state = "startingStyleRule-begin";
-					i += "starting-style".length;
-					startingStyleRule = new CSSOM.CSSStartingStyleRule();
-					startingStyleRule.__starts = i;
-				});
-				buffer = "";
-				break;
-			} else if (token.indexOf("@import", i) === i) {
-				buffer = "";
-				validateAtRule("@import", function(){
-					state = "importRule-begin";
-					i += "import".length;
-					buffer += "@import";
-				}, true);
-				break;
-			} else if (token.indexOf("@namespace", i) === i) {
-				buffer = "";
-				validateAtRule("@namespace", function(){
-					state = "namespaceRule-begin";
-					i += "namespace".length;
-					buffer += "@namespace";
-				}, true);
-				break;
-			} else if (token.indexOf("@font-face", i) === i) {
-				buffer = "";
-				validateAtRule("@font-face", function(){
-					state = "fontFaceRule-begin";
-					i += "font-face".length;
-					fontFaceRule = new CSSOM.CSSFontFaceRule();
-					fontFaceRule.__starts = i;
-				}, true);
-				break;
-			} else {
-				atKeyframesRegExp.lastIndex = i;
-				var matchKeyframes = atKeyframesRegExp.exec(token);
-				if (matchKeyframes && matchKeyframes.index === i) {
-					state = "keyframesRule-begin";
-					keyframesRule = new CSSOM.CSSKeyframesRule();
-					keyframesRule.__starts = i;
-					keyframesRule._vendorPrefix = matchKeyframes[1]; // Will come out as undefined if no prefix was found
-					i += matchKeyframes[0].length - 1;
+
+			// At-rule
+			case "@":
+				if (nestedSelectorRule) {
+					if (styleRule && styleRule.constructor.name === "CSSNestedDeclarations") {
+						currentScope.cssRules.push(styleRule);
+					}
+					if (nestedSelectorRule.parentRule && nestedSelectorRule.parentRule.constructor.name === "CSSStyleRule") {
+						styleRule = nestedSelectorRule.parentRule;
+					}
+					// Don't reset nestedSelectorRule here - preserve it through @-rules
+				}
+				if (token.indexOf("@-moz-document", i) === i) {
+					validateAtRule("@-moz-document", function () {
+						state = "documentRule-begin";
+						documentRule = new CSSOM.CSSDocumentRule();
+						documentRule.__starts = i;
+						i += "-moz-document".length;
+					});
 					buffer = "";
 					break;
-				} else if (state === "selector") {
-					state = "atRule";
-				}
-			}
-			buffer += character;
-			break;
+				} else if (token.indexOf("@media", i) === i) {
+					validateAtRule("@media", function () {
+						state = "atBlock";
+						mediaRule = new CSSOM.CSSMediaRule();
+						mediaRule.__starts = i;
+						i += "media".length;
+					});
+					buffer = "";
+					break;
+				} else if (token.indexOf("@container", i) === i) {
+					validateAtRule("@container", function () {
+						state = "containerBlock";
+						containerRule = new CSSOM.CSSContainerRule();
+						containerRule.__starts = i;
+						i += "container".length;
+					});
+					buffer = "";
+					break;
+				} else if (token.indexOf("@counter-style", i) === i) {
+					validateAtRule("@counter-style", function () {
+						state = "counterStyleBlock"
+						counterStyleRule = new CSSOM.CSSCounterStyleRule();
+						counterStyleRule.__starts = i;
+						i += "counter-style".length;
+					}, true);
+					buffer = "";
+					break;
+				} else if (token.indexOf("@scope", i) === i) {
+					validateAtRule("@scope", function () {
+						state = "scopeBlock";
+						scopeRule = new CSSOM.CSSScopeRule();
+						scopeRule.__starts = i;
+						i += "scope".length;
+					});
+					buffer = "";
+					break;
+				} else if (token.indexOf("@layer", i) === i) {
+					validateAtRule("@layer", function () {
+						state = "layerBlock"
+						layerBlockRule = new CSSOM.CSSLayerBlockRule();
+						layerBlockRule.__starts = i;
+						i += "layer".length;
+					});
+					buffer = "";
+					break;
+				} else if (token.indexOf("@page", i) === i) {
+					validateAtRule("@page", function () {
+						state = "pageBlock"
+						pageRule = new CSSOM.CSSPageRule();
+						pageRule.__starts = i;
+						i += "page".length;
+					});
+					buffer = "";
+					break;
+				} else if (token.indexOf("@supports", i) === i) {
+					validateAtRule("@supports", function () {
+						state = "conditionBlock";
+						supportsRule = new CSSOM.CSSSupportsRule();
+						supportsRule.__starts = i;
+						i += "supports".length;
+					});
+					buffer = "";
+					break;
+				} else if (token.indexOf("@host", i) === i) {
+					validateAtRule("@host", function () {
+						state = "hostRule-begin";
+						i += "host".length;
+						hostRule = new CSSOM.CSSHostRule();
+						hostRule.__starts = i;
+					});
+					buffer = "";
+					break;
+				} else if (token.indexOf("@starting-style", i) === i) {
+					validateAtRule("@starting-style", function () {
+						state = "startingStyleRule-begin";
+						i += "starting-style".length;
+						startingStyleRule = new CSSOM.CSSStartingStyleRule();
+						startingStyleRule.__starts = i;
+					});
+					buffer = "";
+					break;
+				} else if (token.indexOf("@import", i) === i) {
+					buffer = "";
+					validateAtRule("@import", function () {
+						state = "importRule-begin";
+						i += "import".length;
+						buffer += "@import";
+					}, true);
+					break;
+				} else if (token.indexOf("@namespace", i) === i) {
+					buffer = "";
+					validateAtRule("@namespace", function () {
+						state = "namespaceRule-begin";
+						i += "namespace".length;
+						buffer += "@namespace";
+					}, true);
+					break;
+				} else if (token.indexOf("@font-face", i) === i) {
+					buffer = "";
+					// @font-face can be nested only inside CSSScopeRule or CSSConditionRule
+					// and only if there's no CSSStyleRule in the parent chain
+					var cannotBeNested = true;
+					if (currentScope !== topScope) {
+						var hasStyleRuleInChain = false;
+						var hasValidParent = false;
+
+						// Check currentScope
+						if (currentScope.constructor.name === 'CSSStyleRule') {
+							hasStyleRuleInChain = true;
+						} else if (currentScope instanceof CSSOM.CSSScopeRule || currentScope instanceof CSSOM.CSSConditionRule) {
+							hasValidParent = true;
+						}
 
-		case "{":
-			if (currentScope === topScope) {
-				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);
-					if (ruleClosingMatch) {
-						styleRule = null;
+						// Check ancestorRules for CSSStyleRule
+						if (!hasStyleRuleInChain) {
+							for (var j = 0; j < ancestorRules.length; j++) {
+								if (ancestorRules[j].constructor.name === 'CSSStyleRule') {
+									hasStyleRuleInChain = true;
+									break;
+								}
+								if (ancestorRules[j] instanceof CSSOM.CSSScopeRule || ancestorRules[j] instanceof CSSOM.CSSConditionRule) {
+									hasValidParent = true;
+								}
+							}
+						}
+
+						// Allow nesting if we have a valid parent and no style rule in the chain
+						if (hasValidParent && !hasStyleRuleInChain) {
+							cannotBeNested = false;
+						}
+					}
+					validateAtRule("@font-face", function () {
+						state = "fontFaceRule-begin";
+						i += "font-face".length;
+						fontFaceRule = new CSSOM.CSSFontFaceRule();
+						fontFaceRule.__starts = i;
+					}, cannotBeNested);
+					break;
+				} else {
+					atKeyframesRegExp.lastIndex = i;
+					var matchKeyframes = atKeyframesRegExp.exec(token);
+					if (matchKeyframes && matchKeyframes.index === i) {
+						state = "keyframesRule-begin";
+						keyframesRule = new CSSOM.CSSKeyframesRule();
+						keyframesRule.__starts = i;
+						keyframesRule._vendorPrefix = matchKeyframes[1]; // Will come out as undefined if no prefix was found
+						i += matchKeyframes[0].length - 1;
 						buffer = "";
-						state = "before-selector";
-						i += ruleClosingMatch.index + ruleClosingMatch[0].length;
 						break;
+					} else if (state === "selector") {
+						state = "atRule";
 					}
 				}
+				buffer += character;
+				break;
 
-				if (parentRule) {
-					styleRule.__parentRule = parentRule;
-					pushToAncestorRules(parentRule);
+			case "{":
+				if (currentScope === topScope) {
+					nestedSelectorRule = null;
 				}
-
-				currentScope = parentRule = styleRule;
-				styleRule.selectorText = processSelectorText(buffer.trim());
-				styleRule.style.__starts = i;
-				styleRule.__parentStyleSheet = styleSheet;
-				buffer = "";
-				state = "before-name";
-			} else if (state === "atBlock") {
-				mediaRule.media.mediaText = buffer.trim();
-
-				if (parentRule) {
-					mediaRule.__parentRule = parentRule;
-					pushToAncestorRules(parentRule);
+				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);
+						if (ruleClosingMatch) {
+							styleRule = null;
+							buffer = "";
+							state = "before-selector";
+							i += ruleClosingMatch.index + ruleClosingMatch[0].length;
+							break;
+						}
+					}
 
-				currentScope = parentRule = mediaRule;
-				mediaRule.__parentStyleSheet = styleSheet;
-				buffer = "";
-				state = "before-selector";
-			} else if (state === "containerBlock") {
-				containerRule.__conditionText = buffer.trim();
-
-				if (parentRule) {
-					containerRule.__parentRule = parentRule;
-					pushToAncestorRules(parentRule);
-				}
-				currentScope = parentRule = containerRule;
-				containerRule.__parentStyleSheet = styleSheet;
-				buffer = "";
-				state = "before-selector";
-			} else if (state === "counterStyleBlock") {
-				// TODO: Validate counter-style name. At least that it cannot be empty nor multiple
-				counterStyleRule.name = buffer.trim().replace(/\n/g, "");
-				currentScope = parentRule = counterStyleRule;
-				counterStyleRule.__parentStyleSheet = styleSheet;
-				buffer = "";
-			} else if (state === "conditionBlock") {
-				supportsRule.__conditionText = buffer.trim();
-
-				if (parentRule) {
-					supportsRule.__parentRule = parentRule;
-					pushToAncestorRules(parentRule);
-				}
+					// Ensure styleRule exists before trying to set properties on it
+					if (!styleRule) {
+						styleRule = new CSSOM.CSSStyleRule();
+						styleRule.__starts = i;
+					}
 
-				currentScope = parentRule = supportsRule;
-				supportsRule.__parentStyleSheet = styleSheet;
-				buffer = "";
-				state = "before-selector";
-			} else if (state === "scopeBlock") {
-				var parsedScopePrelude = parseScopePrelude(buffer.trim());
-				
-				if (parsedScopePrelude.hasStart) {
-					scopeRule.__start = parsedScopePrelude.startSelector;
-				}
-				if (parsedScopePrelude.hasEnd) {
-					scopeRule.__end = parsedScopePrelude.endSelector;
-				}
-				if (parsedScopePrelude.hasOnlyEnd) {
-					scopeRule.__end = parsedScopePrelude.endSelector;
-				}
+					var originalParentRule = parentRule;
 
-				if (parentRule) {
-					scopeRule.__parentRule = parentRule;
-					pushToAncestorRules(parentRule);
-				}
-				currentScope = parentRule = scopeRule;
-				scopeRule.__parentStyleSheet = styleSheet;
-				buffer = "";
-				state = "before-selector";
-			} else if (state === "layerBlock") {
-				layerBlockRule.name = buffer.trim();
+					if (parentRule) {
+						styleRule.__parentRule = parentRule;
+						pushToAncestorRules(parentRule);
+					}
 
-				var isValidName = layerBlockRule.name.length === 0 || layerBlockRule.name.match(cssCustomIdentifierRegExp) !== null;
+					currentScope = parentRule = styleRule;
+					var processedSelectorText = processSelectorText(buffer.trim());
+					// In a nested selector, ensure each selector contains '&' at the beginning, except for selectors that already have '&' somewhere
+					if (originalParentRule && originalParentRule.constructor.name === "CSSStyleRule") {
+						styleRule.selectorText = parseAndSplitNestedSelectors(processedSelectorText).map(function (sel) {
+							// Add & at the beginning if there's no & in the selector, or if it starts with a combinator
+							return (sel.indexOf('&') === -1 || startsWithCombinatorRegExp.test(sel)) ? '& ' + sel : sel;
+						}).join(', ');
+					} else {
+						styleRule.selectorText = processedSelectorText;
+					}
+					styleRule.style.__starts = i;
+					styleRule.__parentStyleSheet = styleSheet;
+					buffer = "";
+					state = "before-name";
+				} else if (state === "atBlock") {
+					mediaRule.media.mediaText = buffer.trim();
 
-				if (isValidName) {
 					if (parentRule) {
-						layerBlockRule.__parentRule = parentRule;
+						mediaRule.__parentRule = parentRule;
 						pushToAncestorRules(parentRule);
+						// If entering @media from within a CSSStyleRule, set nestedSelectorRule
+						// so that & selectors and declarations work correctly inside
+						if (parentRule.constructor.name === "CSSStyleRule" && !nestedSelectorRule) {
+							nestedSelectorRule = parentRule;
+						}
 					}
-	
-					currentScope = parentRule = layerBlockRule;
-					layerBlockRule.__parentStyleSheet = styleSheet;
-				}
-				buffer = "";
-				state = "before-selector";
-			} else if (state === "pageBlock") {
-				pageRule.selectorText = buffer.trim();
-
-				if (parentRule) {
-					pageRule.__parentRule = parentRule;
-					pushToAncestorRules(parentRule);
-				}
 
-				currentScope = parentRule = pageRule;
-				pageRule.__parentStyleSheet = styleSheet;
-				styleRule = pageRule;
-				buffer = "";
-				state = "before-name";
-			} else if (state === "hostRule-begin") {
-				if (parentRule) {
-					pushToAncestorRules(parentRule);
-				}
-
-				currentScope = parentRule = hostRule;
-				hostRule.__parentStyleSheet = styleSheet;
-				buffer = "";
-				state = "before-selector";
-			} else if (state === "startingStyleRule-begin") {
-				if (parentRule) {
-					startingStyleRule.__parentRule = parentRule;
-					pushToAncestorRules(parentRule);
-				}
-
-				currentScope = parentRule = startingStyleRule;
-				startingStyleRule.__parentStyleSheet = styleSheet;
-				buffer = "";
-				state = "before-selector";
+					currentScope = parentRule = mediaRule;
+					pushToAncestorRules(mediaRule);
+					mediaRule.__parentStyleSheet = styleSheet;
+					styleRule = null; // Reset styleRule when entering @-rule
+					buffer = "";
+					state = "before-selector";
+				} else if (state === "containerBlock") {
+					containerRule.__conditionText = buffer.trim();
 
-			} else if (state === "fontFaceRule-begin") {
-				if (parentRule) {
-					fontFaceRule.__parentRule = parentRule;
-				}
-				fontFaceRule.__parentStyleSheet = styleSheet;
-				styleRule = fontFaceRule;
-				buffer = "";
-				state = "before-name";
-			} else if (state === "keyframesRule-begin") {
-				keyframesRule.name = buffer.trim();
-				if (parentRule) {
-					pushToAncestorRules(parentRule);
-					keyframesRule.__parentRule = parentRule;
-				}
-				keyframesRule.__parentStyleSheet = styleSheet;
-				currentScope = parentRule = keyframesRule;
-				buffer = "";
-				state = "keyframeRule-begin";
-			} else if (state === "keyframeRule-begin") {
-				styleRule = new CSSOM.CSSKeyframeRule();
-				styleRule.keyText = buffer.trim();
-				styleRule.__starts = i;
-				buffer = "";
-				state = "before-name";
-			} else if (state === "documentRule-begin") {
-				// FIXME: what if this '{' is in the url text of the match function?
-				documentRule.matcher.matcherText = buffer.trim();
-				if (parentRule) {
-					pushToAncestorRules(parentRule);
-					documentRule.__parentRule = parentRule;
-				}
-				currentScope = parentRule = documentRule;
-				documentRule.__parentStyleSheet = styleSheet;
-				buffer = "";
-				state = "before-selector";
-			} else if (state === "before-name" || state === "name") {
-				if (styleRule.constructor.name === "CSSNestedDeclarations") {
-					if (styleRule.style.length) {
-						parentRule.cssRules.push(styleRule);
-						styleRule.__parentRule = parentRule;
-						styleRule.__parentStyleSheet = styleSheet;
+					if (parentRule) {
+						containerRule.__parentRule = parentRule;
 						pushToAncestorRules(parentRule);
-					} else {
-						// If the styleRule is empty, we can assume that it's a nested selector
+						if (parentRule.constructor.name === "CSSStyleRule" && !nestedSelectorRule) {
+							nestedSelectorRule = parentRule;
+						}
+					}
+					currentScope = parentRule = containerRule;
+					pushToAncestorRules(containerRule);
+					containerRule.__parentStyleSheet = styleSheet;
+					styleRule = null; // Reset styleRule when entering @-rule
+					buffer = "";
+					state = "before-selector";
+				} else if (state === "counterStyleBlock") {
+					var counterStyleName = buffer.trim().replace(/\n/g, "");
+					// Validate: name cannot be empty, contain whitespace, or contain dots
+					var isValidCounterStyleName = counterStyleName.length > 0 && !/[\s.]/.test(counterStyleName);
+
+					if (isValidCounterStyleName) {
+						counterStyleRule.name = counterStyleName;
+						currentScope = parentRule = counterStyleRule;
+						counterStyleRule.__parentStyleSheet = styleSheet;
+					}
+					buffer = "";
+				} else if (state === "conditionBlock") {
+					supportsRule.__conditionText = buffer.trim();
+
+					if (parentRule) {
+						supportsRule.__parentRule = parentRule;
 						pushToAncestorRules(parentRule);
+						if (parentRule.constructor.name === "CSSStyleRule" && !nestedSelectorRule) {
+							nestedSelectorRule = parentRule;
+						}
 					}
-				} else {
-					currentScope = parentRule = styleRule;
-					pushToAncestorRules(parentRule);
-					styleRule.__parentStyleSheet = styleSheet;
-				}
-				
-				styleRule = new CSSOM.CSSStyleRule();
-				var processedSelectorText = processSelectorText(buffer.trim());
-				// In a nested selector, ensure each selector contains '&' at the beginning, except for selectors that already have '&' somewhere
-				if (parentRule.constructor.name === "CSSScopeRule" || (parentRule.constructor.name !== "CSSStyleRule" && parentRule.parentRule === null)) {
-					styleRule.selectorText = processedSelectorText;
-				} else {
-					styleRule.selectorText = parseAndSplitNestedSelectors(processedSelectorText).map(function(sel) {
-						// Add & at the beginning if there's no & in the selector, or if it starts with a combinator
-						return (sel.indexOf('&') === -1 || startsWithCombinatorRegExp.test(sel)) ? '& ' + sel : sel;
-					}).join(', ');
-				}
-				styleRule.style.__starts = i - buffer.length;
-				styleRule.__parentRule = parentRule;
-				nestedSelectorRule = styleRule;
 
-				buffer = "";
-				state = "before-name";
-			}
-			break;
-
-		case ":":
-			if (state === "name") {
-				// It can be a nested selector, let's check
-				var openBraceBeforeMatch = token.slice(i).match(/[{;}]/);
-				var hasOpenBraceBefore = openBraceBeforeMatch && openBraceBeforeMatch[0] === '{';
-				if (hasOpenBraceBefore) {
-					// Is a selector
-					buffer += character;
-				} else {
-					// Is a declaration
-					name = buffer.trim();
+					currentScope = parentRule = supportsRule;
+					pushToAncestorRules(supportsRule);
+					supportsRule.__parentStyleSheet = styleSheet;
+					styleRule = null; // Reset styleRule when entering @-rule
 					buffer = "";
-					state = "before-value";
-				}
-			} else {
-				buffer += character;
-			}
-			break;
+					state = "before-selector";
+				} else if (state === "scopeBlock") {
+					var parsedScopePrelude = parseScopePrelude(buffer.trim());
 
-		case "(":
-			if (state === 'value') {
-				// ie css expression mode
-				if (buffer.trim() === 'expression') {
-					var info = (new CSSOM.CSSValueExpression(token, i)).parse();
+					if (parsedScopePrelude.hasStart) {
+						scopeRule.__start = parsedScopePrelude.startSelector;
+					}
+					if (parsedScopePrelude.hasEnd) {
+						scopeRule.__end = parsedScopePrelude.endSelector;
+					}
+					if (parsedScopePrelude.hasOnlyEnd) {
+						scopeRule.__end = parsedScopePrelude.endSelector;
+					}
 
-					if (info.error) {
-						parseError(info.error);
-					} else {
-						buffer += info.expression;
-						i = info.idx;
+					if (parentRule) {
+						scopeRule.__parentRule = parentRule;
+						pushToAncestorRules(parentRule);
+						if (parentRule.constructor.name === "CSSStyleRule" && !nestedSelectorRule) {
+							nestedSelectorRule = parentRule;
+						}
 					}
-				} else {
-					state = 'value-parenthesis';
-					//always ensure this is reset to 1 on transition
-					//from value to value-parenthesis
-					valueParenthesisDepth = 1;
-					buffer += character;
-				}
-			} else if (state === 'value-parenthesis') {
-				valueParenthesisDepth++;
-				buffer += character;
-			} else {
-				buffer += character;
-			}
-			break;
+					currentScope = parentRule = scopeRule;
+					pushToAncestorRules(scopeRule);
+					scopeRule.__parentStyleSheet = styleSheet;
+					styleRule = null; // Reset styleRule when entering @-rule
+					buffer = "";
+					state = "before-selector";
+				} else if (state === "layerBlock") {
+					layerBlockRule.name = buffer.trim();
 
-		case ")":
-			if (state === 'value-parenthesis') {
-				valueParenthesisDepth--;
-				if (valueParenthesisDepth === 0) state = 'value';
-			}
-			buffer += character;
-			break;
+					var isValidName = layerBlockRule.name.length === 0 || layerBlockRule.name.match(cssCustomIdentifierRegExp) !== null;
 
-		case "!":
-			if (state === "value" && token.indexOf("!important", i) === i) {
-				priority = "important";
-				i += "important".length;
-			} else {
-				buffer += character;
-			}
-			break;
+					if (isValidName) {
+						if (parentRule) {
+							layerBlockRule.__parentRule = parentRule;
+							pushToAncestorRules(parentRule);
+							if (parentRule.constructor.name === "CSSStyleRule" && !nestedSelectorRule) {
+								nestedSelectorRule = parentRule;
+							}
+						}
 
-		case ";":
-			switch (state) {
-				case "before-value":
-				case "before-name":
-					parseError("Unexpected ;");
+						currentScope = parentRule = layerBlockRule;
+						pushToAncestorRules(layerBlockRule);
+						layerBlockRule.__parentStyleSheet = styleSheet;
+					}
+					styleRule = null; // Reset styleRule when entering @-rule
 					buffer = "";
-					state = "before-name";
-					break;
-				case "value":
-					styleRule.style.setProperty(name, buffer.trim(), priority, parseError);
-					priority = "";
+					state = "before-selector";
+				} else if (state === "pageBlock") {
+					pageRule.selectorText = buffer.trim();
+
+					if (parentRule) {
+						pageRule.__parentRule = parentRule;
+						pushToAncestorRules(parentRule);
+					}
+
+					currentScope = parentRule = pageRule;
+					pageRule.__parentStyleSheet = styleSheet;
+					styleRule = pageRule;
 					buffer = "";
 					state = "before-name";
-					break;
-				case "atRule":
-					buffer = "";
-					state = "before-selector";
-					break;
-				case "importRule":
-					var isValid = topScope.cssRules.length === 0 || topScope.cssRules.some(function (rule) {
-						return ['CSSImportRule', 'CSSLayerStatementRule'].indexOf(rule.constructor.name) !== -1
-					});
-					if (isValid) {
-						importRule = new CSSOM.CSSImportRule();
-						importRule.__parentStyleSheet = importRule.styleSheet.__parentStyleSheet = styleSheet;
-						importRule.cssText = buffer + character;
-						topScope.cssRules.push(importRule);
+				} else if (state === "hostRule-begin") {
+					if (parentRule) {
+						pushToAncestorRules(parentRule);
 					}
+
+					currentScope = parentRule = hostRule;
+					pushToAncestorRules(hostRule);
+					hostRule.__parentStyleSheet = styleSheet;
 					buffer = "";
 					state = "before-selector";
-					break;
-				case "namespaceRule":
-					var isValid = topScope.cssRules.length === 0 || topScope.cssRules.every(function (rule) {
-						return ['CSSImportRule','CSSLayerStatementRule','CSSNamespaceRule'].indexOf(rule.constructor.name) !== -1
-					});
-					if (isValid) {
-						try {
-							// Validate namespace syntax before creating the rule
-							var testNamespaceRule = new CSSOM.CSSNamespaceRule();
-							testNamespaceRule.cssText = buffer + character;
-							
-							namespaceRule = testNamespaceRule;
-							namespaceRule.__parentStyleSheet = styleSheet;
-							topScope.cssRules.push(namespaceRule);
-							
-							// Track the namespace prefix for validation
-							if (namespaceRule.prefix) {
-								definedNamespacePrefixes[namespaceRule.prefix] = namespaceRule.namespaceURI;
-							}
-						} catch(e) {
-							parseError(e.message);
+				} else if (state === "startingStyleRule-begin") {
+					if (parentRule) {
+						startingStyleRule.__parentRule = parentRule;
+						pushToAncestorRules(parentRule);
+						if (parentRule.constructor.name === "CSSStyleRule" && !nestedSelectorRule) {
+							nestedSelectorRule = parentRule;
 						}
 					}
+
+					currentScope = parentRule = startingStyleRule;
+					pushToAncestorRules(startingStyleRule);
+					startingStyleRule.__parentStyleSheet = styleSheet;
+					styleRule = null; // Reset styleRule when entering @-rule
 					buffer = "";
 					state = "before-selector";
-					break;
-				case "layerBlock":
-					var nameListStr = buffer.trim().split(",").map(function (name) {
-						return name.trim();
-					});
-					var isInvalid = parentRule !== undefined || nameListStr.some(function (name) {
-						return name.trim().match(cssCustomIdentifierRegExp) === null;
-					});
 
-					if (!isInvalid) {
-						layerStatementRule = new CSSOM.CSSLayerStatementRule();
-						layerStatementRule.__parentStyleSheet = styleSheet;
-						layerStatementRule.__starts = layerBlockRule.__starts;
-						layerStatementRule.__ends = i;
-						layerStatementRule.nameList = nameListStr;
-						topScope.cssRules.push(layerStatementRule);
+				} else if (state === "fontFaceRule-begin") {
+					if (parentRule) {
+						fontFaceRule.__parentRule = parentRule;
 					}
+					fontFaceRule.__parentStyleSheet = styleSheet;
+					styleRule = fontFaceRule;
 					buffer = "";
-					state = "before-selector";
-					break;
-				default:
-					buffer += character;
-					break;
-			}
-			break;
-
-		case "}":
-			if (state === "counterStyleBlock") {
-				// FIXME : Implement cssText get setter that parses the real implementation
-				counterStyleRule.cssText = "@counter-style " + counterStyleRule.name + " { " + buffer.trim().replace(/\n/g, " ").replace(/(['"])(?:\\.|[^\\])*?\1|(\s{2,})/g, function(match, quote) {
-					return quote ? match : ' ';
-				}) + " }";
-				buffer = "";
-				state = "before-selector";
-			}
-
-			switch (state) {
-				case "value":
-					styleRule.style.setProperty(name, buffer.trim(), priority, parseError);
-					priority = "";
-					/* falls through */
-				case "before-value":
-				case "before-name":
-				case "name":
-					styleRule.__ends = i + 1;
-					
-					if (parentRule === styleRule) {
-						parentRule = ancestorRules.pop()
+					state = "before-name";
+				} else if (state === "keyframesRule-begin") {
+					keyframesRule.name = buffer.trim();
+					if (parentRule) {
+						pushToAncestorRules(parentRule);
+						keyframesRule.__parentRule = parentRule;
 					}
-
+					keyframesRule.__parentStyleSheet = styleSheet;
+					currentScope = parentRule = keyframesRule;
+					buffer = "";
+					state = "keyframeRule-begin";
+				} else if (state === "keyframeRule-begin") {
+					styleRule = new CSSOM.CSSKeyframeRule();
+					styleRule.keyText = buffer.trim();
+					styleRule.__starts = i;
+					buffer = "";
+					state = "before-name";
+				} else if (state === "documentRule-begin") {
+					// FIXME: what if this '{' is in the url text of the match function?
+					documentRule.matcher.matcherText = buffer.trim();
 					if (parentRule) {
-						styleRule.__parentRule = parentRule;
+						pushToAncestorRules(parentRule);
+						documentRule.__parentRule = parentRule;
 					}
-					styleRule.__parentStyleSheet = styleSheet;
-
-					if (currentScope === styleRule) {
-						currentScope = parentRule || topScope;
+					currentScope = parentRule = documentRule;
+					pushToAncestorRules(documentRule);
+					documentRule.__parentStyleSheet = styleSheet;
+					buffer = "";
+					state = "before-selector";
+				} else if (state === "before-name" || state === "name") {
+					// @font-face and similar rules don't support nested selectors
+					// If we encounter a nested selector block inside them, skip it
+					if (styleRule.constructor.name === "CSSFontFaceRule" ||
+						styleRule.constructor.name === "CSSKeyframeRule" ||
+						(styleRule.constructor.name === "CSSPageRule" && parentRule === styleRule)) {
+						// Skip the nested block
+						var ruleClosingMatch = token.slice(i).match(forwardRuleClosingBraceRegExp);
+						if (ruleClosingMatch) {
+							i += ruleClosingMatch.index + ruleClosingMatch[0].length - 1;
+							buffer = "";
+							state = "before-name";
+							break;
+						}
 					}
 
-					if (styleRule.constructor.name === "CSSStyleRule" && !isValidSelectorText(styleRule.selectorText)) {
-						if (styleRule === nestedSelectorRule) {
-							nestedSelectorRule = null;
-						}
-						parseError('Invalid CSSStyleRule (selectorText = "' + styleRule.selectorText + '")', styleRule.parentRule !== null);
-					} else {
-						if (styleRule.parentRule) {
-							styleRule.parentRule.cssRules.push(styleRule);
+					if (styleRule.constructor.name === "CSSNestedDeclarations") {
+						if (styleRule.style.length) {
+							parentRule.cssRules.push(styleRule);
+							styleRule.__parentRule = parentRule;
+							styleRule.__parentStyleSheet = styleSheet;
+							pushToAncestorRules(parentRule);
 						} else {
-							currentScope.cssRules.push(styleRule);
+							// If the styleRule is empty, we can assume that it's a nested selector
+							pushToAncestorRules(parentRule);
 						}
+					} else {
+						currentScope = parentRule = styleRule;
+						pushToAncestorRules(parentRule);
+						styleRule.__parentStyleSheet = styleSheet;
 					}
+
+					styleRule = new CSSOM.CSSStyleRule();
+					var processedSelectorText = processSelectorText(buffer.trim());
+					// In a nested selector, ensure each selector contains '&' at the beginning, except for selectors that already have '&' somewhere
+					if (parentRule.constructor.name === "CSSScopeRule" || (parentRule.constructor.name !== "CSSStyleRule" && parentRule.parentRule === null)) {
+						styleRule.selectorText = processedSelectorText;
+					} else {
+						styleRule.selectorText = parseAndSplitNestedSelectors(processedSelectorText).map(function (sel) {
+							// Add & at the beginning if there's no & in the selector, or if it starts with a combinator
+							return (sel.indexOf('&') === -1 || startsWithCombinatorRegExp.test(sel)) ? '& ' + sel : sel;
+						}).join(', ');
+					}
+					styleRule.style.__starts = i - buffer.length;
+					styleRule.__parentRule = parentRule;
+					// Only set nestedSelectorRule if we're directly inside a CSSStyleRule or CSSScopeRule,
+					// not inside other grouping rules like @media/@supports
+					if (parentRule.constructor.name === "CSSStyleRule" || parentRule.constructor.name === "CSSScopeRule") {
+						nestedSelectorRule = styleRule;
+					}
+
 					buffer = "";
-					if (currentScope.constructor === CSSOM.CSSKeyframesRule) {
-						state = "keyframeRule-begin";
+					state = "before-name";
+				}
+				break;
+
+			case ":":
+				if (state === "name") {
+					// It can be a nested selector, let's check
+					var openBraceBeforeMatch = token.slice(i).match(/[{;}]/);
+					var hasOpenBraceBefore = openBraceBeforeMatch && openBraceBeforeMatch[0] === '{';
+					if (hasOpenBraceBefore) {
+						// Is a selector
+						buffer += character;
 					} else {
-						state = "before-selector";
+						// Is a declaration
+						name = buffer.trim();
+						buffer = "";
+						state = "before-value";
 					}
+				} else {
+					buffer += character;
+				}
+				break;
 
-					if (styleRule.constructor.name === "CSSNestedDeclarations") {
-						if (currentScope !== topScope) {
-							nestedSelectorRule = currentScope;
+			case "(":
+				if (state === 'value') {
+					// ie css expression mode
+					if (buffer.trim() === 'expression') {
+						var info = (new CSSOM.CSSValueExpression(token, i)).parse();
+
+						if (info.error) {
+							parseError(info.error);
+						} else {
+							buffer += info.expression;
+							i = info.idx;
 						}
-						styleRule = null;
 					} else {
-						styleRule = null;
-						break;
+						state = 'value-parenthesis';
+						//always ensure this is reset to 1 on transition
+						//from value to value-parenthesis
+						valueParenthesisDepth = 1;
+						buffer += character;
 					}
-				case "keyframeRule-begin":
-				case "before-selector":
-				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);
+				} else if (state === 'value-parenthesis') {
+					valueParenthesisDepth++;
+					buffer += character;
+				} else {
+					buffer += character;
+				}
+				break;
+
+			case ")":
+				if (state === 'value-parenthesis') {
+					valueParenthesisDepth--;
+					if (valueParenthesisDepth === 0) state = 'value';
+				}
+				buffer += character;
+				break;
+
+			case "!":
+				if (state === "value" && token.indexOf("!important", i) === i) {
+					priority = "important";
+					i += "important".length;
+				} else {
+					buffer += character;
+				}
+				break;
+
+			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, parseError);
+						priority = "";
+						buffer = "";
+						state = "before-name";
+						break;
+					case "atRule":
+						buffer = "";
+						state = "before-selector";
+						break;
+					case "importRule":
+						var isValid = topScope.cssRules.length === 0 || topScope.cssRules.some(function (rule) {
+							return ['CSSImportRule', 'CSSLayerStatementRule'].indexOf(rule.constructor.name) !== -1
+						});
+						if (isValid) {
+							importRule = new CSSOM.CSSImportRule();
+							importRule.__parentStyleSheet = importRule.styleSheet.__parentStyleSheet = styleSheet;
+							importRule.parse(buffer + character);
+							topScope.cssRules.push(importRule);
 						}
-						
+						buffer = "";
+						state = "before-selector";
 						break;
-					}
-
-					while (ancestorRules.length > 0) {
-						parentRule = ancestorRules.pop();
-
-						if (
-							parentRule.constructor.name === "CSSStyleRule"
-							|| parentRule.constructor.name === "CSSMediaRule"
-							|| parentRule.constructor.name === "CSSSupportsRule"
-							|| parentRule.constructor.name === "CSSContainerRule"
-							|| parentRule.constructor.name === "CSSScopeRule"
-							|| parentRule.constructor.name === "CSSLayerBlockRule"
-							|| parentRule.constructor.name === "CSSStartingStyleRule"
-						) {
-							if (nestedSelectorRule) {
-								if (nestedSelectorRule.parentRule) {
-									prevScope = nestedSelectorRule;
-									currentScope = nestedSelectorRule.parentRule;
-									if (currentScope.cssRules.findIndex(function (rule) {
-										return rule === prevScope
-									}) === -1) {
-										currentScope.cssRules.push(prevScope);
-									}
-									nestedSelectorRule = currentScope;
+					case "namespaceRule":
+						var isValid = topScope.cssRules.length === 0 || topScope.cssRules.every(function (rule) {
+							return ['CSSImportRule', 'CSSLayerStatementRule', 'CSSNamespaceRule'].indexOf(rule.constructor.name) !== -1
+						});
+						if (isValid) {
+							try {
+								// Validate namespace syntax before creating the rule
+								var testNamespaceRule = new CSSOM.CSSNamespaceRule();
+								testNamespaceRule.parse(buffer + character);
+
+								namespaceRule = testNamespaceRule;
+								namespaceRule.__parentStyleSheet = styleSheet;
+								topScope.cssRules.push(namespaceRule);
+
+								// Track the namespace prefix for validation
+								if (namespaceRule.prefix) {
+									definedNamespacePrefixes[namespaceRule.prefix] = namespaceRule.namespaceURI;
 								}
+							} catch (e) {
+								parseError(e.message);
+							}
+						}
+						buffer = "";
+						state = "before-selector";
+						break;
+					case "layerBlock":
+						var nameListStr = buffer.trim().split(",").map(function (name) {
+							return name.trim();
+						});
+						var isInvalid = nameListStr.some(function (name) {
+							return name.trim().match(cssCustomIdentifierRegExp) === null;
+						});
+
+						// Check if there's a CSSStyleRule in the parent chain
+						var hasStyleRuleParent = false;
+						if (parentRule) {
+							var checkParent = parentRule;
+							while (checkParent) {
+								if (checkParent.constructor.name === "CSSStyleRule") {
+									hasStyleRuleParent = true;
+									break;
+								}
+								checkParent = checkParent.__parentRule;
+							}
+						}
+
+						if (!isInvalid && !hasStyleRuleParent) {
+							layerStatementRule = new CSSOM.CSSLayerStatementRule();
+							layerStatementRule.__parentStyleSheet = styleSheet;
+							layerStatementRule.__starts = layerBlockRule.__starts;
+							layerStatementRule.__ends = i;
+							layerStatementRule.nameList = nameListStr;
+
+							// Add to parent rule if nested, otherwise to top scope
+							if (parentRule) {
+								layerStatementRule.__parentRule = parentRule;
+								parentRule.cssRules.push(layerStatementRule);
 							} else {
-								prevScope = currentScope;
-								parentRule !== prevScope && parentRule.cssRules.push(prevScope);
-								break;
+								topScope.cssRules.push(layerStatementRule);
 							}
 						}
-					}
-					
-					if (currentScope.parentRule == null) {
-						currentScope.__ends = i + 1;
-						if (currentScope !== topScope && topScope.cssRules.findIndex(function (rule) {
-							return rule === currentScope
-						}) === -1) {
-							topScope.cssRules.push(currentScope);
+						buffer = "";
+						state = "before-selector";
+						break;
+					default:
+						buffer += character;
+						break;
+				}
+				break;
+
+			case "}":
+				if (state === "counterStyleBlock") {
+					// FIXME : Implement missing properties on CSSCounterStyleRule interface and update parse method
+					// For now it's just assigning entire rule text
+					counterStyleRule.parse("@counter-style " + counterStyleRule.name + " { " + buffer + " }");
+					buffer = "";
+					state = "before-selector";
+				}
+
+				switch (state) {
+					case "value":
+						styleRule.style.setProperty(name, buffer.trim(), priority, parseError);
+						priority = "";
+					/* falls through */
+					case "before-value":
+					case "before-name":
+					case "name":
+						styleRule.__ends = i + 1;
+
+						if (parentRule === styleRule) {
+							parentRule = ancestorRules.pop()
 						}
-						currentScope = topScope;
-						if (nestedSelectorRule === parentRule) {
-							// Check if this selector is really starting inside another selector
-							var nestedSelectorTokenToCurrentSelectorToken = token.slice(nestedSelectorRule.__starts, i + 1);
-							var openingBraceMatch = nestedSelectorTokenToCurrentSelectorToken.match(/{/g);
-							var closingBraceMatch = nestedSelectorTokenToCurrentSelectorToken.match(/}/g);
-							var openingBraceLen = openingBraceMatch && openingBraceMatch.length;
-							var closingBraceLen = closingBraceMatch && closingBraceMatch.length;
-
-							if (openingBraceLen === closingBraceLen) {
-								// If the number of opening and closing braces are equal, we can assume that the new selector is starting outside the nestedSelectorRule
-								nestedSelectorRule.__ends = i + 1;
+
+						if (parentRule) {
+							styleRule.__parentRule = parentRule;
+						}
+						styleRule.__parentStyleSheet = styleSheet;
+
+						if (currentScope === styleRule) {
+							currentScope = parentRule || topScope;
+						}
+
+						if (styleRule.constructor.name === "CSSStyleRule" && !isValidSelectorText(styleRule.selectorText)) {
+							if (styleRule === nestedSelectorRule) {
 								nestedSelectorRule = null;
-								parentRule = null;
 							}
+							parseError('Invalid CSSStyleRule (selectorText = "' + styleRule.selectorText + '")', styleRule.parentRule !== null);
+						} else {
+							if (styleRule.parentRule) {
+								styleRule.parentRule.cssRules.push(styleRule);
+							} else {
+								currentScope.cssRules.push(styleRule);
+							}
+						}
+						buffer = "";
+						if (currentScope.constructor === CSSOM.CSSKeyframesRule) {
+							state = "keyframeRule-begin";
+						} else {
+							state = "before-selector";
+						}
+
+						if (styleRule.constructor.name === "CSSNestedDeclarations") {
+							if (currentScope !== topScope) {
+								// Only set nestedSelectorRule if currentScope is CSSStyleRule or CSSScopeRule
+								// Not for other grouping rules like @media/@supports
+								if (currentScope.constructor.name === "CSSStyleRule" || currentScope.constructor.name === "CSSScopeRule") {
+									nestedSelectorRule = currentScope;
+								}
+							}
+							styleRule = null;
 						} else {
-							parentRule = null;
+							// Update nestedSelectorRule when closing a CSSStyleRule
+							if (styleRule === nestedSelectorRule) {
+								var selector = styleRule.selectorText && styleRule.selectorText.trim();
+								// Check if this is proper nesting (&.class, &:pseudo) vs prepended & (& :is, & .class with space)
+								// Prepended & has pattern "& X" where X starts with : or .
+								var isPrependedAmpersand = selector && selector.match(/^&\s+[:\.]/);
+
+								// Check if parent is a grouping rule that can contain nested selectors
+								var isGroupingRule = currentScope && currentScope instanceof CSSOM.CSSGroupingRule;
+
+								if (!isPrependedAmpersand && isGroupingRule) {
+									// Proper nesting - set nestedSelectorRule to parent for more nested selectors
+									// But only if it's a CSSStyleRule or CSSScopeRule, not other grouping rules like @media
+									if (currentScope.constructor.name === "CSSStyleRule" || currentScope.constructor.name === "CSSScopeRule") {
+										nestedSelectorRule = currentScope;
+									}
+									// If currentScope is another type of grouping rule (like @media), keep nestedSelectorRule unchanged
+								} else {
+									// Prepended & or not nested in grouping rule - reset to prevent CSSNestedDeclarations
+									nestedSelectorRule = null;
+								}
+							} else if (nestedSelectorRule && currentScope instanceof CSSOM.CSSGroupingRule) {
+								// When closing a nested rule that's not the nestedSelectorRule itself,
+								// maintain nestedSelectorRule if we're still inside a grouping rule
+								// This ensures declarations after nested selectors inside @media/@supports etc. work correctly
+							}
+							styleRule = null;
+							break;
+						}
+					case "keyframeRule-begin":
+					case "before-selector":
+					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;
 						}
-					} else {
-						currentScope = parentRule;
-					}
 
-					buffer = "";
-					state = "before-selector";
-					break;
-			}
-			break;
+						while (ancestorRules.length > 0) {
+							parentRule = ancestorRules.pop();
+
+							if (parentRule instanceof CSSOM.CSSGroupingRule && (parentRule.constructor.name !== 'CSSStyleRule' || parentRule.__parentRule)) {
+								if (nestedSelectorRule) {
+									if (nestedSelectorRule.parentRule) {
+										prevScope = nestedSelectorRule;
+										currentScope = nestedSelectorRule.parentRule;
+										if (currentScope.cssRules.findIndex(function (rule) {
+											return rule === prevScope
+										}) === -1) {
+											currentScope.cssRules.push(prevScope);
+										}
+										nestedSelectorRule = currentScope;
+									} else {
+										// If nestedSelectorRule doesn't have a parentRule, we're closing a grouping rule
+										// inside a top-level CSSStyleRule. We need to push currentScope to the parentRule.
+										prevScope = currentScope;
+										// Push to actual parent from ancestorRules if available
+										var actualParent = ancestorRules.length > 0 ? ancestorRules[ancestorRules.length - 1] : nestedSelectorRule;
+										actualParent !== prevScope && actualParent.cssRules.push(prevScope);
+										// Update currentScope to the nestedSelectorRule before breaking
+										currentScope = actualParent;
+										parentRule = actualParent;
+										break;
+									}
+								} else {
+									prevScope = currentScope;
+									parentRule !== prevScope && parentRule.cssRules.push(prevScope);
+									break;
+								}
+							}
+						}
 
-		default:
-			switch (state) {
-				case "before-selector":
-					state = "selector";
-					if ((styleRule || scopeRule) && parentRule) {
-						// Assuming it's a declaration inside Nested Selector OR a Nested Declaration
-						// If Declaration inside Nested Selector let's keep the same styleRule
-						if (
-							parentRule.constructor.name === "CSSStyleRule"
-							|| parentRule.constructor.name === "CSSMediaRule"
-							|| parentRule.constructor.name === "CSSSupportsRule"
-							|| parentRule.constructor.name === "CSSContainerRule"
-							|| parentRule.constructor.name === "CSSScopeRule"
-							|| parentRule.constructor.name === "CSSLayerBlockRule"
-							|| parentRule.constructor.name === "CSSStartingStyleRule"
-						) {
-							// parentRule.__parentRule = styleRule;
-							state = "before-name";
-							if (styleRule !== parentRule) {
-								styleRule = new CSSOM.CSSNestedDeclarations();
-								styleRule.__starts = i;	
+						// If currentScope has a __parentRule and wasn't added yet, add it
+						if (ancestorRules.length === 0 && currentScope.__parentRule && currentScope.__parentRule.cssRules) {
+							if (currentScope.__parentRule.cssRules.findIndex(function (rule) {
+								return rule === currentScope
+							}) === -1) {
+								currentScope.__parentRule.cssRules.push(currentScope);
 							}
 						}
-						
-					} else if (nestedSelectorRule && parentRule && (
-						parentRule.constructor.name === "CSSStyleRule"
-						|| parentRule.constructor.name === "CSSMediaRule"
-						|| parentRule.constructor.name === "CSSSupportsRule"
-						|| parentRule.constructor.name === "CSSContainerRule"
-						|| parentRule.constructor.name === "CSSLayerBlockRule"
-						|| parentRule.constructor.name === "CSSStartingStyleRule"
-					)) {
-						state = "before-name";
-						if (parentRule.cssRules.length) {
-							currentScope = nestedSelectorRule = parentRule;
-							styleRule = new CSSOM.CSSNestedDeclarations();
-							styleRule.__starts = i;	
-						} else {
-							if (parentRule.constructor.name === "CSSStyleRule") {
-								styleRule = parentRule;
+
+						// Only handle top-level rule closing if we processed all ancestors
+						if (ancestorRules.length === 0 && currentScope.parentRule == null) {
+							currentScope.__ends = i + 1;
+							if (currentScope !== topScope && topScope.cssRules.findIndex(function (rule) {
+								return rule === currentScope
+							}) === -1) {
+								topScope.cssRules.push(currentScope);
+							}
+							currentScope = topScope;
+							if (nestedSelectorRule === parentRule) {
+								// Check if this selector is really starting inside another selector
+								var nestedSelectorTokenToCurrentSelectorToken = token.slice(nestedSelectorRule.__starts, i + 1);
+								var openingBraceMatch = nestedSelectorTokenToCurrentSelectorToken.match(/{/g);
+								var closingBraceMatch = nestedSelectorTokenToCurrentSelectorToken.match(/}/g);
+								var openingBraceLen = openingBraceMatch && openingBraceMatch.length;
+								var closingBraceLen = closingBraceMatch && closingBraceMatch.length;
+
+								if (openingBraceLen === closingBraceLen) {
+									// If the number of opening and closing braces are equal, we can assume that the new selector is starting outside the nestedSelectorRule
+									nestedSelectorRule.__ends = i + 1;
+									nestedSelectorRule = null;
+									parentRule = null;
+								}
 							} else {
+								parentRule = null;
+							}
+						} else {
+							currentScope = parentRule;
+						}
+
+						buffer = "";
+						state = "before-selector";
+						break;
+				}
+				break;
+
+			default:
+				switch (state) {
+					case "before-selector":
+						state = "selector";
+						if ((styleRule || scopeRule) && parentRule) {
+							// Assuming it's a declaration inside Nested Selector OR a Nested Declaration
+							// If Declaration inside Nested Selector let's keep the same styleRule
+							if (!isSelectorStartChar(character) && !isWhitespaceChar(character) && parentRule instanceof CSSOM.CSSGroupingRule) {
+								// parentRule.__parentRule = styleRule;
+								state = "before-name";
+								if (styleRule !== parentRule) {
+									styleRule = new CSSOM.CSSNestedDeclarations();
+									styleRule.__starts = i;
+								}
+							}
+
+						} else if (nestedSelectorRule && parentRule && parentRule instanceof CSSOM.CSSGroupingRule) {
+							if (isSelectorStartChar(character)) {
+								// If starting with a selector character, create CSSStyleRule instead of CSSNestedDeclarations
 								styleRule = new CSSOM.CSSStyleRule();
-								styleRule.__starts = i;								
+								styleRule.__starts = i;
+							} else if (!isWhitespaceChar(character)) {
+								// Starting a declaration (not whitespace, not a selector)
+								state = "before-name";
+								// Check if we should create CSSNestedDeclarations
+								// This happens if: parent has cssRules OR nestedSelectorRule exists (indicating CSSStyleRule in hierarchy)
+								if (parentRule.cssRules.length || nestedSelectorRule) {
+									currentScope = parentRule;
+									// Only set nestedSelectorRule if parentRule is CSSStyleRule or CSSScopeRule
+									if (parentRule.constructor.name === "CSSStyleRule" || parentRule.constructor.name === "CSSScopeRule") {
+										nestedSelectorRule = parentRule;
+									}
+									styleRule = new CSSOM.CSSNestedDeclarations();
+									styleRule.__starts = i;
+								} else {
+									if (parentRule.constructor.name === "CSSStyleRule") {
+										styleRule = parentRule;
+									} else {
+										styleRule = new CSSOM.CSSStyleRule();
+										styleRule.__starts = i;
+									}
+								}
 							}
 						}
-					} else {
-						styleRule = new CSSOM.CSSStyleRule();
-						styleRule.__starts = i;
-					}
-					break;
-				case "before-name":
-					state = "name";
-					break;
-				case "before-value":
-					state = "value";
-					break;
-				case "importRule-begin":
-					state = "importRule";
-					break;
-				case "namespaceRule-begin":
-					state = "namespaceRule";
-					break;
+						break;
+					case "before-name":
+						state = "name";
+						break;
+					case "before-value":
+						state = "value";
+						break;
+					case "importRule-begin":
+						state = "importRule";
+						break;
+					case "namespaceRule-begin":
+						state = "namespaceRule";
+						break;
+				}
+				buffer += character;
+				break;
+		}
+
+		// Auto-close all unclosed nested structures
+		// Check AFTER processing the character, at the ORIGINAL ending index
+		// Only add closing braces if CSS is incomplete (not at top scope)
+		if (i === initialEndingIndex && (currentScope !== topScope || ancestorRules.length > 0)) {
+			var needsClosing = ancestorRules.length;
+			if (currentScope !== topScope && ancestorRules.indexOf(currentScope) === -1) {
+				needsClosing += 1;
+			}
+			// Add closing braces for all unclosed structures
+			for (var closeIdx = 0; closeIdx < needsClosing; closeIdx++) {
+				token += "}";
+				endingIndex += 1;
 			}
-			buffer += character;
-			break;
 		}
 	}