@litejs/dom 26.3.0 → 26.4.1

package/css.js

@@ -8,7 +8,7 @@ exports.CSSStyleSheet = CSSStyleSheet
 
 /* c8 ignore next */
 var URL = global.URL || require("url").URL
-, varRe = /var\((--[^,)]+)(?:,([^)]+))?\)/g
+, varRe = /var\((--[^,)]+),?\s*([^)]*)\)/g
 , CSS = exports.CSS = {
 	escape(sel) {
 		return ("" + sel).replace(/[^a-zA-Z0-9_\u00A0-\uFFFF-]/g, "\\$&").replace(/^(-?)([0-9])/, "$1\\3$2 ")
@@ -19,10 +19,12 @@ var URL = global.URL || require("url").URL
 		, vars = opts && opts.var ? {} : null
 		, varFn = vars && function(_, n) { return vars[n] || _ }
 		return Array.prototype.map.call(rules, rule => {
-			if (vars && rule.selectorText === ":root") {
-				if (rule.style) for (var i = 0; i < rule.style.length; i++) {
-					var n = rule.style[i]
-					if (n.slice(0, 2) === "--") vars[n] = rule.style[n].replace(varRe, varFn)
+			var sel = rule.selectorText
+			, style = rule.style
+			if (vars && sel === ":root") {
+				if (style) for (var i = 0; i < style.length; i++) {
+					var n = style[i]
+					if (n.slice(0, 2) === "--") vars[n] = style[n].replace(varRe, varFn)
 				}
 				return ""
 			}
@@ -40,8 +42,8 @@ var URL = global.URL || require("url").URL
 			}
 
 			// Handle plugins on style rules
-			if (rule.style && rule.style._plugins) {
-				for (var style = rule.style, j = 0; j < style._plugins.length; j++) {
+			if (style && style._plugins) {
+				for (var j = 0; j < style._plugins.length; j++) {
 					var idx = style._plugins[j][0]
 					, pn = style._plugins[j][1]
 					, k = style[idx]
@@ -49,7 +51,12 @@ var URL = global.URL || require("url").URL
 				}
 			}
 
-			var text = clear(rule.cssText)
+			if (opts && opts.used && sel) {
+				sel = filterSelectors(sel, opts.used)
+				if (!sel) return ""
+			}
+
+			var text = clear(opts && style && style.__ ? sel + "{" + cssText(style, opts.prefix) + "}" : rule.cssText)
 			if (!text || /\{\s*\}$/.test(text)) return ""
 			if (vars) text = text.replace(varRe, (_, v, fb) => vars[v] || fb || _)
 			if (opts && opts.color) text = text.replace(colorRe, colorFn)
@@ -58,6 +65,16 @@ var URL = global.URL || require("url").URL
 		}).filter(Boolean).join("\n")
 	}
 }
+, filterSelectors = (text, used) => {
+	var classes = used.classes
+	, keep = used.keep
+	return require("./selector.js").selectorSplit(text).filter(sel => {
+		for (var m, classRe = /\.([-\w]+)/g; (m = classRe.exec(sel)); ) {
+			if (!(classes && classes.has(m[1]) || keep && keep.test(m[1]))) return false
+		}
+		return true
+	}).join(",")
+}
 , toUrl = (dir) => new URL((dir || ".").replace(/\/+$/, "") + "/", "file:///").href
 , read = (root, url, baseURI, enc = "utf8") => require("fs").readFileSync(
 	new URL(url, new URL((baseURI || ".") + "/", new URL((root || ".").replace(/\/+$/, "") + "/", "file:///" + process.cwd() + "/"))).pathname.replace(/^\/(?=\w:)|[+#].*/, ""),
@@ -91,7 +108,7 @@ var URL = global.URL || require("url").URL
 	q ? (q = str.indexOf("'") == -1 ? "'" : "\"", q + str.replace(q === "'" ? /\\(")/g : /\\(')/g, "$1")) + q :
 	c ? "" :
 	_.replace(/[\t\n]+/g, " ")
-	.replace(/ +(?=[,;{}>~+\/])/g, "").replace(/([,;{}>~+\/]) +/g, "$1")
+	.replace(/ *([,;{}>~+\/]) */g, "$1")
 	.replace(/;(?=})/g, "")
 	.replace(/: +/g, ":")
 	.replace(/([ :,])0\.([0-9])/g, "$1.$2")
@@ -114,17 +131,18 @@ var URL = global.URL || require("url").URL
 , toRgba = (rgbHex, alpha) => ("rgba(" + rgbHex.replace(/../g, x => parseInt(x, 16)+",") + alpha + ")").replace("0.", ".")
 , colorRe = /\b(rgb|hsl)a?\s*\(\s*(\d+)(?:deg)?[\s,]+(\d+)[\s,%]+(\d+)%?(?:[\s,\/]+(0?\.?\d+)(%?))?\s*\)/g
 , colorFn = (_, name, a, b, c, d, p) => (_ = toRgb[name](a, b, c), (p ? d/=100 : d) < 1 ? toRgba(_, d) : "#" + _.replace(/(\w)\1(\w)\2(\w)\3/, "$1$2$3"))
+, cssText = (style, prefix) => {
+	for (var out = [], name, value, i = style.length; i--; ) {
+		name = style[i]
+		value = style.__[i] || style[name]
+		out[i] = name + ":" + value
+		if (prefix && prefix[name]) out[i] = prefix[name].join(out[i] + ";") + out[i] + ";" + out[i]
+	}
+	return out.join(";")
+}
 , styleHandler = {
 	get(style, prop) {
-		if (prop === "cssText") {
-			for (var out = [], name, value, i = style.length; i--; ) {
-				name = style[i]
-				value = style.__[i] || style[name]
-				out[i] = name + ":" + value
-			}
-			return out.join(";")
-		}
-		return style[prop] || ""
+		return prop === "cssText" ? cssText(style) : style[prop] || ""
 	},
 	set(style, prop, val) {
 		if (prop === "cssText") {

package/dom.js

@@ -222,11 +222,14 @@ var boolAttrs = {
 	}
 }
 , Element = {
+	get children() {
+		return this.childNodes.filter(node => node.nodeType === 1)
+	},
 	get firstElementChild() {
-		return getElement(this.childNodes, 0, 1, 1)
+		return getElement(this.childNodes, 0, 1)
 	},
 	get lastElementChild() {
-		return getElement(this.childNodes, this.childNodes.length - 1, -1, 1)
+		return getElement(this.childNodes, this.childNodes.length - 1, -1)
 	},
 	get nextElementSibling() {
 		return getSibling(this, 1, 1)
@@ -414,6 +417,13 @@ extendNode(HTMLElement, Element, {
 	get elements() {
 		return this.tagName === "FORM" ? selector.find(this, "input,select,textarea,button") : undefined
 	},
+	get labels() {
+		if (!selector.matches(this, "input,select,textarea,button")) return
+		var labels = this.id ? selector.find(this.ownerDocument, "label[for='" + this.id + "']") : []
+		, parent = selector.closest(this, "label")
+		if (parent && labels.indexOf(parent) < 0) labels.push(parent)
+		return labels
+	},
 	get sheet() {
 		return makeSheet(this)
 	},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@litejs/dom",
-  "version": "26.3.0",
+  "version": "26.4.1",
   "description": "A small DOM library for server-side testing, rendering, and handling of HTML files",
   "license": "MIT",
   "author": "Lauri Rooden <lauri@rooden.ee>",
@@ -29,6 +29,6 @@
     "url": "https://github.com/litejs/dom.git"
   },
   "devDependencies": {
-    "@litejs/cli": "26.3.0"
+    "@litejs/cli": "26.4.0"
   }
 }