@oscarpalmer/abydon 0.12.0 → 0.14.0

package/src/node/value.ts

@@ -1,12 +1,100 @@
 import {isNullableOrWhitespace} from '@oscarpalmer/atoms/is';
-import type {Key} from '@oscarpalmer/atoms/models';
 import {getString} from '@oscarpalmer/atoms/string';
-import {type Reactive, effect} from '@oscarpalmer/sentinel';
+import type {Reactive} from '@oscarpalmer/mora';
+import {isChildNode} from '@oscarpalmer/toretto/is';
 import type {Fragment} from '../fragment';
-import {compareArrays, isChildNode, isFragment} from '../helpers';
+import {compareArrays, isFragment} from '../helpers';
 import {createNodes, replaceNodes} from '../helpers/dom';
 import type {FragmentData, FragmentItem} from '../models';
 
+//
+
+type Identifiers = {
+	next: unknown[];
+	previous: (unknown | undefined)[];
+};
+
+type BaseItems = {
+	fragments: Fragment[];
+	templates: Fragment[];
+};
+
+type ExtendedItems = {
+	next: Fragment[];
+} & BaseItems;
+
+//
+
+function addToArray(
+	identifiers: Identifiers,
+	items: ExtendedItems,
+	nodes: ChildNode[],
+	added: boolean,
+): void {
+	let position = nodes[0];
+
+	const before =
+		added && !identifiers.previous.includes(items.templates[0].identifier);
+
+	const next = items.next.flatMap(fragment =>
+		fragment.get().flatMap(node => ({
+			identifier: fragment.identifier,
+			value: node,
+		})),
+	);
+
+	const {length} = next;
+
+	for (let index = 0; index < length; index += 1) {
+		const node = next[index];
+
+		if (!(added && identifiers.previous.includes(node.identifier))) {
+			if (index === 0 && before) {
+				position.before(node.value);
+			} else {
+				position.after(node.value);
+			}
+		}
+
+		position = node.value;
+	}
+}
+
+function handleArray(
+	identifiers: Identifiers,
+	items: BaseItems,
+	nodes: ChildNode[],
+): Partial<FragmentItem> {
+	const next = items.templates.map(
+		template =>
+			items.fragments?.find(
+				fragment => fragment.identifier === template.identifier,
+			) ?? template,
+	);
+
+	const comparison = compareArrays(items.fragments ?? [], items.templates);
+
+	if (comparison !== 'removed') {
+		addToArray(identifiers, {...items, next}, nodes, comparison === 'added');
+	}
+
+	const toRemove =
+		items.fragments?.filter(
+			fragment => !identifiers.next.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 removeFragments(fragments: Fragment[] | undefined): void {
 	if (fragments != null) {
 		const {length} = fragments;
@@ -18,15 +106,13 @@ function removeFragments(fragments: Fragment[] | undefined): void {
 }
 
 function setArray(
-	fragments: Fragment[] | undefined,
-	nodes: ChildNode[] | undefined,
+	item: FragmentItem,
 	comment: Comment,
-	text: Text,
 	value: unknown[],
 ): Partial<FragmentItem> | boolean {
 	if (value.length === 0) {
 		return {
-			nodes: setText(fragments, nodes, comment, text, value),
+			nodes: setText(item, comment, value),
 		};
 	}
 
@@ -34,10 +120,10 @@ function setArray(
 		item => isFragment(item) && item.identifier != null,
 	) as Fragment[];
 
-	const identifiers = templates.map(fragment => fragment.identifier) as Key[];
-	const oldIdentifiers = fragments?.map(fragment => fragment.identifier) ?? [];
+	const next = templates.map(fragment => fragment.identifier) as unknown[];
+	const previous = item.fragments?.map(fragment => fragment.identifier) ?? [];
 
-	if (new Set(identifiers).size !== templates.length) {
+	if (new Set(next).size !== templates.length) {
 		templates = [];
 	}
 
@@ -45,16 +131,14 @@ function setArray(
 
 	if (
 		noTemplates ||
-		nodes == null ||
-		oldIdentifiers.some(identifier => identifier == null)
+		item.nodes == null ||
+		previous.some(identifier => identifier == null)
 	) {
 		return {
 			fragments: noTemplates ? undefined : templates,
 			nodes: setNodes(
-				fragments,
-				nodes,
+				item,
 				comment,
-				text,
 				noTemplates
 					? value.flatMap(item => createNodes(item))
 					: templates.flatMap(template => template.get()),
@@ -62,84 +146,35 @@ function setArray(
 		};
 	}
 
-	const next = templates.map(
-		template =>
-			fragments?.find(
-				fragment => fragment.identifier === template.identifier,
-			) ?? template,
+	return handleArray(
+		{
+			next,
+			previous,
+		},
+		{
+			templates,
+			fragments: item.fragments ?? [],
+		},
+		item.nodes,
 	);
-
-	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} = items;
-
-		for (let index = 0; index < length; 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 as Key),
-		) ?? [];
-
-	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: Fragment[] | undefined,
-	nodes: ChildNode[] | undefined,
+	item: FragmentItem,
 	comment: Comment,
-	text: Text,
 	next: ChildNode[],
 ): ChildNode[] {
-	if (nodes == null) {
+	if (item.nodes == null) {
 		if (comment.parentNode != null) {
 			replaceNodes([comment], next);
-		} else if (text.parentNode != null) {
-			replaceNodes([text], next);
+		} else if (item.text?.parentNode != null) {
+			replaceNodes([item.text], next);
 		}
 	} else {
-		replaceNodes(nodes, next);
+		replaceNodes(item.nodes, next);
 	}
 
-	removeFragments(fragments);
+	removeFragments(item.fragments);
 
 	return next;
 }
@@ -147,75 +182,87 @@ function setNodes(
 export function setReactiveValue(
 	data: FragmentData,
 	comment: Comment,
-	reactive: Reactive,
+	reactive: Reactive<unknown>,
 ): void {
-	const item = data.items.find(item => item.nodes.includes(comment));
-	const text = new Text();
+	let item = data.items.find(item => item.nodes?.includes(comment));
 
-	let fragments: Fragment[] | undefined;
-	let nodes: ChildNode[] | undefined;
+	item ??= {};
 
-	data.sentinel.effects.add(
-		effect(() => {
-			const value = reactive.get();
+	item.text = new Text();
 
+	data.mora.subscribers.add(
+		reactive.subscribe(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;
+				setReactiveValueForArray(item, comment, value);
 			} else {
-				const valueIsFragment = isFragment(value);
-
-				fragments = valueIsFragment ? [value] : undefined;
-
-				if (valueIsFragment || isChildNode(value)) {
-					nodes = setNodes(fragments, nodes, comment, text, createNodes(value));
-				} else {
-					nodes = setText(fragments, nodes, comment, text, value);
-				}
+				setReactiveValueForSingle(item, comment, value);
 			}
 
-			if (item != null) {
-				item.fragments = fragments;
-				item.nodes = [...(nodes ?? [comment])];
-			}
+			item.nodes = [...(item.nodes ?? [comment])];
 		}),
 	);
 }
 
+function setReactiveValueForArray(
+	item: FragmentItem,
+	comment: Comment,
+	value: unknown[],
+): void {
+	const result = setArray(item, comment, value);
+
+	item.fragments = typeof result === 'boolean' ? undefined : result?.fragments;
+
+	if (typeof result === 'boolean') {
+		item.nodes = result ? item.text == null ? [] : [item.text] : undefined;
+	} else {
+		item.nodes = result?.nodes;
+	}
+}
+
+function setReactiveValueForSingle(
+	item: FragmentItem,
+	comment: Comment,
+	value: unknown,
+): void {
+	const valueIsFragment = isFragment(value);
+
+	item.fragments = valueIsFragment ? [value] : undefined;
+
+	if (valueIsFragment || isChildNode(value)) {
+		item.nodes = setNodes(item, comment, createNodes(value));
+	} else {
+		item.nodes = setText(item, comment, value);
+	}
+}
+
 function setText(
-	fragments: Fragment[] | undefined,
-	nodes: ChildNode[] | undefined,
+	item: FragmentItem,
 	comment: Comment,
-	text: Text,
 	value: unknown,
 ): ChildNode[] | undefined {
 	const isNullable = isNullableOrWhitespace(value);
 
-	text.textContent = isNullable ? '' : getString(value);
+	if (item.text != null) {
+		item.text.textContent = isNullable ? '' : getString(value);
+	}
 
 	let result = false;
 
-	if (nodes != null) {
-		replaceNodes(nodes, [isNullable ? comment : text]);
+	if (item.nodes != null) {
+		replaceNodes(item.nodes, isNullable ? [comment] : item.text == null ? [] : [item.text]);
 
 		result = !isNullable;
 	} else if (isNullable && comment.parentNode == null) {
-		text.replaceWith(comment);
-	} else if (!isNullable && text.parentNode == null) {
-		comment.replaceWith(text);
+		item.text?.replaceWith(comment);
+	} else if (!isNullable && item?.text?.parentNode == null) {
+		if (item.text != null) {
+			comment.replaceWith(item.text);
+		}
 
 		result = true;
 	}
 
-	removeFragments(fragments);
+	removeFragments(item.fragments);
 
-	return result ? [text] : undefined;
+	return result ? item.text == null ? [] : [item.text] : undefined;
 }

package/src/{html.ts → parse.ts}

@@ -1,5 +1,4 @@
 import {isNullableOrWhitespace} from '@oscarpalmer/atoms/is';
-import {Fragment} from './fragment';
 import type {FragmentData} from './models';
 
 function handleExpression(
@@ -7,10 +6,6 @@ function handleExpression(
 	prefix: string,
 	expression: unknown,
 ): string {
-	if (isNullableOrWhitespace(expression)) {
-		return prefix;
-	}
-
 	if (Array.isArray(expression)) {
 		const {length} = expression;
 
@@ -23,34 +18,37 @@ function handleExpression(
 		return `${prefix}${expressions}`;
 	}
 
-	if (typeof expression === 'function' || typeof expression === 'object') {
+	if (
+		typeof expression === 'function' ||
+		(typeof expression === 'object' && expression != null)
+	) {
 		const index = data.values.push(expression) - 1;
 
 		return `${prefix}<!--abydon.${index}-->`;
 	}
 
-	return `${prefix}${expression}`;
-}
-
-export function html(
-	strings: TemplateStringsArray,
-	...values: unknown[]
-): Fragment {
-	return new Fragment(strings, values);
+	return isNullableOrWhitespace(expression) ? prefix : `${prefix}${expression}`;
 }
 
 export function parse(data: FragmentData): string {
+	if (data.template != null) {
+		return data.template;
+	}
+
 	const {length} = data.strings;
 
-	let template = '';
+	data.template = '';
 
 	for (let index = 0; index < length; index += 1) {
-		template += handleExpression(
+		data.template += handleExpression(
 			data,
 			data.strings[index],
 			data.expressions[index],
 		);
 	}
 
-	return template;
+	data.expressions = [];
+	data.strings = [] as never;
+
+	return data.template;
 }

package/types/constants.d.ts

@@ -0,0 +1,9 @@
+export declare const ABORT_CONTROLLERS: WeakMap<HTMLOrSVGElement, AbortController>;
+export declare const ATTRIBUTE_CLASS_PREFIX_LENGTH = 6;
+export declare const EXPRESSION_ATTRIBUTE_CLASS: RegExp;
+export declare const EXPRESSION_ATTRIBUTE_STYLE_FULL: RegExp;
+export declare const EXPRESSION_ATTRIBUTE_STYLE_PREFIX: RegExp;
+export declare const EXPRESSION_COMMENT_FULL: RegExp;
+export declare const EXPRESSION_COMMENT_CONTENT: RegExp;
+export declare const EXPRESSION_EVENT_NAME: RegExp;
+export declare const REASON_EVENT_REMOVED = "Event removed as element was removed from document by Abydon";

package/types/fragment.d.ts

@@ -1,8 +1,6 @@
-import type { Key } from '@oscarpalmer/atoms/models';
 export declare class Fragment {
-    private readonly $fragment;
-    private readonly data;
-    get identifier(): Key | undefined;
+    #private;
+    get identifier(): unknown;
     constructor(strings: TemplateStringsArray, expressions: unknown[]);
     /**
      * Appends the fragment to the given element
@@ -12,7 +10,7 @@ export declare class Fragment {
      * Gets a list of the fragment's nodes
      */
     get(): ChildNode[];
-    identify(identifier: Key): Fragment;
+    identify(identifier: unknown): Fragment;
     /**
      * Removes the fragment from the DOM
      */

package/types/helpers/index.d.ts

@@ -1,6 +1,3 @@
 import type { Fragment } from '../fragment';
-import type { HTMLOrSVGElement } from '../models';
 export declare function compareArrays(first: unknown[], second: unknown[]): 'added' | 'dissimilar' | 'removed';
-export declare function isChildNode(value: unknown): value is ChildNode;
 export declare function isFragment(value: unknown): value is Fragment;
-export declare function isHTMLOrSVGElement(value: unknown): value is HTMLOrSVGElement;

package/types/index.d.ts

@@ -1,3 +1,5 @@
-import '@oscarpalmer/sentinel';
+import '@oscarpalmer/mora';
+import { Fragment } from './fragment';
+export declare function html(strings: TemplateStringsArray, ...values: unknown[]): Fragment;
+export * from '@oscarpalmer/mora';
 export type { Fragment } from './fragment';
-export { html } from './html';

package/types/models.d.ts

@@ -1,21 +1,19 @@
-import type { Key } from '@oscarpalmer/atoms/models';
-import type { Effect, Reactive } from '@oscarpalmer/sentinel';
+import type { Reactive } from '@oscarpalmer/mora';
 import type { Fragment } from './fragment';
 export type FragmentData = {
     expressions: unknown[];
-    identifier?: Key;
+    identifier?: unknown;
     items: FragmentItem[];
-    sentinel: FragmentDataSentinel;
+    mora: MoraData;
     strings: TemplateStringsArray;
     values: unknown[];
 };
-type FragmentDataSentinel = {
-    effects: Set<Effect>;
-    values: Set<Reactive>;
-};
 export type FragmentItem = {
     fragments?: Fragment[];
     nodes: ChildNode[];
 };
-export type HTMLOrSVGElement = HTMLElement | SVGElement;
+type MoraData = {
+    subscribers: Set<() => void>;
+    values: Set<Reactive<unknown>>;
+};
 export {};

package/types/node/attribute/index.d.ts

@@ -1,2 +1,3 @@
-import type { FragmentData, HTMLOrSVGElement } from '../../models';
+import type { HTMLOrSVGElement } from '@oscarpalmer/toretto/models';
+import type { FragmentData } from '../../models';
 export declare function mapAttributes(data: FragmentData, element: HTMLOrSVGElement): void;

package/types/node/attribute/value.d.ts

@@ -1,2 +1,3 @@
-import type { FragmentData, HTMLOrSVGElement } from '../../models';
+import type { HTMLOrSVGElement } from '@oscarpalmer/toretto/models';
+import type { FragmentData } from '../../models';
 export declare function setAttribute(data: FragmentData, element: HTMLOrSVGElement, name: string, value: unknown): void;

package/types/node/event.d.ts

@@ -1,3 +1,3 @@
-import type { HTMLOrSVGElement } from '../models';
+import type { HTMLOrSVGElement } from '@oscarpalmer/toretto/models';
 export declare function mapEvent(element: HTMLOrSVGElement, name: string, value: unknown): void;
 export declare function removeEvents(element: HTMLOrSVGElement): void;

package/types/node/value.d.ts

@@ -1,3 +1,3 @@
-import { type Reactive } from '@oscarpalmer/sentinel';
+import type { Reactive } from '@oscarpalmer/mora';
 import type { FragmentData } from '../models';
-export declare function setReactiveValue(data: FragmentData, comment: Comment, reactive: Reactive): void;
+export declare function setReactiveValue(data: FragmentData, comment: Comment, reactive: Reactive<unknown>): void;

package/types/parse.d.ts

@@ -0,0 +1,2 @@
+import type { FragmentData } from './models';
+export declare function parse(data: FragmentData): string;

package/dist/fragment.mjs

@@ -1,75 +0,0 @@
-// src/fragment.ts
-import {html as html2} from "@oscarpalmer/toretto/html";
-import {parse} from "./html";
-import {mapNodes} from "./node";
-import {removeNodes} from "./helpers/dom";
-function removeFragment(data) {
-  removeSentinels(data);
-  const { length } = data.items;
-  for (let index = 0;index < length; index += 1) {
-    const { fragments, nodes } = data.items[index];
-    const { length: length2 } = fragments ?? [];
-    for (let index2 = 0;index2 < length2; index2 += 1) {
-      fragments?.[index2]?.remove();
-    }
-    removeNodes(nodes);
-  }
-  data.items.splice(0, length);
-}
-function removeSentinels(data) {
-  const sentinels = [...data.sentinel.effects, ...data.sentinel.values];
-  const { length } = sentinels;
-  for (let index = 0;index < length; index += 1) {
-    sentinels[index].stop();
-  }
-  data.sentinel.effects.clear();
-  data.sentinel.values.clear();
-}
-
-class Fragment {
-  $fragment = true;
-  data;
-  get identifier() {
-    return this.data.identifier;
-  }
-  constructor(strings, expressions) {
-    this.data = {
-      expressions,
-      strings,
-      items: [],
-      sentinel: {
-        effects: new Set,
-        values: new Set
-      },
-      values: []
-    };
-  }
-  appendTo(element) {
-    element.append(...this.get());
-  }
-  get() {
-    if (this.data.items.length === 0) {
-      const parsed = parse(this.data);
-      const templated = html2(parsed, {
-        sanitiseBooleanAttributes: false
-      });
-      this.data.items.splice(0, this.data.items.length, ...templated.map((node2) => ({
-        nodes: [node2]
-      })));
-      mapNodes(this.data, this.data.items.flatMap((item) => item.fragments?.flatMap((fragment) => fragment.get()) ?? item.nodes));
-    }
-    return [
-      ...this.data.items.flatMap((item) => item.fragments?.flatMap((fragment) => fragment.get()) ?? item.nodes)
-    ];
-  }
-  identify(identifier) {
-    this.data.identifier = identifier;
-    return this;
-  }
-  remove() {
-    removeFragment(this.data);
-  }
-}
-export {
-  Fragment
-};

package/dist/helpers/dom.mjs

@@ -1,44 +0,0 @@
-// src/helpers/dom.ts
-import {getString} from "@oscarpalmer/atoms/string";
-import {isChildNode, isFragment, isHTMLOrSVGElement} from "./index";
-import {removeEvents} from "../node/event";
-function createNodes(value) {
-  if (isFragment(value)) {
-    return value.get();
-  }
-  if (isChildNode(value)) {
-    return [value];
-  }
-  return [new Text(getString(value))];
-}
-function removeNodes(nodes) {
-  sanitiseNodes(nodes);
-  const { length } = nodes;
-  for (let index = 0;index < length; index += 1) {
-    nodes[index].remove();
-  }
-}
-function replaceNodes(from, to) {
-  from[0]?.replaceWith(...to);
-  const { length } = from;
-  for (let index = 1;index < length; index += 1) {
-    from[index].remove();
-  }
-}
-function sanitiseNodes(nodes) {
-  const { length } = nodes;
-  for (let index = 0;index < length; index += 1) {
-    const node = nodes[index];
-    if (isHTMLOrSVGElement(node)) {
-      removeEvents(node);
-    }
-    if (node.hasChildNodes()) {
-      sanitiseNodes([...node.childNodes]);
-    }
-  }
-}
-export {
-  replaceNodes,
-  removeNodes,
-  createNodes
-};