@oscarpalmer/abydon 0.9.0 → 0.11.0

package/dist/node/event.mjs

@@ -1,4 +1,12 @@
 // src/node/event.ts
+function getController(element) {
+  let controller = controllers.get(element);
+  if (controller == null) {
+    controller = new AbortController;
+    controllers.set(element, controller);
+  }
+  return controller;
+}
 function getOptions(options) {
   const parts = options.split(":");
   return {
@@ -9,11 +17,23 @@ function getOptions(options) {
 }
 function mapEvent(element, name, value) {
   element.removeAttribute(name);
-  const [, type, options] = /^@(\w+)(?::([a-z:]+))?$/.exec(name) ?? [];
+  const [, type, options] = eventNamePattern.exec(name) ?? [];
   if (typeof value === "function" && type != null) {
-    element.addEventListener(type, value, getOptions(options ?? ""));
+    element.addEventListener(type, value, {
+      ...getOptions(options ?? ""),
+      signal: getController(element).signal
+    });
+  }
+}
+function removeEvents(element) {
+  if (controllers.has(element)) {
+    controllers.get(element)?.abort();
+    controllers.delete(element);
   }
 }
+var controllers = new WeakMap;
+var eventNamePattern = /^@([\w-]+)(?::([a-z:]+))?$/i;
 export {
+  removeEvents,
   mapEvent
 };

package/dist/node/index.mjs

@@ -1,5 +1,5 @@
 // src/node/index.ts
-import {isReactive} from "@oscarpalmer/sentinel";
+import {computed, isReactive} from "@oscarpalmer/sentinel";
 import {isFragment, isProperElement} from "../helpers";
 import {createNodes} from "../helpers/dom";
 import {mapAttributes} from "./attribute";
@@ -30,8 +30,8 @@ function mapNodes(data, nodes) {
 function mapValue(data, comment, value2) {
   switch (true) {
     case typeof value2 === "function":
-      mapValue(data, comment, value2());
-      return;
+      setReactiveNode(data, comment, computed(value2));
+      break;
     case isReactive(value2):
       setReactiveNode(data, comment, value2);
       break;
@@ -44,7 +44,7 @@ function replaceComment(data, comment, value2) {
   const item = data.items.find((item2) => item2.nodes.includes(comment));
   const nodes = createNodes(value2);
   if (item != null) {
-    item.fragment = isFragment(value2) ? value2 : undefined;
+    item.fragments = isFragment(value2) ? [value2] : undefined;
     item.nodes = nodes;
   }
   comment.replaceWith(...nodes);

package/dist/node/value.mjs

@@ -2,10 +2,68 @@
 import {isNullableOrWhitespace} from "@oscarpalmer/atoms/is";
 import {getString} from "@oscarpalmer/atoms/string";
 import {effect} from "@oscarpalmer/sentinel";
-import {isFragment, isProperNode} from "../helpers";
+import {compareArrays, isFragment, isProperNode} from "../helpers";
 import {createNodes, replaceNodes} from "../helpers/dom";
-function setNodes(nodes, comment, text, value) {
-  const next = createNodes(value);
+function removeFragments(fragments) {
+  if (fragments != null) {
+    const { length } = fragments;
+    for (let index = 0;index < length; index += 1) {
+      fragments[index].remove();
+    }
+  }
+}
+function setArray(fragments, nodes, comment, text, value) {
+  if (value.length === 0) {
+    return {
+      nodes: setText(fragments, nodes, comment, text, value)
+    };
+  }
+  let templates = value.filter((item) => isFragment(item) && item.identifier != null);
+  const identifiers = templates.map((fragment) => fragment.identifier);
+  const oldIdentifiers = fragments?.map((fragment) => fragment.identifier) ?? [];
+  if (new Set(identifiers).size !== templates.length) {
+    templates = [];
+  }
+  const noTemplates = templates.length === 0;
+  if (noTemplates || nodes == null || oldIdentifiers.some((identifier) => identifier == null)) {
+    return {
+      fragments: noTemplates ? undefined : templates,
+      nodes: setNodes(fragments, nodes, comment, text, noTemplates ? value.flatMap((item) => createNodes(item)) : templates.flatMap((template) => template.get()))
+    };
+  }
+  const next = templates.map((template) => fragments?.find((fragment) => fragment.identifier === template.identifier) ?? template);
+  const comparison = compareArrays(fragments ?? [], templates);
+  if (comparison !== "removed") {
+    let position = nodes[0];
+    const before = comparison === "added" && !oldIdentifiers.includes(templates[0].identifier);
+    const items = next.flatMap((fragment) => fragment.get().flatMap((node) => ({
+      identifier: fragment.identifier,
+      value: node
+    })));
+    const { length: length2 } = items;
+    for (let index = 0;index < length2; index += 1) {
+      const item = items[index];
+      if (comparison === "dissimilar" || !oldIdentifiers.includes(item.identifier)) {
+        if (index === 0 && before) {
+          position.before(item.value);
+        } else {
+          position.after(item.value);
+        }
+      }
+      position = item.value;
+    }
+  }
+  const toRemove = fragments?.filter((fragment) => !identifiers.includes(fragment.identifier)) ?? [];
+  const { length } = toRemove;
+  for (let index = 0;index < length; index += 1) {
+    toRemove[index].remove();
+  }
+  return {
+    fragments: next,
+    nodes: next.flatMap((fragment) => fragment.get())
+  };
+}
+function setNodes(fragments, nodes, comment, text, next) {
   if (nodes == null) {
     if (comment.parentNode != null) {
       replaceNodes([comment], next);
@@ -15,42 +73,50 @@ function setNodes(nodes, comment, text, value) {
   } else {
     replaceNodes(nodes, next);
   }
+  removeFragments(fragments);
   return next;
 }
 function setReactiveNode(data, comment, reactive) {
   const item = data.items.find((item2) => item2.nodes.includes(comment));
   const text = new Text;
+  let fragments;
   let nodes;
   effect(() => {
     const value = reactive.get();
-    const valueIsFragment = isFragment(value);
-    if (valueIsFragment || isProperNode(value)) {
-      nodes = setNodes(nodes, comment, text, value);
+    if (Array.isArray(value)) {
+      const result = setArray(fragments, nodes, comment, text, value);
+      fragments = typeof result === "boolean" ? undefined : result?.fragments;
+      nodes = typeof result === "boolean" ? result ? [text] : undefined : result?.nodes;
     } else {
-      nodes = setText(nodes, comment, text, value) ? [text] : undefined;
+      const valueIsFragment = isFragment(value);
+      fragments = valueIsFragment ? [value] : undefined;
+      if (valueIsFragment || isProperNode(value)) {
+        nodes = setNodes(fragments, nodes, comment, text, createNodes(value));
+      } else {
+        nodes = setText(fragments, nodes, comment, text, value);
+      }
     }
     if (item != null) {
-      item.fragment = valueIsFragment ? value : undefined;
+      item.fragments = fragments;
       item.nodes = [...nodes ?? [comment]];
     }
   });
 }
-function setText(nodes, comment, text, value) {
+function setText(fragments, nodes, comment, text, value) {
   const isNullable = isNullableOrWhitespace(value);
   text.textContent = isNullable ? "" : getString(value);
+  let result = false;
   if (nodes != null) {
     replaceNodes(nodes, [isNullable ? comment : text]);
-    return !isNullable;
-  }
-  if (isNullable && comment.parentNode == null) {
+    result = !isNullable;
+  } else if (isNullable && comment.parentNode == null) {
     text.replaceWith(comment);
-    return false;
-  }
-  if (!isNullable && text.parentNode == null) {
+  } else if (!isNullable && text.parentNode == null) {
     comment.replaceWith(text);
-    return true;
+    result = true;
   }
-  return false;
+  removeFragments(fragments);
+  return result ? [text] : undefined;
 }
 export {
   setReactiveNode

package/package.json

@@ -10,8 +10,8 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^1.8.3",
-		"@types/bun": "^1.1.6",
-		"bun": "^1.1.24",
+		"@types/bun": "^1.1.8",
+		"bun": "^1.1.27",
 		"dts-bundle-generator": "^9.5.1",
 		"typescript": "^5.5.4"
 	},
@@ -47,5 +47,5 @@
 	},
 	"type": "module",
 	"types": "types/index.d.ts",
-	"version": "0.9.0"
+	"version": "0.11.0"
 }

package/src/fragment.ts

@@ -1,12 +1,18 @@
+import type {Key} from '@oscarpalmer/atoms/models';
 import {html} from '@oscarpalmer/toretto/html';
 import {parse} from './html';
 import type {FragmentData, ProperNode} from './models';
 import {mapNodes} from './node';
+import {removeNodes} from './helpers/dom';
 
 export class Fragment {
 	private readonly $fragment = true;
 	private readonly data: FragmentData;
 
+	get identifier(): Key | undefined {
+		return this.data.identifier;
+	}
+
 	constructor(strings: TemplateStringsArray, expressions: unknown[]) {
 		this.data = {
 			expressions,
@@ -26,7 +32,7 @@ export class Fragment {
 	/**
 	 * Gets a list of the fragment's nodes
 	 */
-	get(): Node[] {
+	get(): ProperNode[] {
 		if (this.data.items.length === 0) {
 			const parsed = parse(this.data);
 
@@ -45,18 +51,26 @@ export class Fragment {
 			mapNodes(
 				this.data,
 				this.data.items.flatMap(
-					item => item.fragment?.get() ?? item.nodes,
-				) as ProperNode[],
+					item =>
+						item.fragments?.flatMap(fragment => fragment.get()) ?? item.nodes,
+				),
 			);
 		}
 
 		return [
-			...(this.data.items.flatMap(
-				item => item.fragment?.get() ?? item.nodes,
-			) as ProperNode[]),
+			...this.data.items.flatMap(
+				item =>
+					item.fragments?.flatMap(fragment => fragment.get()) ?? item.nodes,
+			),
 		];
 	}
 
+	identify(identifier: Key): Fragment {
+		this.data.identifier = identifier;
+
+		return this;
+	}
+
 	/**
 	 * Removes the fragment from the DOM
 	 */
@@ -64,13 +78,14 @@ export class Fragment {
 		const {length} = this.data.items;
 
 		for (let index = 0; index < length; index += 1) {
-			const item = this.data.items[index];
-
-			item.fragment?.remove();
+			const {fragments, nodes} = this.data.items[index];
+			const {length} = fragments ?? [];
 
-			for (const node of item.nodes) {
-				node.remove();
+			for (let index = 0; index < length; index += 1) {
+				fragments?.[index]?.remove();
 			}
+
+			removeNodes(nodes);
 		}
 
 		this.data.items.splice(0, length);

package/src/helpers/dom.ts

@@ -1,6 +1,7 @@
 import {getString} from '@oscarpalmer/atoms/string';
 import type {ProperNode} from '../models';
-import {isFragment, isProperNode} from './index';
+import {isFragment, isProperElement, isProperNode} from './index';
+import {removeEvents} from '../node/event';
 
 export function createNodes(value: unknown): ProperNode[] {
 	if (isFragment(value)) {
@@ -14,16 +15,38 @@ export function createNodes(value: unknown): ProperNode[] {
 	return [new Text(getString(value))];
 }
 
+export function removeNodes(nodes: ProperNode[]): void {
+	sanitiseNodes(nodes);
+
+	const {length} = nodes;
+
+	for (let index = 0; index < length; index += 1) {
+		nodes[index].remove();
+	}
+}
+
 export function replaceNodes(from: ProperNode[], to: ProperNode[]): void {
+	from[0]?.replaceWith(...to);
+
 	const {length} = from;
 
+	for (let index = 1; index < length; index += 1) {
+		from[index].remove();
+	}
+}
+
+function sanitiseNodes(nodes: ProperNode[]): void {
+	const {length} = nodes;
+
 	for (let index = 0; index < length; index += 1) {
-		const node = from[index];
+		const node = nodes[index];
+
+		if (isProperElement(node)) {
+			removeEvents(node);
+		}
 
-		if (index === 0) {
-			node.replaceWith(...to);
-		} else {
-			node.remove();
+		if (node.hasChildNodes()) {
+			sanitiseNodes([...node.childNodes] as ProperNode[]);
 		}
 	}
 }

package/src/helpers/index.ts

@@ -1,6 +1,25 @@
 import type {Fragment} from '../fragment';
 import type {ProperElement, ProperNode} from '../models';
 
+export function compareArrays(
+	first: unknown[],
+	second: unknown[],
+): 'added' | 'dissimilar' | 'removed' {
+	const firstIsLarger = first.length > second.length;
+	const from = firstIsLarger ? first : second;
+	const to = firstIsLarger ? second : first;
+
+	if (
+		!from
+			.filter(key => to.includes(key))
+			.every((key, index) => to[index] === key)
+	) {
+		return 'dissimilar';
+	}
+
+	return firstIsLarger ? 'removed' : 'added';
+}
+
 export function isFragment(value: unknown): value is Fragment {
 	return (
 		typeof value === 'object' &&

package/src/models.ts

@@ -1,14 +1,16 @@
+import type {Key} from '@oscarpalmer/atoms/models';
 import type {Fragment} from './fragment';
 
 export type FragmentData = {
 	expressions: unknown[];
+	identifier?: Key;
 	items: FragmentItem[];
 	strings: TemplateStringsArray;
 	values: unknown[];
 };
 
 export type FragmentItem = {
-	fragment?: Fragment;
+	fragments?: Fragment[];
 	nodes: ProperNode[];
 };
 

package/src/node/attribute/index.ts

@@ -1,4 +1,5 @@
-import {isReactive} from '@oscarpalmer/sentinel';
+import type {GenericCallback} from '@oscarpalmer/atoms/models';
+import {computed, isReactive} from '@oscarpalmer/sentinel';
 import type {FragmentData, ProperElement} from '../../models';
 import {mapEvent} from '../event';
 import {setAttribute} from './value';
@@ -11,28 +12,35 @@ function getValue(data: FragmentData, original: string): unknown {
 	return matches == null ? original : data.values[+matches[1]];
 }
 
-export function mapAttributes(data: FragmentData, element: ProperElement): void {
-		const attributes = [...element.attributes];
-		const {length} = attributes;
-
-		for (let index = 0; index < length; index += 1) {
-			const {name, value} = attributes[index];
-
-			const actual = getValue(data, value);
-
-			if (name.startsWith('@')) {
-				mapEvent(element, name, actual);
-			} else if (name.includes('.') || isReactive(actual)) {
-				mapValue(element, name, actual);
-			}
+export function mapAttributes(
+	data: FragmentData,
+	element: ProperElement,
+): void {
+	const attributes = [...element.attributes];
+	const {length} = attributes;
+
+	for (let index = 0; index < length; index += 1) {
+		const {name, value} = attributes[index];
+
+		const actual = getValue(data, value);
+
+		if (name.startsWith('@')) {
+			mapEvent(element, name, actual);
+		} else if (
+			name.includes('.') ||
+			typeof value === 'function' ||
+			isReactive(actual)
+		) {
+			mapValue(element, name, actual);
 		}
 	}
+}
 
 function mapValue(element: ProperElement, name: string, value: unknown): void {
 	switch (true) {
 		case typeof value === 'function':
-			mapValue(element, name, value());
-			return;
+			setAttribute(element, name, computed(value as GenericCallback));
+			break;
 
 		default:
 			setAttribute(element, name, value);

package/src/node/attribute/value.ts

@@ -7,8 +7,9 @@ import {
 } from '@oscarpalmer/toretto/attribute';
 import type {ProperElement} from '../../models';
 
-const classPattern = /^class\./;
-const stylePattern = /^style\./;
+const classExpression = /^class\./;
+const styleFullExpression = /^style\.([\w-]+)(?:\.([\w-]+))?$/;
+const stylePrefixExpression = /^style\./;
 
 export function setAttribute(
 	element: ProperElement,
@@ -18,11 +19,11 @@ export function setAttribute(
 	element.removeAttribute(name);
 
 	switch (true) {
-		case classPattern.test(name):
+		case classExpression.test(name):
 			setClasses(element, name, value);
 			return;
 
-		case stylePattern.test(name):
+		case stylePrefixExpression.test(name):
 			setStyle(element, name, value);
 			return;
 
@@ -38,7 +39,7 @@ function setClasses(
 	value: unknown,
 ): void {
 	function update(value: unknown): void {
-		if (/^(|true)$/.test(getString(value))) {
+		if (value === true) {
 			element.classList.add(...classes);
 		} else {
 			element.classList.remove(...classes);
@@ -68,18 +69,16 @@ function setStyle(element: ProperElement, name: string, value: unknown): void {
 		}
 	}
 
-	const [, property, unit] = /^\w+\.([a-z-]+)(?:\.(\w+))?$/i.exec(name) ?? [];
+	const [, property, unit] = styleFullExpression.exec(name) ?? [];
 
-	if (property == null) {
-		return;
-	}
-
-	if (isReactive(value)) {
-		effect(() => {
-			update(value.get());
-		});
-	} else {
-		update(value);
+	if (property != null) {
+		if (isReactive(value)) {
+			effect(() => {
+				update(value.get());
+			});
+		} else {
+			update(value);
+		}
 	}
 }
 
@@ -111,9 +110,7 @@ function updateProperty(
 	name: string,
 	value: unknown,
 ): void {
-	(element as unknown as PlainObject)[name] = /^(|true)$/.test(
-		getString(value),
-	);
+	(element as unknown as PlainObject)[name] = value === true;
 }
 
 function updateSelected(

package/src/node/event.ts

@@ -1,5 +1,21 @@
 import type {ProperElement} from '../models';
 
+const controllers = new WeakMap<ProperElement, AbortController>();
+
+const eventNamePattern = /^@([\w-]+)(?::([a-z:]+))?$/i;
+
+function getController(element: ProperElement): AbortController {
+	let controller = controllers.get(element);
+
+	if (controller == null) {
+		controller = new AbortController();
+
+		controllers.set(element, controller);
+	}
+
+	return controller;
+}
+
 function getOptions(options: string): AddEventListenerOptions {
 	const parts = options.split(':');
 
@@ -17,13 +33,19 @@ export function mapEvent(
 ): void {
 	element.removeAttribute(name);
 
-	const [, type, options] = /^@(\w+)(?::([a-z:]+))?$/.exec(name) ?? [];
+	const [, type, options] = eventNamePattern.exec(name) ?? [];
 
 	if (typeof value === 'function' && type != null) {
-		element.addEventListener(
-			type,
-			value as EventListener,
-			getOptions(options ?? ''),
-		);
+		element.addEventListener(type, value as EventListener, {
+			...getOptions(options ?? ''),
+			signal: getController(element).signal,
+		});
+	}
+}
+
+export function removeEvents(element: ProperElement): void {
+	if (controllers.has(element)) {
+		controllers.get(element)?.abort();
+		controllers.delete(element);
 	}
 }

package/src/node/index.ts

@@ -1,4 +1,5 @@
-import {isReactive} from '@oscarpalmer/sentinel';
+import type {GenericCallback} from '@oscarpalmer/atoms/models';
+import {computed, isReactive} from '@oscarpalmer/sentinel';
 import {isFragment, isProperElement} from '../helpers';
 import {createNodes} from '../helpers/dom';
 import type {FragmentData, ProperNode} from '../models';
@@ -41,8 +42,8 @@ export function mapNodes(data: FragmentData, nodes: ProperNode[]): void {
 function mapValue(data: FragmentData, comment: Comment, value: unknown): void {
 	switch (true) {
 		case typeof value === 'function':
-			mapValue(data, comment, value());
-			return;
+			setReactiveNode(data, comment, computed(value as GenericCallback));
+			break;
 
 		case isReactive(value):
 			setReactiveNode(data, comment, value);
@@ -63,7 +64,7 @@ function replaceComment(
 	const nodes = createNodes(value);
 
 	if (item != null) {
-		item.fragment = isFragment(value) ? value : undefined;
+		item.fragments = isFragment(value) ? [value] : undefined;
 		item.nodes = nodes;
 	}