@acemir/cssom 0.9.2 → 0.9.3

package/build/CSSOM.js

@@ -1816,7 +1816,7 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 *
 	 * @type {RegExp}
 	 */
-	var basicSelectorRegExp = /^([a-zA-Z][a-zA-Z0-9_-]*|\*|#[a-zA-Z0-9_-]+|\.[a-zA-Z0-9_-]+|\[[^\[\]]*\]|::?[a-zA-Z0-9_-]+(?:\([^\(\)]*\))?|&|\s*[>+~]\s*|\s+)+$/;
+	var basicSelectorRegExp = /^([a-zA-Z][a-zA-Z0-9_-]*|\*|#[a-zA-Z0-9_-]+|\.[a-zA-Z0-9_-]+|\[[^\[\]]*(?:\s+[iI])?\]|::?[a-zA-Z0-9_-]+(?:\([^\(\)]*\))?|&|\s*[>+~]\s*|\s+)+$/;
 
 	/**
 	 * Regular expression to match CSS pseudo-classes with arguments.
@@ -1834,7 +1834,7 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 *   - Group 2: "2n+1"
 	 * @type {RegExp}
 	 */
-	var globalPseudoClassRegExp = /:([a-zA-Z-]+)\(([^)]*)\)/g;
+	var globalPseudoClassRegExp = /:([a-zA-Z-]+)\(([^)]*?(?:\s+[iI])?)\)/g;
 
 	/**
 	 * Parses a CSS selector string and splits it into parts, handling nested parentheses.
@@ -1846,30 +1846,42 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 * @param {string} selector - The CSS selector string to parse.
 	 * @returns {string[]} An array of selector parts, split by top-level commas, with whitespace trimmed.
 	 */
-	function parseNestedSelectors(selector) {
+	function parseAndSplitNestedSelectors(selector) {
 		var depth = 0;
 		var buffer = "";
 		var parts = [];
+		var inSingleQuote = false;
+		var inDoubleQuote = false;
 		var i, char;
 
 		for (i = 0; i < selector.length; i++) {
 			char = selector.charAt(i);
 
-			if (char === '(') {
-				depth++;
+			if (char === "'" && !inDoubleQuote) {
+				inSingleQuote = !inSingleQuote;
 				buffer += char;
-			} else if (char === ')') {
-				depth--;
+			} else if (char === '"' && !inSingleQuote) {
+				inDoubleQuote = !inDoubleQuote;
 				buffer += char;
-				if (depth === 0) {
-					parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+			} else if (!inSingleQuote && !inDoubleQuote) {
+				if (char === '(') {
+					depth++;
+					buffer += char;
+				} else if (char === ')') {
+					depth--;
+					buffer += char;
+					if (depth === 0) {
+						parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+						buffer = "";
+					}
+				} else if (char === ',' && depth === 0) {
+					if (buffer.replace(/^\s+|\s+$/g, "")) {
+						parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+					}
 					buffer = "";
+				} else {
+					buffer += char;
 				}
-			} else if (char === ',' && depth === 0) {
-				if (buffer.replace(/^\s+|\s+$/g, "")) {
-					parts.push(buffer.replace(/^\s+|\s+$/g, ""));
-				}
-				buffer = "";
 			} else {
 				buffer += char;
 			}
@@ -1908,7 +1920,7 @@ CSSOM.parse = function parse(token, errorHandler) {
 		while ((match = pseudoClassRegExp.exec(selector)) !== null) {
 			var pseudoClass = match[1];
 			if (selectorListPseudoClasses.hasOwnProperty(pseudoClass)) {
-				nestedSelectors = parseNestedSelectors(match[2]);
+				nestedSelectors = parseAndSplitNestedSelectors(match[2]);
 				// Validate each nested selector
 				for (i = 0; i < nestedSelectors.length; i++) {
 					if (!validateSelector(nestedSelectors[i])) {
@@ -1931,9 +1943,10 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 */
 	function isValidSelectorText(selectorText) {
 		// Split selectorText by commas and validate each part
-		var selectors = selectorText.split(',');
+		var selectors = parseAndSplitNestedSelectors(selectorText);
 		for (var i = 0; i < selectors.length; i++) {
-			if (!validateSelector(selectors[i].replace(/^\s+|\s+$/g, ""))) {
+			var processedSelectors = selectors[i].replace(/^\s+|\s+$/g, "");
+			if (!validateSelector(processedSelectors)) {
 				return false;
 			}
 		}
@@ -2159,7 +2172,6 @@ CSSOM.parse = function parse(token, errorHandler) {
 				}
 
 				currentScope = parentRule = styleRule;
-				console.log('sel out', buffer);
 				styleRule.selectorText = buffer.trim();
 				styleRule.style.__starts = i;
 				styleRule.parentStyleSheet = styleSheet;
@@ -2289,9 +2301,8 @@ CSSOM.parse = function parse(token, errorHandler) {
 				}
 				
 				styleRule = new CSSOM.CSSStyleRule();
-				console.log('sel in', buffer);
 				// In a nested selector, ensure each selector contains '&' at the beginning, except for selectors that already have '&' somewhere
-				styleRule.selectorText = parseNestedSelectors(buffer.trim()).map(function(sel) {
+				styleRule.selectorText = parseAndSplitNestedSelectors(buffer.trim()).map(function(sel) {
 						return sel.indexOf('&') === -1 ? '& ' + sel : sel;
 					}).join(', ');
 				styleRule.style.__starts = i - buffer.length;

package/lib/parse.js

@@ -249,7 +249,7 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 *
 	 * @type {RegExp}
 	 */
-	var basicSelectorRegExp = /^([a-zA-Z][a-zA-Z0-9_-]*|\*|#[a-zA-Z0-9_-]+|\.[a-zA-Z0-9_-]+|\[[^\[\]]*\]|::?[a-zA-Z0-9_-]+(?:\([^\(\)]*\))?|&|\s*[>+~]\s*|\s+)+$/;
+	var basicSelectorRegExp = /^([a-zA-Z][a-zA-Z0-9_-]*|\*|#[a-zA-Z0-9_-]+|\.[a-zA-Z0-9_-]+|\[[^\[\]]*(?:\s+[iI])?\]|::?[a-zA-Z0-9_-]+(?:\([^\(\)]*\))?|&|\s*[>+~]\s*|\s+)+$/;
 
 	/**
 	 * Regular expression to match CSS pseudo-classes with arguments.
@@ -267,7 +267,7 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 *   - Group 2: "2n+1"
 	 * @type {RegExp}
 	 */
-	var globalPseudoClassRegExp = /:([a-zA-Z-]+)\(([^)]*)\)/g;
+	var globalPseudoClassRegExp = /:([a-zA-Z-]+)\(([^)]*?(?:\s+[iI])?)\)/g;
 
 	/**
 	 * Parses a CSS selector string and splits it into parts, handling nested parentheses.
@@ -279,30 +279,42 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 * @param {string} selector - The CSS selector string to parse.
 	 * @returns {string[]} An array of selector parts, split by top-level commas, with whitespace trimmed.
 	 */
-	function parseNestedSelectors(selector) {
+	function parseAndSplitNestedSelectors(selector) {
 		var depth = 0;
 		var buffer = "";
 		var parts = [];
+		var inSingleQuote = false;
+		var inDoubleQuote = false;
 		var i, char;
 
 		for (i = 0; i < selector.length; i++) {
 			char = selector.charAt(i);
 
-			if (char === '(') {
-				depth++;
+			if (char === "'" && !inDoubleQuote) {
+				inSingleQuote = !inSingleQuote;
 				buffer += char;
-			} else if (char === ')') {
-				depth--;
+			} else if (char === '"' && !inSingleQuote) {
+				inDoubleQuote = !inDoubleQuote;
 				buffer += char;
-				if (depth === 0) {
-					parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+			} else if (!inSingleQuote && !inDoubleQuote) {
+				if (char === '(') {
+					depth++;
+					buffer += char;
+				} else if (char === ')') {
+					depth--;
+					buffer += char;
+					if (depth === 0) {
+						parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+						buffer = "";
+					}
+				} else if (char === ',' && depth === 0) {
+					if (buffer.replace(/^\s+|\s+$/g, "")) {
+						parts.push(buffer.replace(/^\s+|\s+$/g, ""));
+					}
 					buffer = "";
+				} else {
+					buffer += char;
 				}
-			} else if (char === ',' && depth === 0) {
-				if (buffer.replace(/^\s+|\s+$/g, "")) {
-					parts.push(buffer.replace(/^\s+|\s+$/g, ""));
-				}
-				buffer = "";
 			} else {
 				buffer += char;
 			}
@@ -341,7 +353,7 @@ CSSOM.parse = function parse(token, errorHandler) {
 		while ((match = pseudoClassRegExp.exec(selector)) !== null) {
 			var pseudoClass = match[1];
 			if (selectorListPseudoClasses.hasOwnProperty(pseudoClass)) {
-				nestedSelectors = parseNestedSelectors(match[2]);
+				nestedSelectors = parseAndSplitNestedSelectors(match[2]);
 				// Validate each nested selector
 				for (i = 0; i < nestedSelectors.length; i++) {
 					if (!validateSelector(nestedSelectors[i])) {
@@ -364,9 +376,10 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 */
 	function isValidSelectorText(selectorText) {
 		// Split selectorText by commas and validate each part
-		var selectors = selectorText.split(',');
+		var selectors = parseAndSplitNestedSelectors(selectorText);
 		for (var i = 0; i < selectors.length; i++) {
-			if (!validateSelector(selectors[i].replace(/^\s+|\s+$/g, ""))) {
+			var processedSelectors = selectors[i].replace(/^\s+|\s+$/g, "");
+			if (!validateSelector(processedSelectors)) {
 				return false;
 			}
 		}
@@ -592,7 +605,6 @@ CSSOM.parse = function parse(token, errorHandler) {
 				}
 
 				currentScope = parentRule = styleRule;
-				console.log('sel out', buffer);
 				styleRule.selectorText = buffer.trim();
 				styleRule.style.__starts = i;
 				styleRule.parentStyleSheet = styleSheet;
@@ -722,9 +734,8 @@ CSSOM.parse = function parse(token, errorHandler) {
 				}
 				
 				styleRule = new CSSOM.CSSStyleRule();
-				console.log('sel in', buffer);
 				// In a nested selector, ensure each selector contains '&' at the beginning, except for selectors that already have '&' somewhere
-				styleRule.selectorText = parseNestedSelectors(buffer.trim()).map(function(sel) {
+				styleRule.selectorText = parseAndSplitNestedSelectors(buffer.trim()).map(function(sel) {
 						return sel.indexOf('&') === -1 ? '& ' + sel : sel;
 					}).join(', ');
 				styleRule.style.__starts = i - buffer.length;

package/package.json

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