@acemir/cssom 0.9.11 → 0.9.13

package/build/CSSOM.js

@@ -354,7 +354,7 @@ Object.defineProperty(CSSOM.CSSStyleRule.prototype, "cssText", {
 				valuesArr.push(this.cssRules.map(function(rule){ return rule.cssText }).join("\n  "));
 				values = valuesArr.join("\n  ") + "\n}"
 			} else {
-				values = " {" + this.style.cssText + "}";
+				values = " { " + this.style.cssText + " }";
 			}
 			text = this.selectorText + values;
 		} else {
@@ -602,7 +602,7 @@ Object.defineProperties(CSSOM.CSSMediaRule.prototype, {
       for (var i=0, length=this.cssRules.length; i < length; i++) {
         cssTexts.push(this.cssRules[i].cssText);
       }
-      return "@media " + this.media.mediaText + " {" + cssTexts.join("") + "}";
+      return "@media " + this.media.mediaText + " {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
     },
     configurable: true,
     enumerable: true
@@ -641,7 +641,7 @@ Object.defineProperties(CSSOM.CSSContainerRule.prototype, {
       for (var i=0, length=this.cssRules.length; i < length; i++) {
         cssTexts.push(this.cssRules[i].cssText);
       }
-      return "@container " + this.containerText + " {" + cssTexts.join("") + "}";
+      return "@container " + this.containerText + " {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
     },
     configurable: true,
     enumerable: true
@@ -670,7 +670,7 @@ Object.defineProperty(CSSOM.CSSSupportsRule.prototype, "cssText", {
       cssTexts.push(this.cssRules[i].cssText);
     }
 
-    return "@supports " + this.conditionText + " {" + cssTexts.join("") + "}";
+    return "@supports " + this.conditionText + " {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
   }
 });
 
@@ -864,7 +864,7 @@ CSSOM.CSSNamespaceRule.prototype.type = 10;
 
 Object.defineProperty(CSSOM.CSSNamespaceRule.prototype, "cssText", {
   get: function() {
-    return "@namespace" + (this.prefix && " " + this.prefix) + " url(" + this.namespaceURI + ");";
+    return "@namespace" + (this.prefix && " " + this.prefix) + " url(\"" + this.namespaceURI + "\");";
   },
   set: function(cssText) {
     // Reset prefix and namespaceURI
@@ -883,10 +883,10 @@ Object.defineProperty(CSSOM.CSSNamespaceRule.prototype, "cssText", {
     }
 
     // Regex to match valid namespace syntax:
-    // 1. [optional prefix] url("...") or [optional prefix] url('...') or [optional prefix] url()
+    // 1. [optional prefix] url("...") or [optional prefix] url('...') or [optional prefix] url() or [optional prefix] url(unquoted)
     // 2. [optional prefix] "..." or [optional prefix] '...'
     // The prefix must be a valid CSS identifier (letters, digits, hyphens, underscores, starting with letter or underscore)
-    var re = /^(?:([a-zA-Z_][a-zA-Z0-9_-]*)\s+)?(?:url\(\s*(?:(['"])(.*?)\2\s*)?\)|(['"])(.*?)\4)$/;
+    var re = /^(?:([a-zA-Z_][a-zA-Z0-9_-]*)\s+)?(?:url\(\s*(?:(['"])(.*?)\2\s*|([^)]*?))\s*\)|(['"])(.*?)\5)$/;
     var match = text.match(re);
 
     if (match) {
@@ -894,13 +894,17 @@ Object.defineProperty(CSSOM.CSSNamespaceRule.prototype, "cssText", {
       if (match[1]) {
         this.prefix = match[1];
       }
-      // If url(...) form
+      // If url(...) form with quotes
       if (typeof match[3] !== "undefined") {
         this.namespaceURI = match[3];
       }
+      // If url(...) form without quotes
+      else if (typeof match[4] !== "undefined") {
+        this.namespaceURI = match[4].trim();
+      }
       // If quoted string form
-      else if (typeof match[5] !== "undefined") {
-        this.namespaceURI = match[5];
+      else if (typeof match[6] !== "undefined") {
+        this.namespaceURI = match[6];
       }
     } else {
       throw new DOMException("Invalid @namespace rule", "InvalidStateError");
@@ -930,7 +934,7 @@ CSSOM.CSSFontFaceRule.prototype.type = 5;
 // http://www.opensource.apple.com/source/WebCore/WebCore-955.66.1/css/WebKitCSSFontFaceRule.cpp
 Object.defineProperty(CSSOM.CSSFontFaceRule.prototype, "cssText", {
   get: function() {
-    return "@font-face {" + this.style.cssText + "}";
+    return "@font-face { " + this.style.cssText + " }";
   }
 });
 
@@ -958,7 +962,7 @@ Object.defineProperty(CSSOM.CSSHostRule.prototype, "cssText", {
 		for (var i=0, length=this.cssRules.length; i < length; i++) {
 			cssTexts.push(this.cssRules[i].cssText);
 		}
-		return "@host {" + cssTexts.join("") + "}";
+		return "@host {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
 	}
 });
 
@@ -986,7 +990,7 @@ Object.defineProperty(CSSOM.CSSStartingStyleRule.prototype, "cssText", {
 		for (var i=0, length=this.cssRules.length; i < length; i++) {
 			cssTexts.push(this.cssRules[i].cssText);
 		}
-		return "@starting-style {" + cssTexts.join("") + "}";
+		return "@starting-style {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
 	}
 });
 
@@ -1045,9 +1049,9 @@ CSSOM.CSSStyleSheet.prototype.insertRule = function(rule, index) {
 	var ruleToParse = String(rule);
 	var parsedSheet = CSSOM.parse(ruleToParse);
 	if (parsedSheet.cssRules.length !== 1) {
-		var domExceptionName = "SyntaxError";
+		var domExceptionName = DOMException.SYNTAX_ERR;
 		if (ruleToParse.trimStart().startsWith('@namespace')) {
-			domExceptionName = "InvalidStateError";
+			domExceptionName = DOMException.INVALID_STATE_ERR;
 		}
 		throw new DOMException("Failed to execute 'insertRule' on 'CSSStyleSheet': Failed to parse the rule '" + ruleToParse + "'.", domExceptionName);
 	}
@@ -1080,14 +1084,14 @@ CSSOM.CSSStyleSheet.prototype.deleteRule = function(index) {
 		index = 4294967296 + index;
 	}
 	if (index >= this.cssRules.length) {
-		throw new DOMException("Failed to execute 'deleteRule' on 'CSSStyleSheet': The index provided (" + index + ") is larger than the maximum index (" + this.cssRules.length + ").", "IndexSizeError");
+		throw new DOMException("Failed to execute 'deleteRule' on 'CSSStyleSheet': The index provided (" + index + ") is larger than the maximum index (" + this.cssRules.length + ").", DOMException.INDEX_SIZE_ERR);
 	}
 	if (this.cssRules[index] && this.cssRules[index].constructor.name == "CSSNamespaceRule") {
 		var shouldContinue = this.cssRules.every(function (rule) {
 			return ['CSSImportRule','CSSLayerStatementRule','CSSNamespaceRule'].indexOf(rule.constructor.name) !== -1
 		});
 		if (!shouldContinue) {
-			throw new DOMException("Failed to execute 'deleteRule' on 'CSSStyleSheet': Deleting a CSSNamespaceRule is not allowed when there is rules other than @import, @layer statement, or @namespace.", "InvalidStateError");
+			throw new DOMException("Failed to execute 'deleteRule' on 'CSSStyleSheet': Deleting a CSSNamespaceRule is not allowed when there is rules other than @import, @layer statement, or @namespace.", DOMException.INVALID_STATE_ERR);
 		}
 	}
 	this.cssRules.splice(index, 1);
@@ -1131,9 +1135,9 @@ Object.defineProperty(CSSOM.CSSKeyframesRule.prototype, "cssText", {
   get: function() {
     var cssTexts = [];
     for (var i=0, length=this.cssRules.length; i < length; i++) {
-      cssTexts.push("  " + this.cssRules[i].cssText);
+      cssTexts.push(this.cssRules[i].cssText);
     }
-    return "@" + (this._vendorPrefix || '') + "keyframes " + this.name + " { \n" + cssTexts.join("\n") + "\n}";
+    return "@" + (this._vendorPrefix || '') + "keyframes " + this.name + (this.name && " ") + "{" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
   }
 });
 
@@ -1160,7 +1164,7 @@ CSSOM.CSSKeyframeRule.prototype.type = 8;
 // http://www.opensource.apple.com/source/WebCore/WebCore-955.66.1/css/WebKitCSSKeyframeRule.cpp
 Object.defineProperty(CSSOM.CSSKeyframeRule.prototype, "cssText", {
   get: function() {
-    return this.keyText + " {" + this.style.cssText + "} ";
+    return this.keyText + " { " + this.style.cssText + " } ";
   }
 });
 
@@ -1244,7 +1248,7 @@ Object.defineProperty(CSSOM.CSSDocumentRule.prototype, "cssText", {
     for (var i=0, length=this.cssRules.length; i < length; i++) {
         cssTexts.push(this.cssRules[i].cssText);
     }
-    return "@-moz-document " + this.matcher.matcherText + " {" + cssTexts.join("") + "}";
+    return "@-moz-document " + this.matcher.matcherText + " {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
   }
 });
 
@@ -1642,7 +1646,7 @@ Object.defineProperties(CSSOM.CSSLayerBlockRule.prototype, {
       for (var i = 0, length = this.cssRules.length; i < length; i++) {
         cssTexts.push(this.cssRules[i].cssText);
       }
-      return "@layer " + this.name + (this.name && " ") + "{" + cssTexts.join("") + "}";
+      return "@layer " + this.name + (this.name && " ") + "{" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
     },
     configurable: true,
     enumerable: true,
@@ -2571,9 +2575,13 @@ CSSOM.parse = function parse(token, errorHandler) {
 					return match;
 				});
 				// In a nested selector, ensure each selector contains '&' at the beginning, except for selectors that already have '&' somewhere
-				styleRule.selectorText = parseAndSplitNestedSelectors(processedSelectorText).map(function(sel) {
-						return sel.indexOf('&') === -1 ? '& ' + sel : sel;
-					}).join(', ');
+				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(', ');
+				}
 				styleRule.style.__starts = i - buffer.length;
 				styleRule.parentRule = parentRule;
 				nestedSelectorRule = styleRule;

package/lib/CSSContainerRule.js

@@ -37,7 +37,7 @@ Object.defineProperties(CSSOM.CSSContainerRule.prototype, {
       for (var i=0, length=this.cssRules.length; i < length; i++) {
         cssTexts.push(this.cssRules[i].cssText);
       }
-      return "@container " + this.containerText + " {" + cssTexts.join("") + "}";
+      return "@container " + this.containerText + " {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
     },
     configurable: true,
     enumerable: true

package/lib/CSSDocumentRule.js

@@ -29,7 +29,7 @@ Object.defineProperty(CSSOM.CSSDocumentRule.prototype, "cssText", {
     for (var i=0, length=this.cssRules.length; i < length; i++) {
         cssTexts.push(this.cssRules[i].cssText);
     }
-    return "@-moz-document " + this.matcher.matcherText + " {" + cssTexts.join("") + "}";
+    return "@-moz-document " + this.matcher.matcherText + " {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
   }
 });
 

package/lib/CSSFontFaceRule.js

@@ -26,7 +26,7 @@ CSSOM.CSSFontFaceRule.prototype.type = 5;
 // http://www.opensource.apple.com/source/WebCore/WebCore-955.66.1/css/WebKitCSSFontFaceRule.cpp
 Object.defineProperty(CSSOM.CSSFontFaceRule.prototype, "cssText", {
   get: function() {
-    return "@font-face {" + this.style.cssText + "}";
+    return "@font-face { " + this.style.cssText + " }";
   }
 });
 

package/lib/CSSHostRule.js

@@ -27,7 +27,7 @@ Object.defineProperty(CSSOM.CSSHostRule.prototype, "cssText", {
 		for (var i=0, length=this.cssRules.length; i < length; i++) {
 			cssTexts.push(this.cssRules[i].cssText);
 		}
-		return "@host {" + cssTexts.join("") + "}";
+		return "@host {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
 	}
 });
 

package/lib/CSSKeyframeRule.js

@@ -27,7 +27,7 @@ CSSOM.CSSKeyframeRule.prototype.type = 8;
 // http://www.opensource.apple.com/source/WebCore/WebCore-955.66.1/css/WebKitCSSKeyframeRule.cpp
 Object.defineProperty(CSSOM.CSSKeyframeRule.prototype, "cssText", {
   get: function() {
-    return this.keyText + " {" + this.style.cssText + "} ";
+    return this.keyText + " { " + this.style.cssText + " } ";
   }
 });
 

package/lib/CSSKeyframesRule.js

@@ -27,9 +27,9 @@ Object.defineProperty(CSSOM.CSSKeyframesRule.prototype, "cssText", {
   get: function() {
     var cssTexts = [];
     for (var i=0, length=this.cssRules.length; i < length; i++) {
-      cssTexts.push("  " + this.cssRules[i].cssText);
+      cssTexts.push(this.cssRules[i].cssText);
     }
-    return "@" + (this._vendorPrefix || '') + "keyframes " + this.name + " { \n" + cssTexts.join("\n") + "\n}";
+    return "@" + (this._vendorPrefix || '') + "keyframes " + this.name + (this.name && " ") + "{" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
   }
 });
 

package/lib/CSSLayerBlockRule.js

@@ -26,7 +26,7 @@ Object.defineProperties(CSSOM.CSSLayerBlockRule.prototype, {
       for (var i = 0, length = this.cssRules.length; i < length; i++) {
         cssTexts.push(this.cssRules[i].cssText);
       }
-      return "@layer " + this.name + (this.name && " ") + "{" + cssTexts.join("") + "}";
+      return "@layer " + this.name + (this.name && " ") + "{" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
     },
     configurable: true,
     enumerable: true,

package/lib/CSSMediaRule.js

@@ -40,7 +40,7 @@ Object.defineProperties(CSSOM.CSSMediaRule.prototype, {
       for (var i=0, length=this.cssRules.length; i < length; i++) {
         cssTexts.push(this.cssRules[i].cssText);
       }
-      return "@media " + this.media.mediaText + " {" + cssTexts.join("") + "}";
+      return "@media " + this.media.mediaText + " {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
     },
     configurable: true,
     enumerable: true

package/lib/CSSNamespaceRule.js

@@ -23,7 +23,7 @@ CSSOM.CSSNamespaceRule.prototype.type = 10;
 
 Object.defineProperty(CSSOM.CSSNamespaceRule.prototype, "cssText", {
   get: function() {
-    return "@namespace" + (this.prefix && " " + this.prefix) + " url(" + this.namespaceURI + ");";
+    return "@namespace" + (this.prefix && " " + this.prefix) + " url(\"" + this.namespaceURI + "\");";
   },
   set: function(cssText) {
     // Reset prefix and namespaceURI
@@ -42,10 +42,10 @@ Object.defineProperty(CSSOM.CSSNamespaceRule.prototype, "cssText", {
     }
 
     // Regex to match valid namespace syntax:
-    // 1. [optional prefix] url("...") or [optional prefix] url('...') or [optional prefix] url()
+    // 1. [optional prefix] url("...") or [optional prefix] url('...') or [optional prefix] url() or [optional prefix] url(unquoted)
     // 2. [optional prefix] "..." or [optional prefix] '...'
     // The prefix must be a valid CSS identifier (letters, digits, hyphens, underscores, starting with letter or underscore)
-    var re = /^(?:([a-zA-Z_][a-zA-Z0-9_-]*)\s+)?(?:url\(\s*(?:(['"])(.*?)\2\s*)?\)|(['"])(.*?)\4)$/;
+    var re = /^(?:([a-zA-Z_][a-zA-Z0-9_-]*)\s+)?(?:url\(\s*(?:(['"])(.*?)\2\s*|([^)]*?))\s*\)|(['"])(.*?)\5)$/;
     var match = text.match(re);
 
     if (match) {
@@ -53,13 +53,17 @@ Object.defineProperty(CSSOM.CSSNamespaceRule.prototype, "cssText", {
       if (match[1]) {
         this.prefix = match[1];
       }
-      // If url(...) form
+      // If url(...) form with quotes
       if (typeof match[3] !== "undefined") {
         this.namespaceURI = match[3];
       }
+      // If url(...) form without quotes
+      else if (typeof match[4] !== "undefined") {
+        this.namespaceURI = match[4].trim();
+      }
       // If quoted string form
-      else if (typeof match[5] !== "undefined") {
-        this.namespaceURI = match[5];
+      else if (typeof match[6] !== "undefined") {
+        this.namespaceURI = match[6];
       }
     } else {
       throw new DOMException("Invalid @namespace rule", "InvalidStateError");

package/lib/CSSStartingStyleRule.js

@@ -27,7 +27,7 @@ Object.defineProperty(CSSOM.CSSStartingStyleRule.prototype, "cssText", {
 		for (var i=0, length=this.cssRules.length; i < length; i++) {
 			cssTexts.push(this.cssRules[i].cssText);
 		}
-		return "@starting-style {" + cssTexts.join("") + "}";
+		return "@starting-style {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
 	}
 });
 

package/lib/CSSStyleRule.js

@@ -34,7 +34,7 @@ Object.defineProperty(CSSOM.CSSStyleRule.prototype, "cssText", {
 				valuesArr.push(this.cssRules.map(function(rule){ return rule.cssText }).join("\n  "));
 				values = valuesArr.join("\n  ") + "\n}"
 			} else {
-				values = " {" + this.style.cssText + "}";
+				values = " { " + this.style.cssText + " }";
 			}
 			text = this.selectorText + values;
 		} else {

package/lib/CSSStyleSheet.js

@@ -49,9 +49,9 @@ CSSOM.CSSStyleSheet.prototype.insertRule = function(rule, index) {
 	var ruleToParse = String(rule);
 	var parsedSheet = CSSOM.parse(ruleToParse);
 	if (parsedSheet.cssRules.length !== 1) {
-		var domExceptionName = "SyntaxError";
+		var domExceptionName = DOMException.SYNTAX_ERR;
 		if (ruleToParse.trimStart().startsWith('@namespace')) {
-			domExceptionName = "InvalidStateError";
+			domExceptionName = DOMException.INVALID_STATE_ERR;
 		}
 		throw new DOMException("Failed to execute 'insertRule' on 'CSSStyleSheet': Failed to parse the rule '" + ruleToParse + "'.", domExceptionName);
 	}
@@ -84,14 +84,14 @@ CSSOM.CSSStyleSheet.prototype.deleteRule = function(index) {
 		index = 4294967296 + index;
 	}
 	if (index >= this.cssRules.length) {
-		throw new DOMException("Failed to execute 'deleteRule' on 'CSSStyleSheet': The index provided (" + index + ") is larger than the maximum index (" + this.cssRules.length + ").", "IndexSizeError");
+		throw new DOMException("Failed to execute 'deleteRule' on 'CSSStyleSheet': The index provided (" + index + ") is larger than the maximum index (" + this.cssRules.length + ").", DOMException.INDEX_SIZE_ERR);
 	}
 	if (this.cssRules[index] && this.cssRules[index].constructor.name == "CSSNamespaceRule") {
 		var shouldContinue = this.cssRules.every(function (rule) {
 			return ['CSSImportRule','CSSLayerStatementRule','CSSNamespaceRule'].indexOf(rule.constructor.name) !== -1
 		});
 		if (!shouldContinue) {
-			throw new DOMException("Failed to execute 'deleteRule' on 'CSSStyleSheet': Deleting a CSSNamespaceRule is not allowed when there is rules other than @import, @layer statement, or @namespace.", "InvalidStateError");
+			throw new DOMException("Failed to execute 'deleteRule' on 'CSSStyleSheet': Deleting a CSSNamespaceRule is not allowed when there is rules other than @import, @layer statement, or @namespace.", DOMException.INVALID_STATE_ERR);
 		}
 	}
 	this.cssRules.splice(index, 1);

package/lib/CSSSupportsRule.js

@@ -27,7 +27,7 @@ Object.defineProperty(CSSOM.CSSSupportsRule.prototype, "cssText", {
       cssTexts.push(this.cssRules[i].cssText);
     }
 
-    return "@supports " + this.conditionText + " {" + cssTexts.join("") + "}";
+    return "@supports " + this.conditionText + " {" + (cssTexts.length ? "\n  " + cssTexts.join("\n  ") : "") + "\n}";
   }
 });
 

package/lib/parse.js

@@ -900,9 +900,13 @@ CSSOM.parse = function parse(token, errorHandler) {
 					return match;
 				});
 				// In a nested selector, ensure each selector contains '&' at the beginning, except for selectors that already have '&' somewhere
-				styleRule.selectorText = parseAndSplitNestedSelectors(processedSelectorText).map(function(sel) {
-						return sel.indexOf('&') === -1 ? '& ' + sel : sel;
-					}).join(', ');
+				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(', ');
+				}
 				styleRule.style.__starts = i - buffer.length;
 				styleRule.parentRule = parentRule;
 				nestedSelectorRule = styleRule;

package/package.json

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