@oscarpalmer/toretto 0.30.0 → 0.31.0

package/dist/attribute/index.js

@@ -1,16 +1,16 @@
 import { getAttribute, getAttributes } from "./get.js";
-import { booleanAttributes, isBadAttribute as isBadAttribute$1, isBooleanAttribute as isBooleanAttribute$1, isEmptyNonBooleanAttribute as isEmptyNonBooleanAttribute$1, isInvalidBooleanAttribute as isInvalidBooleanAttribute$1 } from "../internal/attribute.js";
+import { _isBadAttribute, _isBooleanAttribute, _isEmptyNonBooleanAttribute, _isInvalidBooleanAttribute, booleanAttributes } from "../internal/attribute.js";
 import { setAttribute, setAttributes, setProperties, setProperty } from "./set.js";
 function isBadAttribute(first, second) {
-	return isBadAttribute$1(first, second, true);
+	return _isBadAttribute(first, second, true);
 }
 function isBooleanAttribute(first) {
-	return isBooleanAttribute$1(first, true);
+	return _isBooleanAttribute(first, true);
 }
 function isEmptyNonBooleanAttribute(first, second) {
-	return isEmptyNonBooleanAttribute$1(first, second, true);
+	return _isEmptyNonBooleanAttribute(first, second, true);
 }
 function isInvalidBooleanAttribute(first, second) {
-	return isInvalidBooleanAttribute$1(first, second, true);
+	return _isInvalidBooleanAttribute(first, second, true);
 }
 export { booleanAttributes, getAttribute, getAttributes, isBadAttribute, isBooleanAttribute, isEmptyNonBooleanAttribute, isInvalidBooleanAttribute, setAttribute, setAttributes, setProperties, setProperty };

package/dist/event/delegation.js

@@ -1,12 +1,12 @@
 import { isEventTarget } from "../internal/is.js";
-function addDelegatedHandler(document$1, type, name, passive) {
+function addDelegatedHandler(doc, type, name, passive) {
 	const count = `${name}${COUNT_SUFFIX}`;
-	if (document$1[count] != null) {
-		document$1[count] += 1;
+	if (doc[count] != null) {
+		doc[count] += 1;
 		return;
 	}
-	document$1[count] = 1;
-	document$1.addEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE, { passive });
+	doc[count] = 1;
+	doc.addEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE, { passive });
 }
 function addDelegatedListener(target, type, name, listener, passive) {
 	target[name] ??= /* @__PURE__ */ new Set();
@@ -41,12 +41,12 @@ function delegatedEventHandler(event) {
 function getDelegatedName(target, type, options) {
 	if (isEventTarget(target) && EVENT_TYPES.has(type) && !options.capture && !options.once && options.signal == null) return `${EVENT_PREFIX}${type}${options.passive ? EVENT_SUFFIX_PASSIVE : EVENT_SUFFIX_ACTIVE}`;
 }
-function removeDelegatedHandler(document$1, type, name, passive) {
+function removeDelegatedHandler(doc, type, name, passive) {
 	const count = `${name}${COUNT_SUFFIX}`;
-	document$1[count] -= 1;
-	if (document$1[count] < 1) {
-		document$1[count] = void 0;
-		document$1.removeEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE);
+	doc[count] -= 1;
+	if (doc[count] < 1) {
+		doc[count] = void 0;
+		doc.removeEventListener(type, passive ? HANDLER_PASSIVE : HANDLER_ACTIVE);
 	}
 }
 function removeDelegatedListener(target, type, name, listener, passive) {

package/dist/find/index.js

@@ -33,7 +33,7 @@ function findElementOrElementsFromNodes(array, context, contexts) {
 		let element;
 		if (node instanceof Document) element = node.body;
 		else element = node instanceof Element ? node : void 0;
-		if (element != null && (context == null || contexts.length === 0 || contexts.some((context$1) => context$1 === element || context$1.contains(element))) && !result.includes(element)) result.push(element);
+		if (element != null && (context == null || contexts.length === 0 || contexts.some((ctx) => ctx === element || ctx.contains(element))) && !result.includes(element)) result.push(element);
 	}
 	return result;
 }

package/dist/find/relative.js

@@ -1,10 +1,11 @@
 function getDistanceBetweenElements(origin, target) {
-	if (origin === target || origin.parentElement === target) return 0;
-	const comparison = origin.compareDocumentPosition(target);
+	if (origin === target) return 0;
+	if (origin.parentElement === target) return 1;
 	const children = [...origin.parentElement?.children ?? []];
 	if (children.includes(target)) return Math.abs(children.indexOf(origin) - children.indexOf(target));
-	const beforeOrInside = !!(comparison & 2 || comparison & 8);
-	if (beforeOrInside || !!(comparison & 4 || comparison & 16)) return traverse(beforeOrInside ? origin : target, beforeOrInside ? target : origin) ?? -1;
+	const comparison = origin.compareDocumentPosition(target);
+	const beforeOrInside = Boolean(comparison & 2 || comparison & 8);
+	if (beforeOrInside || Boolean(comparison & 4 || comparison & 16)) return traverse(beforeOrInside ? origin : target, beforeOrInside ? target : origin) ?? -1;
 }
 function findAncestor(origin, selector) {
 	if (!(origin instanceof Element) || selector == null) return null;
@@ -23,17 +24,15 @@ function findAncestor(origin, selector) {
 }
 function findRelatives(origin, selector, context) {
 	if (!(origin instanceof Element) || typeof selector !== "string") return [];
-	if (origin.matches(selector)) return [origin];
 	const elements = [...(context instanceof Document || context instanceof Element ? context : document).querySelectorAll(selector)];
 	const { length } = elements;
-	if (length === 0) return [];
-	if (length === 1) return [elements[0]];
+	if (length < 2) return elements.filter((element) => element !== origin);
 	const distances = [];
 	let minimum;
 	for (let index = 0; index < length; index += 1) {
 		const element = elements[index];
-		const distance = getDistanceBetweenElements(origin, element) ?? -1;
-		if (distance > -1) {
+		const distance = getDistanceBetweenElements(origin, element);
+		if (distance != null && distance > 0) {
 			if (minimum == null || distance < minimum) minimum = distance;
 			distances.push({
 				distance,
@@ -41,22 +40,22 @@ function findRelatives(origin, selector, context) {
 			});
 		}
 	}
-	return minimum == null ? [] : distances.filter((found) => found.distance === minimum).map((found) => found.element);
+	return distances.filter((found) => found.distance === minimum && found.element !== origin).map((found) => found.element);
 }
 function traverse(from, to) {
 	let index = [...to.children].indexOf(from);
-	if (index > -1) return index + 1;
+	if (index > -1) return 1;
 	let current = from;
 	let distance = 0;
 	let parent = from.parentElement;
 	while (parent != null) {
 		if (parent === to) return distance + 1;
-		const children = [...parent.children ?? []];
+		const children = [...parent.children];
 		if (children.includes(to)) return distance + Math.abs(children.indexOf(current) - children.indexOf(to));
 		index = children.findIndex((child) => child.contains(to));
 		if (index > -1) {
-			const traversed = traverse(current, children[index]) ?? -1;
-			return traversed === -1 ? -1 : distance + Math.abs(index - children.indexOf(current)) + traversed;
+			const traversed = traverse(current, children[index]);
+			return traversed == null || traversed === -1 ? -1 : distance + Math.abs(index - children.indexOf(current)) + traversed;
 		}
 		current = parent;
 		distance += 1;

package/dist/html/index.js

@@ -1,10 +1,10 @@
 import { sanitizeNodes } from "./sanitize.js";
 import { isPlainObject } from "@oscarpalmer/atoms/is";
 function createHtml(value) {
-	const html$1 = getParser().parseFromString(typeof value === "string" ? value : value.innerHTML, HTML_PARSE_TYPE);
-	html$1.body.normalize();
-	sanitizeNodes([html$1.body], 0);
-	return html$1.body.innerHTML;
+	const parsed = getParser().parseFromString(getHtml(value), PARSE_TYPE_HTML);
+	parsed.body.normalize();
+	sanitizeNodes([parsed.body], 0);
+	return parsed.body.innerHTML;
 }
 function createTemplate(value, options) {
 	const template = document.createElement(TEMPLATE_TAG);
@@ -12,6 +12,9 @@ function createTemplate(value, options) {
 	if (typeof value === "string" && options.cache) templates[value] = template;
 	return template;
 }
+function getHtml(value) {
+	return `${TEMPORARY_ELEMENT}${typeof value === "string" ? value : value.innerHTML}${TEMPORARY_ELEMENT}`;
+}
 function getNodes(value, options) {
 	if (typeof value !== "string" && !(value instanceof HTMLTemplateElement)) return [];
 	const template = getTemplate(value, options);
@@ -28,12 +31,11 @@ function getParser() {
 }
 function getTemplate(value, options) {
 	if (value instanceof HTMLTemplateElement) return createTemplate(value, options);
-	if (typeof value !== "string" || value.trim().length === 0) return;
+	if (value.trim().length === 0) return;
 	let template = templates[value];
 	if (template != null) return template;
 	const element = EXPRESSION_ID.test(value) ? document.querySelector(`#${value}`) : null;
-	template = element instanceof HTMLTemplateElement ? element : createTemplate(value, options);
-	return template;
+	return createTemplate(element instanceof HTMLTemplateElement ? element : value, options);
 }
 var html = ((value, options) => {
 	return getNodes(value, getOptions(options));
@@ -56,8 +58,9 @@ function sanitize(value) {
 	return sanitizeNodes(Array.isArray(value) ? value : [value], 0);
 }
 var EXPRESSION_ID = /^[a-z][\w-]*$/i;
-var HTML_PARSE_TYPE = "text/html";
+var PARSE_TYPE_HTML = "text/html";
 var TEMPLATE_TAG = "template";
+var TEMPORARY_ELEMENT = "<toretto-temporary></toretto-temporary>";
 var parser;
 var templates = {};
 export { html, sanitize };

package/dist/html/sanitize.js

@@ -1,25 +1,24 @@
-import { isBadAttribute, isEmptyNonBooleanAttribute, isInvalidBooleanAttribute } from "../internal/attribute.js";
+import { _isBadAttribute, _isEmptyNonBooleanAttribute, _isInvalidBooleanAttribute } from "../internal/attribute.js";
+import { setAttribute } from "../attribute/set.js";
 function handleElement(element, depth) {
-	if (isClobbered(element)) {
-		element.remove();
-		return true;
-	}
 	if (depth === 0) {
-		const scripts = element.querySelectorAll("script");
-		for (const script of scripts) script.remove();
+		const removable = element.querySelectorAll(REMOVE_SELECTOR);
+		for (const item of removable) item.remove();
 	}
 	sanitizeAttributes(element, [...element.attributes]);
-	return false;
 }
-function isClobbered(element) {
-	return element instanceof HTMLFormElement && (typeof element.nodeName !== "string" || typeof element.textContent !== "string" || typeof element.removeChild !== "function" || !(element.attributes instanceof NamedNodeMap) || typeof element.removeAttribute !== "function" || typeof element.setAttribute !== "function" || typeof element.namespaceURI !== "string" || typeof element.insertBefore !== "function" || typeof element.hasChildNodes !== "function");
+function isClobbered(value) {
+	return value instanceof HTMLFormElement && (typeof value.nodeName !== "string" || typeof value.textContent !== "string" || typeof value.removeChild !== "function" || !(value.attributes instanceof NamedNodeMap) || typeof value.removeAttribute !== "function" || typeof value.setAttribute !== "function" || typeof value.namespaceURI !== "string" || typeof value.insertBefore !== "function" || typeof value.hasChildNodes !== "function");
+}
+function removeNode(node) {
+	if (typeof node.remove === "function") node.remove();
 }
 function sanitizeAttributes(element, attributes) {
 	const { length } = attributes;
 	for (let index = 0; index < length; index += 1) {
 		const { name, value } = attributes[index];
-		if (isBadAttribute(name, value, false) || isEmptyNonBooleanAttribute(name, value, false)) element.removeAttribute(name);
-		else if (isInvalidBooleanAttribute(name, value, false)) element.setAttribute(name, "");
+		if (_isBadAttribute(name, value, false) || _isEmptyNonBooleanAttribute(name, value, false)) element.removeAttribute(name);
+		else if (_isInvalidBooleanAttribute(name, value, false)) setAttribute(element, name, true);
 	}
 }
 function sanitizeNodes(nodes, depth) {
@@ -27,14 +26,30 @@ function sanitizeNodes(nodes, depth) {
 	let { length } = nodes;
 	for (let index = 0; index < length; index += 1) {
 		const node = actual[index];
-		if (node instanceof Element && handleElement(node, depth)) {
+		let remove = isClobbered(node);
+		if (!remove) switch (node.nodeType) {
+			case Node.ELEMENT_NODE:
+				handleElement(node, depth);
+				break;
+			case Node.COMMENT_NODE:
+				remove = COMMENT_HARMFUL.test(node.data);
+				break;
+			case Node.DOCUMENT_TYPE_NODE:
+			case Node.PROCESSING_INSTRUCTION_NODE:
+				remove = true;
+				break;
+		}
+		if (remove) {
+			removeNode(node);
 			actual.splice(index, 1);
-			length -= 1;
 			index -= 1;
+			length -= 1;
 			continue;
 		}
 		if (node.hasChildNodes()) sanitizeNodes([...node.childNodes], depth + 1);
 	}
 	return nodes;
 }
+var COMMENT_HARMFUL = /<[/\w]/g;
+var REMOVE_SELECTOR = "script, toretto-temporary";
 export { sanitizeAttributes, sanitizeNodes };

package/dist/internal/attribute.js

@@ -34,16 +34,16 @@ function handleAttribute(callback, decode, first, second) {
 function isAttribute(value) {
 	return value instanceof Attr || isPlainObject(value) && typeof value.name === "string" && typeof value.value === "string";
 }
-function isBadAttribute(first, second, decode) {
+function _isBadAttribute(first, second, decode) {
 	return handleAttribute(badAttributeHandler, decode, first, second);
 }
-function isBooleanAttribute(first, decode) {
+function _isBooleanAttribute(first, decode) {
 	return handleAttribute((name) => booleanAttributesSet.has(name?.toLowerCase()), decode, first, "");
 }
-function isEmptyNonBooleanAttribute(first, second, decode) {
+function _isEmptyNonBooleanAttribute(first, second, decode) {
 	return handleAttribute((name, value) => name != null && value != null && !booleanAttributesSet.has(name) && value.trim().length === 0, decode, first, second);
 }
-function isInvalidBooleanAttribute(first, second, decode) {
+function _isInvalidBooleanAttribute(first, second, decode) {
 	return handleAttribute(booleanAttributeHandler, decode, first, second);
 }
 function isProperty(value) {
@@ -115,4 +115,4 @@ const booleanAttributes = Object.freeze([
 var booleanAttributesSet = new Set(booleanAttributes);
 var formElement = document.createElement("form");
 var textArea;
-export { booleanAttributes, isBadAttribute, isBooleanAttribute, isEmptyNonBooleanAttribute, isInvalidBooleanAttribute, isProperty, updateValue, updateValues };
+export { _isBadAttribute, _isBooleanAttribute, _isEmptyNonBooleanAttribute, _isInvalidBooleanAttribute, booleanAttributes, isProperty, updateValue, updateValues };

package/dist/is.js

@@ -2,10 +2,10 @@ import { isEventTarget, isHTMLOrSVGElement } from "./internal/is.js";
 function isChildNode(value) {
 	return value instanceof Node && CHILD_NODE_TYPES.has(value.nodeType);
 }
-function isInDocument(node, document) {
+function isInDocument(node, doc) {
 	if (!(node instanceof Node)) return false;
-	if (!(document instanceof Document)) return node.ownerDocument?.contains(node) ?? true;
-	return node.ownerDocument == null ? node === document : node.ownerDocument === document && document.contains(node);
+	if (!(doc instanceof Document)) return node.ownerDocument?.contains(node) ?? true;
+	return node.ownerDocument == null ? node === doc : node.ownerDocument === doc && doc.contains(node);
 }
 var CHILD_NODE_TYPES = new Set([
 	Node.ELEMENT_NODE,

package/dist/style.js

@@ -55,8 +55,8 @@ function toggleStyles(element, styles) {
 	};
 }
 function updateStyleProperty(element, key, value) {
-	updateElementValue(element, key, value, function(property, value$1) {
-		this.style[property] = value$1;
+	updateElementValue(element, key, value, function(property, style) {
+		this.style[property] = style;
 	}, function(property) {
 		this.style[property] = "";
 	}, false);