@xaendar/core 0.6.7 → 0.6.9

package/dist/xaendar-core.es.d.ts

@@ -3,6 +3,7 @@ import { Beautify } from '@xaendar/types';
 import { ClassDecorator as ClassDecorator_2 } from '@xaendar/types';
 import { Constructor } from '@xaendar/types';
 import { EffectOptions } from '@xaendar/signals';
+import { Function as Function_2 } from '@xaendar/types';
 import { NoArgsFunction } from '@xaendar/types';
 import { NoArgsVoidFunction } from '@xaendar/types';
 import { NoArgsVoidFunction as NoArgsVoidFunction_2 } from '@xaendar/types';
@@ -74,7 +75,7 @@ export declare type BaseWebComponentConstructor = Constructor<BaseWebComponent,
  */
 declare type Block = {
     condition?: NoArgsFunction<boolean>;
-    block: NoArgsFunction<NoArgsVoidFunction[]>;
+    block: Function_2<[HTMLElement], NoArgsVoidFunction[]>;
 };
 
 /**
@@ -156,11 +157,12 @@ export declare type EventOptions = Beautify<RequireOne<Omit<CustomEventInit, 'de
  * Reactively iterates over a list of items, re-running the loop whenever the tracked condition changes.
  * Previous iteration side-effects are cleaned up before each re-evaluation.
  *
+ * @param parentNode - The parent HTML element where the conditional structure is applied.
  * @param unwatchFns - Array collecting cleanup functions for the parent scope.
  * @param condition - A reactive function that returns the array of items to iterate over.
- * @param forFn - A callback invoked for each item, receiving the item and its index. Must return an array of cleanup functions.
+ * @param forFn - A callback invoked for each item, receiving the parent node, the item, and its index. Must return an array of cleanup functions.
  */
-export declare function _for(unwatchFns: NoArgsVoidFunction[], condition: () => unknown[], forFn: (item: unknown, index: number) => NoArgsVoidFunction[]): void;
+export declare function _for(parentNode: HTMLElement, unwatchFns: NoArgsVoidFunction[], condition: () => unknown[], forFn: (parentNode: HTMLElement, item: unknown, index: number) => NoArgsVoidFunction[]): void;
 
 /**
  * Creates a reactive conditional structure from a list of branches.
@@ -176,12 +178,13 @@ export declare function _for(unwatchFns: NoArgsVoidFunction[], condition: () =>
  * state (which branch is active) and the related cleanup functions are only updated if
  * the active branch has actually changed.
  *
+ * @param parentNode - The parent HTML element where the conditional structure is applied.
  * @param unwatchFns - Shared array that collects all active cleanup functions.
  *   Mutated in place: the created effect and branch functions are added to and
  *   removed from this array.
  * @param blocks - Ordered list of conditional branches to evaluate.
  */
-export declare function _if(unwatchFns: NoArgsVoidFunction[], blocks: Block[]): void;
+export declare function _if(parentNode: HTMLElement, unwatchFns: NoArgsVoidFunction[], blocks: Block[]): void;
 
 /**
  * An `InputSignal` is a specialized `Signal.State` designed for use as a property signal in web components.
@@ -363,6 +366,7 @@ export { Signal_2 as Signal }
  * Because it delegates to `_if`, the switch benefits from the same optimisation:
  * the active branch is only re-rendered when it actually changes.
  *
+ * @param parentNode - The parent HTML element where the conditional structure is applied.
  * @param unwatchFns - Shared array that collects all active cleanup functions.
  *   Mutated in place by the underlying {@link _if} call.
  * @param expression - Function that evaluates the switch expression. Called
@@ -373,7 +377,7 @@ export { Signal_2 as Signal }
  *   - `block`: function that applies the branch's side effects and returns
  *     its cleanup functions.
  */
-export declare function _switch(unwatchFns: NoArgsVoidFunction[], expression: NoArgsFunction<unknown>, blocks: Array<{
+export declare function _switch(parentNode: HTMLElement, unwatchFns: NoArgsVoidFunction[], expression: NoArgsFunction<unknown>, blocks: Array<{
     condition: unknown[] | null;
     block: NoArgsFunction<NoArgsVoidFunction[]>;
 }>): void;

package/dist/xaendar-core.es.js

@@ -416,23 +416,24 @@ function signal(value, options) {
 * state (which branch is active) and the related cleanup functions are only updated if
 * the active branch has actually changed.
 *
+* @param parentNode - The parent HTML element where the conditional structure is applied.
 * @param unwatchFns - Shared array that collects all active cleanup functions.
 *   Mutated in place: the created effect and branch functions are added to and
 *   removed from this array.
 * @param blocks - Ordered list of conditional branches to evaluate.
 */
-function _if(unwatchFns, blocks) {
+function _if(parentNode, unwatchFns, blocks) {
 	let state = null;
 	let localUnwatchFns = new Array();
 	let fn;
 	switch (blocks.length) {
 		case 1:
-			fn = () => handleIf(blocks[0], state, unwatchFns, localUnwatchFns);
+			fn = () => handleIf(parentNode, blocks[0], state, unwatchFns, localUnwatchFns);
 			break;
 		case 2:
-			fn = () => handleIfElse(blocks[0], blocks[1], state, unwatchFns, localUnwatchFns);
+			fn = () => handleIfElse(parentNode, blocks[0], blocks[1], state, unwatchFns, localUnwatchFns);
 			break;
-		default: fn = () => handleIfElseIf(blocks, state, unwatchFns, localUnwatchFns);
+		default: fn = () => handleIfElseIf(parentNode, blocks, state, unwatchFns, localUnwatchFns);
 	}
 	const unlistener = effect(() => {
 		const retVal = fn();
@@ -457,8 +458,8 @@ function _if(unwatchFns, blocks) {
 * @returns The new state and new cleanup functions if the active branch changed,
 *   otherwise `undefined`.
 */
-function handleIf(ifBlock, state, unwatchFns, localUnwatchFns) {
-	return ifBlock.condition() ? checkAndUpdateState(state, 0, ifBlock.block, unwatchFns, localUnwatchFns) : checkAndUpdateState(state, null, () => [], unwatchFns, localUnwatchFns);
+function handleIf(parentNode, ifBlock, state, unwatchFns, localUnwatchFns) {
+	return ifBlock.condition() ? checkAndUpdateState(parentNode, state, 0, ifBlock.block, unwatchFns, localUnwatchFns) : checkAndUpdateState(parentNode, state, null, () => [], unwatchFns, localUnwatchFns);
 }
 /**
 * Handles the `if` / `else` case (exactly two branches).
@@ -474,8 +475,8 @@ function handleIf(ifBlock, state, unwatchFns, localUnwatchFns) {
 * @returns The new state and new cleanup functions if the active branch changed,
 *   otherwise `undefined`.
 */
-function handleIfElse(ifBlock, elseBlock, state, unwatchFns, localUnwatchFns) {
-	return ifBlock.condition() ? checkAndUpdateState(state, 0, ifBlock.block, unwatchFns, localUnwatchFns) : checkAndUpdateState(state, 1, elseBlock.block, unwatchFns, localUnwatchFns);
+function handleIfElse(parentNode, ifBlock, elseBlock, state, unwatchFns, localUnwatchFns) {
+	return ifBlock.condition() ? checkAndUpdateState(parentNode, state, 0, ifBlock.block, unwatchFns, localUnwatchFns) : checkAndUpdateState(parentNode, state, 1, elseBlock.block, unwatchFns, localUnwatchFns);
 }
 /**
 * Handles the general case of an `if` / `else if` / ... / `else` chain (three or more branches).
@@ -491,10 +492,10 @@ function handleIfElse(ifBlock, elseBlock, state, unwatchFns, localUnwatchFns) {
 * @returns The new state and new cleanup functions if the active branch changed,
 *   otherwise `undefined`. Also returns `undefined` if no branch matches.
 */
-function handleIfElseIf(blocks, state, unwatchFns, localUnwatchFns) {
+function handleIfElseIf(parentNode, blocks, state, unwatchFns, localUnwatchFns) {
 	for (let i = 0; i < blocks.length; i++) {
 		const { condition, block } = blocks[i];
-		if (!condition || condition()) return checkAndUpdateState(state, i, block, unwatchFns, localUnwatchFns);
+		if (!condition || condition()) return checkAndUpdateState(parentNode, state, i, block, unwatchFns, localUnwatchFns);
 	}
 }
 /**
@@ -518,10 +519,10 @@ function handleIfElseIf(blocks, state, unwatchFns, localUnwatchFns) {
 * @returns Il nuovo stato e le nuove funzioni di cleanup se il ramo è cambiato, altrimenti
 *   `undefined`.
 */
-function checkAndUpdateState(state, newState, conditionalBlockFn, unwatchFns, localUnwatchFns) {
+function checkAndUpdateState(parentNode, state, newState, conditionalBlockFn, unwatchFns, localUnwatchFns) {
 	if (state !== newState) {
 		unwatch(unwatchFns, localUnwatchFns);
-		localUnwatchFns = Signal.subtle.untrack(conditionalBlockFn);
+		localUnwatchFns = Signal.subtle.untrack(() => conditionalBlockFn(parentNode));
 		unwatchFns.push(...localUnwatchFns);
 		return {
 			state: newState,
@@ -551,18 +552,19 @@ function unwatch(unwatchFns, localUnwatchFns) {
 * Reactively iterates over a list of items, re-running the loop whenever the tracked condition changes.
 * Previous iteration side-effects are cleaned up before each re-evaluation.
 *
+* @param parentNode - The parent HTML element where the conditional structure is applied.
 * @param unwatchFns - Array collecting cleanup functions for the parent scope.
 * @param condition - A reactive function that returns the array of items to iterate over.
-* @param forFn - A callback invoked for each item, receiving the item and its index. Must return an array of cleanup functions.
+* @param forFn - A callback invoked for each item, receiving the parent node, the item, and its index. Must return an array of cleanup functions.
 */
-function _for(unwatchFns, condition, forFn) {
+function _for(parentNode, unwatchFns, condition, forFn) {
 	const localUnwatchFns = new Array();
 	const unlistener = effect(() => {
 		unwatch(unwatchFns, localUnwatchFns);
 		const items = condition();
 		Signal.subtle.untrack(() => {
 			for (let i = 0; i < items.length; i++) {
-				localUnwatchFns.push(...forFn(items[i], i));
+				localUnwatchFns.push(...forFn(parentNode, items[i], i));
 				unwatchFns.push(...localUnwatchFns);
 			}
 		});
@@ -605,6 +607,7 @@ function _iterationVariables(items, index, itemAlias, indexAlias) {
 * Because it delegates to `_if`, the switch benefits from the same optimisation:
 * the active branch is only re-rendered when it actually changes.
 *
+* @param parentNode - The parent HTML element where the conditional structure is applied.
 * @param unwatchFns - Shared array that collects all active cleanup functions.
 *   Mutated in place by the underlying {@link _if} call.
 * @param expression - Function that evaluates the switch expression. Called
@@ -615,8 +618,8 @@ function _iterationVariables(items, index, itemAlias, indexAlias) {
 *   - `block`: function that applies the branch's side effects and returns
 *     its cleanup functions.
 */
-function _switch(unwatchFns, expression, blocks) {
-	_if(unwatchFns, blocks.map(({ condition, block }) => ({
+function _switch(parentNode, unwatchFns, expression, blocks) {
+	_if(parentNode, unwatchFns, blocks.map(({ condition, block }) => ({
 		condition: condition ? () => condition.some((condition) => condition === expression()) : void 0,
 		block
 	})));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaendar/core",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "description": "A library containing core utils such as webcomponent base classes and theming support",
   "sideEffects": false,
   "type": "module",
@@ -16,7 +16,7 @@
     }
   },
   "dependencies": {
-    "@xaendar/signals": "0.6.7",
-    "@xaendar/types": "0.6.7"
+    "@xaendar/signals": "0.6.9",
+    "@xaendar/types": "0.6.9"
   }
 }