@acemir/cssom 0.9.8 → 0.9.10

package/build/CSSOM.js

@@ -63,7 +63,7 @@ CSSOM.CSSStyleDeclaration.prototype = {
 	{
 		// NOTE: Check viability to add a validation for css values or use a dependency like csstree-validator
 		if (basicStylePropertyValueValidationRegExp.test(value)) {
-			parseErrorHandler && parseErrorHandler('Invalid CSSStyleDeclaration property value');
+			parseErrorHandler && parseErrorHandler('Invalid CSSStyleDeclaration property (name = "' + name + '", value = "' + value + '")');
 		} else if (this[name]) {
 			// Property already exist. Overwrite it.
 			var index = Array.prototype.indexOf.call(this, name);
@@ -2037,10 +2037,19 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 * @returns {boolean} Returns true if all selectors are valid, otherwise false.
 	 */
 	function isValidSelectorText(selectorText) {
+		// 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;
+		var match;
+		while ((match = quotedNewlineRegExp.exec(selectorText)) !== null) {
+			if (/\r|\n/.test(match[0].slice(1, -1))) {
+				return false;
+			}
+		}
 		// Split selectorText by commas and validate each part
 		var selectors = parseAndSplitNestedSelectors(selectorText);
 		for (var i = 0; i < selectors.length; i++) {
-			var processedSelectors = selectors[i].replace(/^\s+|\s+$/g, "");
+			var processedSelectors = selectors[i].trim();
 			if (!validateSelector(processedSelectors)) {
 				return false;
 			}
@@ -2276,7 +2285,10 @@ CSSOM.parse = function parse(token, errorHandler) {
 				}
 
 				currentScope = parentRule = styleRule;
-				styleRule.selectorText = buffer.trim();
+				styleRule.selectorText = buffer.trim().replace(/(['"])(?:\\.|[^\\])*?\1|(\r\n|\r|\n)/g, function(match, _, newline) {
+					if (newline) return " ";
+					return match;
+				});
 				styleRule.style.__starts = i;
 				styleRule.parentStyleSheet = styleSheet;
 				buffer = "";
@@ -2411,8 +2423,12 @@ CSSOM.parse = function parse(token, errorHandler) {
 				}
 				
 				styleRule = new CSSOM.CSSStyleRule();
+				var processedSelectorText = buffer.trim().replace(/(['"])(?:\\.|[^\\])*?\1|(\r\n|\r|\n)/g, function(match, _, newline) {
+					if (newline) return " ";
+					return match;
+				});
 				// In a nested selector, ensure each selector contains '&' at the beginning, except for selectors that already have '&' somewhere
-				styleRule.selectorText = parseAndSplitNestedSelectors(buffer.trim()).map(function(sel) {
+				styleRule.selectorText = parseAndSplitNestedSelectors(processedSelectorText).map(function(sel) {
 						return sel.indexOf('&') === -1 ? '& ' + sel : sel;
 					}).join(', ');
 				styleRule.style.__starts = i - buffer.length;
@@ -2546,7 +2562,7 @@ CSSOM.parse = function parse(token, errorHandler) {
 		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, spaces) {
+				counterStyleRule.cssText = "@counter-style " + counterStyleRule.name + " { " + buffer.trim().replace(/\n/g, " ").replace(/(['"])(?:\\.|[^\\])*?\1|(\s{2,})/g, function(match, quote) {
 					return quote ? match : ' ';
 				}) + " }";
 				buffer = "";
@@ -2580,7 +2596,7 @@ CSSOM.parse = function parse(token, errorHandler) {
 						if (styleRule === nestedSelectorRule) {
 							nestedSelectorRule = null;
 						}
-						parseError('Invalid CSSStyleRule.selectorText');
+						parseError('Invalid CSSStyleRule (selectorText = "' + styleRule.selectorText + '")');
 					} else {
 						currentScope.cssRules.push(styleRule);
 					}

package/lib/CSSStyleDeclaration.js

@@ -64,7 +64,7 @@ CSSOM.CSSStyleDeclaration.prototype = {
 	{
 		// NOTE: Check viability to add a validation for css values or use a dependency like csstree-validator
 		if (basicStylePropertyValueValidationRegExp.test(value)) {
-			parseErrorHandler && parseErrorHandler('Invalid CSSStyleDeclaration property value');
+			parseErrorHandler && parseErrorHandler('Invalid CSSStyleDeclaration property (name = "' + name + '", value = "' + value + '")');
 		} else if (this[name]) {
 			// Property already exist. Overwrite it.
 			var index = Array.prototype.indexOf.call(this, name);

package/lib/parse.js

@@ -456,10 +456,19 @@ CSSOM.parse = function parse(token, errorHandler) {
 	 * @returns {boolean} Returns true if all selectors are valid, otherwise false.
 	 */
 	function isValidSelectorText(selectorText) {
+		// 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;
+		var match;
+		while ((match = quotedNewlineRegExp.exec(selectorText)) !== null) {
+			if (/\r|\n/.test(match[0].slice(1, -1))) {
+				return false;
+			}
+		}
 		// Split selectorText by commas and validate each part
 		var selectors = parseAndSplitNestedSelectors(selectorText);
 		for (var i = 0; i < selectors.length; i++) {
-			var processedSelectors = selectors[i].replace(/^\s+|\s+$/g, "");
+			var processedSelectors = selectors[i].trim();
 			if (!validateSelector(processedSelectors)) {
 				return false;
 			}
@@ -695,7 +704,10 @@ CSSOM.parse = function parse(token, errorHandler) {
 				}
 
 				currentScope = parentRule = styleRule;
-				styleRule.selectorText = buffer.trim();
+				styleRule.selectorText = buffer.trim().replace(/(['"])(?:\\.|[^\\])*?\1|(\r\n|\r|\n)/g, function(match, _, newline) {
+					if (newline) return " ";
+					return match;
+				});
 				styleRule.style.__starts = i;
 				styleRule.parentStyleSheet = styleSheet;
 				buffer = "";
@@ -830,8 +842,12 @@ CSSOM.parse = function parse(token, errorHandler) {
 				}
 				
 				styleRule = new CSSOM.CSSStyleRule();
+				var processedSelectorText = buffer.trim().replace(/(['"])(?:\\.|[^\\])*?\1|(\r\n|\r|\n)/g, function(match, _, newline) {
+					if (newline) return " ";
+					return match;
+				});
 				// In a nested selector, ensure each selector contains '&' at the beginning, except for selectors that already have '&' somewhere
-				styleRule.selectorText = parseAndSplitNestedSelectors(buffer.trim()).map(function(sel) {
+				styleRule.selectorText = parseAndSplitNestedSelectors(processedSelectorText).map(function(sel) {
 						return sel.indexOf('&') === -1 ? '& ' + sel : sel;
 					}).join(', ');
 				styleRule.style.__starts = i - buffer.length;
@@ -965,7 +981,7 @@ CSSOM.parse = function parse(token, errorHandler) {
 		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, spaces) {
+				counterStyleRule.cssText = "@counter-style " + counterStyleRule.name + " { " + buffer.trim().replace(/\n/g, " ").replace(/(['"])(?:\\.|[^\\])*?\1|(\s{2,})/g, function(match, quote) {
 					return quote ? match : ' ';
 				}) + " }";
 				buffer = "";
@@ -999,7 +1015,7 @@ CSSOM.parse = function parse(token, errorHandler) {
 						if (styleRule === nestedSelectorRule) {
 							nestedSelectorRule = null;
 						}
-						parseError('Invalid CSSStyleRule.selectorText');
+						parseError('Invalid CSSStyleRule (selectorText = "' + styleRule.selectorText + '")');
 					} else {
 						currentScope.cssRules.push(styleRule);
 					}

package/package.json

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