@litejs/dom 25.5.0 → 25.9.0

package/css.js

@@ -3,7 +3,6 @@
 
 "use strict"
 
-exports.selectorSplit = selectorSplit
 exports.CSSStyleDeclaration = CSSStyleDeclaration
 exports.CSSStyleSheet = CSSStyleSheet
 
@@ -15,7 +14,7 @@ var fs = require("fs")
 		var { DOMParser } = require("./dom.js")
 		return v.replace(urlRe, function(_, q1, q2, url) {
 			if (q1) return _
-			var frag = url.split("#").pop()
+			var frag = url.split("#")[1]
 			, ext = url.split(/[?#]/)[0].split(".").pop()
 			, enc = ext === "svg" ? "utf8" : "base64"
 			url = read(sheet, url, enc)
@@ -45,17 +44,15 @@ var fs = require("fs")
 , clear = s => s
 	.replace(/("|')((?:\\\1|[^\1])*?)\1|\s*(\/)\*(?:[^*]|\*(?!\/))*\*\/\s*|(?:[^"'\/]|\/(?!\*))+/g, clearFn)
 	.replace(/(["']).*?\1|url\(("|')([^'"()\s]+)\2\)/g, (m,q1,q2,u) => q1 ? m : "url(" + u + ")")
+, hex = n => (0 | +n + 256.5).toString(16).slice(1)
 , toRgb = {
-	rgb(r, g, b) {
-		var f = n => ((n | 0) + 256).toString(16).slice(1)
-		return f(r) + f(g) + f(b)
-	},
+	rgb: (r, g, b) => hex(r) + hex(g) + hex(b),
 	hsl(h, s, l) {
 		l /= 100
 		s /= 100 / (l < 0.5 ? l : 1 - l)
 		function f(n) {
 			n = (n + h / 30) % 12
-			return (0 | 256.5 + (255 * (l - s * (n < 2 || n > 10 ? -1 : n < 4 ? n - 3 : n > 8 ? 9 - n : 1)))).toString(16).slice(1)
+			return hex(255 * (l - s * (n < 2 || n > 10 ? -1 : n < 4 ? n - 3 : n > 8 ? 9 - n : 1)))
 		}
 		return f(0) + f(8) + f(4)
 	}
@@ -89,7 +86,6 @@ var fs = require("fs")
 			for (; (m = re.exec(val)); ) {
 				if (m[4]) {
 					if (min && len && plugins[m[4] = m[4].trim()]) style[k = style[len - 1]] = clear(plugins[m[4]](sheet, style[k]))
-					continue
 				} else {
 					k = m[1]
 					if (lastIdx[k] >= 0) style.__[lastIdx[k]] = style[k]
@@ -235,10 +231,11 @@ CSSStyleSheet.prototype = {
 			} else if (char === "{") {
 				depth++
 			} else if (char === "}" && --depth < 1 || char === ";" && depth < 1) {
-				if (depth < 0) throw "Invalid css"
+				if (depth < 0) throw Error("Unexpected '}'")
 				sheet.rules.push(CSSRule(text.slice(start, start = pos + 1), sheet, char))
 			}
 		}
+		if (depth > 0) throw Error("Unclosed block")
 	},
 	toString(min) {
 		if (min) this.min = min
@@ -246,25 +243,4 @@ CSSStyleSheet.prototype = {
 	}
 }
 
-function selectorSplit(text) {
-	for (var char, inQuote, depth = 0, start = 0, pos = 0, len = text.length, out = []; pos < len; ) {
-		char = text[pos++]
-		if (char === "\\") {
-			pos++
-		} else if (inQuote) {
-			if (char === inQuote) inQuote = ""
-		} else if (char === "'" || char === "\"") {
-			inQuote = char
-		} else if (char === "(" || char === "[") {
-			depth++
-		} else if (char === ")" || char === "]") {
-			depth--
-		} else if (char === "," && depth === 0) {
-			out.push(text.slice(start, (start = pos) - 1).trim())
-		}
-	}
-	out.push(text.slice(start).trim())
-	return out
-}
-
 

package/dom.js

@@ -21,8 +21,9 @@ var boolAttrs = {
 , rawTextElements = { SCRIPT: /<(?=\/script)/i, STYLE: /<(?=\/style)/i }
 , rawTextEscape = { SCRIPT: /<(?=\/script|!--)/ig, STYLE: /<(?=\/style|!--)/ig }
 , hasOwn = voidElements.hasOwnProperty
-, { selectorSplit, CSSStyleDeclaration, CSSStyleSheet } = require("./css.js")
+, { CSSStyleDeclaration, CSSStyleSheet } = require("./css.js")
 , selector = require("./selector.js")
+, cssEscape = sel => ("" + sel).replace(/[^a-zA-Z0-9_\u00A0-\uFFFF-]/g, "\\$&").replace(/^(-?)([0-9])/, "$1\\3$2 ")
 , Node = {
 	ELEMENT_NODE:                1,
 	TEXT_NODE:                   3,
@@ -108,17 +109,6 @@ var boolAttrs = {
 			child.setAttribute(name, (q ? qvalue : value || "").replace(unescRe, unescFn))
 		}
 	},
-	get outerHTML() {
-		return this.toString()
-	},
-	set outerHTML(html) {
-		var frag = this.ownerDocument.createDocumentFragment()
-		frag.innerHTML = html
-		this.parentNode.replaceChild(frag, this)
-	},
-	get sheet() {
-		return makeSheet(this)
-	},
 	get style() {
 		return this._style || (this._style = CSSStyleDeclaration(this.getAttribute("style") || ""))
 	},
@@ -205,6 +195,14 @@ var boolAttrs = {
 	get previousElementSibling() {
 		return getSibling(this, -1, 1)
 	},
+	get outerHTML() {
+		return this.toString()
+	},
+	set outerHTML(html) {
+		var frag = this.ownerDocument.createDocumentFragment()
+		frag.innerHTML = html
+		this.parentNode.replaceChild(frag, this)
+	},
 	replaceChildren() {
 		removeChilds(this)
 		for (var i = 0, l = arguments.length; i < l; ) this.insertBefore(arguments[i++])
@@ -261,7 +259,7 @@ function addGetter(key, opts) {
 	})
 }
 
-;["hasAttribute", "getAttribute", "setAttribute", "removeAttribute"].forEach(function(name) {
+;["hasAttribute", "getAttribute", "setAttribute", "removeAttribute"].forEach(name => {
 	Element[name + "NS"] = function(ns, a, b) {
 		return this[name].call(this, a, b)
 	}
@@ -350,6 +348,9 @@ extendNode(HTMLElement, Element, {
 	namespaceURI: "http://www.w3.org/1999/xhtml",
 	nodeType: 1,
 	tagName: null,
+	get sheet() {
+		return makeSheet(this)
+	},
 	blur() {
 		this.ownerDocument.activeElement = null
 	},
@@ -521,7 +522,8 @@ function mergeAttributes(source, target) {
 exports.document = new Document()
 exports.entities = entities
 exports.mergeAttributes = mergeAttributes
-exports.selectorSplit = selectorSplit
+exports.selectorSplit = selector.selectorSplit
+exports.cssEscape = cssEscape
 exports.CSSStyleDeclaration = CSSStyleDeclaration
 exports.CSSStyleSheet = CSSStyleSheet
 exports.DOMParser = DOMParser

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@litejs/dom",
-  "version": "25.5.0",
+  "version": "25.9.0",
   "description": "A small DOM library for server-side testing, rendering, and handling of HTML files",
   "license": "MIT",
   "author": "Lauri Rooden <lauri@rooden.ee>",
@@ -22,7 +22,7 @@
   "scripts": {
     "test": "lj t"
   },
-  "repository": "github:litejs/dom",
+  "repository": "https://github.com/litejs/dom.git",
   "devDependencies": {
     "@litejs/cli": "25.1.0"
   }

package/selector.js

@@ -3,112 +3,117 @@
 
 "use strict"
 
-!function(exports) {
-	var selectorCache = {
-		"": function() {}
-	}
-	, selectorRe = /([.#:[])([-\w]+)(?:\(((?:[^()]|\([^)]+\))+?)\)|([~^$*|]?)=(("|')(?:\\.|[^\\])*?\6|[-\w]+))?]?/g
-	, selectorLastRe = /([\s>+~]*)(?:("|')(?:\\.|[^\\])*?\2|\((?:[^()]|\([^()]+\))+?\)|~=|[^'"()\s>+~])+$/
-	, selectorSplitRe = /\s*,\s*(?=(?:[^'"()]|"(?:\\.|[^\\"])*?"|'(?:\\.|[^\\'])*?'|\((?:[^()]|\([^()]+\))+?\))+$)/
-	, selectorMap = {
-		"contains": "_.textContent.indexOf(v)>-1",
-		"empty": "!_.lastChild",
-		"enabled": "!m(_,':disabled')",
-		"first-child": "(a=_.parentNode)&&a.firstChild==_",
-		"first-of-type": "!p(_,_.tagName)",
-		"is": "m(_,v)",
-		"lang": "m(c(_,'[lang]'),'[lang|='+v+']')",
-		"last-child": "(a=_.parentNode)&&a.lastChild==_",
-		"last-of-type": "!n(_,_.tagName)",
-		"link": "m(_,'a[href]')",
-		"not": "!m(_,v)",
-		"nth-child": "(a=2,'odd'==v?b=1:'even'==v?b=0:a=1 in(v=v.split('n'))?(b=v[1],v[0]):(b=v[0],0),v=_.parentNode.childNodes,v=1+v.indexOf(_),0==a?v==b:('-'==a||0==(v-b)%a)&&(0<a||v<=b))",
-		"only-child": "(a=_.parentNode)&&a.firstChild==a.lastChild",
-		"only-of-type": "!p(_,_.tagName)&&!n(_,_.tagName)",
-		"optional": "!m(_,':required')",
-		"root": "(a=_.parentNode)&&!a.tagName",
-		".": "~_.className.split(/\\s+/).indexOf(a)",
-		"#": "_.id==a",
-		"^": "!a.indexOf(v)",
-		"|": "a.split('-')[0]==v",
-		"$": "a.slice(-v.length)==v",
-		"~": "~a.split(/\\s+/).indexOf(v)",
-		"*": "~a.indexOf(v)",
-		">>": "m(_.parentNode,v)",
-		"++": "m(_.previousSibling,v)",
-		"~~": "p(_,v)",
-		"": "c(_.parentNode,v)"
-	}
-	, closest = exports.closest = walk.bind(exports, "parentNode", 1)
+exports.find = find
+exports.selectorSplit = selectorSplit
 
+var selectorCache = {
+	"": () => {}
+}
+, selectorRe = /([.#:[])([-\w]+)(?:\(((?:[^()]|\([^)]+\))+?)\)|([~^$*|]?)=(("|')(?:\\.|[^\\])*?\6|[-\w]+))?]?/g
+, selectorLastRe = /([\s>+~]*)(?:("|')(?:\\.|[^\\])*?\2|\((?:[^()]|\([^()]+\))+?\)|~=|[^'"()\s>+~])+$/
+, selectorMap = exports.selectorMap = {
+	"contains": "_.textContent.indexOf(v)>-1",
+	"empty": "!_.lastChild",
+	"enabled": "!m(_,':disabled')",
+	"first-child": "(a=_.parentNode)&&a.firstChild==_",
+	"first-of-type": "!p(_,_.tagName)",
+	"is": "m(_,v)",
+	"lang": "m(c(_,'[lang]'),'[lang|='+v+']')",
+	"last-child": "(a=_.parentNode)&&a.lastChild==_",
+	"last-of-type": "!n(_,_.tagName)",
+	"link": "m(_,'a[href]')",
+	"not": "!m(_,v)",
+	"nth-child": "(a=2,'odd'==v?b=1:'even'==v?b=0:a=1 in(v=v.split('n'))?(b=v[1],v[0]):(b=v[0],0),v=_.parentNode.childNodes,v=1+v.indexOf(_),0==a?v==b:('-'==a||0==(v-b)%a)&&(0<a||v<=b))",
+	"only-child": "(a=_.parentNode)&&a.firstChild==a.lastChild",
+	"only-of-type": "!p(_,_.tagName)&&!n(_,_.tagName)",
+	"optional": "!m(_,':required')",
+	"root": "(a=_.parentNode)&&!a.tagName",
+	".": "~_.className.split(/\\s+/).indexOf(a)",
+	"#": "_.id==a",
+	"^": "!a.indexOf(v)",
+	"|": "a.split('-')[0]==v",
+	"$": "a.slice(-v.length)==v",
+	"~": "~a.split(/\\s+/).indexOf(v)",
+	"*": "~a.indexOf(v)",
+	">>": "m(_.parentNode,v)",
+	"++": "m(_.previousElementSibling,v)",
+	"~~": "p(_,v)",
+	"": "c(_.parentNode,v)"
+}
+, closest = exports.closest = walk.bind(exports, "parentNode", 1)
+, matches = exports.matches = (el, sel) => !!selectorFn(sel)(el)
+, next = exports.next = (el, sel) => walk("nextSibling", 1, el.nextSibling, sel)
+, prev = exports.prev = (el, sel) => walk("previousSibling", 1, el.previousSibling, sel)
 
-	selectorMap["nth-last-child"] = selectorMap["nth-child"].replace("1+", "v.length-")
 
-	function selectorFn(str) {
-		if (str != null && typeof str !== "string") throw Error("Invalid selector")
-		return selectorCache[str || ""] ||
-		(selectorCache[str] = Function("m,c,n,p", "return function(_,v,a,b){return " +
-			str.split(selectorSplitRe).map(function(sel) {
-				var relation, from
-				, rules = ["_&&_.nodeType==1"]
-				, parentSel = sel.replace(selectorLastRe, function(_, _rel, a, start) {
-					from = start + _rel.length
-					relation = _rel.trim()
-					return ""
-				})
-				, tag = sel.slice(from).replace(selectorRe, function(_, op, key, subSel, fn, val, quotation) {
-					rules.push(
-						"((v='" +
-						(subSel || (quotation ? val.slice(1, -1) : val) || "").replace(/[\\']/g, "\\$&") +
-						"'),(a='" + key + "'),1)"
-						,
-						selectorMap[op == ":" ? key : op] ||
-						"(a=_.getAttribute(a))" +
-						(fn ? "&&" + selectorMap[fn] : val ? "==v" : "!==null")
-					)
-					return ""
-				})
+selectorMap["nth-last-child"] = selectorMap["nth-child"].replace("1+", "v.length-")
 
-				if (tag && tag != "*") rules[0] += "&&_.tagName==(_.namespaceURI?'" + tag.toUpperCase() + "':'" + tag + "')"
-				if (parentSel) rules.push("(v='" + parentSel + "')", selectorMap[relation + relation])
-				return rules.join("&&")
-			}).join("||") + "}"
-		)(matches, closest, next, prev))
-	}
+function selectorFn(str) {
+	if (str != null && typeof str !== "string") throw Error("Invalid selector")
+	return selectorCache[str || ""] ||
+	(selectorCache[str] = Function("m,c,n,p", "return (_,v,a,b)=>" +
+		selectorSplit(str).map(sel => {
+			var relation, from
+			, rules = ["_&&_.nodeType==1"]
+			, parentSel = sel.replace(selectorLastRe, (_, _rel, a, start) => {
+				from = start + _rel.length
+				relation = _rel.trim()
+				return ""
+			})
+			, tag = sel.slice(from).replace(selectorRe, (_, op, key, subSel, fn, val, quotation) => {
+				rules.push(
+					"((v='" +
+					(subSel || (quotation ? val.slice(1, -1) : val) || "").replace(/[\\']/g, "\\$&") +
+					"'),(a='" + key + "'),1)"
+					,
+					selectorMap[op == ":" ? key : op] ||
+					"(a=_.getAttribute(a))" +
+					(fn ? "&&" + selectorMap[fn] : val ? "==v" : "!==null")
+				)
+				return ""
+			})
 
+			if (tag && tag != "*") rules[0] += "&&_.tagName==(_.namespaceURI?'" + tag.toUpperCase() + "':'" + tag + "')"
+			if (parentSel) rules.push("(v='" + parentSel + "')", selectorMap[relation + relation])
+			return rules.join("&&")
+		}).join("||")
+	)(matches, closest, next, prev))
+}
 
-	function walk(next, first, el, sel, nextFn) {
-		sel = selectorFn(sel)
-		for (var out = []; el; el = el[next] || nextFn && nextFn(el)) if (sel(el)) {
-			if (first) return el
-			out.push(el)
+function selectorSplit(text) {
+	for (var char, inQuote, depth = 0, start = 0, pos = 0, len = text.length, out = []; pos < len; ) {
+		char = text[pos++]
+		if (char === "\\") {
+			pos++
+		} else if (inQuote) {
+			if (char === inQuote) inQuote = ""
+		} else if (char === "'" || char === "\"") {
+			inQuote = char
+		} else if (char === "(" || char === "[") {
+			depth++
+		} else if (char === ")" || char === "]") {
+			depth--
+		} else if (char === "," && depth === 0) {
+			out.push(text.slice(start, (start = pos) - 1).trim())
 		}
-		return first ? null : out
-	}
-
-	function find(node, sel, first) {
-		return walk("firstChild", first, node.firstChild, sel, function(el) {
-			for (var next = el.nextSibling; !next && ((el = el.parentNode) !== node); ) next = el.nextSibling
-			return next
-		})
-	}
-
-	function matches(el, sel) {
-		return !!selectorFn(sel)(el)
-	}
-
-	function next(el, sel) {
-		return walk("nextSibling", 1, el.nextSibling, sel)
 	}
+	out.push(text.slice(start).trim())
+	return out
+}
 
-	function prev(el, sel) {
-		return walk("previousSibling", 1, el.previousSibling, sel)
+function walk(attr, first, el, sel, nextFn) {
+	sel = selectorFn(sel)
+	for (var out = []; el; el = el[attr] || nextFn && nextFn(el)) if (sel(el)) {
+		if (first) return el
+		out.push(el)
 	}
+	return first ? null : out
+}
 
-	exports.find = find
-	exports.matches = matches
-	exports.next = next
-	exports.prev = prev
-	exports.selectorMap = selectorMap
-}(this) // jshint ignore:line
+function find(node, sel, first) {
+	return walk("firstChild", first, node.firstChild, sel, (el, pos) => {
+		for (pos = el.nextSibling; !pos && ((el = el.parentNode) !== node); ) pos = el.nextSibling
+		return pos
+	})
+}