@acemir/cssom 0.9.19 → 0.9.21

package/lib/parse.js

@@ -50,7 +50,9 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		"conditionBlock": true,
 		"counterStyleBlock": true,
 		'documentRule-begin': true,
-		"layerBlock": true
+		"scopeBlock": true,
+		"layerBlock": true,
+		"pageBlock": true
 	};
 
 	var styleSheet = new CSSOM.CSSStyleSheet();
@@ -68,7 +70,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, 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 = {};
@@ -78,11 +80,13 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	// var atRulesStatemenRegExp = /(?<!{.*)[;}]\s*/; // Match a statement by verifying it finds a semicolon or closing brace not followed by another semicolon or closing brace
 	var beforeRulePortionRegExp = /{(?!.*{)|}(?!.*})|;(?!.*;)|\*\/(?!.*\*\/)/g; // Match the closest allowed character (a opening or closing brace, a semicolon or a comment ending) before the rule
 	var beforeRuleValidationRegExp = /^[\s{};]*(\*\/\s*)?$/; // Match that the portion before the rule is empty or contains only whitespace, semicolons, opening/closing braces, and optionally a comment ending (*/) followed by whitespace
-	var forwardRuleValidationRegExp = /(?:\(|\s|\/\*)/; // Match that the rule is followed by any whitespace, a opening comment or a condition opening parenthesis
+	var forwardRuleValidationRegExp = /(?:\s|\/\*|\{|\()/; // Match that the rule is followed by any whitespace, a opening comment, a condition opening parenthesis or a opening brace
 	var forwardImportRuleValidationRegExp = /(?:\s|\/\*|'|")/; // Match that the rule is followed by any whitespace, an opening comment, a single quote or double quote
 	var forwardRuleClosingBraceRegExp = /{[^{}]*}|}/; // Finds the next closing brace of a rule block
 	var forwardRuleSemicolonAndOpeningBraceRegExp = /^.*?({|;)/; // Finds the next semicolon or opening brace after the at-rule	
-	var layerRuleNameRegExp = /^(-?[_a-zA-Z]+(\.[_a-zA-Z]+)*[_a-zA-Z0-9-]*)$/; // Validates a single @layer name
+	var cssCustomIdentifierRegExp = /^(-?[_a-zA-Z]+(\.[_a-zA-Z]+)*[_a-zA-Z0-9-]*)$/; // Validates a css custom identifier
+	var startsWithCombinatorRegExp = /^\s*[>+~]/; // Checks if a selector starts with a CSS combinator (>, +, ~)
+	var atPageRuleSelectorRegExp = /^([^\s:]+)?((?::\w+)*)$/;
 
 	/**
 	 * Searches for the first occurrence of a CSS at-rule statement terminator (`;` or `}`) 
@@ -174,24 +178,214 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		return i;	
 	}
 
-	var parseError = function(message) {
-		var lines = token.substring(0, i).split('\n');
-		var lineCount = lines.length;
-		var charCount = lines.pop().length + 1;
-		var error = new Error(message + ' (line ' + lineCount + ', char ' + charCount + ')');
-		error.line = lineCount;
-		/* jshint sub : true */
-		error['char'] = charCount;
-		error.styleSheet = styleSheet;
-		// Print the error but continue parsing the sheet
-		try {
-			throw error;
-		} catch(e) {
-			errorHandler && errorHandler(e);
+	/**
+	 * Parses the scope prelude and extracts start and end selectors.
+	 * @param {string} preludeContent - The scope prelude content (without @scope keyword)
+	 * @returns {object} Object with startSelector and endSelector properties
+	 */
+	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();
+		}
+		if (hasEnd) {
+			endSelector = parts[1].slice(1, -1).trim();
+		}
+		if (hasOnlyEnd) {
+			endSelector = parts[0].slice(4, -1).trim();
+		}
+		
+		return {
+			startSelector: startSelector,
+			endSelector: endSelector,
+			hasStart: hasStart,
+			hasEnd: hasEnd,
+			hasOnlyEnd: hasOnlyEnd
+		};
+	};
+
+	/**
+	 * Checks if a selector contains pseudo-elements.
+	 * @param {string} selector - The CSS selector to check
+	 * @returns {boolean} True if the selector contains pseudo-elements
+	 */
+	function hasPseudoElement(selector) {
+		// Match only double-colon (::) pseudo-elements
+		// Also match legacy single-colon pseudo-elements: :before, :after, :first-line, :first-letter
+		// These must NOT be followed by alphanumeric characters (to avoid matching :before-x or similar)
+		var pseudoElementRegex = /::[a-zA-Z][\w-]*|:(before|after|first-line|first-letter)(?![a-zA-Z0-9_-])/;
+		return pseudoElementRegex.test(selector);
+	};
+
+	/**
+	 * Validates balanced parentheses, brackets, and quotes in a selector.
+	 * 
+	 * @param {string} selector - The CSS selector to validate
+	 * @param {boolean} trackAttributes - Whether to track attribute selector context
+	 * @param {boolean} useStack - Whether to use a stack for parentheses (needed for nested validation)
+	 * @returns {boolean} True if the syntax is valid (all brackets, parentheses, and quotes are balanced)
+	 */
+	function validateBalancedSyntax(selector, trackAttributes, useStack) {
+		var parenDepth = 0;
+		var bracketDepth = 0;
+		var inSingleQuote = false;
+		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;
+				}
+			} else if (inDoubleQuote) {
+				if (char === '"' && prevChar !== "\\") {
+					inDoubleQuote = false;
+				}
+			} else if (trackAttributes && inAttr) {
+				if (char === "]") {
+					inAttr = false;
+				} else if (char === "'") {
+					inSingleQuote = true;
+				} else if (char === '"') {
+					inDoubleQuote = true;
+				}
+			} else {
+				if (trackAttributes && char === "[") {
+					inAttr = true;
+				} else if (char === "'") {
+					inSingleQuote = true;
+				} else if (char === '"') {
+					inDoubleQuote = true;
+				} else if (char === '(') {
+					if (useStack) {
+						stack.push("(");
+					} else {
+						parenDepth++;
+					}
+				} else if (char === ')') {
+					if (useStack) {
+						if (!stack.length || stack.pop() !== "(") {
+							return false;
+						}
+					} else {
+						parenDepth--;
+						if (parenDepth < 0) {
+							return false;
+						}
+					}
+				} else if (char === '[') {
+					bracketDepth++;
+				} else if (char === ']') {
+					bracketDepth--;
+					if (bracketDepth < 0) {
+						return false;
+					}
+				}
+			}
 		}
+		
+		// Check if everything is balanced
+		if (useStack) {
+			return stack.length === 0 && bracketDepth === 0 && !inSingleQuote && !inDoubleQuote && !inAttr;
+		} else {
+			return parenDepth === 0 && bracketDepth === 0 && !inSingleQuote && !inDoubleQuote;
+		}
+	};
+
+	/**
+	 * Checks for basic syntax errors in selectors (mismatched parentheses, brackets, quotes).
+	 * @param {string} selector - The CSS selector to check
+	 * @returns {boolean} True if there are syntax errors
+	 */
+	function hasBasicSyntaxError(selector) {
+		return !validateBalancedSyntax(selector, false, false);
 	};
 
-	var validateAtRule = function(atRuleKey, validCallback, cannotBeNested) {
+	/**
+	 * Checks for invalid combinator patterns in selectors.
+	 * @param {string} selector - The CSS selector to check
+	 * @returns {boolean} True if the selector contains invalid combinators
+	 */
+	function hasInvalidCombinators(selector) {
+		// Check for invalid combinator patterns:
+		// - <> (not a valid combinator)
+		// - >> (deep descendant combinator, deprecated and invalid)
+		// - Multiple consecutive combinators like >>, >~, etc.
+		if (/<>/.test(selector)) return true;
+		if (/>>/.test(selector)) return true;
+		// Check for other invalid consecutive combinator patterns
+		if (/[>+~]\s*[>+~]/.test(selector)) return true;
+		return false;
+	};
+
+	/**
+	 * Checks for invalid pseudo-like syntax (function calls without proper pseudo prefix).
+	 * @param {string} selector - The CSS selector to check
+	 * @returns {boolean} True if the selector contains invalid pseudo-like syntax
+	 */
+	function hasInvalidPseudoSyntax(selector) {
+		// Check for specific known pseudo-elements used without : or :: prefix
+		// Examples: slotted(div), part(name), cue(selector)
+		// These are ONLY valid as ::slotted(), ::part(), ::cue()
+		var invalidPatterns = [
+			/(?:^|[\s>+~,\[])slotted\s*\(/i,
+			/(?:^|[\s>+~,\[])part\s*\(/i,
+			/(?:^|[\s>+~,\[])cue\s*\(/i,
+			/(?:^|[\s>+~,\[])cue-region\s*\(/i
+		];
+		
+		for (var i = 0; i < invalidPatterns.length; i++) {
+			if (invalidPatterns[i].test(selector)) {
+				return true;
+			}
+		}
+		return false;
+	};
+
+	/**
+	 * Checks for invalid nesting selector (&) usage.
+	 * The & selector cannot be directly followed by a type selector without a delimiter.
+	 * Valid: &.class, &#id, &[attr], &:hover, &::before, & div, &>div
+	 * Invalid: &div, &span
+	 * @param {string} selector - The CSS selector to check
+	 * @returns {boolean} True if the selector contains invalid & usage
+	 */
+	function hasInvalidNestingSelector(selector) {
+		// Check for & followed directly by a letter (type selector) without any delimiter
+		// This regex matches & followed by a letter (start of type selector) that's not preceded by an escape
+		// We need to exclude valid cases like &.class, &#id, &[attr], &:pseudo, &::pseudo, & (with space), &>
+		var invalidNestingPattern = /&(?![.\#\[:>\+~\s])[a-zA-Z]/;
+		return invalidNestingPattern.test(selector);
+	};
+
+	function validateAtRule(atRuleKey, validCallback, cannotBeNested) {
 		var isValid = false;
 		var sourceRuleRegExp = atRuleKey === "@import" ? forwardImportRuleValidationRegExp : forwardRuleValidationRegExp;
 		var ruleRegExp = new RegExp(atRuleKey + sourceRuleRegExp.source, sourceRuleRegExp.flags);
@@ -212,6 +406,114 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				isValid = true;
 			}
 		}
+		
+		// Additional validation for @scope rule
+		if (isValid && atRuleKey === "@scope") {
+			var openBraceIndex = ruleSlice.indexOf('{');
+			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("@scope".length).trim();
+
+				if (preludeContent.length > 0) {
+					// Parse the scope prelude
+					var parsedScopePrelude = parseScopePrelude(preludeContent);
+					var startSelector = parsedScopePrelude.startSelector;
+					var endSelector = parsedScopePrelude.endSelector;
+					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 === '')) {
+						isValid = false;
+					}
+					// 2. Pseudo-elements are invalid in scope selectors
+					else if ((startSelector && hasPseudoElement(startSelector)) || (endSelector && hasPseudoElement(endSelector))) {
+						isValid = false;
+					}
+					// 3. Basic syntax errors (mismatched parens, brackets, quotes)
+					else if ((startSelector && hasBasicSyntaxError(startSelector)) || (endSelector && hasBasicSyntaxError(endSelector))) {
+						isValid = false;
+					}
+					// 4. Invalid combinator patterns
+					else if ((startSelector && hasInvalidCombinators(startSelector)) || (endSelector && hasInvalidCombinators(endSelector))) {
+						isValid = false;
+					}
+					// 5. Invalid pseudo-like syntax (function without : or :: prefix)
+					else if ((startSelector && hasInvalidPseudoSyntax(startSelector)) || (endSelector && hasInvalidPseudoSyntax(endSelector))) {
+						isValid = false;
+					}
+					// 6. Invalid structure (no proper parentheses found when prelude is not empty)
+					else if (!hasStart && !hasOnlyEnd) {
+						isValid = false;
+					}
+				}
+				// Empty prelude (@scope {}) is valid
+			}
+		}
+
+		if (isValid && atRuleKey === "@page") {
+			var openBraceIndex = ruleSlice.indexOf('{');
+			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
+						// Valid formats:
+						// - (empty - no name, no pseudo-page)
+						// - :left, :right, :first, :blank (pseudo-page only)
+						// - named (named page only)
+						// - named:first (named page with single pseudo-page)
+						// - named:first:left (named page with multiple pseudo-pages)
+						var match = trimmedValue.match(atPageRuleSelectorRegExp);
+						if (match) {
+							var pageName = match[1] || '';
+							var pseudoPages = match[2] || '';
+
+							// Validate page name if present
+							if (pageName) {
+								if (!cssCustomIdentifierRegExp.test(pageName)) {
+									isValid = false;
+								}
+							}
+
+							// Validate pseudo-pages if present
+							if (pseudoPages) {
+								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++) {
+									if (validPseudos.indexOf(pseudos[j].toLowerCase()) === -1) {
+										allValid = false;
+										break;
+									}
+								}
+								
+								if (!allValid) {
+									isValid = false;
+								}
+							}
+						} else {
+							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
@@ -270,55 +572,47 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	 * @returns {boolean}
 	 */
 	function basicSelectorValidator(selector) {
-		var length = selector.length;
-		var i = 0;
-		var stack = [];
-		var inAttr = false;
-		var inSingleQuote = false;
-		var inDoubleQuote = false;
+		// Validate balanced syntax with attribute tracking and stack-based parentheses matching
+		if (!validateBalancedSyntax(selector, true, true)) {
+			return false;
+		}
 
-		while (i < length) {
-			var char = selector[i];
+		// Check for invalid combinator patterns
+		if (hasInvalidCombinators(selector)) {
+			return false;
+		}
 
-			if (inSingleQuote) {
-				if (char === "'" && selector[i - 1] !== "\\") {
-					inSingleQuote = false;
-				}
-			} else if (inDoubleQuote) {
-				if (char === '"' && selector[i - 1] !== "\\") {
-					inDoubleQuote = false;
-				}
-			} else if (inAttr) {
-				if (char === "]") {
-					inAttr = false;
-				} else if (char === "'") {
-					inSingleQuote = true;
-				} else if (char === '"') {
-					inDoubleQuote = true;
-				}
-			} else {
-				if (char === "[") {
-					inAttr = true;
-				} else if (char === "'") {
-					inSingleQuote = true;
-				} else if (char === '"') {
-					inDoubleQuote = true;
-				} else if (char === "(") {
-					stack.push("(");
-				} else if (char === ")") {
-					if (!stack.length || stack.pop() !== "(") {
-						return false;
-					}
-				}
-			}
-			i++;
+		// Check for invalid pseudo-like syntax
+		if (hasInvalidPseudoSyntax(selector)) {
+			return false;
 		}
 
-		// If any stack or quote/attr context remains, it's invalid
-		if (stack.length || inAttr || inSingleQuote || inDoubleQuote) {
+		// Check for invalid nesting selector (&) usage
+		if (hasInvalidNestingSelector(selector)) {
 			return false;
 		}
 
+		// Check for invalid pseudo-class usage with quoted strings
+		// Pseudo-classes like :lang(), :dir(), :nth-*() should not accept quoted strings
+		var pseudoPattern = /::?([a-zA-Z][\w-]*)\(([^)]+)\)/g;
+		var pseudoMatch;
+		while ((pseudoMatch = pseudoPattern.exec(selector)) !== null) {
+			var pseudoName = pseudoMatch[1];
+			var pseudoContent = pseudoMatch[2];
+			
+			// List of pseudo-classes that should not accept quoted strings
+			// :lang() - accepts language codes: en, fr-CA
+			// :dir() - accepts direction: ltr, rtl
+			// :nth-*() - accepts An+B notation: 2n+1, odd, even
+			var noQuotesPseudos = ['lang', 'dir', 'nth-child', 'nth-last-child', 'nth-of-type', 'nth-last-of-type'];
+			
+			for (var i = 0; i < noQuotesPseudos.length; i++) {
+				if (pseudoName === noQuotesPseudos[i] && /['"]/.test(pseudoContent)) {
+					return false;
+				}
+			}
+		}
+
 		// Fallback to a loose regexp for the overall selector structure (without deep paren matching)
 		// This is similar to the original, but without nested paren limitations
 		// Modified to support namespace selectors: *|element, prefix|element, |element
@@ -326,7 +620,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		var looseSelectorRegExp = /^((?:(?:\*|[a-zA-Z_\u00A0-\uFFFF\\][a-zA-Z0-9_\u00A0-\uFFFF\-\\]*|)\|)?[a-zA-Z_\u00A0-\uFFFF\\][a-zA-Z0-9_\u00A0-\uFFFF\-\\]*|(?:(?:\*|[a-zA-Z_\u00A0-\uFFFF\\][a-zA-Z0-9_\u00A0-\uFFFF\-\\]*|)\|)?\*|#[a-zA-Z0-9_\u00A0-\uFFFF\-\\]+|\.[a-zA-Z0-9_\u00A0-\uFFFF\-\\]+|\[(?:[^\[\]'"]|'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")*(?:\s+[iI])?\]|::?[a-zA-Z0-9_\u00A0-\uFFFF\-\\]+(?:\((.*)\))?|&|\s*[>+~]\s*|\s+)+$/;
 		return looseSelectorRegExp.test(selector);
 	}
-
+	
 	/**
 	 * Regular expression to match CSS pseudo-classes with arguments.
 	 *
@@ -357,48 +651,56 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	 * @returns {string[]} An array of selector parts, split by top-level commas, with whitespace trimmed.
 	 */
 	function parseAndSplitNestedSelectors(selector) {
-		var depth = 0;
-		var buffer = "";
-		var parts = [];
-		var inSingleQuote = false;
-		var inDoubleQuote = false;
+		var depth = 0;           // Track parenthesis nesting depth
+		var buffer = "";         // Accumulate characters for current selector part
+		var parts = [];          // Array of split selector parts
+		var inSingleQuote = false; // Track if we're inside single quotes
+		var inDoubleQuote = false; // Track if we're inside double quotes
 		var i, char;
 
 		for (i = 0; i < selector.length; i++) {
 			char = selector.charAt(i);
 
+			// Handle single quote strings
 			if (char === "'" && !inDoubleQuote) {
 				inSingleQuote = !inSingleQuote;
 				buffer += char;
-			} else if (char === '"' && !inSingleQuote) {
+			}
+			// Handle double quote strings
+			else if (char === '"' && !inSingleQuote) {
 				inDoubleQuote = !inDoubleQuote;
 				buffer += char;
-			} else if (!inSingleQuote && !inDoubleQuote) {
+			}
+			// Process characters outside of quoted strings
+			else if (!inSingleQuote && !inDoubleQuote) {
 				if (char === '(') {
+					// Entering a nested level (e.g., :is(...))
 					depth++;
 					buffer += char;
 				} else if (char === ')') {
+					// Exiting a nested level
 					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, ""));
+					// Found a top-level comma separator - split here
+					if (buffer.trim()) {
+						parts.push(buffer.trim());
 					}
 					buffer = "";
 				} else {
+					// Regular character - add to buffer
 					buffer += char;
 				}
-			} else {
+			}
+			// Characters inside quoted strings - add to buffer
+			else {
 				buffer += char;
 			}
 		}
 
-		if (buffer.replace(/^\s+|\s+$/g, "")) {
-			parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+		// Add any remaining content in buffer as the last part
+		if (buffer.trim()) {
+			parts.push(buffer.trim());
 		}
 
 		return parts;
@@ -415,8 +717,8 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	 * @returns {boolean} Returns `true` if the selector is valid, otherwise `false`.
 	 */
 
-	// Cache to store validated selectors
-	var validatedSelectorsCache = new Map();
+	// Cache to store validated selectors (previously a ES6 Map, now an ES5-compliant object)
+	var validatedSelectorsCache = {};
 
 	// Only pseudo-classes that accept selector lists should recurse
 	var selectorListPseudoClasses = {
@@ -427,8 +729,8 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	};
 
 	function validateSelector(selector) {
-		if (validatedSelectorsCache.has(selector)) {
-			return validatedSelectorsCache.get(selector);
+		if (validatedSelectorsCache.hasOwnProperty(selector)) {
+			return validatedSelectorsCache[selector];
 		}
 
 		// Use a non-global regex to find all pseudo-classes with arguments
@@ -445,15 +747,15 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				var nestedSelectors = parseAndSplitNestedSelectors(pseudoClassMatches[j][2]);
 				for (var i = 0; i < nestedSelectors.length; i++) {
 					var nestedSelector = nestedSelectors[i];
-					if (!validatedSelectorsCache.has(nestedSelector)) {
+					if (!validatedSelectorsCache.hasOwnProperty(nestedSelector)) {
 						var nestedSelectorValidation = validateSelector(nestedSelector);
-						validatedSelectorsCache.set(nestedSelector, nestedSelectorValidation);
+						validatedSelectorsCache[nestedSelector] = nestedSelectorValidation;
 						if (!nestedSelectorValidation) {
-							validatedSelectorsCache.set(selector, false);
+							validatedSelectorsCache[selector] = false;
 							return false;
 						}
-					} else if (!validatedSelectorsCache.get(nestedSelector)) {
-						validatedSelectorsCache.set(selector, false);
+					} else if (!validatedSelectorsCache[nestedSelector]) {
+						validatedSelectorsCache[selector] = false;
 						return false;
 					}
 				}
@@ -461,7 +763,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		}
 
 		var basicSelectorValidation = basicSelectorValidator(selector);
-		validatedSelectorsCache.set(selector, basicSelectorValidation);
+		validatedSelectorsCache[selector] = basicSelectorValidation;
 
 		return basicSelectorValidation;
 	}
@@ -525,6 +827,28 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		return definedNamespacePrefixes.hasOwnProperty(namespacePrefix);
 	}
 
+	/**
+	 * Processes a CSS selector text 
+	 * 
+	 * @param {string} selectorText - The CSS selector text to process
+	 * @returns {string} The processed selector text with normalized whitespace
+	 */
+	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) {
+			if (newline) return " ";
+			return match;
+		});
+	}
+
 	/**
 	 * Checks if a given CSS selector text is valid by splitting it by commas
 	 * and validating each individual selector using the `validateSelector` function.
@@ -533,6 +857,9 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 	 * @returns {boolean} Returns true if all selectors are valid, otherwise false.
 	 */
 	function isValidSelectorText(selectorText) {
+		// 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 newlines inside single or double quotes using regex
 		// This matches any quoted string (single or double) containing a newline
 		var quotedNewlineRegExp = /(['"])(?:\\.|[^\\])*?\1/g;
@@ -553,6 +880,23 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		return true;
 	}
 
+	function parseError(message) {
+		var lines = token.substring(0, i).split('\n');
+		var lineCount = lines.length;
+		var charCount = lines.pop().length + 1;
+		var error = new Error(message + ' (line ' + lineCount + ', char ' + charCount + ')');
+		error.line = lineCount;
+		/* jshint sub : true */
+		error['char'] = charCount;
+		error.styleSheet = styleSheet;
+		// Print the error but continue parsing the sheet
+		try {
+			throw error;
+		} catch(e) {
+			errorHandler && errorHandler(e);
+		}
+	};
+
 	var endingIndex = token.length - 1;
 
 	for (var character; (character = token.charAt(i)); i++) {
@@ -642,7 +986,8 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				i += 2;
 				index = token.indexOf("*/", i);
 				if (index === -1) {
-					parseError("Missing */");
+					i = token.length - 1;
+					buffer = "";
 				} else {
 					i = index + 1;
 				}
@@ -697,6 +1042,15 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				}, 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"
@@ -706,6 +1060,15 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				});
 				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";
@@ -803,10 +1166,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				}
 
 				currentScope = parentRule = styleRule;
-				styleRule.selectorText = buffer.trim().replace(/(['"])(?:\\.|[^\\])*?\1|(\r\n|\r|\n)/g, function(match, _, newline) {
-					if (newline) return " ";
-					return match;
-				});
+				styleRule.selectorText = processSelectorText(buffer.trim());
 				styleRule.style.__starts = i;
 				styleRule.__parentStyleSheet = styleSheet;
 				buffer = "";
@@ -824,7 +1184,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				buffer = "";
 				state = "before-selector";
 			} else if (state === "containerBlock") {
-				containerRule.containerText = buffer.trim();
+				containerRule.__conditionText = buffer.trim();
 
 				if (parentRule) {
 					containerRule.__parentRule = parentRule;
@@ -841,7 +1201,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				counterStyleRule.__parentStyleSheet = styleSheet;
 				buffer = "";
 			} else if (state === "conditionBlock") {
-				supportsRule.conditionText = buffer.trim();
+				supportsRule.__conditionText = buffer.trim();
 
 				if (parentRule) {
 					supportsRule.__parentRule = parentRule;
@@ -852,10 +1212,31 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				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;
+				}
+
+				if (parentRule) {
+					scopeRule.__parentRule = parentRule;
+					ancestorRules.push(parentRule);
+				}
+				currentScope = parentRule = scopeRule;
+				scopeRule.__parentStyleSheet = styleSheet;
+				buffer = "";
+				state = "before-selector";
 			} else if (state === "layerBlock") {
 				layerBlockRule.name = buffer.trim();
 
-				var isValidName = layerBlockRule.name.length === 0 || layerBlockRule.name.match(layerRuleNameRegExp) !== null;
+				var isValidName = layerBlockRule.name.length === 0 || layerBlockRule.name.match(cssCustomIdentifierRegExp) !== null;
 
 				if (isValidName) {
 					if (parentRule) {
@@ -868,6 +1249,19 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				}
 				buffer = "";
 				state = "before-selector";
+			} else if (state === "pageBlock") {
+				pageRule.selectorText = buffer.trim();
+
+				if (parentRule) {
+					pageRule.__parentRule = parentRule;
+					ancestorRules.push(parentRule);
+				}
+
+				currentScope = parentRule = pageRule;
+				pageRule.__parentStyleSheet = styleSheet;
+				styleRule = pageRule;
+				buffer = "";
+				state = "before-name";
 			} else if (state === "hostRule-begin") {
 				if (parentRule) {
 					ancestorRules.push(parentRule);
@@ -941,17 +1335,15 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 				}
 				
 				styleRule = new CSSOM.CSSStyleRule();
-				var processedSelectorText = buffer.trim().replace(/(['"])(?:\\.|[^\\])*?\1|(\r\n|\r|\n)/g, function(match, _, newline) {
-					if (newline) return " ";
-					return match;
-				});
+				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 !== "CSSStyleRule" && parentRule.parentRule === null) {
 					styleRule.selectorText = processedSelectorText;
 				} else {
 					styleRule.selectorText = parseAndSplitNestedSelectors(processedSelectorText).map(function(sel) {
-							return sel.indexOf('&') === -1 ? '& ' + sel : sel;
-						}).join(', ');
+						// 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;
@@ -1067,7 +1459,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 							testNamespaceRule.cssText = buffer + character;
 							
 							namespaceRule = testNamespaceRule;
-							namespaceRule.__parentStyleSheet = namespaceRule.styleSheet.__parentStyleSheet = styleSheet;
+							namespaceRule.__parentStyleSheet = styleSheet;
 							styleSheet.cssRules.push(namespaceRule);
 							
 							// Track the namespace prefix for validation
@@ -1086,7 +1478,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 						return name.trim();
 					});
 					var isInvalid = parentRule !== undefined || nameListStr.some(function (name) {
-						return name.trim().match(layerRuleNameRegExp) === null;
+						return name.trim().match(cssCustomIdentifierRegExp) === null;
 					});
 
 					if (!isInvalid) {
@@ -1187,6 +1579,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 							|| parentRule.constructor.name === "CSSMediaRule"
 							|| parentRule.constructor.name === "CSSSupportsRule"
 							|| parentRule.constructor.name === "CSSContainerRule"
+							|| parentRule.constructor.name === "CSSScopeRule"
 							|| parentRule.constructor.name === "CSSLayerBlockRule"
 							|| parentRule.constructor.name === "CSSStartingStyleRule"
 						) {
@@ -1256,6 +1649,7 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 							|| parentRule.constructor.name === "CSSMediaRule"
 							|| parentRule.constructor.name === "CSSSupportsRule"
 							|| parentRule.constructor.name === "CSSContainerRule"
+							|| parentRule.constructor.name === "CSSScopeRule"
 							|| parentRule.constructor.name === "CSSLayerBlockRule"
 							|| parentRule.constructor.name === "CSSStartingStyleRule"
 						) {
@@ -1311,6 +1705,10 @@ CSSOM.parse = function parse(token, opts, errorHandler) {
 		}
 	}
 
+	if (buffer.trim() !== "") {
+		parseError("Unexpected end of input");
+	}
+
 	return styleSheet;
 };
 
@@ -1337,8 +1735,10 @@ CSSOM.CSSKeyframeRule = require('./CSSKeyframeRule').CSSKeyframeRule;
 CSSOM.CSSKeyframesRule = require('./CSSKeyframesRule').CSSKeyframesRule;
 CSSOM.CSSValueExpression = require('./CSSValueExpression').CSSValueExpression;
 CSSOM.CSSDocumentRule = require('./CSSDocumentRule').CSSDocumentRule;
+CSSOM.CSSScopeRule = require('./CSSScopeRule').CSSScopeRule;
 CSSOM.CSSLayerBlockRule = require("./CSSLayerBlockRule").CSSLayerBlockRule;
 CSSOM.CSSLayerStatementRule = require("./CSSLayerStatementRule").CSSLayerStatementRule;
+CSSOM.CSSPageRule = require("./CSSPageRule").CSSPageRule;
 // Use cssstyle if available
 try {
 	CSSOM.CSSStyleDeclaration = require("cssstyle").CSSStyleDeclaration;